From 1a31bf10d21b5753e806639f54afc8b5039dea80 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Feb 2017 11:52:49 +0200
Subject: [PATCH] Don't show recurring invoices as overdue

---
 app/Models/Invoice.php                    | 6 +++---
 app/Ninja/Datatables/InvoiceDatatable.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 5cfe168d3a9a..453f09c01f1d 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -625,9 +625,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';
         }
 
@@ -654,7 +654,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 24b3b2496189..655b924c3b8e 100644
--- a/app/Ninja/Datatables/InvoiceDatatable.php
+++ b/app/Ninja/Datatables/InvoiceDatatable.php
@@ -173,7 +173,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 "<h4><div class=\"label label-{$class}\">$label</div></h4>";