From 70cb0ac635d0c67a62266105e7bb7e0561427ae6 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 7 Apr 2025 12:58:55 -0400
Subject: [PATCH] Add the ability to remove additional assets from the ticket
 details screen

---
 CHANGELOG.md                        |  7 ++++++
 modals/ticket_add_watcher_modal.php |  2 +-
 post/user/ticket.php                | 35 +++++++++++++++++++++++++++++
 ticket.php                          |  5 +++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdeded17..23ffaaf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 This file documents all notable changes made to ITFlow.
+
+## [25.03.4]
+
+### Fixed
+
+
+
 ## [25.03.3]
 
 ### Fixed
diff --git a/modals/ticket_add_watcher_modal.php b/modals/ticket_add_watcher_modal.php
index c1c47e53..ab6a1cf3 100644
--- a/modals/ticket_add_watcher_modal.php
+++ b/modals/ticket_add_watcher_modal.php
@@ -21,7 +21,7 @@
                                 <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
                             </div>
                             <select class="form-control select2" data-tags="true" name="watcher_email">
-                                <option value="">-Select a contact-</option>
+                                <option value="">- Select a contact or enter an email -</option>
                                 <?php
 
                                 $sql_client_contacts_select = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_email FROM contacts WHERE contact_client_id = $client_id AND contact_email <> '' ORDER BY contact_name ASC");
diff --git a/post/user/ticket.php b/post/user/ticket.php
index 99f16ebd..c40f46ec 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -498,6 +498,41 @@ if (isset($_GET['delete_ticket_watcher'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
+if (isset($_GET['delete_ticket_additional_asset'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $asset_id = intval($_GET['delete_ticket_additional_asset']);
+    $ticket_id = intval($_GET['ticket_id']);
+
+    // Get ticket / asset details for logging
+    $sql = mysqli_query($mysqli, "SELECT asset_name, ticket_prefix, ticket_number, ticket_status_name, ticket_client_id FROM assets
+        JOIN tickets ON ticket_id = $ticket_id 
+        JOIN ticket_statuses ON ticket_status = ticket_status_id
+        WHERE asset_id = $asset_id"
+    );
+    $row = mysqli_fetch_array($sql);
+
+    $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+    $ticket_number = intval($row['ticket_number']);
+    $ticket_status_name = sanitizeInput($row['ticket_status_name']);
+    $asset_name = sanitizeInput($row['asset_name']);
+    $client_id = intval($row['ticket_client_id']);
+
+    mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id AND asset_id = $asset_id");
+
+    // History
+    mysqli_query($mysqli, "INSERT INTO ticket_history SET ticket_history_status = '$ticket_status_name', ticket_history_description = '$session_name removed additional asset $asset_name', ticket_history_ticket_id = $ticket_id");
+
+    // Logging
+    logAction("Ticket", "Edit", "$session_name removed asset $asset_name from ticket $ticket_prefix$ticket_number", $client_id, $ticket_id);
+
+    $_SESSION['alert_type'] = "error";
+    $_SESSION['alert_message'] = "Removed asset <strong>$asset_name</strong> from ticket.";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
 if (isset($_POST['edit_ticket_asset'])) {
 
     enforceUserPermission('module_support', 2);
diff --git a/ticket.php b/ticket.php
index 5155ab17..3b28d0f2 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1058,6 +1058,11 @@ if (isset($_GET['ticket_id'])) {
                                     data-ajax-id="<?php echo $additional_asset_id; ?>">
                                     <i class="fa fa-fw fa-<?php echo $additional_asset_icon; ?> text-secondary mr-2"></i><?php echo $additional_asset_name; ?>
                                 </a>
+                                <?php if (empty($ticket_closed_at)) { ?>
+                                    <a class="confirm-link float-right" href="post.php?delete_ticket_additional_asset=<?php echo $additional_asset_id; ?>&ticket_id=<?php echo $ticket_id; ?>" title="Remove asset from ticket">
+                                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                                    </a>
+                                <?php } ?>
                             </div>
                         <?php