diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 9e5f0aa2..7228dac8 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -2560,6 +2560,10 @@ class ClientController extends AdminController if ($this->request->getPost("waiverof30dayswaitingperiod_display")) { $data['Waiver of 30 days waiting period'] = $this->request->getPost("waiverof30dayswaitingperiod"); } + + if ($this->request->getPost("suminsuredenhancement_display")) { + $data['Sum Insured Enhancement'] = $this->request->getPost("suminsuredenhancement"); + } if ($this->request->getPost("waiver_of_90_days_waiting_period_display")) { $data['Waiver of 90 Days Waiting Period'] = $this->request->getPost("waiver_of_90_days_waiting_period"); diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 38e76d58..22f72376 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -1129,10 +1129,21 @@ class LeadsController extends BaseController // print_r($id); die; if (!empty($id)) { $this->leadInstallmentPaymentDetails->whereIn('id', $id)->set(['is_active' => 0])->update(); - return $this->respond(['status' => true, 'message' => 'Removed successfully'], 200); } else { return $this->respond(['status' => false, 'message' => 'Could not be removed.'], 200); } + + if ($this->request->getGet('lead_id')) { + $lead_id = $this->request->getGet('lead_id'); + $data = [ + 'no_of_installment' => 0, + 'is_installment'=> 0 + ]; + $this->leadsModel->where('id', $lead_id)->set($data)->update(); + } + + return $this->respond(['status' => true, 'message' => 'Removed successfully'], 200); + } //-----RFQ and QCR EXPORT------------------------------------------------------------------------------------------------ @@ -2422,6 +2433,7 @@ class LeadsController extends BaseController $installment_data = json_decode($params['installments'], true); if(!empty($installment_data)){ foreach ($installment_data as $key => $value) { + // print_r($value);die $value['payment_date'] = !empty($value['payment_date']) && strtotime($value['payment_date']) ? date('Y/m/d', strtotime($value['payment_date'])) : null; diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php index 1b2f6749..d470750e 100755 --- a/app/Views/policy_gmc_terms.php +++ b/app/Views/policy_gmc_terms.php @@ -744,8 +744,8 @@
- +
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index 6afdc460..64d7ae6d 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -493,7 +493,7 @@
- "> + ">
@@ -521,7 +521,7 @@
- + >
@@ -530,23 +530,24 @@
- +
+
+
+ + "> +
-
- - "> -
- -
- - "> -
+
+ + "> +
+
-
+
@@ -844,12 +845,12 @@ const editor2 = Jodit.make("#internal_mail_content", editorConfig); var placement_date_datePicker = flatpickr("#placement_date", { - dateFormat: "d/m/Y", + dateFormat: "d-m-Y", allowInput: false, }); var payment_date_datePicker = flatpickr("#payment_date", { - dateFormat: "d/m/Y", + dateFormat: "d-m-Y", allowInput: false, }); @@ -3705,6 +3706,11 @@ function constructURL_ForPlacementMailSend() { function ajaxRequest(formData) { + // console.log("formData", formData); + // formData.forEach((value, key) => { + // console.log(key + ': ' + value); + // }); + var apiURL = ''; console.log(apiURL); @@ -5899,6 +5905,7 @@ function appendMultiFileData(data) { let $installmentContainer = $('#installment_form_row'); let row_count = $installmentContainer.find('.form-row').length; let remove_count = $("#no_of_installment").val(); + let lead_id = $('#lead_id').val(); console.log("row count",row_count); if (row_count > 0 ) { let ids = $installmentContainer.find('.form-row').slice(-remove_count).find('input[name="installment_primary_key[]"]').map(function() { @@ -5914,7 +5921,21 @@ function appendMultiFileData(data) { }).then((result) => { if (result.isConfirmed) { let url = ''; - let requestData = { id: ids }; + let requestData = { id: ids,'lead_id': lead_id}; + + if (requestData.id.length == 0) { + + $("#no_of_installment").hide(); + $("#payment_date").show(); + $("#utr_no").show(); + $("#no_of_installment").closest('.form-group').hide(); + $("#payment_date").closest('.form-group').show(); + $("#utr_no").closest('.form-group').show(); + $('#installment_form_row').empty(); + $('#no_of_installment').val(""); + + return; + } $('.loader').fadeIn(); $('.loader-mask').fadeIn(); @@ -5924,14 +5945,31 @@ function appendMultiFileData(data) { if (response.status === true) { toastr.success(response.message, 'SUCCESS'); - $("#no_of_installment").hide(); + $("#no_of_installment").closest('.form-group').hide(); + $('#no_of_installment').val(""); + $('#installment_form_row').empty(); + // $("#no_of_installment").hide(); $("#payment_date").show(); $("#utr_no").show(); - $("#no_of_installment").closest('.form-group').hide(); $("#payment_date").closest('.form-group').show(); $("#utr_no").closest('.form-group').show(); - $('#installment_form_row').empty(); - $('#no_of_installment').val(""); + $('#not_installment').empty(); + + newhtml = ` +
+ + +
+ +
+ + +
+ `; + $('#not_installment').append(newhtml); + $('.payment_date').flatpickr({ + dateFormat: 'd-m-Y', + }); } else { toastr.error(response.message, 'WARNING'); } @@ -6030,7 +6068,7 @@ function appendMultiFileData(data) { $('#installment_form_row').append(html); $('.payment_date').flatpickr({ - dateFormat: 'd/m/Y', + dateFormat: 'd-m-Y', }); } @@ -6188,7 +6226,7 @@ function appendMultiFileData(data) { $(document).ready(function(){ setTimeout(function(){ $('.payment_date').flatpickr({ - dateFormat: 'd/m/Y', + dateFormat: 'd-m-Y', }); }, 2000) }) diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php index 96312b91..48ddd880 100644 --- a/app/Views/view_rfq_non_eb.php +++ b/app/Views/view_rfq_non_eb.php @@ -435,7 +435,7 @@
- "> + ">
@@ -473,11 +473,15 @@ value="">
+
+
+ +
- "> + ">
@@ -4449,7 +4453,7 @@ const editor2 = Jodit.make("#internal_mail_content", editorConfig); var placement_date_datePicker = flatpickr("#placement_date", { - dateFormat: "d/m/Y", + dateFormat: "d-m-Y", allowInput: false, }); @@ -5391,6 +5395,7 @@ let $installmentContainer = $('#installment_form_row'); let row_count = $installmentContainer.find('.form-row').length; let remove_count = $("#no_of_installment").val(); + let lead_id = $('#lead_id').val(); console.log("row count",row_count); if (row_count > 0 ) { let ids = $installmentContainer.find('.form-row').slice(-remove_count).find('input[name="installment_primary_key[]"]').map(function() { @@ -5406,7 +5411,21 @@ }).then((result) => { if (result.isConfirmed) { let url = ''; - let requestData = { id: ids }; + let requestData = { id: ids,'lead_id': lead_id}; + + if (requestData.id.length == 0) { + + $("#no_of_installment").hide(); + $("#payment_date").show(); + $("#utr_no").show(); + $("#no_of_installment").closest('.form-group').hide(); + $("#payment_date").closest('.form-group').show(); + $("#utr_no").closest('.form-group').show(); + $('#installment_form_row').empty(); + $('#no_of_installment').val(""); + + return; + } $('.loader').fadeIn(); $('.loader-mask').fadeIn(); @@ -5424,6 +5443,21 @@ $("#utr_no").closest('.form-group').show(); $('#installment_form_row').empty(); $('#no_of_installment').val(""); + newhtml = ` +
+ + +
+ +
+ + +
+ `; + $('#not_installment').append(newhtml); + $('.payment_date').flatpickr({ + dateFormat: 'd-m-Y', + }); } else { toastr.error(response.message, 'WARNING'); } @@ -5568,14 +5602,15 @@ $('#installment_form_row').append(html); $('.payment_date').flatpickr({ - dateFormat: 'd/m/Y', + + dateFormat: 'd-m-Y', }); } $(document).ready(function(){ setTimeout(function(){ $('.payment_date').flatpickr({ - dateFormat: 'd/m/Y', + dateFormat: 'd-m-Y', }); }, 2000)