From cc579a9a77f3bacaf77c0014865b74e09119ca1f Mon Sep 17 00:00:00 2001 From: Venkatesh Date: Mon, 1 Jun 2026 15:07:12 +0530 Subject: [PATCH] FEAT_REG_NO --- app/Controllers/ClaimController.php | 19 +++++++++++++++---- app/Models/ClaimModel.php | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/Controllers/ClaimController.php b/app/Controllers/ClaimController.php index 7dc6d2c..7e8722d 100644 --- a/app/Controllers/ClaimController.php +++ b/app/Controllers/ClaimController.php @@ -64,7 +64,7 @@ class ClaimController extends ResourceController $to_date = $this->request->getGet('to_date'); $builder = $this->db->table('partner_claims pc') - ->select('pc.*, + ->select("pc.*, i.name as insurer_name, i.short_name as insurer_short_name, pct.claim_type as claim_type_value, @@ -73,7 +73,12 @@ class ClaimController extends ResourceController tcs.claim_status as claim_status_value, pp.start_date as policy_start_date, pp.end_date as policy_end_date, - pp.rc_no as reg_no') + pp.rc_no as reg_no, + CASE + WHEN pc.reg_no IS NULL OR pc.reg_no = '' THEN pp.rc_no + ELSE pc.reg_no + END AS reg_no + ") ->join('insurers i', 'i.id = pc.insurer_id', 'left') ->join('partner_claim_type_master pct', 'pct.id = pc.claim_type', 'left') ->join('partner_agent pa', 'pa.id = pc.agent_id', 'left') @@ -200,6 +205,7 @@ class ClaimController extends ResourceController 'remark' => $reqData['remark'] ?? null, 'is_active' => 1, 'created_by' => $reqData['created_by'] ?? null, + 'reg_no' => $reqData['reg_no'] ?? null, ]; $this->db->transStart(); @@ -352,7 +358,7 @@ class ClaimController extends ResourceController } $claim = $this->db->table('partner_claims pc') - ->select('pc.*, + ->select("pc.*, i.name as insurer_name, i.short_name as insurer_short_name, pct.claim_type as claim_type_value, @@ -361,7 +367,12 @@ class ClaimController extends ResourceController tcs.claim_status as claim_status_value, pp.start_date as policy_start_date, pp.end_date as policy_end_date, - v.vehicle_no as reg_no') + + CASE + WHEN pc.reg_no IS NULL OR pc.reg_no = '' THEN v.vehicle_no + ELSE pc.reg_no + END AS reg_no + ") ->join('insurers i', 'i.id = pc.insurer_id', 'left') ->join('partner_claim_type_master pct', 'pct.id = pc.claim_type', 'left') ->join('partner_agent pa', 'pa.id = pc.agent_id', 'left') diff --git a/app/Models/ClaimModel.php b/app/Models/ClaimModel.php index 2e27d42..b779be0 100644 --- a/app/Models/ClaimModel.php +++ b/app/Models/ClaimModel.php @@ -38,6 +38,7 @@ class ClaimModel extends Model 'updated_by', 'claim_number', 'policy_from', + 'reg_no', ]; // Auto timestamps