From cefc68c6d0cbf78d9001e13f068ed9dd4938cabc Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Wed, 20 Jan 2021 17:27:51 -0500
Subject: [PATCH] Moved some fields around under payment added some dividers
 for sub menus as well as use color red for delete

---
 client_payments.php |  9 ++++++---
 clients.php         |  3 ++-
 payments.php        | 12 +++++++-----
 quotes.php          |  2 ++
 revenues.php        |  4 ++--
 tickets.php         |  3 ++-
 vendors.php         |  3 ++-
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/client_payments.php b/client_payments.php
index 5444889d..2d5c228d 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -74,13 +74,14 @@ $total_pages = ceil($total_found_rows / 10);
       <table class="table table-striped table-borderless table-hover">
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Date Recieved</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Payment Date</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Invoice Date</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
             <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_amount&o=<?php echo $disp; ?>">Invoice Amount</a></th>
             <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_amount&o=<?php echo $disp; ?>">Payment Amount</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_method&o=<?php echo $disp; ?>">Method</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_reference&o=<?php echo $disp; ?>">Reference</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
           </tr>
         </thead>
         <tbody>
@@ -91,6 +92,7 @@ $total_pages = ceil($total_found_rows / 10);
             $invoice_number = $row['invoice_number'];
             $invoice_status = $row['invoice_status'];
             $invoice_amount = $row['invoice_amount'];
+            $invoice_date = $row['invoice_date'];
             $payment_date = $row['payment_date'];
             $payment_method = $row['payment_method'];
             $payment_reference = $row['payment_reference'];
@@ -101,12 +103,13 @@ $total_pages = ceil($total_found_rows / 10);
           ?>
           <tr>
             <td><?php echo $payment_date; ?></td>
+            <td><?php echo $invoice_date; ?></td>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo $invoice_number; ?></a></td>
             <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
             <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
-            <td><?php echo $account_name; ?></td>
             <td><?php echo $payment_method; ?></td>
             <td><?php echo $payment_reference; ?></td>
+            <td><?php echo $account_name; ?></td>
           </tr>
 
           <?php
diff --git a/clients.php b/clients.php
index 22aa186b..f4378097 100644
--- a/clients.php
+++ b/clients.php
@@ -205,7 +205,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item text-danger" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
                 </div>
               </div>  
 
diff --git a/payments.php b/payments.php
index ea9849ad..91c1f906 100644
--- a/payments.php
+++ b/payments.php
@@ -82,13 +82,14 @@
       <table class="table table-striped table-borderless table-hover">
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Date</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Payment Date</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Invoice Date</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
             <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_method&o=<?php echo $disp; ?>">Method</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_method&o=<?php echo $disp; ?>">Payment Method</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_reference&o=<?php echo $disp; ?>">Reference</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
           </tr>
         </thead>
         <tbody>
@@ -98,6 +99,7 @@
             $invoice_id = $row['invoice_id'];
             $invoice_number = $row['invoice_number'];
             $invoice_status = $row['invoice_status'];
+            $invoice_date = $row['invoice_date'];
             $payment_date = $row['payment_date'];
             $payment_method = $row['payment_method'];
             $payment_amount = $row['payment_amount'];
@@ -110,13 +112,13 @@
 
           <tr>
             <td><?php echo $payment_date; ?></td>
+            <td><?php echo $invoice_date; ?></td>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo $invoice_number; ?></a></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=payments"><?php echo $client_name; ?></a></td>
             <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
-            
-            <td><?php echo $account_name; ?></td>
             <td><?php echo $payment_method; ?></td>
             <td><?php echo $payment_reference; ?></td>
+            <td><?php echo $account_name; ?></td>
           </tr>
 
           <?php
diff --git a/quotes.php b/quotes.php
index e5c2160c..719ebfa5 100644
--- a/quotes.php
+++ b/quotes.php
@@ -132,9 +132,11 @@
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id; ?>">Edit</a>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">Copy</a>
+                  <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send</a>
                   <a class="dropdown-item" href="post.php?approve_quote=<?php echo $quote_id; ?>">Approve</a>
                   <a class="dropdown-item" href="post.php?pdf_quote=<?php echo $quote_id; ?>">PDF</a>
+                  <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_quote=<?php echo $quote_id; ?>">Delete</a>
                 </div>
               </div>
diff --git a/revenues.php b/revenues.php
index d71b1858..6e81391d 100644
--- a/revenues.php
+++ b/revenues.php
@@ -75,9 +75,9 @@
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_date&o=<?php echo $disp; ?>">Date</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
             <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_payment_method&o=<?php echo $disp; ?>">Method</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_reference&o=<?php echo $disp; ?>">Reference</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
           </tr>
         </thead>
         <tbody>
@@ -101,9 +101,9 @@
             <td><a href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>"><?php echo $revenue_date; ?></a></td>
             <td><?php echo $category_name; ?></td>
             <td class="text-right">$<?php echo number_format($revenue_amount,2); ?></td>
-            <td><?php echo $account_name; ?></td>
             <td><?php echo $revenue_payment_method; ?></td>
             <td><?php echo $revenue_reference; ?></td>
+            <td><?php echo $account_name; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
diff --git a/tickets.php b/tickets.php
index e6bfc9db..8fb7fbba 100644
--- a/tickets.php
+++ b/tickets.php
@@ -146,7 +146,8 @@
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
                 </div>
               </div>
               <?php
diff --git a/vendors.php b/vendors.php
index c3c9e863..7056076d 100644
--- a/vendors.php
+++ b/vendors.php
@@ -157,7 +157,8 @@
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
                 </div>
               </div>      
             </td>