From a4dc2e4c6a688446ee5b4719a96254ef849cf9bd Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 19:00:08 +0530 Subject: [PATCH] LIVE_return type removed --- app/Controllers/EmployeeRestController.php | 3 ++- app/Models/TicketMasterModel.php | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 5bd6097b..2caef215 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3708,7 +3708,8 @@ class EmployeeRestController extends AdminController $ticket_id = $this->request->getGet('ticket_id') ?? null; $request = \Config\Services::request(); $uri = $request->uri->getPath(); - $returnType = (strpos($uri, 'api') !== false) ? 'api' : 'web'; + $returnType = ""; + // $returnType = (strpos($uri, 'api') !== false) ? 'api' : 'web'; // dd($emp_id); if (empty($emp_id)) { diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php index 3027fe5e..dfe14db3 100644 --- a/app/Models/TicketMasterModel.php +++ b/app/Models/TicketMasterModel.php @@ -796,13 +796,7 @@ class TicketMasterModel extends Model $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); - - if($returnType == 'api'){ - $query->whereIn('sender', ['staff', 'user']); - }else{ - $query->where('tms.sender', "user"); - } - + $query->whereIn('sender', ['staff', 'user']); $query->where('ticket_master.emp_id', $emp_id); if (!empty($ticket_id)) {