From 07c73a6a04e65b1ddaa588d67539971d81bfc5ff Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 29 Jul 2026 00:49:31 -0400 Subject: [PATCH] Add Urgent Priority, move Per Client SLA Settings to notes tab in client add / edit modal remove unnessesary sla admin setting for client overide --- admin/modals/sla/sla_assignment_client.php | 85 ------------------ admin/post/sla.php | 60 +------------ admin/sla.php | 88 ++----------------- agent/asset.php | 4 +- agent/contact.php | 4 +- agent/dashboard.php | 2 +- agent/modals/asset/asset.php | 4 +- agent/modals/asset/asset_bulk_add_ticket.php | 1 + agent/modals/client/client_add.php | 57 ++++++------ .../modals/client/client_bulk_add_ticket.php | 1 + agent/modals/client/client_edit.php | 57 ++++++------ agent/modals/contact/contact.php | 4 +- .../recurring_ticket/recurring_ticket_add.php | 1 + .../recurring_ticket_bulk_priority_edit.php | 1 + .../recurring_ticket_edit.php | 1 + agent/modals/ticket/ticket_add.php | 1 + agent/modals/ticket/ticket_add_v2.php | 1 + .../ticket/ticket_bulk_edit_priority.php | 1 + agent/modals/ticket/ticket_edit.php | 1 + agent/modals/ticket/ticket_priority.php | 1 + agent/post/client.php | 4 +- agent/project.php | 4 +- agent/recurring_tickets.php | 1 + agent/ticket.php | 4 +- agent/ticket_kanban.php | 5 +- agent/ticket_list.php | 4 +- agent/tickets.php | 1 + client/post.php | 2 +- client/ticket_add.php | 1 + 29 files changed, 107 insertions(+), 294 deletions(-) delete mode 100644 admin/modals/sla/sla_assignment_client.php diff --git a/admin/modals/sla/sla_assignment_client.php b/admin/modals/sla/sla_assignment_client.php deleted file mode 100644 index 90f70405..00000000 --- a/admin/modals/sla/sla_assignment_client.php +++ /dev/null @@ -1,85 +0,0 @@ - - -
-
$client_name" : "New client SLA override" ?>
- -
-
- - -
- -
- -
-
- -
- - - - - - -
-
- - -
- - -
- - -
- -
- - -
-
- -Default"; - } - $sla_id = $assignments[$client_id][$priority]; - if ($sla_id == 0) { - return "None"; - } - if (isset($active_slas[$sla_id])) { - return escapeHtml($active_slas[$sla_id]); - } - return "None (archived)"; -} ?> @@ -138,9 +115,6 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)

SLA Assignments

