diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index 8f9b1c4..bfd55ee 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -88,7 +88,14 @@ class EnquiryController extends ResourceController $policies = []; if (!empty($quotations)) { $quotationIds = array_column($quotations, 'id'); - $policies = $this->PolicyModel->whereIn('quotation_id', $quotationIds)->where('is_active', 1)->findAll(); + $policies = $this->PolicyModel->select('partner_policy.*, pe.reg_no, I.name as insurer_name, pq.insured_declared_value, ipti.insurance_plan_type') + ->join('partner_enquiry pe', 'pe.id = partner_policy.enquiry_id', 'left') + ->join('insurers I', 'I.id = pe.insurer_id', 'left') + ->join('partner_quotation pq', 'pq.id = partner_policy.quotation_id', 'left') + ->join('partner_insurance_plan_type_master ipti', 'ipti.id = pq.insurance_plan_type_id', 'left') + ->whereIn('partner_policy.quotation_id', $quotationIds) + ->where('partner_policy.is_active', 1) + ->findAll(); } // Final response diff --git a/app/Controllers/QuotationController.php b/app/Controllers/QuotationController.php index 3b2bbba..c3f230f 100644 --- a/app/Controllers/QuotationController.php +++ b/app/Controllers/QuotationController.php @@ -23,8 +23,10 @@ class QuotationController extends ResourceController $manager_id = $this->request->getGet('manager_id'); - $data = $this->QuotationModel->select('partner_quotation.* , IT.insurance_plan_type') - ->join('partner_insurance_plan_type_master IT', 'IT.id = partner_quotation.insurance_plan_type_id', 'left') + $data = $this->QuotationModel->select('partner_quotation.* , pe.reg_no , I.name as insurer_name, ipti.insurance_plan_type') + ->join('partner_enquiry pe', 'pe.id = partner_quotation.enquiry_id', 'left') + ->join('insurers I', 'I.id = pe.insurer_id', 'left') + ->join('partner_insurance_plan_type_master ipti', 'ipti.id = partner_quotation.insurance_plan_type_id', 'left') ->where('partner_quotation.manager_id',$manager_id) ->findAll(); @@ -39,7 +41,12 @@ class QuotationController extends ResourceController { try { $id = $this->request->getGet('id'); - $record = $this->QuotationModel->find($id); + $record = $this->QuotationModel->select('partner_quotation.* , pe.reg_no , I.name as insurer_name, ipti.insurance_plan_type') + ->join('partner_enquiry pe', 'pe.id = partner_quotation.enquiry_id', 'left') + ->join('insurers I', 'I.id = pe.insurer_id', 'left') + ->join('partner_insurance_plan_type_master ipti', 'ipti.id = partner_quotation.insurance_plan_type_id', 'left') + ->where('partner_quotation.id',$id) + ->find(); if (!$record) { return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);