From 0a96297e0931e570e02efd59ef5a0766cca9d00b Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Fri, 24 Oct 2025 18:18:32 +0530 Subject: [PATCH] GWM --- app/Controllers/EnquiryController.php | 4 +++- app/Models/EnquiryModel.php | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index fe6b8af..1eef745 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -56,7 +56,9 @@ class EnquiryController extends ResourceController $to_date = DateTime::createFromFormat('d-m-Y', $to_date)->format('Y-m-d 23:59:59'); } - if (!empty($agent_id)) { + if (!empty($staff_id) && !empty($manager_id)) { + $data = $this->enquiryModel->getEnquiry('STAFF&MANAGER', [$staff_id,$manager_id], $only_policy_data, $from_date, $to_date, $status); + } elseif (!empty($agent_id)) { $data = $this->enquiryModel->getEnquiry('AGENT', $agent_id, $only_policy_data, $from_date, $to_date, $status); } elseif (!empty($staff_id)) { $data = $this->enquiryModel->getEnquiry('STAFF', $staff_id, $only_policy_data, $from_date, $to_date, $status); diff --git a/app/Models/EnquiryModel.php b/app/Models/EnquiryModel.php index 4dd4435..d080da0 100644 --- a/app/Models/EnquiryModel.php +++ b/app/Models/EnquiryModel.php @@ -93,6 +93,13 @@ class EnquiryModel extends Model { return $data->where('partner_enquiry.manager_id', $Id)->findAll(); } + else if($getBy == 'STAFF&MANAGER') + { + $staffId = $Id[0]; + $managerId = $Id[1]; + return $data->where('partner_enquiry.manager_id', $managerId)->where('partner_enquiry.assigned_to',$staffId)->findAll(); + + } } }