From ef213e34d4e9e2384c1ae092abe2ada628869154 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 2 Nov 2023 16:12:06 -0400
Subject: [PATCH] Invoice UI Update: Bolded Due Date, Moved Subtotal to the top
 added - sign in front of discount, do not subtract the discount from the
 subtotal as this is reservered for total, do not show tax discount or paid in
 pdf if they are 0

---
 guest_view_invoice.php | 60 ++++++++++++++++++++++++++++++----------
 invoice.php            | 63 ++++++++++++++++++++++++++++++++----------
 quote.php              |  2 +-
 3 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 0e1d19ae..981da396 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -185,7 +185,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                             <td>Date</td>
                             <td class="text-right"><?php echo $invoice_date; ?></td>
                         </tr>
-                        <tr>
+                        <tr class="text-bold">
                             <td>Due</td>
                             <td class="text-right"><div class="<?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></td>
                         </tr>
@@ -212,7 +212,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                 <?php
 
                                 $total_tax = 0.00;
-                                $sub_total = 0.00;
+                                $sub_total = 0.00 - $invoice_discount;
 
                                 while ($row = mysqli_fetch_array($sql_invoice_items)) {
                                     $item_id = intval($row['item_id']);
@@ -258,28 +258,30 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                 <div class="col-sm-3 offset-sm-2">
                     <table class="table table-borderless">
                         <tbody>
+                        <tr class="border-bottom">
+                            <td>Subtotal</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
+                        </tr>
                         <?php
                         if ($invoice_discount > 0) {
                             ?>
                             <tr class="border-bottom">
                                 <td>Discount</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
+                                <td class="text-right">-<?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
                             </tr>
-
-                            <?php
-                            $sub_total = $sub_total - $invoice_discount;
+                        <?php
                         }
                         ?>
-                        <tr class="border-bottom">
-                            <td>Subtotal</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
-                        </tr>
                         <?php if ($total_tax > 0) { ?>
                             <tr class="border-bottom">
                                 <td>Tax</td>
                                 <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
                             </tr>
                         <?php } ?>
+                        <tr class="border-bottom">
+                            <td>Total</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                        </tr>
                         <?php if ($amount_paid > 0) { ?>
                             <tr class="border-bottom">
                                 <td><div class="text-success">Paid</div></td>
@@ -397,11 +399,11 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                 {},
                                 {
                                     text: 'Due',
-                                    style: 'invoiceDateTitle'
+                                    style: 'invoiceDueDateTitle'
                                 },
                                 {
                                     text: <?php echo json_encode(html_entity_decode($invoice_due)) ?>,
-                                    style: 'invoiceDateValue'
+                                    style: 'invoiceDueDateValue'
                                 },
                             ],
                         ]
@@ -520,7 +522,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                             ],
                             [
                                 {
-                                    rowSpan: 5,
+                                    rowSpan: '*',
                                     text: <?php echo json_encode(html_entity_decode($invoice_note)) ?>,
                                     style: 'notesText'
                                 },
@@ -533,6 +535,20 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                     style: 'itemsFooterSubValue'
                                 }
                             ],
+                            <?php if ($invoice_discount > 0) { ?>
+                            [
+                                {},
+                                {
+                                    text: 'Discount',
+                                    style: 'itemsFooterSubTitle'
+                                },
+                                {
+                                    text: <?php echo json_encode(numfmt_format_currency($currency_format, -$invoice_discount, $invoice_currency_code)) ?>,
+                                    style: 'itemsFooterSubValue'
+                                }
+                            ],
+                            <?php } ?>
+                            <?php if ($total_tax > 0) { ?>
                             [
                                 {},
                                 {
@@ -544,6 +560,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                     style: 'itemsFooterSubValue'
                                 }
                             ],
+                            <?php } ?>
                             [
                                 {},
                                 {
@@ -555,6 +572,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                     style: 'itemsFooterSubValue'
                                 }
                             ],
