From 093fd694154f08f233753fe7a7cb88b6e667c743 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 16 Feb 2025 18:27:43 -0500 Subject: [PATCH] Migrated Ticket Priority, Assign Agent, Assign Contact, Ticket Billable, Task edit, task_template edit to the the new AJAX Modal --- admin_ticket_template_details.php | 7 +- ajax/ajax_ticket_assign.php | 45 +++++------ ajax/ajax_ticket_billable.php | 59 ++++++++++++++ ajax/ajax_ticket_contact.php | 101 ++++++++++++++++++++++++ ajax/ajax_ticket_priority.php | 62 +++++++++++++++ ajax/ajax_ticket_reply_edit.php | 70 ++++++++++++++++ ajax/ajax_ticket_task_edit.php | 64 +++++++++++++++ ajax/ajax_ticket_template_task_edit.php | 62 +++++++++++++++ client_tickets.php | 54 ++++++++----- modals/task_edit_modal.php | 48 ----------- modals/ticket_assign_modal.php | 52 ------------ modals/ticket_edit_billable_modal.php | 40 ---------- modals/ticket_edit_priority_modal.php | 41 ---------- modals/ticket_reply_edit_modal.php | 2 +- post/user/task.php | 37 ++++++--- post/user/ticket.php | 2 +- ticket.php | 63 +++++++++++---- tickets_compact.php | 39 +++++---- tickets_list.php | 42 ++++++---- 19 files changed, 599 insertions(+), 291 deletions(-) create mode 100644 ajax/ajax_ticket_billable.php create mode 100644 ajax/ajax_ticket_contact.php create mode 100644 ajax/ajax_ticket_priority.php create mode 100644 ajax/ajax_ticket_reply_edit.php create mode 100644 ajax/ajax_ticket_task_edit.php create mode 100644 ajax/ajax_ticket_template_task_edit.php delete mode 100644 modals/task_edit_modal.php delete mode 100644 modals/ticket_assign_modal.php delete mode 100644 modals/ticket_edit_billable_modal.php delete mode 100644 modals/ticket_edit_priority_modal.php diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index 2a6d5c8c..be7b8b88 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -112,7 +112,11 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
- + Edit
@@ -125,7 +129,6 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE diff --git a/ajax/ajax_ticket_assign.php b/ajax/ajax_ticket_assign.php index c8bd25e1..9286ca6c 100644 --- a/ajax/ajax_ticket_assign.php +++ b/ajax/ajax_ticket_assign.php @@ -2,35 +2,25 @@ require_once '../includes/ajax_header.php'; -$client_id = intval($_GET['id']); +$ticket_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $client_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM tickets + LEFT JOIN clients ON client_id = ticket_client_id + WHERE ticket_id = $ticket_id + LIMIT 1" +); $row = mysqli_fetch_array($sql); +$ticket_prefix = nullable_htmlentities($row['ticket_prefix']); +$ticket_number = intval($row['ticket_number']); +$ticket_assigned_to = intval($row['ticket_assigned_to']); +$ticket_status = intval($row['ticket_status']); +$ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); $client_name = nullable_htmlentities($row['client_name']); -$client_is_lead = intval($row['client_lead']); -$client_type = nullable_htmlentities($row['client_type']); -$client_website = nullable_htmlentities($row['client_website']); -$client_referral = nullable_htmlentities($row['client_referral']); -$client_currency_code = nullable_htmlentities($row['client_currency_code']); -$client_net_terms = intval($row['client_net_terms']); -$client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); -$client_abbreviation = nullable_htmlentities($row['client_abbreviation']); -$client_rate = floatval($row['client_rate']); -$client_notes = nullable_htmlentities($row['client_notes']); -$client_created_at = nullable_htmlentities($row['client_created_at']); -$client_archived_at = nullable_htmlentities($row['client_archived_at']); - -// Client Tags -$client_tag_id_array = array(); -$sql_client_tags = mysqli_query($mysqli, "SELECT tag_id FROM client_tags WHERE client_id = $client_id"); -while ($row = mysqli_fetch_array($sql_client_tags)) { - $client_tag_id = intval($row['tag_id']); - $client_tag_id_array[] = $client_tag_id; -} // Generate the HTML form content using output buffering. ob_start(); + ?>
@@ -42,7 +32,7 @@ ob_start();
- +
@@ -74,11 +64,16 @@ ob_start();
- - + +
+ +
+
+ + Edit Billable Status for +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Changing contact: -
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ > + +
+
+ + +
+ +
+ + +
+ +
+ + + +
+
Editing ticket priority: -
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Editing Ticket Reply
+ +
+
+ + + +
+ +
+
+ + +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
Editing task
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Editing task
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + - + + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_contact.php" + data-ajax-id = "" + + > + + = 2) { ?> - + Yes"; @@ -291,12 +303,21 @@ $total_tickets_closed = intval($row['total_tickets_closed']); echo "No"; } ?> + - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_priority.php" + data-ajax-id = "" + + > + + @@ -306,7 +327,15 @@ $total_tickets_closed = intval($row['total_tickets_closed']); - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_assign.php" + data-ajax-id = "" + + > + + @@ -325,20 +354,6 @@ $total_tickets_closed = intval($row['total_tickets_closed']); " tabindex="-1"> -
-
-
-
Editing task
- -
-
- - - - -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- - -
- -
- -
-
-
diff --git a/modals/ticket_assign_modal.php b/modals/ticket_assign_modal.php deleted file mode 100644 index 9ab37025..00000000 --- a/modals/ticket_assign_modal.php +++ /dev/null @@ -1,52 +0,0 @@ - diff --git a/modals/ticket_edit_billable_modal.php b/modals/ticket_edit_billable_modal.php deleted file mode 100644 index f938c99f..00000000 --- a/modals/ticket_edit_billable_modal.php +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/modals/ticket_edit_priority_modal.php b/modals/ticket_edit_priority_modal.php deleted file mode 100644 index b0778bca..00000000 --- a/modals/ticket_edit_priority_modal.php +++ /dev/null @@ -1,41 +0,0 @@ - diff --git a/modals/ticket_reply_edit_modal.php b/modals/ticket_reply_edit_modal.php index b1306b5c..8ea4ef73 100644 --- a/modals/ticket_reply_edit_modal.php +++ b/modals/ticket_reply_edit_modal.php @@ -25,7 +25,7 @@
- +
diff --git a/post/user/task.php b/post/user/task.php index 3d74a51f..9add77fb 100644 --- a/post/user/task.php +++ b/post/user/task.php @@ -30,7 +30,7 @@ if (isset($_POST['add_task'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['edit_task'])) { +if (isset($_POST['edit_ticket_task'])) { enforceUserPermission('module_support', 2); @@ -38,18 +38,12 @@ if (isset($_POST['edit_task'])) { $task_name = sanitizeInput($_POST['name']); $task_order = intval($_POST['order']); $task_completion_estimate = intval($_POST['completion_estimate']); - $is_ticket = intval($_POST['is_ticket']); - if($is_ticket == 1) { - // Get Client ID - $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); - $row = mysqli_fetch_array($sql); - $client_id = intval($row['ticket_client_id']); - mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id"); - } else { - $client_id = 0; - mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_id"); - } + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id"); // Logging logAction("Task", "Edit", "$session_name edited task $task_name", $client_id, $task_id); @@ -59,6 +53,25 @@ if (isset($_POST['edit_task'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } +if (isset($_POST['edit_ticket_template_task'])) { + + enforceUserPermission('module_support', 2); + + $task_template_id = intval($_POST['task_template_id']); + $task_name = sanitizeInput($_POST['name']); + $task_order = intval($_POST['order']); + $task_completion_estimate = intval($_POST['completion_estimate']); + + mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_template_id"); + + // Logging + logAction("Task", "Edit", "$session_name edited task $task_name", 0, $task_template_id); + + $_SESSION['alert_message'] = "Task $task_name edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_GET['delete_task'])) { diff --git a/post/user/ticket.php b/post/user/ticket.php index fe4ee944..a38720ab 100644 --- a/post/user/ticket.php +++ b/post/user/ticket.php @@ -293,7 +293,7 @@ if (isset($_POST['edit_ticket_contact'])) { $ticket_id = intval($_POST['ticket_id']); $contact_id = intval($_POST['contact']); - $notify = intval($_POST['contact_notify']); + $notify = intval($_POST['contact_notify']) ?? 0; // Get Original contact, and ticket details $sql = mysqli_query($mysqli, "SELECT diff --git a/ticket.php b/ticket.php index 9d131a02..c2483b65 100644 --- a/ticket.php +++ b/ticket.php @@ -430,7 +430,11 @@ if (isset($_GET['ticket_id'])) {
- + Add Contact @@ -500,7 +504,10 @@ if (isset($_GET['ticket_id'])) {
- +
@@ -510,7 +517,16 @@ if (isset($_GET['ticket_id'])) {
- + + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_priority.php" + data-ajax-id = "" + + > + +
= 1) { ?>
Ticket is - + Billable"; @@ -775,7 +795,12 @@ if (isset($_GET['ticket_id'])) {
- + Edit
@@ -810,13 +835,10 @@ if (isset($_GET['ticket_id'])) { ?>
- - @@ -890,7 +912,15 @@ if (isset($_GET['ticket_id'])) {
Contact
- No One + + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_contact.php" + data-ajax-id = "" + + > + No One
@@ -951,7 +981,11 @@ if (isset($_GET['ticket_id'])) {
- + Edit @@ -970,9 +1004,8 @@ if (isset($_GET['ticket_id'])) { + } + ?>
@@ -1166,19 +1199,15 @@ if (isset($_GET['ticket_id'])) { = 2 && empty($ticket_closed_at)) { require_once "modals/ticket_edit_modal.php"; - require_once "modals/ticket_assign_modal.php"; - require_once "modals/ticket_edit_contact_modal.php"; require_once "modals/ticket_edit_asset_modal.php"; require_once "modals/ticket_edit_vendor_modal.php"; require_once "modals/ticket_add_watcher_modal.php"; - require_once "modals/ticket_edit_priority_modal.php"; require_once "modals/ticket_change_client_modal.php"; require_once "modals/ticket_edit_schedule_modal.php"; require_once "modals/ticket_merge_modal.php"; } if (lookupUserPermission("module_support") >= 2 && lookupUserPermission("module_sales") >= 2 && $config_module_enable_accounting) { - require_once "modals/ticket_edit_billable_modal.php"; require_once "modals/ticket_invoice_add_modal.php"; } } diff --git a/tickets_compact.php b/tickets_compact.php index a79ae7f0..fc289ee7 100644 --- a/tickets_compact.php +++ b/tickets_compact.php @@ -173,7 +173,13 @@
- + + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_priority.php" + data-ajax-id = "" + + > @@ -223,7 +229,11 @@ = 2) { ?> - + Yes"; @@ -231,6 +241,7 @@ echo "No"; } ?> + @@ -242,25 +253,21 @@ - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_assign.php" + data-ajax-id = "" + + > + + - - diff --git a/tickets_list.php b/tickets_list.php index 7830d5a7..07ae8482 100644 --- a/tickets_list.php +++ b/tickets_list.php @@ -216,7 +216,11 @@ = 2) { ?> - + Yes"; @@ -224,12 +228,23 @@ echo "No"; } ?> + - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_priority.php" + data-ajax-id = "" + + > + + + + @@ -240,7 +255,15 @@ - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_assign.php" + data-ajax-id = "" + + > + + @@ -259,19 +282,8 @@