From 799ba40731f6d0dbebaee4017bfdee88f71bac3f Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Mon, 14 Feb 2022 20:29:04 +0000
Subject: [PATCH] Adjust ticket count in header & side-nav to reflect open
 ticket count including working/onhold tickets

---
 client.php          | 9 +++------
 client_side_nav.php | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client.php b/client.php
index 75605160..fc9e39c2 100644
--- a/client.php
+++ b/client.php
@@ -94,11 +94,8 @@ if(isset($_GET['client_id'])){
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id"));
   $num_assets = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_client_id = $client_id"));
-  $num_tickets = $row['num'];
-
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status = 'Open' AND ticket_client_id = $client_id"));
-  $num_open_tickets = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status != 'Closed' AND ticket_client_id = $client_id"));
+  $num_active_tickets = $row['num'];
 
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id"));
   $num_services = $row['num'];
@@ -235,7 +232,7 @@ $location_phone = formatPhoneNumber($location_phone);
       <?php } ?>
       <div class="col-md-2 border-left">
         <h4 class="text-secondary">Support</h4>
-        <h6 class="ml-1 text-secondary">Open Tickets <div class="text-dark float-right"><?php echo $num_open_tickets; ?></div></h6>
+        <h6 class="ml-1 text-secondary">Open Tickets <div class="text-dark float-right"><?php echo $num_active_tickets; ?></div></h6>
       </div>
       <div class="col-md-1 border-left">
         <div class="dropdown dropleft text-center">
diff --git a/client_side_nav.php b/client_side_nav.php
index 1de14ee6..1ce0bf6a 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -134,8 +134,8 @@
             <p>
               Tickets
               <?php 
-              if($num_tickets > 0){ ?>
-              <span class="right badge badge-light"><?php echo $num_tickets; ?></span>
+              if($num_active_tickets > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_active_tickets; ?></span>
               <?php } ?>
             </p>
           </a>