+                            <?php if ($amount_paid > 0) { ?>
                             [
                                 {},
                                 {
@@ -566,6 +584,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                                     style: 'itemsFooterSubValue'
                                 }
                             ],
+                            <?php } ?>
                             [
                                 {},
                                 {
@@ -631,7 +650,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                     alignment: 'right',
                     margin: [0,0,0,30]
                 },
-                // Invoice Dates
+                // Invoice Date
                 invoiceDateTitle: {
                     fontSize: 10,
                     alignment: 'left',
@@ -642,6 +661,19 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                     alignment: 'right',
                     margin: [0,5,0,5]
                 },
+                // Invoice Due Date
+                invoiceDueDateTitle: {
+                    fontSize: 10,
+                    bold: true,
+                    alignment: 'left',
+                    margin: [0,5,0,5]
+                },
+                invoiceDueDateValue: {
+                    fontSize: 10,
+                    bold: true,
+                    alignment: 'right',
+                    margin: [0,5,0,5]
+                },
                 // Items Header
                 itemsHeader: {
                     fontSize: 10,
diff --git a/invoice.php b/invoice.php
index b5983fb6..8b1471eb 100644
--- a/invoice.php
+++ b/invoice.php
@@ -242,7 +242,7 @@ if (isset($_GET['invoice_id'])) {
                             <td>Date</td>
                             <td class="text-right"><?php echo $invoice_date; ?></td>
                         </tr>
-                        <tr>
+                        <tr class="text-bold">
                             <td>Due</td>
                             <td class="text-right"><?php echo $invoice_due; ?></td>
                         </tr>
@@ -403,28 +403,31 @@ if (isset($_GET['invoice_id'])) {
                     <table class="table table-borderless">
                         <tbody>
 
+                        <tr class="border-bottom">
+                            <td>Subtotal</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
+                        </tr>
                         <?php
                         if ($invoice_discount > 0) {
                             ?>
                             <tr class="border-bottom">
                                 <td>Discount</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
+                                <td class="text-right">-<?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
                             </tr>
-
-                            <?php
-                            $sub_total = $sub_total - $invoice_discount;
+                        <?php    
                         }
                         ?>
-                        <tr class="border-bottom">
-                            <td>Subtotal</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
-                        </tr>
                         <?php if ($total_tax > 0) { ?>
                             <tr class="border-bottom">
                                 <td>Tax</td>
                                 <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
                             </tr>
-                        <?php } 
+                        <?php } ?>
+                        <tr class="border-bottom">
+                            <td>Total</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                        </tr>
+                        <?php
                         if ($amount_paid > 0) { ?>
                             <tr class="border-bottom">
                                 <td><div class="text-success">Paid</div></td>
@@ -680,11 +683,11 @@ require_once "footer.php";
                             {},
                             {
                                 text: 'Due',
-                                style: 'invoiceDateTitle'
+                                style: 'invoiceDueDateTitle'
                             },
                             {
                                 text: <?php echo json_encode($invoice_due) ?>,
-                                style: 'invoiceDateValue'
+                                style: 'invoiceDueDateValue'
                             },
                         ],
                     ]
@@ -803,7 +806,7 @@ require_once "footer.php";
                         ],
                         [
                             {
-                                rowSpan: 5,
+                                rowSpan: '*',
                                 text: <?php echo json_encode(html_entity_decode($invoice_note)) ?>,
                                 style: 'notesText'
                             },
@@ -816,6 +819,20 @@ require_once "footer.php";
                                 style: 'itemsFooterSubValue'
                             }
                         ],
+                        <?php if ($invoice_discount > 0) { ?>
+                        [
+                            {},
+                            {
+                                text: 'Discount',
+                                style: 'itemsFooterSubTitle'
+                            },
+                            {
+                                text: <?php echo json_encode(numfmt_format_currency($currency_format, -$invoice_discount, $invoice_currency_code)) ?>,
+                                style: 'itemsFooterSubValue'
+                            }
+                        ],
+                        <?php } ?>
+                        <?php if ($total_tax > 0) { ?>
                         [
                             {},
                             {
@@ -827,6 +844,7 @@ require_once "footer.php";
                                 style: 'itemsFooterSubValue'
                             }
                         ],
+                        <?php } ?>
                         [
                             {},
                             {
@@ -838,6 +856,7 @@ require_once "footer.php";
                                 style: 'itemsFooterSubValue'
                             }
                         ],
+                        <?php if ($amount_paid > 0) { ?>
                         [
                             {},
                             {
@@ -849,6 +868,7 @@ require_once "footer.php";
                                 style: 'itemsFooterSubValue'
                             }
                         ],
+                        <?php } ?>
                         [
                             {},
                             {
@@ -858,7 +878,7 @@ require_once "footer.php";
                             {
                                 text: <?php echo json_encode(numfmt_format_currency($currency_format, $balance, $invoice_currency_code)) ?>,
 
-                                style: 'itemsFooterTotalTitle'
+                                style: 'itemsFooterTotalValue'
                             }
                         ],
                     ]
@@ -914,7 +934,7 @@ require_once "footer.php";
                 alignment: 'right',
                 margin: [0,0,0,30]
             },
-            // Invoice Dates
+            // Invoice Date
             invoiceDateTitle: {
                 fontSize: 10,
                 alignment: 'left',
@@ -925,6 +945,19 @@ require_once "footer.php";
                 alignment: 'right',
                 margin: [0,5,0,5]
             },
+            // Invoice Due Date
+            invoiceDueDateTitle: {
+                fontSize: 10,
+                bold: true,
+                alignment: 'left',
+                margin: [0,5,0,5]
+            },
+            invoiceDueDateValue: {
+                fontSize: 10,
+                bold: true,
+                alignment: 'right',
+                margin: [0,5,0,5]
+            },
             // Items Header
             itemsHeader: {
                 fontSize: 10,
diff --git a/quote.php b/quote.php
index 650a9034..c644944d 100644
--- a/quote.php
+++ b/quote.php
@@ -234,7 +234,7 @@ if (isset($_GET['quote_id'])) {
                             <td>Date</td>
                             <td class="text-right"><?php echo $quote_date; ?></td>
                         </tr>
-                        <tr>
+                        <tr class="text-bold">
                             <td>Expire</td>
                             <td class="text-right"><?php echo $quote_expire; ?></td>
                         </tr>