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..971be548 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -3007,4 +3007,11 @@ class EmployeeController extends AdminController } + + public function retailendorsementList() + { + $data['message'] = 'File Not Found'; + echo view('errors/404', $data); + } + } diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index cb01779e..77fa60f1 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3703,6 +3703,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)) { @@ -3710,7 +3713,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/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 @@ +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); @@ -808,7 +814,8 @@ class TicketMasterModel extends Model } $data = $query->findAll(); - // dd($data, db_connect()->getLastQuery()); + // dd($data, db_connect()->getLastQuery()); + // print_r($this->db->getLastQuery());die; return $data; } diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 2a79ffc2..f88d5736 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -1332,6 +1332,9 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus {
  • Test Members List
  • +
  • + Retail Endorsement +
  • diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php new file mode 100755 index 00000000..e69de29b