From c9c9e2a7e5a6a8f2875a10c830f044fa8689467f Mon Sep 17 00:00:00 2001
From: Nadir Hamid <matrix.nad@gmail.com>
Date: Tue, 9 Jun 2026 18:15:32 +0000
Subject: [PATCH] fix some database lookups and UI issues

---
 .../Admin/SupportTicketController.php         | 24 ++++++++++++++-----
 app/resources/lang/en/admin/tickets.php       |  1 +
 .../views/admin/supportticket/index.blade.php |  1 +
 .../emails/support_ticket_updated.blade.php   | 13 +++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/app/Http/Controllers/Admin/SupportTicketController.php b/app/app/Http/Controllers/Admin/SupportTicketController.php
index 783aa431f..a4ad34bcb 100755
--- a/app/app/Http/Controllers/Admin/SupportTicketController.php
+++ b/app/app/Http/Controllers/Admin/SupportTicketController.php
@@ -13,6 +13,7 @@
 use App\PortNumber;
 use App\Http\Requests\Admin\SupportTicketRequest;
 use App\Helpers\MainHelper;
+use App\Helpers\EmailHelper;
 use Auth;
 use Datatables;
 use DB;
@@ -123,13 +124,24 @@ public function addUpdate(Request $request, SupportTicket $supportticket)
     {
         $user = Auth::user();
         $data = $request->all();
-        SupportTicketUpdate::create([
+        $update = SupportTicketUpdate::create([
             'comment' => $data['comment'],
             'ticket_id' => $supportticket->id,
             'user_id' => $user->id,
             'direction' => 'STAFF'
         ]);
 
+        $subject = "New support ticket updated";
+        $emailData = [
+            'user' => $user,
+            'ticket' => $supportticket,
+            'update' => $update,
+        ];
+
+        $workspace = Workspace::find($supportticket->workspace_id);
+        $workspaceCreator = User::find($workspace->creator_id);
+        EmailHelper::sendEmail($subject, $workspaceCreator->email, 'support_ticket_updated', $emailData);
+
         return response();
     }
 
@@ -140,16 +152,16 @@ public function addUpdate(Request $request, SupportTicket $supportticket)
      */
     public function data(Request $request)
     {
-        $tickets = SupportTicket::select(array('support_tickets.id', 'support_tickets.workspace_id', 'support_tickets.subject', 'support_tickets.priority', 'support_tickets.created_at', 'support_tickets.category_id', 'support_tickets_categories.name'));
-        $tickets = $tickets->join('support_tickets_categories', 'support_tickets_categories.id', '=', 'support_tickets.category_id');
-        $tickets->orderBy('created_at', 'DESC');
+        $tickets = SupportTicket::select(array('support_tickets.id', 'support_tickets.workspace_id', 'support_tickets.subject', 'support_tickets.priority', 'support_tickets_categories.name', 'support_tickets.created_at'));
+        $tickets = $tickets->leftJoin('support_tickets_categories', 'support_tickets_categories.id', '=', 'support_tickets.category_id');
+        $tickets->orderBy('support_tickets.created_at', 'DESC');
         $workspaceId = $request->get('workspace_id');
         if (!empty($workspaceId)) {
-            $tickets->where('workspace_id', $workspaceId);
+            $tickets->where('support_tickets.workspace_id', $workspaceId);
         }
         $ticketId = $request->get('id');
         if (!empty($ticketId)) {
-            $tickets->where('id', $ticketId);
+            $tickets->where('support_tickets.id', $ticketId);
         }
 
         return Datatables::of($tickets)
diff --git a/app/resources/lang/en/admin/tickets.php b/app/resources/lang/en/admin/tickets.php
index 9d4bbc3c1..08ebd4ab3 100755
--- a/app/resources/lang/en/admin/tickets.php
+++ b/app/resources/lang/en/admin/tickets.php
@@ -8,6 +8,7 @@
     'workspace_id' => 'Workspace ID',
     'status' => 'Status',
     'category_id' => 'Category',
+    'category' => 'Category',
     'assigned_to_id' => 'Assigned to',
     'comment' => 'Comment'
 ];
diff --git a/app/resources/views/admin/supportticket/index.blade.php b/app/resources/views/admin/supportticket/index.blade.php
index d2c82c805..fb2484344 100755
--- a/app/resources/views/admin/supportticket/index.blade.php
+++ b/app/resources/views/admin/supportticket/index.blade.php
@@ -20,6 +20,7 @@
             <th>{!! trans("admin/tickets.workspace_id") !!}</th>
             <th>{!! trans("admin/tickets.subject") !!}</th>
             <th>{!! trans("admin/tickets.priority") !!}</th>
+            <th>{!! trans("admin/tickets.category") !!}</th>
             <th>{!! trans("admin/admin.created_at") !!}</th>
             <th>{!! trans("admin/admin.action") !!}</th>
         </tr>
diff --git a/app/resources/views/emails/support_ticket_updated.blade.php b/app/resources/views/emails/support_ticket_updated.blade.php
index 6cbec80b2..877853d14 100755
--- a/app/resources/views/emails/support_ticket_updated.blade.php
+++ b/app/resources/views/emails/support_ticket_updated.blade.php
@@ -21,6 +21,17 @@
                                     <td class="feedback-card" bgcolor="#f7f9fc" style="padding: 30px 32px; border-radius: 6px; border: 1px solid #e7edf5;">
                                         <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
                                             <tbody>
+
+                                                <tr>
+                                                    <td style="font-family: Roboto, Arial, Helvetica, sans-serif; font-size: 13px; line-height: 20px; color: #667085; padding-bottom: 4px;">
+                                                        Updated by
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="font-family: Roboto, Arial, Helvetica, sans-serif; font-size: 15px; line-height: 24px; color: #344054; padding-bottom: 18px;">
+                                                        {{ $user['email'] }}
+                                                    </td>
+                                                </tr>
                                                 <tr>
                                                     <td style="font-family: Roboto, Arial, Helvetica, sans-serif; font-size: 13px; line-height: 20px; color: #667085; padding-bottom: 4px;">
                                                         Subject
@@ -38,7 +49,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td style="font-family: Roboto, Arial, Helvetica, sans-serif; font-size: 15px; line-height: 24px; color: #344054; word-break: break-word;">
-                                                        {!! nl2br(e($update->comments)) !!}
+                                                        {!! nl2br(e($update->comment)) !!}
                                                     </td>
                                                 </tr>
                                             </tbody>