From f9e9af1f5aee29d9bb40d0b9c0093a66713340c6 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 2 Dec 2025 13:11:47 +0530 Subject: [PATCH] enquiry_status filter added --- app/Controllers/EnquiryController.php | 11 ++++++----- app/Models/EnquiryModel.php | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index de48757..80fb867 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -43,7 +43,8 @@ class EnquiryController extends ResourceController $from_date = $this->request->getGet('from_date'); $to_date = $this->request->getGet('to_date'); - $status = $this->request->getGet('status'); + $status = $this->request->getGet('status'); + $enquiry_status = $this->request->getGet('enquiry_status'); $only_policy_data = $this->request->getGet('only_policy_data') ?? false; @@ -62,15 +63,15 @@ class EnquiryController extends ResourceController } 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); + $data = $this->enquiryModel->getEnquiry('STAFF&MANAGER', [$staff_id,$manager_id], $only_policy_data, $from_date, $to_date, $status ,$enquiry_status); } elseif (!empty($agent_id)) { - $data = $this->enquiryModel->getEnquiry('AGENT', $agent_id, $only_policy_data, $from_date, $to_date, $status); + $data = $this->enquiryModel->getEnquiry('AGENT', $agent_id, $only_policy_data, $from_date, $to_date, $status ,$enquiry_status); } elseif (!empty($staff_id)) { - $data = $this->enquiryModel->getEnquiry('STAFF', $staff_id, $only_policy_data, $from_date, $to_date, $status); + $data = $this->enquiryModel->getEnquiry('STAFF', $staff_id, $only_policy_data, $from_date, $to_date, $status ,$enquiry_status); } elseif (!empty($enquiry_id)) { $data = $this->enquiryModel->getEnquiry('ENQUIRY',$enquiry_id, $only_policy_data); } elseif (!empty($manager_id)) { - $data = $this->enquiryModel->getEnquiry('MANAGER',$manager_id, $only_policy_data, $from_date, $to_date, $status); + $data = $this->enquiryModel->getEnquiry('MANAGER',$manager_id, $only_policy_data, $from_date, $to_date, $status ,$enquiry_status); } else { $data = $this->enquiryModel->getEnquiry('ALL'); } diff --git a/app/Models/EnquiryModel.php b/app/Models/EnquiryModel.php index d040a5f..38ca2fa 100644 --- a/app/Models/EnquiryModel.php +++ b/app/Models/EnquiryModel.php @@ -40,7 +40,7 @@ class EnquiryModel extends Model protected $updatedField = 'updated_on'; - public function getEnquiry($getBy = null , $Id = null , $only_policy_data = false, $from_date = null, $to_date = null , $status = null) + public function getEnquiry($getBy = null , $Id = null , $only_policy_data = false, $from_date = null, $to_date = null , $status = null , $enquiry_status = null) { $data = $this->select('partner_enquiry.*, partner_enquiry.name as insured_name, VT.vehicle_type as vehicle_type, @@ -74,6 +74,10 @@ class EnquiryModel extends Model if($status != null){ $data->where('partner_enquiry.status' , $status ); } + + if($$enquiry_status != null){ + $data->where('partner_enquiry.enquiry_status' , $enquiry_status ); + } if($only_policy_data){