From 2c9ace8c4d02c1d340e2c61734ffdd90c209f4ef Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 10:51:34 +0530 Subject: [PATCH 1/4] 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; } From 3ecda530ba5177c48f39aa1785232795cc051457 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 10:55:00 +0530 Subject: [PATCH 2/4] CHANGE_Retails endorsement --- app/Config/Routes.php | 1 + app/Controllers/EmployeeController.php | 6 +++ app/Models/PartnerEndorsementRequestModel.php | 40 +++++++++++++++++++ app/Views/layout/header.php | 3 ++ 4 files changed, 50 insertions(+) create mode 100755 app/Models/PartnerEndorsementRequestModel.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 69a64d66..c7ddf8da 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -184,6 +184,7 @@ $routes->group("/employee", ["filter" => "authMVC"], function ($routes) { $routes->post("test-rack-rate", "EmployeeController::testRackRate"); $routes->get('test_members_list', 'EmployeeController::test_members_list'); $routes->post('get_emp_history','EmployeeController::getEmpHistory'); + $routes->get("retail-endorsement-list", "EmployeeController::retailendorsementList"); }); diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index c5badc3b..613f3ebb 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -3007,4 +3007,10 @@ class EmployeeController extends AdminController } + public function retailendorsementList() + { + $data['message'] = 'File Not Found'; + echo view('errors/404', $data); + } + } diff --git a/app/Models/PartnerEndorsementRequestModel.php b/app/Models/PartnerEndorsementRequestModel.php new file mode 100755 index 00000000..d8b162b4 --- /dev/null +++ b/app/Models/PartnerEndorsementRequestModel.php @@ -0,0 +1,40 @@ + Test Members List + From 929dad2d28b3fa12ed21cebe2f2b93bd248d14d6 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 11:13:31 +0530 Subject: [PATCH 3/4] LIVE_TicketModel Print_r removed --- app/Models/TicketMasterModel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php index f8e8e3ea..3027fe5e 100644 --- a/app/Models/TicketMasterModel.php +++ b/app/Models/TicketMasterModel.php @@ -804,7 +804,7 @@ class TicketMasterModel extends Model } $query->where('ticket_master.emp_id', $emp_id); - + if (!empty($ticket_id)) { $query->where('ticket_master.id', $ticket_id); } @@ -814,8 +814,8 @@ class TicketMasterModel extends Model } $data = $query->findAll(); - // dd($data, db_connect()->getLastQuery()); - print_r($this->db->getLastQuery());die; + // dd($data, db_connect()->getLastQuery()); + // print_r($this->db->getLastQuery());die; return $data; } From 93218aad71d7bfe1bbacd7ddf4ee09683a82bd7f Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 9 Sep 2025 11:15:34 +0530 Subject: [PATCH 4/4] CHANGE_Retail endrosement 2 --- app/Controllers/EmployeeController.php | 1 + app/Views/layout/header.php | 4 ++-- app/Views/retail_endorsement_list.php | 0 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 app/Views/retail_endorsement_list.php diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 613f3ebb..971be548 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -3007,6 +3007,7 @@ class EmployeeController extends AdminController } + public function retailendorsementList() { $data['message'] = 'File Not Found'; diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 9346a524..f88d5736 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -1332,9 +1332,9 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus {
  • Test Members List
    • - + diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php new file mode 100755 index 00000000..e69de29b