From 5c3d928c245fc57416f351daffb025127b2d71cb Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Tue, 25 Feb 2025 11:53:01 +0530
Subject: [PATCH] GWM : Ticket

---
 app/Controllers/EmployeeRestController.php |  6 +++++-
 app/Models/TicketMasterModel.php           | 11 ++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 0bde6c9a..5b24dafe 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -3251,6 +3251,8 @@ class EmployeeRestController extends AdminController
         $modeOFIntimate = $this->ticketController->modeOFIntimate;
         $claimType = $this->ticketController->claimType;
         $relationshipType = $this->ticketController->relationshipType;
+        $ticketTypeArray = $this->ticketController->ticketType;
+
 
         $emp_id = $this->request->getGet('emp_id');
         $ticket_type = $this->request->getGet('ticket_type') ?? null;
@@ -3290,7 +3292,9 @@ class EmployeeRestController extends AdminController
                 if (in_array($value['claim_type'], [2, 3, 4])) {
                     $claimPrimaryTypey = "2";
                 }
-                $ticket_data[$key]['claim_type_value'] = $claimType[$claimPrimaryTypey][$value['claim_type']] ?? null;
+                $ticket_data[$key]['claim_type_value'] = $claimType[$claimPrimaryTypey][$value['claim_type']] ?? null;  
+                $ticket_data[$key]['ticket_policy_type'] = $ticketTypeArray[$value['ticket_type_id']] ?? null;
+
             }
         }
 
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 01d90b17..da4b2eec 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -680,16 +680,17 @@ class TicketMasterModel extends Model
     //api
     public function get_ticket_data($emp_id, $ticket_type = null, $ticket_id = null)
     {
-        $query = $this->select('*')
-            ->where('is_active', 1)
-            ->where('emp_id', $emp_id);
+        $query = $this->select('ticket_master.*, tms.mail_subject as subject')
+            ->join('ticket_messages tms', 'ticket_master.id = tms.ticket_id', 'left')
+            ->where('ticket_master.is_active', 1)
+            ->where('ticket_master.emp_id', $emp_id);
 
         if (!empty($ticket_id)) {
-            $query->where('id', $ticket_id);
+            $query->where('ticket_master.id', $ticket_id);
         }
 
         if (!empty($ticket_type)) {
-            $query->where('ticket_type_id', $ticket_type);
+            $query->where('ticket_master.ticket_type_id', $ticket_type);
         }
 
         $data = $query->findAll();