diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index ea15cb12..eb2523f4 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -239,8 +239,8 @@ class LeadsController extends BaseController $policy_end_date = null; } - if(!empty($data['incurred_claims_date'][$index])){ - $incurred_claims_date = change_date_format($data['incurred_claims_date'][$index], 'd/m/Y', 'Y-m-d'); + if(!empty($data['incurred_claim_date'][$index])){ + $incurred_claims_date = change_date_format($data['incurred_claim_date'][$index], 'd/m/Y', 'Y-m-d'); }else{ $incurred_claims_date = null; } @@ -371,6 +371,18 @@ class LeadsController extends BaseController $data['policy_end_date'] = null; } + if (!empty($data['incurred_claims_date'])) { + $data['incurred_claims_date'] = change_date_format($data['incurred_claims_date'], 'Y-m-d', 'd/m/Y'); + } else { + $data['incurred_claims_date'] = null; + } + + if (!empty($data['premium_date'])) { + $data['premium_date'] = change_date_format($data['premium_date'], 'Y-m-d', 'd/m/Y'); + } else { + $data['premium_date'] = null; + } + if ($data) { return $this->respond(['status' => true, 'data' => $data], 200); } else { @@ -747,20 +759,25 @@ class LeadsController extends BaseController $rowNumber += 2; // Add premium data + $labelArray = ["Premium", "GST (%)", "GST Amount (₹)", "Total"]; $premiumData = $data['premium_data']['data']; - $premium = ['Premium']; - $gst = ['GST']; - $total = ['Total']; + $premium = [$labelArray[0]]; + $gst = [$labelArray[1]]; + $gstAmt = [$labelArray[2]]; + $total = [$labelArray[3]]; foreach ($premiumData as $proposal => $insurers) { - foreach ($insurers as $insurer => $values) { - $premium[] = $values['Premium']; - $gst[] = $values['GST']; - $total[] = $values['Total']; + if($proposal != 'Particulars'){ + foreach ($insurers as $insurer => $values) { + $premium[] = $values[$labelArray[0]]; + $gst[] = $values[$labelArray[1]]; + $gstAmt[] = $values[$labelArray[2]]; + $total[] = $values[$labelArray[3]]; + } } } - foreach ([$premium, $gst, $total] as $index => $rowData) { + foreach ([$premium, $gst, $gstAmt, $total] as $index => $rowData) { $columnLetter = 'B'; foreach ($rowData as $key => $value) { $sheet->setCellValue("{$columnLetter}{$rowNumber}", $value); diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php index 9674abf7..3cc264e6 100644 --- a/app/Views/leads_form.php +++ b/app/Views/leads_form.php @@ -405,7 +405,6 @@ function getLeadsDataForEdit(input) { $('#policy_start_date_1').val(res.data.policy_start_date); $('#policy_end_date_1').val(res.data.policy_end_date); $('#no_of_lives').val(res.data.no_of_lives); - $('#incurred_claims').val(res.data.incurred_claims); $('#location').val(res.data.location); let increment = 1; @@ -430,7 +429,9 @@ function getLeadsDataForEdit(input) { $('#annualised_claims_' + increment).val(res.data.annualised_claims); $('#incurred_claims_ratio_' + increment).val(res.data.incurred_claims_ratio); $('#earned_claims_ratio_' + increment).val(res.data.earned_claims_ratio); + $('#incurred_claims_' + increment).val(res.data.incurred_claims); $('#file_name_display').text('Upload File Name : ' + res.data.file_name); + // $('#file_name').val(res.data.file_name); if (res.data.salse_person_id) { @@ -887,7 +888,7 @@ function addHTMLInput(check) { newRow7.innerHTML += `
- +
`; @@ -982,7 +983,7 @@ function addHTMLInput(check) { console.log('increment', increment); console.log('policy_start_datePicker selectedDates', selectedDates); - console.log('policy_start_datePicker incurred_claim_', $("#incurred_claim_" + increment).val()); + console.log('policy_start_datePicker incurred_claim_date_', $("#incurred_claim_date_" + increment).val()); // Recalculate policy_run_days if incurred claim date is already selected if ($("#incurred_claim_date_" + increment).val()) { @@ -1000,21 +1001,19 @@ function addHTMLInput(check) { var incurred_claim_datepicker = flatpickr("#incurred_claim_date_" + increment, { dateFormat: "d/m/Y", allowInput: false, - onChange: function(selectedDates) { + onChange: function (selectedDates) { + console.log('Flatpickr instance:', this); + console.log('ID of this element:', this.input.id); - console.log('this object', this); - console.log('id of this element:', this.id); + // Extract the increment value from the element's ID + let increment = this.input.id.split('_').pop(); + console.log('Extracted increment:', increment); - let increment = this.element.id.split('_').pop(); - console.log(increment); // Outputs: 1 - - console.log('selectedDates', selectedDates); - console.log('policy_start_date_', $("#policy_start_date_" + increment).val()); + console.log('Selected Dates:', selectedDates); + console.log('Policy Start Date:', $("#policy_start_date_" + increment).val()); // Recalculate policy_run_days if policy start date is already selected if ($("#policy_start_date_" + increment).val()) { - - console.log('selectedDates', selectedDates); calculatePolicyRunDays(increment); } } @@ -1063,9 +1062,10 @@ function removeHTMLInput(element) function calculatePolicyRunDays(increment) { console.log('calculatePolicyRunDays function called'); + console.log('increment', increment); var policyStartDate = flatpickr.parseDate($("#policy_start_date_" + increment).val(), "d/m/Y"); - var incurredClaimDate = flatpickr.parseDate($("#incurred_claim_" + increment).val(), "d/m/Y"); + var incurredClaimDate = flatpickr.parseDate($("#incurred_claim_date_" + increment).val(), "d/m/Y"); console.log('policyStartDate', policyStartDate) console.log('incurredClaimDate', incurredClaimDate) diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index 8700ecad..ddcbc1b6 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -232,7 +232,7 @@ Sno Item Key Particulars - Proposal 1 + Proposal 1