From 90042531f2366e284b2af0896156cc1c04052dd8 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@webdev.localDomain>
Date: Mon, 12 Aug 2019 12:19:44 -0400
Subject: [PATCH] Fixed overdue status in invoice also added description under
 edit revenue

---
 edit_revenue_modal.php |  5 +++++
 invoice.php            | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index 7e52c5bd..8cc66d2f 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -103,6 +103,11 @@
               <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $revenue_reference; ?>">
             </div>
           </div>
+
+          <div class="form-group">
+            <label>Description</label>
+            <textarea class="form-control" rows="4" name="description"><?php echo $revenue_description; ?></textarea>
+          </div>
   
         </div>
         <div class="modal-footer bg-white">
diff --git a/invoice.php b/invoice.php
index 6510b294..fd41ce37 100644
--- a/invoice.php
+++ b/invoice.php
@@ -49,11 +49,11 @@ if(isset($_GET['invoice_id'])){
   $balance = $invoice_amount - $amount_paid;
 
   //check to see if overdue
-
-  $unixtime_invoice_due = strtotime($invoice_due);
-  if($unixtime_invoice_due < time()){
-    $invoice_status = "Overdue";
-    $invoice_color = "text-danger";
+  if($invoice_status !== "Paid" AND $invoice_status !== "Draft" AND $invoice_status !== "Cancelled"){
+    $unixtime_invoice_due = strtotime($invoice_due);
+    if($unixtime_invoice_due < time()){
+      $invoice_overdue = "Overdue";
+    }
   }
   
   //Set Badge color based off of invoice status
@@ -80,8 +80,11 @@ if(isset($_GET['invoice_id'])){
   <li class="breadcrumb-item">
     <a href="client.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
   </li>
-  <li class="breadcrumb-item active">INV-<?php echo $invoice_number; ?></li>
+  <li class="breadcrumb-item active"><?php echo $invoice_number; ?></li>
   <span class="p-2 ml-2 badge badge-<?php echo $invoice_badge_color; ?>"><?php echo $invoice_status; ?></span>
+  <?php if(isset($invoice_overdue)){ ?>
+  <span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
+  <?php } ?>
 </ol>