diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 2c1bfae3..04f4b2de 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -458,7 +458,7 @@
-
@@ -1346,6 +1346,41 @@
// $('#co_premium_' + input).val(cop.toFixed(2));
// $('#co_tp_premium_' + input).val(cotp.toFixed(2));
// $('#co_ter_premium_' + input).val(cotep.toFixed(2));
+ // }
+
+ // Apply Deletion (Negative) Values
+ // function applyDeletionSymbolsToFields(input, isDeletion) {
+ // console.log('========== APPLYING DELETION SYMBOLS ==========');
+
+ // if (!isDeletion) return;
+
+ // const fieldIds = [
+ // 'base_premium',
+ // 'tp_premium',
+ // 'ter_premium',
+ // 'co_premium',
+ // 'co_tp_premium',
+ // 'co_ter_premium',
+ // 'gst_amount',
+ // 'agreed_amount',
+ // 'non_comm_per_amt',
+ // 'total_amt',
+ // 'exp_amt'
+ // ];
+
+ // fieldIds.forEach(field => {
+ // const $el = $('#' + field + '_' + input);
+ // console.log('$el', '#' + field + '_' + input);
+ // console.log('$el', $el);
+ // let val = $el.val()?.trim();
+ // console.log('$val', val);
+ // if (!val || val.startsWith('-')) return;
+
+ // let num = parseFloat(val);
+ // if (!isNaN(num) && num > 0) $el.val(-num);
+ // });
+
+ // console.log('========== COMPLETED DELETION SYMBOL APPLICATION ==========');
// }
function checkAndDistributeTax(input){
@@ -1432,9 +1467,9 @@
let bap = selectedOption.data('bap') || '';
let allocg = selectedOption.data('allocg') || '';
let endorsement_type = $('#action_type').val();
- let isDeletion = endorsement_type === "deletion";
-
- console.log("bap:", bap, "allocg:", allocg, "isDeletion:", isDeletion);
+ let isDeletion = false;
+ // let isDeletion = endorsement_type === "deletion" || endorsement_type === "policy_cancellation";
+ console.log({bap, allocg, isDeletion});
const event = window.event || {};
@@ -1458,7 +1493,20 @@
let cotp = (allocg !== 'EB') ? absNum('co_tp_premium') : 0;
let cotep = (['Fire', 'Marine Cargo', 'Marine Hull'].includes(bap)) ? absNum('co_ter_premium') : 0;
- console.log({ bp, tp, tep, cop, cotp, cotep, ncpa });
+ console.log('premiums :', { bp, tp, tep, cop, cotp, cotep, ncpa });
+
+ let bp_raw_val = parseFloat($('#base_premium_' + input).val());
+ console.log('bp_raw_val', bp_raw_val);
+
+ // handel the positive(+), negative(-) symbole add the value
+ if(endorsement_type === "addition" || endorsement_type === "baby_addition" || endorsement_type === "addition_inception"){
+ isDeletion = false
+ }else if(endorsement_type === "deletion" || endorsement_type === "policy_cancellation"){
+ isDeletion = true
+ }else if(bp_raw_val < 0){
+ isDeletion = true;
+ console.log('Value is negative:', bp_raw_val);
+ }
let co_share_type_val = numVal('co_share_type');
console.log('co_share_type_val :', co_share_type_val);
@@ -1532,18 +1580,17 @@
setCoPremiums(input);
// ✅ Apply deletion symbols last (safely);
- if (isDeletion) {
- applyDeletionSymbolsToFields(input, true);
- }
+ // if (isDeletion) {
+ applyDeletionSymbolsToFields(input, isDeletion);
+ // }
console.log('############################## END AMOUNT CALCULATION ############################################');
}
// Apply Deletion (Negative) Values
function applyDeletionSymbolsToFields(input, isDeletion) {
- console.log('========== APPLYING DELETION SYMBOLS ==========');
- if (!isDeletion) return;
+ console.log('========== APPLYING DELETION SYMBOLS ==========');
const fieldIds = [
'base_premium',
@@ -1561,14 +1608,20 @@
fieldIds.forEach(field => {
const $el = $('#' + field + '_' + input);
- console.log('$el', '#' + field + '_' + input);
- console.log('$el', $el);
let val = $el.val()?.trim();
- console.log('$val', val);
- if (!val || val.startsWith('-')) return;
+ if (!val) return;
- let num = parseFloat(val);
- if (!isNaN(num) && num > 0) $el.val(-num);
+ let num = parseFloat(val.replace(/^-/, '')); // remove any existing minus first
+ console.log('num', num);
+ if (isNaN(num)) return;
+
+ if (isDeletion) {
+ // Apply minus sign
+ if (num > 0) $el.val(-num);
+ } else {
+ // Remove minus sign
+ $el.val(num);
+ }
});
console.log('========== COMPLETED DELETION SYMBOL APPLICATION ==========');
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index d91ef483..6f5485cb 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -519,12 +519,16 @@ table.dataTable thead th {
}
],
language: {
- search: `
-
`,
- searchPlaceholder: "Search"
+ search: `
+
`,
+ searchPlaceholder: "Search",
+ emptyTable: '
'
},
paging: true, // Enable pagination
pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 41df9fe9..3b8013c6 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -813,7 +813,7 @@
- | Insurer |
+ Insurer* |
| Is Leader? |
@@ -883,7 +883,7 @@
-
>
+
| Agreed Amount |
@@ -3588,7 +3588,7 @@
$("#inception_form_id").submit(function(event) {
-
+ if (!this.checkValidity()) { return; }
event.preventDefault();
let policy_type_id = $('#policy_type_id').val();
@@ -3607,6 +3607,53 @@
return;
}
+ let hasEmptyInsurer = false;
+ let firstEmptyField = null;
+
+ // $('select[name="follow_insurer_id[]"]').each(function() {
+ // const $field = $(this);
+ // const errorId = 'error-' + $field.attr('id');
+
+ // // Remove any old message
+ // $('#' + errorId).remove();
+
+ // if ($field.val().trim() === "") {
+ // hasEmptyInsurer = true;
+ // $field.addClass('is-invalid');
+
+ // // Add error message only once
+ // if (!$field.next('.text-danger').length) {
+ // $field.after(`This value is required.`);
+ // }
+
+ // if (!firstEmptyField) {
+ // firstEmptyField = this; // store first empty field
+ // }
+ // } else {
+ // $field.removeClass('is-invalid');
+ // $('#' + errorId).remove(); // remove if filled
+ // }
+ // });
+ $('select[name="follow_insurer_id[]"]').each(function() {
+ if ($(this).val().trim() === "") {
+ hasEmptyInsurer = true;
+ $(this).addClass('is-invalid');
+ if (!firstEmptyField) {
+ firstEmptyField = this; // store the first invalid field
+ }
+ } else {
+ $(this).removeClass('is-invalid');
+ }
+ });
+
+ if (hasEmptyInsurer) {
+ if (firstEmptyField) {
+ $(firstEmptyField).focus();
+ }
+ toastr.warning('Please select all Insurers before submitting', 'Warning');
+ return;
+ }
+
if(pt_form_sumbit_handler == 0){
toastr.warning('Base premium greater than CD Amount', 'WARNING');
return;
@@ -4392,7 +4439,7 @@
case 0: // Insurer selection
newCell = `
- |