diff --git a/admin_ticket_status_edit_modal.php b/admin_ticket_status_edit_modal.php index 30776671..0e2885ca 100644 --- a/admin_ticket_status_edit_modal.php +++ b/admin_ticket_status_edit_modal.php @@ -27,7 +27,20 @@
- + + + + +
+ +
+
+ +
+
diff --git a/admin_ticket_statuses.php b/admin_ticket_statuses.php index 5fa10c9c..8ae6f7ce 100644 --- a/admin_ticket_statuses.php +++ b/admin_ticket_statuses.php @@ -52,6 +52,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Name Color + Status Action @@ -62,15 +63,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $ticket_status_id = intval($row['ticket_status_id']); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); + $ticket_status_active = intval($row['ticket_status_active']); + if ($ticket_status_active) { + $ticket_status_display = "
Active
"; + } else { + $ticket_status_display = "
Disabled
"; + } ?> - + - + + + 5 ) { ?>
diff --git a/client_asset_details.php b/client_asset_details.php index 5dcfeae0..e81c7ffd 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -472,7 +472,7 @@ if (isset($_GET['asset_id'])) { - + diff --git a/client_contact_details.php b/client_contact_details.php index 3f1a71d2..b669835a 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -53,7 +53,10 @@ if (isset($_GET['contact_id'])) { $software_count = mysqli_num_rows($sql_related_software); // Related Tickets Query - $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users on ticket_assigned_to = user_id WHERE ticket_contact_id = $contact_id ORDER BY ticket_id DESC"); + $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets + LEFT JOIN users ON ticket_assigned_to = user_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_contact_id = $contact_id ORDER BY ticket_id DESC"); $ticket_count = mysqli_num_rows($sql_related_tickets); ?> @@ -479,9 +482,11 @@ if (isset($_GET['contact_id'])) { $ticket_id = intval($row['ticket_id']); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); - $ticket_subject = nullable_htmlentities($row['ticket_subject']); + $ticket_subject = intval($row['ticket_subject']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); $ticket_status = nullable_htmlentities($row['ticket_status']); + $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); + $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); if (empty($ticket_updated_at)) { @@ -495,14 +500,6 @@ if (isset($_GET['contact_id'])) { } $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); - if ($ticket_status == "Open") { - $ticket_status_display = "$ticket_status"; - } elseif ($ticket_status == "Working") { - $ticket_status_display = "$ticket_status"; - } else { - $ticket_status_display = "$ticket_status"; - } - if ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; } elseif ($ticket_priority == "Medium") { @@ -529,7 +526,7 @@ if (isset($_GET['contact_id'])) { - + diff --git a/client_tickets.php b/client_tickets.php index e5a0ecd4..9750c375 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -260,7 +260,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); - + diff --git a/dashboard.php b/dashboard.php index 4e8c7ac3..90903fe2 100644 --- a/dashboard.php +++ b/dashboard.php @@ -644,12 +644,13 @@ if ($user_config_dashboard_technical_enable == 1) { $sql_your_tickets = mysqli_query( $mysqli, "SELECT * FROM tickets - LEFT JOIN clients ON ticket_client_id = client_id - LEFT JOIN contacts ON ticket_contact_id = contact_id - WHERE ticket_assigned_to = $session_user_id - AND ticket_closed_at IS NULL - ORDER BY ticket_number DESC" - ); + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + WHERE ticket_assigned_to = $session_user_id + AND ticket_closed_at IS NULL + ORDER BY ticket_number DESC" + ); ?> @@ -773,7 +774,8 @@ if ($user_config_dashboard_technical_enable == 1) { $ticket_subject = nullable_htmlentities($row['ticket_subject']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); $ticket_status_id = intval($row['ticket_status']); - $ticket_status_name = sanitizeInput(getTicketStatusName($row['ticket_status'])); + $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); + $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $ticket_created_at_time_ago = timeAgo($row['ticket_created_at']); $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); @@ -792,7 +794,7 @@ if ($user_config_dashboard_technical_enable == 1) { $contact_id = intval($row['ticket_contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); - $ticket_status_color = getTicketStatusColor($ticket_status_id); + if ($ticket_priority == "High") { $ticket_priority_color = "danger"; @@ -822,7 +824,9 @@ if ($user_config_dashboard_technical_enable == 1) { - + + + diff --git a/database_updates.php b/database_updates.php index d0ccc405..b8ece960 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1795,10 +1795,21 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.8'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.8') { - // // Insert queries here required to update to DB version 1.1.9 + if (CURRENT_DATABASE_VERSION == '1.1.8') { + // Update Ticket Status color to use colors to allow more predefined colors + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#dc3545' WHERE ticket_status_id = 1"); // New + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#007bff' WHERE ticket_status_id = 2"); // Open + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#28a745' WHERE ticket_status_id = 3"); // On Hold + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#343a40' WHERE ticket_status_id = 4"); // Auto Close + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#343a40' WHERE ticket_status_id = 5"); // Closed + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.1.9') { + // // Insert queries here required to update to DB version 1.2.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.9"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.0"); // } } else { diff --git a/database_version.php b/database_version.php index 8aa90f59..36edf3d4 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.8"); +DEFINE("LATEST_DATABASE_VERSION", "1.1.9"); diff --git a/db.sql b/db.sql index aae0ddbb..80b6ace0 100644 --- a/db.sql +++ b/db.sql @@ -1881,4 +1881,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-03-31 13:55:08 +-- Dump completed on 2024-04-01 16:24:03 diff --git a/post/admin.php b/post/admin.php index 859a93cb..8331cb79 100644 --- a/post/admin.php +++ b/post/admin.php @@ -220,8 +220,9 @@ if (isset($_POST['edit_ticket_status'])) { $ticket_status_id = intval($_POST['ticket_status_id']); $name = sanitizeInput($_POST['name']); $color = sanitizeInput($_POST['color']); + $status = intval($_POST['status']); - mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_name = '$name', ticket_status_color = '$color' WHERE ticket_status_id = $ticket_status_id"); + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_name = '$name', ticket_status_color = '$color', ticket_status_active = $status WHERE ticket_status_id = $ticket_status_id"); $ticket_status_id = mysqli_insert_id($mysqli); diff --git a/project_details.php b/project_details.php index 731bddb3..ea40b471 100644 --- a/project_details.php +++ b/project_details.php @@ -280,7 +280,7 @@ if (isset($_GET['project_id'])) { - + diff --git a/setup.php b/setup.php index 59df2dfe..6dab7b80 100644 --- a/setup.php +++ b/setup.php @@ -296,11 +296,11 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); // Add default ticket statuses - mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'New', ticket_status_color = 'danger'"); // Default ID for new tickets is 1 - mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Open', ticket_status_color = 'primary'"); // 2 - mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'On Hold', ticket_status_color = 'success'"); // 3 - mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Auto Close', ticket_status_color = 'success'"); // 4 - mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Closed', ticket_status_color = 'dark'"); // 5 + mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'New', ticket_status_color = '#dc3545'"); // Default ID for new tickets is 1 + mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Open', ticket_status_color = '#007bff'"); // 2 + mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'On Hold', ticket_status_color = '#28a745'"); // 3 + mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Auto Close', ticket_status_color = '#343a40'"); // 4 + mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Closed', ticket_status_color = '#343a40'"); // 5 $_SESSION['alert_message'] = "Company $name created!"; diff --git a/ticket.php b/ticket.php index bde6acab..361d234b 100644 --- a/ticket.php +++ b/ticket.php @@ -265,7 +265,7 @@ if (isset($_GET['ticket_id'])) {
-

Ticket

+

Ticket

diff --git a/tickets.php b/tickets.php index f1eacd6b..90641d8d 100644 --- a/tickets.php +++ b/tickets.php @@ -448,7 +448,8 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); - $ticket_scheduled_for
"; } ?> + + $ticket_scheduled_for
"; } ?>