-
- -
@@ -150,7 +124,7 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority) Default (all clients)
-
@@ -163,61 +137,11 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)
-
- -
+ -
- - Client overrides -
- - "> - - - - - - - - - - - - - $override_client_name) { ?> - - - - - - - - - -
ClientLowMediumHighAction
No client overrides - everyone follows the defaults above.
- - - - -
- -
- - Edit - -
- - Remove - -
-
-
-
+ Per-client overrides are set on each client (edit client, Notes tab).
diff --git a/agent/asset.php b/agent/asset.php index ec3cd0b3..b197acc0 100644 --- a/agent/asset.php +++ b/agent/asset.php @@ -1107,7 +1107,9 @@ if (isset($_GET['asset_id'])) { } $ticket_closed_at = escapeHtml($row['ticket_closed_at']); - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/contact.php b/agent/contact.php index fb75f794..1c19a483 100644 --- a/agent/contact.php +++ b/agent/contact.php @@ -847,7 +847,9 @@ if (isset($_GET['contact_id'])) { } $ticket_closed_at = escapeHtml($row['ticket_closed_at']); - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/dashboard.php b/agent/dashboard.php index f87e81e0..ff237de9 100644 --- a/agent/dashboard.php +++ b/agent/dashboard.php @@ -770,7 +770,7 @@ if ($user_config_dashboard_technical_enable == 1) { $has_client = ""; } - $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info"); + $ticket_priority_color = $ticket_priority == "Urgent" ? "dark" : ($ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info")); $contact_display = empty($contact_name) ? "-" : "$contact_name"; ?> diff --git a/agent/modals/asset/asset.php b/agent/modals/asset/asset.php index 2e65b499..ec3eca77 100644 --- a/agent/modals/asset/asset.php +++ b/agent/modals/asset/asset.php @@ -635,7 +635,9 @@ ob_start(); } $ticket_closed_at = escapeHtml($row['ticket_closed_at']); - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/modals/asset/asset_bulk_add_ticket.php b/agent/modals/asset/asset_bulk_add_ticket.php index 0a8b644f..9050cac8 100644 --- a/agent/modals/asset/asset_bulk_add_ticket.php +++ b/agent/modals/asset/asset_bulk_add_ticket.php @@ -50,6 +50,7 @@ ob_start(); + diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php index bf05a353..f715e601 100644 --- a/agent/modals/client/client_add.php +++ b/agent/modals/client/client_add.php @@ -159,34 +159,6 @@ ob_start(); - -
- -
- -
- - -
- -
- Default follows the global SLA assignment for each priority. -
- -
@@ -391,6 +363,7 @@ ob_start();
+ @@ -399,6 +372,34 @@ ob_start();
+ + +
+ +
+ +
+ + +
+ +
+ Default follows the global SLA assignment for each priority. +
+ diff --git a/agent/modals/client/client_bulk_add_ticket.php b/agent/modals/client/client_bulk_add_ticket.php index 8e852951..026998f0 100644 --- a/agent/modals/client/client_bulk_add_ticket.php +++ b/agent/modals/client/client_bulk_add_ticket.php @@ -46,6 +46,7 @@ ob_start(); + diff --git a/agent/modals/client/client_edit.php b/agent/modals/client/client_edit.php index b242d51b..de4021e4 100644 --- a/agent/modals/client/client_edit.php +++ b/agent/modals/client/client_edit.php @@ -193,34 +193,6 @@ ob_start(); - -
- -
- -
- - -
- -
- Default follows the global SLA assignment for each priority. -
- - @@ -269,6 +241,7 @@ ob_start(); + @@ -279,6 +252,34 @@ ob_start(); + +
+ +
+ +
+ + +
+ +
+ Default follows the global SLA assignment for each priority. +
+ + diff --git a/agent/modals/contact/contact.php b/agent/modals/contact/contact.php index 4c3be677..ce77a145 100644 --- a/agent/modals/contact/contact.php +++ b/agent/modals/contact/contact.php @@ -629,7 +629,9 @@ ob_start(); $ticket_updated_at_display = $ticket_updated_at; } - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php index 783923d3..ac6753a2 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_add.php +++ b/agent/modals/recurring_ticket/recurring_ticket_add.php @@ -111,6 +111,7 @@ ob_start(); + diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php index 692adc37..adb00213 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php @@ -33,6 +33,7 @@ ob_start(); + diff --git a/agent/modals/recurring_ticket/recurring_ticket_edit.php b/agent/modals/recurring_ticket/recurring_ticket_edit.php index b1c01b23..69443692 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_edit.php @@ -95,6 +95,7 @@ ob_start(); + diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php index 2dec2dcc..b31ec92f 100644 --- a/agent/modals/ticket/ticket_add.php +++ b/agent/modals/ticket/ticket_add.php @@ -149,6 +149,7 @@ ob_start(); + diff --git a/agent/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php index efde07a0..e5c53a66 100644 --- a/agent/modals/ticket/ticket_add_v2.php +++ b/agent/modals/ticket/ticket_add_v2.php @@ -161,6 +161,7 @@ ob_start(); + diff --git a/agent/modals/ticket/ticket_bulk_edit_priority.php b/agent/modals/ticket/ticket_bulk_edit_priority.php index 6990c8b6..c736ee14 100644 --- a/agent/modals/ticket/ticket_bulk_edit_priority.php +++ b/agent/modals/ticket/ticket_bulk_edit_priority.php @@ -33,6 +33,7 @@ ob_start(); + diff --git a/agent/modals/ticket/ticket_edit.php b/agent/modals/ticket/ticket_edit.php index 9ed6cb7a..486826ad 100644 --- a/agent/modals/ticket/ticket_edit.php +++ b/agent/modals/ticket/ticket_edit.php @@ -111,6 +111,7 @@ ob_start(); + diff --git a/agent/modals/ticket/ticket_priority.php b/agent/modals/ticket/ticket_priority.php index a2f03ab3..cd7dbf91 100644 --- a/agent/modals/ticket/ticket_priority.php +++ b/agent/modals/ticket/ticket_priority.php @@ -49,6 +49,7 @@ ob_start(); + diff --git a/agent/post/client.php b/agent/post/client.php index 4a7ce844..f80608ec 100644 --- a/agent/post/client.php +++ b/agent/post/client.php @@ -246,7 +246,7 @@ if (isset($_POST['add_client'])) { // Ticket SLA assignments (fields only rendered when active SLAs exist) if (isset($_POST['client_sla_low'])) { - foreach (['Low', 'Medium', 'High'] as $sla_priority) { + foreach (['Low', 'Medium', 'High', 'Urgent'] as $sla_priority) { $sla_value = strval($_POST['client_sla_' . strtolower($sla_priority)] ?? 'default'); if ($sla_value !== 'default') { $client_sla_id = intval($sla_value); @@ -345,7 +345,7 @@ if (isset($_POST['edit_client'])) { } $sla_assignments_changed = false; - foreach (['Low', 'Medium', 'High'] as $sla_priority) { + foreach (['Low', 'Medium', 'High', 'Urgent'] as $sla_priority) { $sla_value = strval($_POST['client_sla_' . strtolower($sla_priority)] ?? 'default'); $sla_current = $current_sla_assignments[$sla_priority] ?? 'default'; if ($sla_value === $sla_current) { diff --git a/agent/project.php b/agent/project.php index 5cbfb519..10c90edd 100644 --- a/agent/project.php +++ b/agent/project.php @@ -413,7 +413,9 @@ if (isset($_GET['project_id'])) { } $ticket_closed_at = escapeHtml($row['ticket_closed_at']); - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/recurring_tickets.php b/agent/recurring_tickets.php index 60b91875..9f3aef1f 100644 --- a/agent/recurring_tickets.php +++ b/agent/recurring_tickets.php @@ -68,6 +68,7 @@ $sql = mysqli_query( CASE WHEN '$sort' = 'recurring_ticket_priority' THEN CASE recurring_ticket_priority + WHEN 'Urgent' THEN 0 WHEN 'High' THEN 1 WHEN 'Medium' THEN 2 WHEN 'Low' THEN 3 diff --git a/agent/ticket.php b/agent/ticket.php index d422b1bf..0c51c4aa 100644 --- a/agent/ticket.php +++ b/agent/ticket.php @@ -86,7 +86,9 @@ if (isset($_GET['ticket_id'])) { } //Set Ticket Badge Color based of priority - if ($ticket_priority == "High") { + if ($ticket_priority == "Urgent") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; diff --git a/agent/ticket_kanban.php b/agent/ticket_kanban.php index bf6d0443..5a0976f3 100644 --- a/agent/ticket_kanban.php +++ b/agent/ticket_kanban.php @@ -24,6 +24,7 @@ while ($row = mysqli_fetch_assoc($status_sql)) { $ordering_snippet = "ORDER BY CASE + WHEN ticket_priority = 'Urgent' THEN 0 WHEN ticket_priority = 'High' THEN 1 WHEN ticket_priority = 'Medium' THEN 2 WHEN ticket_priority = 'Low' THEN 3 @@ -98,7 +99,9 @@ $kanban = array_values($statuses); Low +