From 2c9ace8c4d02c1d340e2c61734ffdd90c209f4ef Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 10:51:34 +0530 Subject: [PATCH] LIVE_Track Clamin in api --- app/Controllers/EmployeeRestController.php | 5 ++++- app/Models/TicketMasterModel.php | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index ae86e534..059ea366 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3664,6 +3664,9 @@ class EmployeeRestController extends AdminController $emp_id = $this->request->getGet('emp_id'); $ticket_type = $this->request->getGet('ticket_type') ?? null; $ticket_id = $this->request->getGet('ticket_id') ?? null; + $request = \Config\Services::request(); + $uri = $request->uri->getPath(); + $returnType = (strpos($uri, 'api') !== false) ? 'api' : 'web'; // dd($emp_id); if (empty($emp_id)) { @@ -3671,7 +3674,7 @@ class EmployeeRestController extends AdminController } $TicketMasterModel = new TicketMasterModel(); - $ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $ticket_type, $ticket_id); + $ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id); if (!empty($ticket_data)) { diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php index 2ff3876a..f8e8e3ea 100644 --- a/app/Models/TicketMasterModel.php +++ b/app/Models/TicketMasterModel.php @@ -791,14 +791,20 @@ class TicketMasterModel extends Model } //api - public function get_ticket_data($emp_id, $ticket_type = null, $ticket_id = null) + public function get_ticket_data($emp_id, $returnType,$ticket_type = null, $ticket_id = null) { $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('tms.sender', "user") - ->where('ticket_master.emp_id', $emp_id); + ->where('ticket_master.is_active', 1); + if($returnType == 'api'){ + $query->whereIn('sender', ['staff', 'user']); + }else{ + $query->where('tms.sender', "user"); + } + + $query->where('ticket_master.emp_id', $emp_id); + if (!empty($ticket_id)) { $query->where('ticket_master.id', $ticket_id); } @@ -809,6 +815,7 @@ class TicketMasterModel extends Model $data = $query->findAll(); // dd($data, db_connect()->getLastQuery()); + print_r($this->db->getLastQuery());die; return $data; }