From 56899e60cfe6a82b55eda21d53e6dba81f07be8b Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Tue, 3 Jan 2023 20:43:51 +0000
Subject: [PATCH] Move ticket merge javascript to separate file

---
 js/ticket_merge.js     | 40 +++++++++++++++++++++++++++++++++++
 ticket_merge_modal.php | 47 ++++--------------------------------------
 2 files changed, 44 insertions(+), 43 deletions(-)
 create mode 100644 js/ticket_merge.js

diff --git a/js/ticket_merge.js b/js/ticket_merge.js
new file mode 100644
index 00000000..dc8e6408
--- /dev/null
+++ b/js/ticket_merge.js
@@ -0,0 +1,40 @@
+// Ticket merging
+
+// Gets details of the ticket we're going to merge this ticket into
+// Shows the details under the comments box & enables the merge button if the status of the merge into ticket is not closed
+function merge_into_number_get_details() {
+
+    // Get the ticket number to merge into
+    var merge_into_ticket_number = document.getElementById("merge_into_ticket_number").value;
+
+    // Reset the form
+    document.getElementById("merge_ticket_btn").disabled = true;
+    document.getElementById("merge_into_details_div").hidden = true;
+
+    // Send a GET request to post.php as post.php?merge_ticket_get_json_details=true&merge_into_ticket_number=NUMBER
+    jQuery.get(
+        "ajax.php",
+        {merge_ticket_get_json_details: 'true', merge_into_ticket_number: merge_into_ticket_number},
+        function(data){
+            // If we get a response from post.php, parse it as JSON
+            const merge_into_ticket_info = JSON.parse(data);
+
+            // Check that the current ticket ID isn't also the new/merge ticket ID
+            if(parseInt(merge_into_ticket_info.ticket_id) !== parseInt(document.getElementById("current_ticket_id").value)){
+
+                // Show the div with the master ticket details, populate
+                document.getElementById("merge_into_details_div").hidden = false;
+                document.getElementById("merge_into_details_number").innerText = "Master ticket details: " + merge_into_ticket_info.ticket_prefix + merge_into_ticket_info.ticket_number;
+                document.getElementById("merge_into_details_client").innerText = "Client Contact: " + merge_into_ticket_info.client_name + " / " + merge_into_ticket_info.contact_name;
+                document.getElementById("merge_into_details_subject").innerText = "Subject: " + merge_into_ticket_info.ticket_subject;
+                document.getElementById("merge_into_details_priority").innerText = "Priority: " + merge_into_ticket_info.ticket_priority;
+                document.getElementById("merge_into_details_status").innerText = "Status: " + merge_into_ticket_info.ticket_status;
+
+                // Enable the merge button if the merge into ticket isn't in a closed state
+                if(merge_into_ticket_info.ticket_status.toLowerCase() != "closed"){
+                    document.getElementById("merge_ticket_btn").disabled = false;
+                }
+            }
+        }
+    );
+}
\ No newline at end of file
diff --git a/ticket_merge_modal.php b/ticket_merge_modal.php
index a70cae2c..203d6ccb 100644
--- a/ticket_merge_modal.php
+++ b/ticket_merge_modal.php
@@ -17,10 +17,9 @@
                             <div class="input-group-prepend">
                                 <?php
                                 // Show the ticket prefix, or just the tag icon
-                                if(empty($ticket_prefix)){
+                                if (empty($ticket_prefix)) {
                                     echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
-                                }
-                                else{
+                                } else {
                                     echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
                                 }
                                 ?>
@@ -60,43 +59,5 @@
     </div>
 </div>
 
-<script>
-    //Gets details of the ticket we're going to merge this ticket into
-    //Shows the details under the comments box & enables the merge button if the status of the merge into ticket is not closed
-    function merge_into_number_get_details() {
-
-        //Get the ticket number to merge into
-        var merge_into_ticket_number = document.getElementById("merge_into_ticket_number").value;
-
-        //Reset the form
-        document.getElementById("merge_ticket_btn").disabled = true;
-        document.getElementById("merge_into_details_div").hidden = true;
-
-        //Send a GET request to post.php as post.php?merge_ticket_get_json_details=true&merge_into_ticket_number=NUMBER
-        jQuery.get(
-            "ajax.php",
-            {merge_ticket_get_json_details: 'true', merge_into_ticket_number: merge_into_ticket_number},
-            function(data){
-                //If we get a response from post.php, parse it as JSON
-                const merge_into_ticket_info = JSON.parse(data);
-
-                //Check that the current ticket ID isn't also the new/merge ticket ID
-                if(parseInt(merge_into_ticket_info.ticket_id) !== parseInt(document.getElementById("current_ticket_id").value)){
-
-                    //Show the div with the master ticket details, populate
-                    document.getElementById("merge_into_details_div").hidden = false;
-                    document.getElementById("merge_into_details_number").innerText = "Master ticket details: " + merge_into_ticket_info.ticket_prefix + merge_into_ticket_info.ticket_number;
-                    document.getElementById("merge_into_details_client").innerText = "Client Contact: " + merge_into_ticket_info.client_name + " / " + merge_into_ticket_info.contact_name;
-                    document.getElementById("merge_into_details_subject").innerText = "Subject: " + merge_into_ticket_info.ticket_subject;
-                    document.getElementById("merge_into_details_priority").innerText = "Priority: " + merge_into_ticket_info.ticket_priority;
-                    document.getElementById("merge_into_details_status").innerText = "Status: " + merge_into_ticket_info.ticket_status;
-
-                    //Enable the merge button if the merge into ticket isn't in a closed state
-                    if(merge_into_ticket_info.ticket_status.toLowerCase() != "closed"){
-                        document.getElementById("merge_ticket_btn").disabled = false;
-                    }
-                }
-            }
-        );
-    }
-</script>
\ No newline at end of file
+<!-- Ticket merge JS -->
+<script src="js/ticket_merge.js"></script>
\ No newline at end of file