diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 36007889..ed6a72e4 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -114,7 +114,8 @@ class TicketController extends BaseController '((AUTO_QUERY_CONTENT))' => 'auto_query_content', ]; $this->extraFields = [ - + 1 => ['non_id_reason'], + 10 => ['pay_initiate_date'], 3 => ['raised_date'], 4 => ['raised_date'], 5 => ['claim_number', 'registration_date'], diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php index da4b2eec..878fad2e 100644 --- a/app/Models/TicketMasterModel.php +++ b/app/Models/TicketMasterModel.php @@ -68,6 +68,10 @@ class TicketMasterModel extends Model 'return_remark', 'cancel_remark', 'awb_no_courier_name', + + 'non_id_reason', + 'head_rejection_reason', + 'pay_initiate_date', ]; diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php index d625a183..2c06d68b 100644 --- a/app/Views/policy_transaction_inception_form.php +++ b/app/Views/policy_transaction_inception_form.php @@ -1314,8 +1314,8 @@ $(document).ready(function(){ $(document).on('change', 'input[type="checkbox"][name="co_share_type[]"]', function() { - $('[name="base_premium[]"]').val(""); - $('[name="co_premium[]"]').val(""); + // $('[name="base_premium[]"]').val(""); + // $('[name="co_premium[]"]').val(""); let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1; @@ -1764,7 +1764,7 @@ function checkAndDistributeTax(input) function amountCalculation(input) { - console.log('amountCalculation - ' + input); + console.log('amountCalculation : ' + input); let selectedOption = $('#policy_type_id').find('option:selected'); let bap = selectedOption.data('bap'); @@ -1816,10 +1816,8 @@ function amountCalculation(input) { // Calculate GST percentage let gst_per = igst; if (igst === 0) { - console.log('called' + cgst + sgst); gst_per = parseFloat(cgst) + parseFloat(sgst); // gst_per = (cgst) + (sgst); - console.log(gst_per); } console.log('gst_per', gst_per); @@ -4267,4 +4265,34 @@ function getCdAmount(cd_ac_pk, increment){ } +$('#bro_payable_by').on('change', function(){ + + var columnIndexes = []; + $('#insurerTable thead th').each(function(index) { + if(index == 0){ + console.log("columnIndexes is ", index); + }else{ + amountCalculation(index); + } + columnIndexes.push(index); + }); + console.log("columnIndexes", columnIndexes); + +}); + +$(document).on('change', '#insurerTable input, #insurerTable select, #insurerTable textarea', function() { + console.log('Changed in table:', $(this).attr('name'), 'Value:', $(this).val()); + getColumnIndexes() +}); + +function getColumnIndexes() { + $('#insurerTable thead th').each(function(index) { + if (index === 0) { + console.log("columnIndexes is", index); + } else { + amountCalculation(index); + } + }); +} + \ No newline at end of file diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php index 96064eb9..835a252f 100644 --- a/app/Views/ticket_edit_onbording.php +++ b/app/Views/ticket_edit_onbording.php @@ -24,28 +24,28 @@
  • - + General
    • diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php index 31a7c964..23c8151c 100644 --- a/app/Views/ticket_form_gmc.php +++ b/app/Views/ticket_form_gmc.php @@ -294,6 +294,12 @@ value="" name="settle_letter"> + + - + +
    @@ -363,6 +373,7 @@ $(document).ready(function() { flatpickr("#denial_date", { dateFormat: "d/m/Y", allowInput: false }); flatpickr("#approved_date", { dateFormat: "d/m/Y", allowInput: false }); flatpickr("#settled_date", { dateFormat: "d/m/Y", allowInput: false }); + flatpickr("#pay_initiate_date", { dateFormat: "d/m/Y", allowInput: false }); // updateClaimStatusDisplay("") var extraFields = ; @@ -408,7 +419,7 @@ $(document).ready(function() { function updateClaimStatusDisplay(value) { // Hide all sections and remove required attribute from their inputs and textareas - let sections = $('.cda_ir, .settled, .approved, .rejected, .up_qdr, .up_cnu, .canceled, .returned'); + let sections = $('.cda_ir, .settled, .approved, .rejected, .up_qdr, .up_cnu, .canceled, .returned, .payment, .non_id'); sections.hide().find('input, textarea').removeAttr('required'); // Determine which section to show @@ -429,11 +440,22 @@ function updateClaimStatusDisplay(value) { showClass = '.canceled'; } else if (value == 14) { // RETURNED showClass = '.returned'; + } else if (value == 1) { // NON ID + showClass = '.non_id'; + } else if (value == 10) { // PAYMENT INITIATED + showClass = '.payment'; } // Show the relevant section and enable required attributes if (showClass) { - $(showClass).show().find('input, textarea').attr('required', true); + // $(showClass).show().find('input, textarea').attr('required', true); + $(showClass).show().find('input, textarea').attr('required', true).each(function() { + var $label = $("label[for='" + $(this).attr('id') + "']"); + if ($label.length && !$label.find('.text-danger').length) { + $label.append(' *'); + } + }); + } } @@ -455,7 +477,7 @@ function claimStatusFieldChanges(fields) { var $label = $parentDiv.find("label[for='" + fieldId + "']"); if ($label.length && !$label.find(".text-danger").length) { - $label.append(' *'); + // $label.append(' *'); } } }); @@ -477,7 +499,7 @@ function claimStatusFieldRemoveREquired(fields, remove_or_add, thirdClass) { var $label = $parentDiv.find("label[for='" + fieldId + "']"); // if(remove_or_add == false){ // $parentDiv.find("label[for='" + fieldId + "'] .text-danger").remove(); - // console.log('one', remove_or_add); + // // console.log('one', remove_or_add); // }else{ // if ($label.length && !$label.find(".text-danger").length) { // $label.append(' *'); @@ -512,10 +534,14 @@ $(document).on("input", function (event) { if (thirdClass) { claimStatusFieldRemoveREquired(fields, false, thirdClass); - let $label = $(thirdClass).find("label"); - if ($label.length && !$label.find(".text-danger").length) { - $label.append(' *'); - } + $(thirdClass).each(function() { + let $label = $(this).find("label"); + $label.each(function() { + if (!$(this).find(".text-danger").length) { + $(this).append(' *'); + } + }); + }); } else { claimStatusFieldRemoveREquired($field, false, ''); } diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php index 05534579..7ee087e1 100644 --- a/app/Views/ticket_history.php +++ b/app/Views/ticket_history.php @@ -5,7 +5,7 @@ - + diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php index 65885cd1..a51706fd 100644 --- a/app/Views/ticket_list.php +++ b/app/Views/ticket_list.php @@ -74,11 +74,11 @@ table.dataTable tbody td { title="
    - +
    FieldLabel Change