Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
2adf649c0d
@ -544,7 +544,11 @@
|
|||||||
let increment = this.input.id.split('_').pop();
|
let increment = this.input.id.split('_').pop();
|
||||||
console.log('Extracted increment:', increment);
|
console.log('Extracted increment:', increment);
|
||||||
|
|
||||||
|
let lead_type = $('#lead_type').val();
|
||||||
var policyStartDate = $("#source_policy_start_date");
|
var policyStartDate = $("#source_policy_start_date");
|
||||||
|
if(lead_type == 3){
|
||||||
|
policyStartDate = $("#policy_start_date");
|
||||||
|
}
|
||||||
console.log('Selected Dates:', selectedDates);
|
console.log('Selected Dates:', selectedDates);
|
||||||
console.log('policy start date instance', policyStartDate)
|
console.log('policy start date instance', policyStartDate)
|
||||||
console.log('Policy Start Date:', policyStartDate.val());
|
console.log('Policy Start Date:', policyStartDate.val());
|
||||||
@ -909,6 +913,10 @@
|
|||||||
console.log('Extracted increment:', increment);
|
console.log('Extracted increment:', increment);
|
||||||
|
|
||||||
var policyStartDate = $("#source_policy_start_date");
|
var policyStartDate = $("#source_policy_start_date");
|
||||||
|
if(lead_type == 3){
|
||||||
|
policyStartDate = $("#policy_start_date");
|
||||||
|
}
|
||||||
|
|
||||||
console.log('Selected Dates:', selectedDates);
|
console.log('Selected Dates:', selectedDates);
|
||||||
console.log('policy start date instance', policyStartDate)
|
console.log('policy start date instance', policyStartDate)
|
||||||
console.log('Policy Start Date:', policyStartDate.val());
|
console.log('Policy Start Date:', policyStartDate.val());
|
||||||
@ -1155,8 +1163,11 @@
|
|||||||
|
|
||||||
console.log('calculatePolicyRunDays function called');
|
console.log('calculatePolicyRunDays function called');
|
||||||
console.log('increment', increment);
|
console.log('increment', increment);
|
||||||
|
let lead_type = $('#lead_type').val();
|
||||||
var policyStartDate = $("#source_policy_start_date");
|
var policyStartDate = $("#source_policy_start_date");
|
||||||
|
if(lead_type == 3){
|
||||||
|
policyStartDate = $("#policy_start_date");
|
||||||
|
}
|
||||||
var policyStartDate = flatpickr.parseDate(policyStartDate.val(), "d/m/Y");
|
var policyStartDate = flatpickr.parseDate(policyStartDate.val(), "d/m/Y");
|
||||||
var incurredClaimDate = flatpickr.parseDate($("#incurred_claim_date_" + increment).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
|
// Prevent division by zero in incurred claim ratio calculation
|
||||||
let premium_as_on_date = Number($('#premium_date_' + increment).val()) || 0;
|
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 = (annualised_claims > 0 && premium_as_on_date > 0)
|
||||||
let incurred_claim_ratio_roundoff = Math.round(incurred_claim_ratio);
|
? (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);
|
console.log('incurred_claim_ratio', incurred_claim_ratio_roundoff);
|
||||||
|
|
||||||
$('#incurred_claims_ratio_' + increment).val(incurred_claim_ratio_roundoff);
|
$('#incurred_claims_ratio_' + increment).val(incurred_claim_ratio_roundoff);
|
||||||
|
|||||||
@ -3854,15 +3854,15 @@ $('#policy_no').change(function(){
|
|||||||
|
|
||||||
if(res.status == true){
|
if(res.status == true){
|
||||||
$('#ct_type').val(1);
|
$('#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_start_date').val(res.data.policy_start_date);
|
||||||
$('#policy_end_date').val(res.data.policy_end_date);
|
$('#policy_end_date').val(res.data.policy_end_date);
|
||||||
$('#tpa').val(res.data.tpa_branch_id+'-'+res.data.tpa_id).select2();
|
$('#tpa').val(res.data.tpa_branch_id+'-'+res.data.tpa_id).select2();
|
||||||
}else{
|
}else{
|
||||||
$('#ct_type').val(2);
|
$('#ct_type').val(2);
|
||||||
$('#client_policy_id').val();
|
$('#client_policy_id').val('');
|
||||||
$('#policy_start_date').val();
|
$('#policy_start_date').val('');
|
||||||
$('#policy_end_date').val();
|
$('#policy_end_date').val('');
|
||||||
$('#tpa').val('').select2();
|
$('#tpa').val('').select2();
|
||||||
console.log(res.message, 'warning');
|
console.log(res.message, 'warning');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
<label for="policy_run_days">Policy Run Days<span class="text-danger">*</span></label>
|
<label for="policy_run_days">Policy Run Days<span class="text-danger">*</span></label>
|
||||||
<input value="<?= isset($lead_edit_data['policy_run_days']) ? $lead_edit_data['policy_run_days'] : '' ?>" type="text" class="form-control" id="policy_run_days<?= $increment ?>" name="policy_run_days[]"
|
<input value="<?= isset($lead_edit_data['policy_run_days']) ? $lead_edit_data['policy_run_days'] : '' ?>" type="text" class="form-control" id="policy_run_days<?= $increment ?>" name="policy_run_days[]"
|
||||||
placeholder="Enter Policy Run Days" oninput="earnedPremiumCalc(this)" onkeyup="incurredClaimSum(this)">
|
placeholder="Enter Policy Run Days" oninput="earnedPremiumCalc(this); incurredClaimSum(this)">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
@ -43,7 +43,7 @@
|
|||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
<label for="premium_date">Premium as on Date<span class="text-danger">*</span></label>
|
<label for="premium_date">Premium as on Date<span class="text-danger">*</span></label>
|
||||||
<input value="<?= isset($lead_edit_data['premium_date']) ? $lead_edit_data['premium_date'] : '' ?>" type="text" class="form-control" id="premium_date<?= $increment ?>" name="premium_date[]"
|
<input value="<?= isset($lead_edit_data['premium_date']) ? $lead_edit_data['premium_date'] : '' ?>" type="text" class="form-control" id="premium_date<?= $increment ?>" name="premium_date[]"
|
||||||
placeholder="Enter Premium Date">
|
placeholder="Enter Premium Date" oninput="incurredClaimSum(this); earnedPremiumCalc(this)">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
@ -55,7 +55,7 @@
|
|||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
<label for="annualised_claims">Annualised Claims<span class="text-danger">*</span></label>
|
<label for="annualised_claims">Annualised Claims<span class="text-danger">*</span></label>
|
||||||
<input value="<?= isset($lead_edit_data['annualised_claims']) ? $lead_edit_data['annualised_claims'] : '' ?>" type="text" class="form-control" id="annualised_claims<?= $increment ?>" name="annualised_claims[]"
|
<input value="<?= isset($lead_edit_data['annualised_claims']) ? $lead_edit_data['annualised_claims'] : '' ?>" type="text" class="form-control" id="annualised_claims<?= $increment ?>" name="annualised_claims[]"
|
||||||
placeholder="Enter Annualised Claims">
|
placeholder="Enter Annualised Claims" oninput="incurredClaimSum(this)">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
<div class="form-group col-md-3 renewalFields" style="display: none;">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user