From 3c5c86c4c5e66eb79d32ed3b69fd4568f03585ee Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 29 Oct 2025 17:49:39 -0400
Subject: [PATCH] Fix Issue with user not showing up in add ticket and
 recurring ticket, Also fixed the sort from DESC to ASC in some areas with
 user select

---
 agent/modals/recurring_ticket/recurring_ticket_add.php  | 2 +-
 agent/modals/recurring_ticket/recurring_ticket_edit.php | 2 +-
 agent/modals/ticket/ticket_add_v2.php                   | 2 +-
 agent/modals/ticket/ticket_assign.php                   | 5 ++---
 agent/modals/ticket/ticket_bulk_assign.php              | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/agent/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php
index 52f7fa64..bac158ef 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_add.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_add.php
@@ -113,7 +113,7 @@
                                         $sql = mysqli_query(
                                             $mysqli,
                                             "SELECT user_id, user_name FROM users
-                                            WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                            WHERE user_type = 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']);
diff --git a/agent/modals/recurring_ticket/recurring_ticket_edit.php b/agent/modals/recurring_ticket/recurring_ticket_edit.php
index 2c163e04..6cb9fc64 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_edit.php
@@ -136,7 +136,7 @@ ob_start();
                             $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
                                 WHERE user_type = 1
                                 AND user_archived_at IS NULL
-                                ORDER BY user_name DESC"
+                                ORDER BY user_name ASC"
                             );
                             while ($row = mysqli_fetch_array($sql_users_select)) {
                                 $user_id_select = intval($row['user_id']);
diff --git a/agent/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php
index 7e96fd44..23a25a6c 100644
--- a/agent/modals/ticket/ticket_add_v2.php
+++ b/agent/modals/ticket/ticket_add_v2.php
@@ -160,7 +160,7 @@
                                         $sql = mysqli_query(
                                             $mysqli,
                                             "SELECT user_id, user_name FROM users
-                                            WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                            WHERE user_type = 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']);
diff --git a/agent/modals/ticket/ticket_assign.php b/agent/modals/ticket/ticket_assign.php
index d67233d0..40492fa0 100644
--- a/agent/modals/ticket/ticket_assign.php
+++ b/agent/modals/ticket/ticket_assign.php
@@ -44,11 +44,10 @@ ob_start();
                 <select class="form-control select2" name="assigned_to">
                     <option value="0">Not Assigned</option>
                     <?php
-                    $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
-                        LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                    $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
                         WHERE user_type = 1
                         AND user_archived_at IS NULL
-                        ORDER BY user_name DESC"
+                        ORDER BY user_name ASC"
                     );
                     while ($row = mysqli_fetch_array($sql_users_select)) {
                         $user_id_select = intval($row['user_id']);
diff --git a/agent/modals/ticket/ticket_bulk_assign.php b/agent/modals/ticket/ticket_bulk_assign.php
index 52a1f968..044be7e6 100644
--- a/agent/modals/ticket/ticket_bulk_assign.php
+++ b/agent/modals/ticket/ticket_bulk_assign.php
@@ -22,7 +22,7 @@
                                 WHERE user_type = 1
                                 AND user_status = 1
                                 AND user_archived_at IS NULL 
-                                ORDER BY user_name DESC"
+                                ORDER BY user_name ASC"
                             );
                             while ($row = mysqli_fetch_array($sql_users_select)) {
                                 $user_id_select = intval($row['user_id']);