diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index e58afced97fd..bc39e95d4cf3 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -608,9 +608,9 @@ class Invoice extends EntityModel implements BalanceAffecting return trans("texts.{$label}"); } - public static function calcStatusClass($statusId, $balance, $dueDate) + public static function calcStatusClass($statusId, $balance, $dueDate, $isRecurring) { - if ($statusId >= INVOICE_STATUS_SENT && static::calcIsOverdue($balance, $dueDate)) { + if ($statusId >= INVOICE_STATUS_SENT && ! $isRecurring && static::calcIsOverdue($balance, $dueDate)) { return 'danger'; } @@ -637,7 +637,7 @@ class Invoice extends EntityModel implements BalanceAffecting public function statusClass() { - return static::calcStatusClass($this->invoice_status_id, $this->balance, $this->getOriginal('due_date')); + return static::calcStatusClass($this->invoice_status_id, $this->balance, $this->getOriginal('due_date'), $this->is_recurring); } public function statusLabel() diff --git a/app/Ninja/Datatables/InvoiceDatatable.php b/app/Ninja/Datatables/InvoiceDatatable.php index 94a5bd9d87f0..4d1c75b7df3b 100644 --- a/app/Ninja/Datatables/InvoiceDatatable.php +++ b/app/Ninja/Datatables/InvoiceDatatable.php @@ -168,7 +168,7 @@ class InvoiceDatatable extends EntityDatatable private function getStatusLabel($model) { - $class = Invoice::calcStatusClass($model->invoice_status_id, $model->balance, $model->due_date); + $class = Invoice::calcStatusClass($model->invoice_status_id, $model->balance, $model->due_date, $model->is_recurring); $label = Invoice::calcStatusLabel($model->invoice_status_name, $class, $this->entityType, $model->quote_invoice_id); return "