From d32925eefcb2a4faf7177dca6ce063e5428570b0 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 13 Mar 2024 14:03:07 -0400 Subject: [PATCH 01/24] Tidy --- post/event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post/event.php b/post/event.php index 2955a31cf..aa729f8d2 100644 --- a/post/event.php +++ b/post/event.php @@ -74,7 +74,7 @@ 'subject' => $subject, 'body' => $body ] - ]; + ]; $mail = addToMailQueue($mysqli, $data); // Logging for email (success/fail) From 27a96c2293ef5ce7344a70cc8e0a6a8990529b38 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 15 Mar 2024 18:32:42 -0400 Subject: [PATCH 02/24] Add Important asset, document, file, add file Description to DB Structure --- database_updates.php | 17 ++++++++++++++--- database_version.php | 2 +- db.sql | 6 +++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/database_updates.php b/database_updates.php index f509e09a4..74f606911 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1636,10 +1636,21 @@ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.0'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.0') { - // // Insert queries here required to update to DB version 1.1.1 + if (CURRENT_DATABASE_VERSION == '1.1.0') { + mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_description` TEXT DEFAULT NULL AFTER `file_name`"); + mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `file_hash`"); + + mysqli_query($mysqli, "ALTER TABLE `documents` ADD `document_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `document_content_raw`"); + + mysqli_query($mysqli, "ALTER TABLE `assets` ADD `asset_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `asset_notes`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.1.1') { + // // Insert queries here required to update to DB version 1.1.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.2'"); // } } else { diff --git a/database_version.php b/database_version.php index c33ccb54c..04a479379 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.0"); +DEFINE("LATEST_DATABASE_VERSION", "1.1.1"); diff --git a/db.sql b/db.sql index d0f5546ec..4f1d619fe 100644 --- a/db.sql +++ b/db.sql @@ -143,6 +143,7 @@ CREATE TABLE `assets` ( `asset_warranty_expire` date DEFAULT NULL, `asset_install_date` date DEFAULT NULL, `asset_notes` text DEFAULT NULL, + `asset_important` tinyint(1) NOT NULL DEFAULT 0, `asset_created_at` datetime NOT NULL DEFAULT current_timestamp(), `asset_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `asset_archived_at` datetime DEFAULT NULL, @@ -461,6 +462,7 @@ CREATE TABLE `documents` ( `document_description` text DEFAULT NULL, `document_content` longtext NOT NULL, `document_content_raw` longtext NOT NULL, + `document_important` tinyint(1) NOT NULL DEFAULT 0, `document_parent` int(11) NOT NULL DEFAULT 0, `document_created_at` datetime NOT NULL DEFAULT current_timestamp(), `document_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), @@ -591,8 +593,10 @@ CREATE TABLE `files` ( `file_id` int(11) NOT NULL AUTO_INCREMENT, `file_reference_name` varchar(200) DEFAULT NULL, `file_name` varchar(200) NOT NULL, + `file_description` text DEFAULT NULL, `file_ext` varchar(200) DEFAULT NULL, `file_hash` varchar(200) DEFAULT NULL, + `file_important` tinyint(1) NOT NULL DEFAULT 0, `file_created_at` datetime NOT NULL DEFAULT current_timestamp(), `file_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `file_archived_at` datetime DEFAULT NULL, @@ -1769,4 +1773,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-03-05 18:47:45 +-- Dump completed on 2024-03-15 18:31:42 From cdd16bd460204379608045082d2f301078bc34d6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 15 Mar 2024 18:44:16 -0400 Subject: [PATCH 03/24] Add file Description below filename, still need to work on the UI a bit --- client_file_upload_modal.php | 12 ++++++++++++ client_files.php | 6 +++++- post/file.php | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/client_file_upload_modal.php b/client_file_upload_modal.php index 89b6c3ac6..68e297482 100644 --- a/client_file_upload_modal.php +++ b/client_file_upload_modal.php @@ -11,7 +11,19 @@
+ +
+ +
+
+ +
+ +
+
+
+
diff --git a/client_files.php b/client_files.php index 86231d60e..bc3edd61c 100644 --- a/client_files.php +++ b/client_files.php @@ -249,6 +249,7 @@ while ($row = mysqli_fetch_array($sql)) { $file_id = intval($row['file_id']); $file_name = nullable_htmlentities($row['file_name']); + $file_description = nullable_htmlentities($row['file_description']); $file_reference_name = nullable_htmlentities($row['file_reference_name']); $file_ext = nullable_htmlentities($row['file_ext']); if ($file_ext == 'pdf') { @@ -283,7 +284,10 @@
- " target="_blank" class="text-secondary"> + + " target="_blank" class="text-secondary"> +
+
diff --git a/post/file.php b/post/file.php index bf49af633..3e5753521 100644 --- a/post/file.php +++ b/post/file.php @@ -7,6 +7,7 @@ if (isset($_POST['upload_files'])) { $client_id = intval($_POST['client_id']); $folder_id = intval($_POST['folder_id']); + $description = sanitizeInput($_POST['description']); if (!file_exists("uploads/clients/$client_id")) { mkdir("uploads/clients/$client_id"); @@ -39,7 +40,7 @@ // Extract .ext from reference file name to be used to store SHA256 hash $file_hash = strstr($file_reference_name, '.', true) ?: $file_reference_name; - mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_ext = '$file_extension', file_hash = '$file_hash', file_folder_id = $folder_id, file_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_description = '$description', file_ext = '$file_extension', file_hash = '$file_hash', file_folder_id = $folder_id, file_client_id = $client_id"); //Logging $file_id = intval(mysqli_insert_id($mysqli)); From f9a5ca1ef8f645f4faf8c80d87fae815c6602a6f Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 17 Mar 2024 11:09:53 +0000 Subject: [PATCH 04/24] Ticketing updates - Bugfix: Prevent tickets from being assigned to disabled techs - Bugfix: Un-assign all open tickets when a tech account is disabled - Allow auto-assignment of recurring/scheduled tickets to an agent/tech (#901) - Rework layout of recurring/scheduled ticket modal --- ajax.php | 22 ++- cron.php | 10 +- database_updates.php | 22 ++- database_version.php | 2 +- db.sql | 1 + js/recurring_tickets_add_modal.js | 64 +++++++ js/recurring_tickets_edit_modal.js | 24 +++ post/recurring_ticket_model.php | 5 + post/ticket.php | 8 +- post/user.php | 4 + recurring_ticket_add_modal.php | 285 ++++++++++++++++------------- recurring_ticket_edit_modal.php | 178 +++++++++++------- ticket.php | 1 + ticket_add_modal.php | 8 +- ticket_bulk_assign_modal.php | 1 + 15 files changed, 425 insertions(+), 210 deletions(-) create mode 100644 js/recurring_tickets_add_modal.js diff --git a/ajax.php b/ajax.php index 8875fb597..41467ac59 100644 --- a/ajax.php +++ b/ajax.php @@ -359,6 +359,7 @@ $client_id = intval($_GET['client_id']); $ticket_id = intval($_GET['ticket_id']); + // Get all contacts, to allow tickets to be raised under a specific contact $contact_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL @@ -368,7 +369,7 @@ $response['contacts'][] = $row; } - + // Get ticket details $ticket_sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $ticket_id AND scheduled_ticket_client_id = $client_id LIMIT 1"); @@ -376,11 +377,26 @@ $response['ticket'][] = $row; } + // Get assets $asset_sql = mysqli_query($mysqli, "SELECT asset_id, asset_name FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"); while ($row = mysqli_fetch_array($asset_sql)) { $response['assets'][] = $row; } + // Get technicians to auto assign the ticket to + $sql_agents = mysqli_query( + $mysqli, + "SELECT users.user_id, user_name FROM users + LEFT JOIN user_settings on users.user_id = user_settings.user_id + WHERE user_role > 1 + AND user_status = 1 + AND user_archived_at IS NULL + ORDER BY user_name ASC" + ); + while ($row = mysqli_fetch_array($sql_agents)) { + $response['agents'][] = $row; + } + echo json_encode($response); } @@ -448,9 +464,9 @@ $contact_sql = mysqli_query( $mysqli, - "SELECT contact_id, contact_name FROM contacts + "SELECT contact_id, contact_name, contact_primary, contact_important, contact_technical FROM contacts WHERE contacts.contact_archived_at IS NULL AND contact_client_id = $client_id - ORDER BY contact_important DESC, contact_name" + ORDER BY contact_primary DESC, contact_technical DESC, contact_important DESC, contact_name" ); while ($row = mysqli_fetch_array($contact_sql)) { diff --git a/cron.php b/cron.php index 06decb6c7..f0290f0e0 100644 --- a/cron.php +++ b/cron.php @@ -249,10 +249,16 @@ $priority = sanitizeInput($row['scheduled_ticket_priority']); $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency'])); $created_id = intval($row['scheduled_ticket_created_by']); + $assigned_id = intval($row['scheduled_ticket_assigned_to']); $client_id = intval($row['scheduled_ticket_client_id']); $contact_id = intval($row['scheduled_ticket_contact_id']); $asset_id = intval($row['scheduled_ticket_asset_id']); + $ticket_status = 'New'; // Default + if ($assigned_id > 0) { + $ticket_status = 'Open'; // Set to open if we've auto-assigned an agent + } + // Assign this new ticket the next ticket number $ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1")); $ticket_number = intval($ticket_number_sql['config_ticket_next_number']); @@ -262,7 +268,7 @@ mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Raise the ticket - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'New', ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); $id = mysqli_insert_id($mysqli); // Logging @@ -316,7 +322,7 @@ if (filter_var($config_ticket_new_ticket_notification_email, FILTER_VALIDATE_EMAIL)) { $email_subject = "ITFlow - New Recurring Ticket - $client_name: $ticket_subject"; - $email_body = "Hello,

This is a notification that a recurring scheduled ticket has been raised in ITFlow.
Ticket: $ticket_prefix$ticket_number
Client: $client_name
Priority: $priority
Link: https://$config_base_url/ticket.php?ticket_id=$id

--------------------------------

$ticket_subject
$ticket_details"; + $email_body = "Hello,

This is a notification that a recurring (scheduled) ticket has been raised in ITFlow.
Ticket: $ticket_prefix$ticket_number
Client: $client_name
Priority: $priority
Link: https://$config_base_url/ticket.php?ticket_id=$id

--------------------------------

$ticket_subject
$ticket_details"; $email = [ 'from' => $config_ticket_from_email, diff --git a/database_updates.php b/database_updates.php index 74f606911..61572a66b 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1560,7 +1560,7 @@ } - + if (CURRENT_DATABASE_VERSION == '1.0.2') { //Insert queries here required to update to DB version 1.0.3 mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_stripe_expense_vendor` INT(11) NOT NULL DEFAULT 0 AFTER `config_stripe_account`"); @@ -1610,14 +1610,14 @@ if (CURRENT_DATABASE_VERSION == '1.0.6') { // Insert queries here required to update to DB version 1.0.7 mysqli_query($mysqli, "CREATE TABLE `remember_tokens` (`remember_token_id` int(11) NOT NULL AUTO_INCREMENT,`remember_token_token` varchar(255) NOT NULL,`remember_token_user_id` int(11) NOT NULL,`remember_token_created_at` datetime NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`remember_token_id`))"); - + // Then, update the database to the next sequential version mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.7'"); } if (CURRENT_DATABASE_VERSION == '1.0.7') { mysqli_query($mysqli, "ALTER TABLE `user_settings` DROP `user_config_remember_me_token`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.8'"); } @@ -1626,13 +1626,13 @@ mysqli_query($mysqli, "ALTER TABLE `assets` DROP `asset_login_id`"); // Dropped this unused Table as we don't need many to many relationship between assets and logins mysqli_query($mysqli, "DROP TABLE asset_logins"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.9'"); } if (CURRENT_DATABASE_VERSION == '1.0.9') { mysqli_query($mysqli, "ALTER TABLE `transfers` ADD `transfer_method` VARCHAR(200) DEFAULT NULL AFTER `transfer_id`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.0'"); } @@ -1647,10 +1647,16 @@ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.1') { - // // Insert queries here required to update to DB version 1.1.2 + if (CURRENT_DATABASE_VERSION == '1.1.1') { + mysqli_query($mysqli, "ALTER TABLE `scheduled_tickets` ADD `scheduled_ticket_assigned_to` INT(11) NOT NULL DEFAULT '0' AFTER `scheduled_ticket_created_by`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.2'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.1.2') { + // // Insert queries here required to update to DB version 1.1.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.3'"); // } } else { diff --git a/database_version.php b/database_version.php index 04a479379..7a9af70dd 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.1"); +DEFINE("LATEST_DATABASE_VERSION", "1.1.2"); diff --git a/db.sql b/db.sql index 4f1d619fe..f401f2650 100644 --- a/db.sql +++ b/db.sql @@ -1090,6 +1090,7 @@ CREATE TABLE `scheduled_tickets` ( `scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(), `scheduled_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `scheduled_ticket_created_by` int(11) NOT NULL DEFAULT 0, + `scheduled_ticket_assigned_to` int(11) NOT NULL DEFAULT 0, `scheduled_ticket_client_id` int(11) NOT NULL DEFAULT 0, `scheduled_ticket_contact_id` int(11) NOT NULL DEFAULT 0, `scheduled_ticket_asset_id` int(11) NOT NULL DEFAULT 0, diff --git a/js/recurring_tickets_add_modal.js b/js/recurring_tickets_add_modal.js new file mode 100644 index 000000000..1d4d75a07 --- /dev/null +++ b/js/recurring_tickets_add_modal.js @@ -0,0 +1,64 @@ +// Client selected listener +// We seem to have to use jQuery to listen for events, as the client input is a select2 component? + +const clientSelectDropdown = document.getElementById("changeClientSelect"); // Define client selector + +// If the client selector is disabled, we must be on client_recurring_tickets.php instead. Trigger the contact list update. +if (clientSelectDropdown.disabled) { + + let client_id = $(clientSelectDropdown).find(':selected').val(); + + // Update the contacts dropdown list + populateContactsDropdown(client_id); + +} + +// Listener for client selection. Populate contact select when a client is selected +$(clientSelectDropdown).on('select2:select', function (e) { + let client_id = $(this).find(':selected').val(); + + // Update the contacts dropdown list + populateContactsDropdown(client_id); + + // TODO: Update the assets dropdown list + +}); + +// Populate client contact function (after a client is selected) +function populateContactsDropdown(client_id) { + // Send a GET request to ajax.php as ajax.php?get_client_contacts=true&client_id=NUM + jQuery.get( + "ajax.php", + {get_client_contacts: 'true', client_id: client_id}, + function(data) { + + // If we get a response from ajax.php, parse it as JSON + const response = JSON.parse(data); + + // Access the data for contacts (multiple) + const contacts = response.contacts; + + // Contacts dropdown + const contactSelectDropdown = document.getElementById("contactSelect"); + + // Clear Category dropdown + let i, L = contactSelectDropdown.options.length - 1; + for (i = L; i >= 0; i--) { + contactSelectDropdown.remove(i); + } + contactSelectDropdown[contactSelectDropdown.length] = new Option('- Contact -', '0'); + + // Populate dropdown + contacts.forEach(contact => { + var appendText = ""; + if (contact.contact_primary == "1") { + appendText = " (Primary)"; + } else if (contact.contact_technical == "1") { + appendText = " (Technical)"; + } + contactSelectDropdown[contactSelectDropdown.length] = new Option(contact.contact_name + appendText, contact.contact_id); + }); + + } + ); +} diff --git a/js/recurring_tickets_edit_modal.js b/js/recurring_tickets_edit_modal.js index 07de7c6b9..2ce3e2c08 100644 --- a/js/recurring_tickets_edit_modal.js +++ b/js/recurring_tickets_edit_modal.js @@ -13,6 +13,7 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { const contacts = response.contacts; const ticket = response.ticket[0]; const assets = response.assets; + const agents = response.agents; // Populate the scheduled ticket modal fields document.getElementById("editHeader").innerText = " Edit Recurring ticket: " + ticket.scheduled_ticket_subject; @@ -80,6 +81,29 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id); } }); + + + // Agent dropdown + var agentDropdown = document.getElementById("editTicketAgent"); + + // Clear agent dropdown + var i, L = agentDropdown.options.length -1; + for(i = L; i >= 0; i--) { + agentDropdown.remove(i); + } + agentDropdown[agentDropdown.length] = new Option('- Agent -', '0'); + + + // Populate dropdown + agents.forEach(agent => { + if(parseInt(agent.user_id) == parseInt(ticket.scheduled_ticket_assigned_to)){ + // Selected agent + agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id, true, true); + } + else{ + agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id); + } + }); } ); } diff --git a/post/recurring_ticket_model.php b/post/recurring_ticket_model.php index 88a445941..ae42ccb96 100644 --- a/post/recurring_ticket_model.php +++ b/post/recurring_ticket_model.php @@ -15,3 +15,8 @@ if (isset($_POST['contact'])) { $contact_id = intval($_POST['contact']); } + +$assigned_to = "0"; +if (isset($_POST['assigned_to'])) { + $assigned_to = intval($_POST['assigned_to']); +} diff --git a/post/ticket.php b/post/ticket.php index d0cdd1834..e24168bf8 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1318,7 +1318,7 @@ exit; } -if (isset($_POST['add_scheduled_ticket']) || isset($_POST['add_recurring_ticket'])) { +if (isset($_POST['add_recurring_ticket'])) { validateTechRole(); @@ -1334,7 +1334,7 @@ } // Add scheduled ticket - mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); $scheduled_ticket_id = mysqli_insert_id($mysqli); @@ -1346,7 +1346,7 @@ header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['edit_scheduled_ticket']) || isset($_POST['edit_recurring_ticket'])) { +if (isset($_POST['edit_recurring_ticket'])) { validateTechRole(); @@ -1363,7 +1363,7 @@ } // Edit scheduled ticket - mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); + mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Recurring Ticket', log_action = 'Modify', log_description = '$session_name modified recurring ticket for $subject - $frequency', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id"); diff --git a/post/user.php b/post/user.php index 0b900cfbd..36f870ef0 100644 --- a/post/user.php +++ b/post/user.php @@ -207,6 +207,10 @@ mysqli_query($mysqli, "UPDATE users SET user_status = 0 WHERE user_id = $user_id"); + // Un-assign tickets + mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = 0 WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL"); + mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_assigned_to = 0 WHERE scheduled_ticket_assigned_to = $user_id"); + //Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name disabled user $user_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $user_id"); diff --git a/recurring_ticket_add_modal.php b/recurring_ticket_add_modal.php index adb787705..56a289b7c 100644 --- a/recurring_ticket_add_modal.php +++ b/recurring_ticket_add_modal.php @@ -9,150 +9,184 @@
- - -
- -
-
- + + + +
+ +
+ +
+ +
+
+ +
+
-
-
- -
- -
-
- + +
+ +
+ +
+ +
+
+ +
+
-
-
- -
- -
-
- +
+ +
+
+ +
+ +
- +
-
-
- -
-
- + +
+ +
+ +
+
+ +
+ +
- " max="2999-12-31" required> -
-
-
- -
-
- + +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+
- +
-
- +
+ +
+ +
+
+ +
+ +
+
-
- -
-
- +
+ +
+
+ +
+ " max="2999-12-31" required>
-
+
- +
+ + + +
+ +
+
+ +
+ +
+
+ + + +
-
-
@@ -164,3 +198,8 @@
+ + + + + diff --git a/recurring_ticket_edit_modal.php b/recurring_ticket_edit_modal.php index d7a9717ef..e07f15ade 100644 --- a/recurring_ticket_edit_modal.php +++ b/recurring_ticket_edit_modal.php @@ -8,88 +8,136 @@
+ + +
- - - -
- -
-
- + + + +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+
- - -
-
-
- -
-
- +
+ +
+
+ +
+ + +
- + +
+ +
+
+ +
+ +
+
+
-
-
- -
-
- +
+ +
+ +
+
+ +
+ +
- - +
-
-
- -
-
- +
+ +
+ +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ +
- +
-
-
- -
-
- +
+ +
+ +
+
+ +
+ +
- +
-
-
-
diff --git a/ticket.php b/ticket.php index 1f8859f95..076d22370 100644 --- a/ticket.php +++ b/ticket.php @@ -222,6 +222,7 @@ "SELECT users.user_id, user_name FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role > 1 + AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 79fe9745a..6d2c57bd7 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -48,7 +48,7 @@
- +
@@ -119,7 +119,7 @@ $mysqli, "SELECT users.user_id, user_name FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id - WHERE user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + WHERE user_role > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql)) { $user_id = intval($row['user_id']); @@ -137,7 +137,7 @@
- +
@@ -169,7 +169,7 @@ } else { $contact_title_display = ""; } - + ?> diff --git a/ticket_bulk_assign_modal.php b/ticket_bulk_assign_modal.php index 6393a351c..7934281e9 100644 --- a/ticket_bulk_assign_modal.php +++ b/ticket_bulk_assign_modal.php @@ -21,6 +21,7 @@ $sql_users_select = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role > 1 + AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name DESC" ); From dfce95a67b53d8794494474768b2ee712d7a7afa Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 17 Mar 2024 11:57:58 +0000 Subject: [PATCH 05/24] Recurring tickets bugfixes --- js/recurring_tickets_add_modal.js | 3 +- js/recurring_tickets_edit_modal.js | 82 +++++++++++++++--------------- recurring_ticket_add_modal.php | 6 ++- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/js/recurring_tickets_add_modal.js b/js/recurring_tickets_add_modal.js index 1d4d75a07..433fb5fe1 100644 --- a/js/recurring_tickets_add_modal.js +++ b/js/recurring_tickets_add_modal.js @@ -3,14 +3,13 @@ const clientSelectDropdown = document.getElementById("changeClientSelect"); // Define client selector -// If the client selector is disabled, we must be on client_recurring_tickets.php instead. Trigger the contact list update. +// // If the client selector is disabled, we must be on client_recurring_tickets.php instead. Trigger the contact list update. if (clientSelectDropdown.disabled) { let client_id = $(clientSelectDropdown).find(':selected').val(); // Update the contacts dropdown list populateContactsDropdown(client_id); - } // Listener for client selection. Populate contact select when a client is selected diff --git a/js/recurring_tickets_edit_modal.js b/js/recurring_tickets_edit_modal.js index 2ce3e2c08..67966341f 100644 --- a/js/recurring_tickets_edit_modal.js +++ b/js/recurring_tickets_edit_modal.js @@ -9,11 +9,11 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { // If we get a response from post.php, parse it as JSON const response = JSON.parse(data); - // Access the ticket info, and all potential assets + // Access the ticket info, agents and all potential assets const contacts = response.contacts; const ticket = response.ticket[0]; - const assets = response.assets; const agents = response.agents; + const assets = response.assets; // Populate the scheduled ticket modal fields document.getElementById("editHeader").innerText = " Edit Recurring ticket: " + ticket.scheduled_ticket_subject; @@ -23,6 +23,28 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { document.getElementById("editTicketNextRun").value = ticket.scheduled_ticket_next_run; tinyMCE.get('editTicketDetails').setContent(ticket.scheduled_ticket_details); + // Agent assignment dropdown + var agentDropdown = document.getElementById("editTicketAgent"); + + // Clear agent dropdown + var i, L = agentDropdown.options.length -1; + for(i = L; i >= 0; i--) { + agentDropdown.remove(i); + } + agentDropdown[agentDropdown.length] = new Option('- Agent -', '0'); + + + // Populate dropdown + agents.forEach(agent => { + if(parseInt(agent.user_id) == parseInt(ticket.scheduled_ticket_assigned_to)){ + // Selected agent + agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id, true, true); + } + else{ + agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id); + } + }); + // Contact dropdown var contactDropdown = document.getElementById("editTicketContact"); @@ -62,48 +84,28 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { }); // Asset dropdown - var assetDropdown = document.getElementById("editTicketAssetId"); - - // Clear asset dropdown - var i, L = assetDropdown.options.length -1; - for(i = L; i >= 0; i--) { - assetDropdown.remove(i); - } - assetDropdown[assetDropdown.length] = new Option('- Asset -', '0'); + if (assets && assets.length > 0) { + var assetDropdown = document.getElementById("editTicketAssetId"); - // Populate dropdown - assets.forEach(asset => { - if(parseInt(asset.asset_id) == parseInt(ticket.scheduled_ticket_asset_id)){ - // Selected asset - assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id, true, true); - } - else{ - assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id); + // Clear asset dropdown + var i, L = assetDropdown.options.length -1; + for(i = L; i >= 0; i--) { + assetDropdown.remove(i); } - }); - - - // Agent dropdown - var agentDropdown = document.getElementById("editTicketAgent"); - - // Clear agent dropdown - var i, L = agentDropdown.options.length -1; - for(i = L; i >= 0; i--) { - agentDropdown.remove(i); + assetDropdown[assetDropdown.length] = new Option('- Asset -', '0'); + + // Populate dropdown + assets.forEach(asset => { + if(parseInt(asset.asset_id) == parseInt(ticket.scheduled_ticket_asset_id)){ + // Selected asset + assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id, true, true); + } + else{ + assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id); + } + }); } - agentDropdown[agentDropdown.length] = new Option('- Agent -', '0'); - - // Populate dropdown - agents.forEach(agent => { - if(parseInt(agent.user_id) == parseInt(ticket.scheduled_ticket_assigned_to)){ - // Selected agent - agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id, true, true); - } - else{ - agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id); - } - }); } ); } diff --git a/recurring_ticket_add_modal.php b/recurring_ticket_add_modal.php index 56a289b7c..16e24bdb7 100644 --- a/recurring_ticket_add_modal.php +++ b/recurring_ticket_add_modal.php @@ -8,6 +8,10 @@
+ + + +
    @@ -111,7 +115,7 @@
    - +
    From 73b5a6b0a5f5c1b700b8beac51c57ae6ce0b77eb Mon Sep 17 00:00:00 2001 From: wrongecho <32306651+wrongecho@users.noreply.github.com> Date: Sun, 17 Mar 2024 16:23:55 +0000 Subject: [PATCH 06/24] Create dbsql-lint.yml --- .github/workflows/dbsql-lint.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/dbsql-lint.yml diff --git a/.github/workflows/dbsql-lint.yml b/.github/workflows/dbsql-lint.yml new file mode 100644 index 000000000..d190fd300 --- /dev/null +++ b/.github/workflows/dbsql-lint.yml @@ -0,0 +1,37 @@ +name: SQL Syntax Check for db.sql + +on: + pull_request: + paths: + - 'db.sql' + +jobs: + syntax_check: + name: Check db.sql SQL Syntax + runs-on: ubuntu-latest + + services: + mariadb: + image: mariadb:latest + ports: + - "3306:3306" + env: + MYSQL_RANDOM_ROOT_PASSWORD: "yes" + MARIADB_USER: user + MARIADB_PASSWORD: password + MARIADB_DATABASE: itfsyntaxdb + options: >- + --health-cmd="healthcheck.sh --connect --innodb_initialized" + --health-interval=10s + --health-timeout=5s + --health-retries=3 + + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Import & Lint db.sql + run: mysql --host 127.0.0.1 -uuser -ppassword itfsyntaxdb < db.sql + + - name: Show imported tables + run: mysql --host 127.0.0.1 -uuser -ppassword itfsyntaxdb -e "show tables;" From 0fd50a33ea0055d45971f7dd19e3a00e77015d9a Mon Sep 17 00:00:00 2001 From: wrongecho <32306651+wrongecho@users.noreply.github.com> Date: Sun, 17 Mar 2024 16:26:59 +0000 Subject: [PATCH 07/24] Update db.sql Recurring ticket agent assignment, retrigger checks --- db.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db.sql b/db.sql index f401f2650..c21d9c056 100644 --- a/db.sql +++ b/db.sql @@ -1,6 +1,6 @@ -- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for debian-linux-gnu (x86_64) -- --- Host: localhost Database: itflow_dev +-- Host: localhost Database: itflow_dev- -- ------------------------------------------------------ -- Server version 10.11.6-MariaDB-0+deb12u1 From 678c53a8fbfdff5fe7171fb5829e242786826b87 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 17 Mar 2024 16:39:03 +0000 Subject: [PATCH 08/24] Reword SMTP test message to make it clear that messages are queued --- post/setting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/post/setting.php b/post/setting.php index 78f933209..fa99eed19 100644 --- a/post/setting.php +++ b/post/setting.php @@ -184,10 +184,10 @@ $mail = addToMailQueue($mysqli, $data); if ($mail === true) { - $_SESSION['alert_message'] = "Test email sent successfully"; + $_SESSION['alert_message'] = "Test email queued successfully - Check Admin > Mail queue"; } else { $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Test email failed"; + $_SESSION['alert_message'] = "Failed to add test mail to queue"; } header("Location: " . $_SERVER["HTTP_REFERER"]); From d29726f63ed591c974adc268f76a78f21266f998 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 17 Mar 2024 18:51:56 +0000 Subject: [PATCH 09/24] Bugfix: Contact generated passwords are in quotes Fixing as per https://forum.itflow.org/d/760-password-generator-include-at-start-and-end --- client_contact_details.php | 29 +++++++++++++---------------- client_contacts.php | 25 +++++++++++-------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/client_contact_details.php b/client_contact_details.php index 6eeaffd67..3f1a71d2d 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -221,12 +221,12 @@ -
    +
    - + @@ -580,26 +580,23 @@ function updateContactNotes(contact_id) {