Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't show recurring invoices as overdue

Browse Source
This commit is contained in:
Hillel Coren 2017-02-07 11:52:49 +02:00
parent 1dea3876ed
commit 1a31bf10d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Invoice.php
View File

@ -625,9 +625,9 @@ class Invoice extends EntityModel implements BalanceAffecting
return trans("texts.{$label}"); 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'; return 'danger';
} }
@ -654,7 +654,7 @@ class Invoice extends EntityModel implements BalanceAffecting
public function statusClass() 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() public function statusLabel()

2
app/Ninja/Datatables/InvoiceDatatable.php
View File

@ -173,7 +173,7 @@ class InvoiceDatatable extends EntityDatatable
private function getStatusLabel($model) 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); $label = Invoice::calcStatusLabel($model->invoice_status_name, $class, $this->entityType, $model->quote_invoice_id);
return "<h4><div class=\"label label-{$class}\">$label</div></h4>"; return "<h4><div class=\"label label-{$class}\">$label</div></h4>";