From 4005e951c319ec9e1c7e6ff7815ee3acfbf3dd9c Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 28 May 2025 17:36:50 +0530 Subject: [PATCH] FIX_LEAD_CALCULATION : RV --- app/Views/leads_form.php | 23 ++++++++++++++++--- .../policy_transaction_inception_form.php | 8 +++---- app/Views/rfq/gmc.php | 6 ++--- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php index 23209757..92d4435f 100644 --- a/app/Views/leads_form.php +++ b/app/Views/leads_form.php @@ -544,7 +544,11 @@ let increment = this.input.id.split('_').pop(); console.log('Extracted increment:', increment); + let lead_type = $('#lead_type').val(); var policyStartDate = $("#source_policy_start_date"); + if(lead_type == 3){ + policyStartDate = $("#policy_start_date"); + } console.log('Selected Dates:', selectedDates); console.log('policy start date instance', policyStartDate) console.log('Policy Start Date:', policyStartDate.val()); @@ -909,6 +913,10 @@ console.log('Extracted increment:', increment); var policyStartDate = $("#source_policy_start_date"); + if(lead_type == 3){ + policyStartDate = $("#policy_start_date"); + } + console.log('Selected Dates:', selectedDates); console.log('policy start date instance', policyStartDate) console.log('Policy Start Date:', policyStartDate.val()); @@ -1155,8 +1163,11 @@ console.log('calculatePolicyRunDays function called'); console.log('increment', increment); - + let lead_type = $('#lead_type').val(); var policyStartDate = $("#source_policy_start_date"); + if(lead_type == 3){ + policyStartDate = $("#policy_start_date"); + } var policyStartDate = flatpickr.parseDate(policyStartDate.val(), "d/m/Y"); var incurredClaimDate = flatpickr.parseDate($("#incurred_claim_date_" + increment).val(), "d/m/Y"); @@ -1207,8 +1218,14 @@ // Prevent division by zero in incurred claim ratio calculation let premium_as_on_date = Number($('#premium_date_' + increment).val()) || 0; - let incurred_claim_ratio = annualised_claims > 0 ? annualised_claims / premium_as_on_date : 0; - let incurred_claim_ratio_roundoff = Math.round(incurred_claim_ratio); + let incurred_claim_ratio = (annualised_claims > 0 && premium_as_on_date > 0) + ? (annualised_claims / premium_as_on_date) + : 0; + + let incurred_claim_ratio_roundoff = isFinite(incurred_claim_ratio) + ? Math.round(incurred_claim_ratio) + : 0; + console.log('incurred_claim_ratio', incurred_claim_ratio_roundoff); $('#incurred_claims_ratio_' + increment).val(incurred_claim_ratio_roundoff); diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php index ad4f430c..93cc234d 100644 --- a/app/Views/policy_transaction_inception_form.php +++ b/app/Views/policy_transaction_inception_form.php @@ -3854,15 +3854,15 @@ $('#policy_no').change(function(){ if(res.status == true){ $('#ct_type').val(1); - $('#client_policy_id').val(res.data.client_policy_id); + $('#client_policy_id').val(res.data.id); $('#policy_start_date').val(res.data.policy_start_date); $('#policy_end_date').val(res.data.policy_end_date); $('#tpa').val(res.data.tpa_branch_id+'-'+res.data.tpa_id).select2(); }else{ $('#ct_type').val(2); - $('#client_policy_id').val(); - $('#policy_start_date').val(); - $('#policy_end_date').val(); + $('#client_policy_id').val(''); + $('#policy_start_date').val(''); + $('#policy_end_date').val(''); $('#tpa').val('').select2(); console.log(res.message, 'warning'); } diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php index 884428b3..9700a144 100644 --- a/app/Views/rfq/gmc.php +++ b/app/Views/rfq/gmc.php @@ -30,7 +30,7 @@