From 59cf07bf4985fee86affd0fa85c095e019980ea5 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:23:29 +0000 Subject: [PATCH] Update filter to allow for closed and open when looking for unbilled. --- client_tickets.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index 7fcdd0e9..bc838a13 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -19,10 +19,13 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { } if (isset($_GET['billable']) && ($_GET['billable']) == '1') { - $billable = '1'; - $ticket_billable_snippet = " AND ticket_billable = 1"; - $ticket_status_snippet = $ticket_status . $ticket_billable_snippet; -} + $billable = 1; + $ticket_billable_snippet = "ticket_billable = 1"; + $ticket_status_snippet = '1 = 1'; +} else { + $billable = 0; + $ticket_billable_snippet = '1 = 1'; +} //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -37,6 +40,7 @@ $sql = mysqli_query( LEFT JOIN vendors ON ticket_vendor_id = vendor_id WHERE ticket_client_id = $client_id AND $ticket_status_snippet + AND $ticket_billable_snippet AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR asset_name LIKE '%$q%' OR vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%q%') ORDER BY $sort $order LIMIT $record_from, $record_to" );