From 78cfda1dbcc42044ee029d04ec01b152e2926369 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 19 Feb 2025 11:56:49 -0500 Subject: [PATCH] Merged Global Recurring Tickets with Client Recurring Tickets seperated them with some header logic --- client_recurring_tickets.php | 200 ----------------------------------- global_search.php | 2 +- includes/client_side_nav.php | 2 +- recurring_tickets.php | 21 +++- 4 files changed, 19 insertions(+), 206 deletions(-) delete mode 100644 client_recurring_tickets.php diff --git a/client_recurring_tickets.php b/client_recurring_tickets.php deleted file mode 100644 index e3c15737..00000000 --- a/client_recurring_tickets.php +++ /dev/null @@ -1,200 +0,0 @@ - - -
-
-

Recurring Tickets

-
- -
-
- -
- -
- -
- -
-
- -
- -
-
-
- -
-
- -
-
- -
-
-
- -
- -
- - - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- 		- - Subject - - - - Priority - - - - Frequency - - - - Next Run Date - - Action
-
- -
- 		-
- -
- - Edit - -
- - Force Reoccur - - -
- - Delete - -
- -
-
- -
- -
- - - -
-
- - - - - + diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index d3fdfc61..69feef28 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -69,7 +69,7 @@
  • - "> + ">

    Recurring Tickets diff --git a/recurring_tickets.php b/recurring_tickets.php index 87b07b00..0c7c6fac 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -4,7 +4,14 @@ $sort = "scheduled_ticket_subject"; $order = "ASC"; -require_once "includes/inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND scheduled_ticket_client_id = $client_id"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; +} // Perms enforceUserPermission('module_support'); @@ -25,6 +32,7 @@ $sql = mysqli_query( LEFT JOIN clients on scheduled_ticket_client_id = client_id WHERE scheduled_tickets.scheduled_ticket_subject LIKE '%$q%' $rec_ticket_permission_snippet + $client_query ORDER BY CASE WHEN '$sort' = 'scheduled_ticket_priority' THEN @@ -59,6 +67,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    + + +
    @@ -104,11 +115,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +     Client + Subject @@ -156,8 +169,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + + + )"> @@ -218,7 +233,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));