From 7de91d96f4370d7919f4c7bacc8da852b7c209bf Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 13 Jan 2022 16:08:15 -0500
Subject: [PATCH] Client Tickets display Contact Email below Contact name,
 removed email column reworked the display handler

---
 client_tickets.php | 17 ++++++++++-------
 tickets.php        |  4 +---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client_tickets.php b/client_tickets.php
index f3603e2c..5a868fb5 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -88,8 +88,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <th><a class="text-dark" 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></th> 
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Email</a></th>           
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact</a></th>          
             <th><a class="text-dark" 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_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>
@@ -144,6 +143,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }
             $contact_id = $row['contact_id'];
             $contact_name = $row['contact_name'];
+            if(empty($contact_name)){
+              $contact_display = "-";
+            }else{
+              $contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
+            }
             $contact_title = $row['contact_title'];
             $contact_email = $row['contact_email'];
             $contact_phone = $row['contact_phone'];
@@ -160,11 +164,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <tr>
             <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-             <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $contact_name; ?></a></td>
-             <td><?php echo $contact_email; ?></td>
-             <td><?php echo $ticket_priority_display; ?></td>
-             <td><?php echo $ticket_status_display; ?></td>                   
+            <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+            <td><?php echo $contact_display; ?></td>
+            <td><?php echo $ticket_priority_display; ?></td>
+            <td><?php echo $ticket_status_display; ?></td>                   
             <td><?php echo $ticket_assigned_to_display; ?></td>
             <td><?php echo $ticket_updated_at_display; ?></td>
             <td><?php echo $ticket_created_at; ?></td>
diff --git a/tickets.php b/tickets.php
index 4655832e..9f33b802 100644
--- a/tickets.php
+++ b/tickets.php
@@ -178,8 +178,7 @@
         <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=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></th>  
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">From</a></th> 
+            <th><a class="text-dark" 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=client_name&o=<?php echo $disp; ?>">Client</a></th>
             <th><a class="text-dark" 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_status&o=<?php echo $disp; ?>">Status</a>
@@ -254,7 +253,6 @@
           <tr>
             <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
              <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-             <td><?php echo $contact_email; ?></td>
              <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $client_name; ?></a></td>
              <td><?php echo $ticket_priority_display; ?></td>
              <td><?php echo $ticket_status_display; ?></td>