From e633d1ad71dee7bf6f62f22085079dc611f4d3c6 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 22 Feb 2022 02:15:41 -0500
Subject: [PATCH] Merged contact with client on ticket listing

---
 clients.php |  4 ++--
 tickets.php | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/clients.php b/clients.php
index 2345df31..e8a3e58c 100644
--- a/clients.php
+++ b/clients.php
@@ -300,9 +300,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               ?>
             </td>
             <td class="text-right">
-              Balance: <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
+              <span class="text-secondary">Balance</span> <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
               <br>
-              Paid: <?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?>
+              <span class="text-secondary">Paid</span> <?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?>
             </td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/tickets.php b/tickets.php
index 730e74a3..f2669907 100644
--- a/tickets.php
+++ b/tickets.php
@@ -308,30 +308,27 @@ $total_tickets_assigned = $row['total_tickets_assigned'];
                     } ?>">
                     <tr>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_number&o=<?php echo $disp; ?>">Number</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_number&o=<?php echo $disp; ?>">Number</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Subject</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Subject</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client / Contact</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_priority&o=<?php echo $disp; ?>">Priority</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_priority&o=<?php echo $disp; ?>">Priority</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_status&o=<?php echo $disp; ?>">Status</a>
+                        <th><a class="text-dark"
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Assigned</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_status&o=<?php echo $disp; ?>">Status</a>
-                        <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Assigned</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_updated_at&o=<?php echo $disp; ?>">Last Response</a>
                         </th>
                         <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_updated_at&o=<?php echo $disp; ?>">Last
-                                Response</a></th>
-                        <th><a class="text-dark"
-                               href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_created_at&o=<?php echo $disp; ?>">Created</a>
+                            href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_created_at&o=<?php echo $disp; ?>">Created</a>
                         </th>
 
                         <th class="text-center">Action</th>
@@ -411,9 +408,10 @@ $total_tickets_assigned = $row['total_tickets_assigned'];
                             <td>
                                 <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
                             </td>
-                            <td><?php echo $contact_display; ?></td>
                             <td>
                                 <a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $client_name; ?></a>
+                                <br>
+                                <?php echo $contact_display; ?>
                             </td>
                             <td><?php echo $ticket_priority_display; ?></td>
                             <td><?php echo $ticket_status_display; ?></td>