diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 336c3d5c..4a2a59d6 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -1063,6 +1063,7 @@ class PolicyTransactionController extends BaseController
     {
         $id = $this->request->getPost('id');
         $data = $this->preparePolicyTransactionData();
+        // print_r($data); die;
         
         if (!$id) {
             return $this->insertEndorsementTransaction($data);
@@ -1079,25 +1080,12 @@ class PolicyTransactionController extends BaseController
         // print_r($data); 
         // die;
 
-        // $data_received_date = (string)$this->request->getPost('data_received_date');
-        // $closure_date = (string)$this->request->getPost('closure_date');
-        // $endorse_eff_date = (string)$this->request->getPost('endorse_eff_date');
-        // $month = (string)$this->request->getPost('month');
-
-        // $data['data_received_date'] = empty($data['data_received_date']) ? null : date('Y-m-d', strtotime($data_received_date));
-        // $data['closure_date'] = empty($data['closure_date']) ? null : date('Y-m-d', strtotime($closure_date));
-        // $data['endorse_eff_date'] = empty($data['endorse_eff_date']) ? null : date('Y-m-d', strtotime($endorse_eff_date));
-
-        // $month = '01-'.$data['month'];
-        // $data['month'] = empty($data['month']) ? null : date('Y-m-d', strtotime($month)); 
-
         if (!isset($data['policy_with_corr'])) {
             $data['policy_with_corr'] = 0;
         } elseif ($data['policy_with_corr']) {
             $data['policy_with_corr'] = 1;
         }
 
-
         if(empty($data['data_received_date'])){
             $data['data_received_date'] = null;
         }else{
@@ -1269,7 +1257,7 @@ class PolicyTransactionController extends BaseController
     public function getEndorsementDataForEdit($id)
     {
         $data = $this->policyTransactionModel
-                ->select('
+            ->select('
                         policy_transaction.*, 
                         clients.short_name as client_short_name, 
                         clients.client_type, 
@@ -1283,52 +1271,43 @@ class PolicyTransactionController extends BaseController
 
                         ) as last_action_date
                     ')
-                ->join('clients', 'clients.id = policy_transaction.client_id')
-                ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
-                ->where('policy_transaction.id', $id)
-                ->where('policy_transaction.is_active', 1)
-                ->first();
-
-        // $data['policy_start_date'] = empty($data['policy_start_date']) ? '' : date('d/m/Y', strtotime($data['s_date']));
-        // $data['policy_end_date'] = empty($data['policy_end_date']) ? '' : date('d/m/Y', strtotime($data['e_date']));
-        // $data['data_received_date'] = empty($data['data_received_date']) ? '' : date('d/m/Y', strtotime($data['data_received_date']));
-        // $data['closure_date'] = empty($data['closure_date']) ? '' : date('d/m/Y', strtotime($data['closure_date']));
-        // $data['endorse_eff_date'] = empty($data['endorse_eff_date']) ? '' : date('d/m/Y', strtotime($data['endorse_eff_date']));
-
-        // $data['month'] = (isset($data['month']) && $data['month'] !== null && $data['month'] !== '') 
-        //     ? date('M/Y', strtotime($data['month'])) 
-        //     : null;
+            ->join('clients', 'clients.id = policy_transaction.client_id')
+            ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
+            ->where('policy_transaction.id', $id)
+            ->where('policy_transaction.is_active', 1)
+            ->orderBy('id', 'asc')
+            ->first();
 
 
-        if(!empty($data['policy_start_date'])){
+        if (!empty($data['policy_start_date'])) {
             $data['policy_start_date'] =  change_date_format($data['policy_start_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['policy_end_date'])){
+        if (!empty($data['policy_end_date'])) {
             $data['policy_end_date'] =  change_date_format($data['policy_end_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['data_received_date'])){
+        if (!empty($data['data_received_date'])) {
             $data['data_received_date'] =  change_date_format($data['data_received_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['policy_issue_date'])){
+        if (!empty($data['policy_issue_date'])) {
             $data['policy_issue_date'] =  change_date_format($data['policy_issue_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['endorse_eff_date'])){
+        if (!empty($data['endorse_eff_date'])) {
             $data['endorse_eff_date'] =  change_date_format($data['endorse_eff_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['install_due_date'])){
+        if (!empty($data['install_due_date'])) {
             $data['install_due_date'] =  change_date_format($data['install_due_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['last_action_date'])){
+        if (!empty($data['last_action_date'])) {
             $data['last_action_date'] =  change_date_format($data['last_action_date'], 'Y-m-d', 'd/m/Y');
         }
 
-        if(!empty($data['month'])){
+        if (!empty($data['month'])) {
             $data['month'] =  change_date_format($data['month'], 'Y-m-d', 'M/Y');
         }
 
@@ -1337,7 +1316,7 @@ class PolicyTransactionController extends BaseController
         //get PT Co-Share Details
         $data['pt_co_share_details'] = $this->PTCOShareDetailsModel
 
-                    ->select("
+            ->select("
                         pt_co_share_details.*,
                 
                         (
@@ -1453,19 +1432,18 @@ class PolicyTransactionController extends BaseController
                             ) AS actual_tep_brokerage_amount
     
                     ")
-        ->where('pt_id', $id)
-        ->where('is_active', 1)
-        ->orderBy('id', 'asc')
-        ->findAll();
+            ->where('pt_id', $id)
+            ->where('is_active', 1)
+            ->orderBy('id', 'asc')
+            ->findAll();
 
         // print_r($data['endorse_eff_date']); die;
 
-        if($data){
+        if ($data) {
             return $this->respond(['status' => true, 'data' => $data], 200);
-        }else{
+        } else {
             return $this->respond(['status' => false], 200);
         }
-
     }
 
     //------------------------------------------------------------------------------------------------
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index c9d439b9..6e1ba143 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -120,7 +120,8 @@
                         <input type="hidden" name="insurer_id" id="insurer_id">
                         <input type="hidden" name="cd_ac_no" id="cd_ac_no">
                         <input type="hidden" name="ct_type" id="ct_type">
-                        <input type="hidden" id="bro_payable_by">
+                        <input type="hidden" name="" id="bro_payable_by">
+                        <input type="hidden" name="" id="cop_yes">
 
 
                         <!-- Client Row -->
@@ -378,9 +379,15 @@
                                                                                     <tr class="hideter" id="table_tr_6" style="display: none;">
                                                                                         <td>TEP Premium</td>
                                                                                     </tr>
-                                                                                    <tr id="table_tr_7" style="display: none;">
+                                                                                    <tr  class="hidecop" id="table_tr_7" style="display: none;">
                                                                                         <td>Co-Premium</td>
                                                                                     </tr>
+                                                                                    <tr class="hidecotp" id="table_tr_38" style="display: none;">
+                                                                                        <td>Co-TP Premium</td>
+                                                                                    </tr>
+                                                                                    <tr class="hidecoter" id="table_tr_39" style="display: none;">
+                                                                                        <td>Co-TEP Premium</td>
+                                                                                    </tr>
                                                                                     <tr id="table_tr_8">
                                                                                         <td>CGST</td>
                                                                                     </tr>
@@ -503,6 +510,7 @@
 <script>
     
 var team_id = [];
+var insurer_count_array = [];
 
 $(document).ready(function(){
 
@@ -516,7 +524,6 @@ $(document).ready(function(){
     }
 
     getURLParamsForReport() 
-    // hidePermiumDetailsBasedOnTheTeam()
 })
 
 $(document).ready(function(){
@@ -611,15 +618,26 @@ $(document).ready(function(){
 
                     if(res.status == true){
                         if(res.data.length > 0){
-                            populateTable(res.data);
+
                             $('#bro_payable_by').val(res.data[0].bro_payable_by)
+
+                            if(res.is_copay_yes && res.is_copay_yes.co_share == 1){
+                                // console.log('copay yes', res.is_copay_yes);
+                                $('#cop_yes').val(1);
+                            }else{
+                                // console.log('copay no', res.is_copay_yes);
+                                $('#cop_yes').val(0);
+                            }
+
+                            populateTable(res.data);
+
+
                         }else{
                             addInsurerColumn()
                         }
                     }else{
                         addInsurerColumn()
                     }
-                    // hidePermiumDetailsBasedOnTheTeam();
                 },
                 error: function (xhr, status, error) {
                     console.error(xhr.responseText);
@@ -627,9 +645,6 @@ $(document).ready(function(){
                 }
             });
         }
-
-        
-
     });
 })
 
@@ -698,6 +713,7 @@ $(document).ready(function() {
         }
     });
 });
+
 //---------------------------------------------------------------------------------------------------------
 
 $("#endorsement_form_id").submit(function(event) {
@@ -831,9 +847,8 @@ $('#endorsement_no').on('change', function(){
 
 })
 
-//---------------------------------------------------------------------------------------------------------
+//------------- EDIT FUNCTION -----------------------------------------------------------------------------------------------
 
-//edit function
 function getPolicyTransactionDataForEndorsementEdit(input){   
 
     $('.loader').fadeIn();
@@ -853,6 +868,16 @@ function getPolicyTransactionDataForEndorsementEdit(input){
             if(res.status == true){
 
                 hide_list_show_add() 
+
+                $('#bro_payable_by').val(res.data.bro_payable_by)
+
+                if(res.data && res.data.co_share == 1){
+                    console.log('copay yes', res.data);
+                    $('#cop_yes').val(1);
+                }else{
+                    console.log('copay no', res.data);
+                    $('#cop_yes').val(0);
+                }
                 
                 $('#policy_tranction_primarykey').val(res.data.id);
                 $('#client_id').val(res.data.client_id).change();
@@ -928,132 +953,9 @@ function getPolicyTransactionDataForEndorsementEdit(input){
     checkInvoiceStatusToHideSubmitBtn(id)
     
 }
-//end edit function
 
-// function checkAndDistributeTax(input)
-// {
-//     const event = window.event;
-//     // console.log("Event type:", event.type);  
-//     // console.log("Event target:", event.target); 
-//     console.log("Event id:", event.target.id); 
+//------------- END EDIT FUNCTION --------------------------------------------------------------------------------------------
 
-//     let cgst = parseFloat($('#cgst_' + input).val());
-//     let sgst = parseFloat($('#sgst_' + input).val());
-//     let igst = parseFloat($('#igst_' + input).val());
-//     if(((event.target.id).startsWith('cgst') || (event.target.id).startsWith('sgst') ))
-//     {
-//         if(cgst !== 0) { $('#sgst_' + input).val(cgst.toFixed(2)); }
-//         else if(sgst !== 0) { $('#cgst_' + input).val(sgst.toFixed(2)); }
-        
-//         $('#igst_' + input).val(0.00);
-//     }
-//     else
-//     {
-//         $('#cgst_' + input).val(0.00);
-//         $('#sgst_' + input).val(0.00);
-//     }
-// }
-
-// function amountCalculation(input) {
-
-//     // console.log(input);
-//     let selectedOption =  $('#client_policy_id').find('option:selected');
-//     let bap = selectedOption.data('bap');
-
-
-//     // Retrieve and parse the values or default to 0 if not a number
-//     let bp = parseFloat($('#base_premium_' + input).val()) || 0;
-
-//     var tp = 0;
-//     if(bap == 'Motor'){
-//         tp = parseFloat($('#tp_premium_' + input).val()) || 0;
-//     }
-
-//     var tep = 0;
-//     if(bap == 'Fire' || bap == 'Marine Cargo' || bap == 'Marine Hull'){
-//         tep = parseFloat($('#ter_premium_' + input).val()) || 0;
-//     }
-
-//     let cop = parseFloat($('#co_premium_' + input).val()) || 0;
-//     checkAndDistributeTax(input);
-//     let cgst = parseFloat($('#cgst_' + input).val()) || 0;
-//     let sgst = parseFloat($('#sgst_' + input).val()) || 0;
-//     let igst = parseFloat($('#igst_' + input).val()) || 0;
-//     let stamp_duty_amt = parseFloat($('#stamp_duty_' + input).val()) || 0;
-//     let agreed_amount = parseFloat($('#agreed_amount_' + input).val()) || 0;
-
-//     let agreed_bp_per = parseFloat($('#agreed_bp_' + input).val()) || 0;
-//     let agreed_tp_per = parseFloat($('#agreed_tp_' + input).val()) || 0;
-//     let agreed_tep_per = parseFloat($('#agreed_tep_' + input).val()) || 0;
-
-//     let standard_bp_per = parseFloat($('#standard_bp_' + input).val()) || 0;
-//     let standard_tp_per = parseFloat($('#standard_tp_' + input).val()) || 0;
-//     let standard_tep_per = parseFloat($('#standard_tep_' + input).val()) || 0;
-
-//     let co_share_per = parseFloat($('#co_share_per_' + input).val()) || 0;
-
-//     let co_premium_amt = ((bp + tp + tep) *  co_share_per) / 100;
-//     $('#co_premium_' + input).val(!isNaN(co_premium_amt) && isFinite(co_premium_amt) ? co_premium_amt.toFixed(2) : '0.00');
-
-
-//     // Calculate GST percentage
-//     let gst_per = igst;
-//     if (igst === 0) {
-//         gst_per = cgst + sgst;
-//     }
-
-//     // Calculate the total premium (Base + TP + Co-Premium)
-//     let tpTotal = bp + tp + tep + cop;
-
-//     let gst_per_amt = (tpTotal * gst_per) / 100;
-//     // $('#gst_amount_' + input).val(gst_per_amt.toFixed(2));
-//     $('#gst_amount_' + input).val(!isNaN(gst_per_amt) && isFinite(gst_per_amt) ? gst_per_amt.toFixed(2) : '0.00');
-
-
-//     let finalTotal = tpTotal + gst_per_amt + stamp_duty_amt;
-
-//     // console.log('Summed Amount:', finalTotal);
-//     // $('#total_amt_' + input).val(finalTotal.toFixed(2));
-//     $('#total_amt_' + input).val(!isNaN(finalTotal) && isFinite(finalTotal) ? finalTotal.toFixed(2) : '0.00');
-
-
-//     let sum_of_agreed_premium = agreed_bp_per + agreed_tp_per + agreed_tep_per;
-//     console.log('sum_of_agreed_precentage : ', sum_of_agreed_premium);
-
-//     var expectedAmount = 0;
-
-//     if(agreed_amount > 0 ){
-//         expectedAmount = agreed_amount;
-//         console.log('Formula 1 AGREED AMOUNT');
-//     }else if(sum_of_agreed_premium > 0){
-//         expectedAmount = ((bp + cop) * agreed_bp_per)+ ((tp + tep)*(agreed_tp_per + agreed_tep_per));
-//         expectedAmount = expectedAmount / 100;
-//         console.log('Formula 2 AGREED BP TP/TEP %');
-//     }else{
-//         expectedAmount = ((bp + cop) * standard_bp_per)+ ((tp + tep)*(standard_tp_per + standard_tep_per));
-//         expectedAmount = expectedAmount / 100;
-//         console.log('Formula 3 STANDARD BP TP/TEP %');
-//     }
-
-//     console.log('expectedAmount', expectedAmount);
-
-//     //Expected Amount
-//     // $('#exp_amt_' + input).val(expectedAmount.toFixed(2));
-//     $('#exp_amt_' + input).val(!isNaN(expectedAmount) && isFinite(expectedAmount) ? expectedAmount.toFixed(2) : '0.00');
-
-
-//     let actual_bp_brokerage_amount = parseFloat($('#actual_bp_brokerage_amt_' + input).val()) || 0;
-//     let actual_tp_brokerage_amount = parseFloat($('#actual_tp_brokerage_amt_' + input).val()) || 0;
-//     let actual_tep_brokerage_amount = parseFloat($('#actual_tep_brokerage_amt_' + input).val()) || 0;
-
-//     // let variance = expectedAmount - (actual_bp_brokerage_amount + actual_tp_brokerage_amount + actual_tep_brokerage_amount)
-//     let variance = (actual_bp_brokerage_amount + actual_tp_brokerage_amount + actual_tep_brokerage_amount) - expectedAmount;
-
-//     // $('#variance_' + input).val(variance.toFixed(2));
-//     $('#variance_' + input).val(!isNaN(variance) && isFinite(variance) ? variance.toFixed(2) : '0.00');
-
-//     // console.log('variance', variance);
-// }
 
 function checkAndDistributeTax(input) {
     const event = window.event;
@@ -1081,8 +983,9 @@ function checkAndDistributeTax(input) {
 
 function amountCalculation(input) {
 
-    console.log('amountCalculation - ' + input);
-    let selectedOption =  $('#policy_type_id').find('option:selected');
+    console.log('############################## AMOUNT CALCULATION ############################################')
+    console.log('amountCalculation  :  ' + input);
+    let selectedOption =  $('#client_policy_id').find('option:selected');
     let bap = selectedOption.data('bap');
 
     const event = window.event;
@@ -1102,7 +1005,19 @@ function amountCalculation(input) {
         tep = parseFloat($('#ter_premium_' + input).val()) || 0;
     }
 
+    //co-share premium
     let cop = parseFloat($('#co_premium_' + input).val()) || 0;
+
+    var cotp = 0;
+    if(bap == 'Motor'){
+        cotp = parseFloat($('#co_tp_premium_' + input).val()) || 0;
+    }
+
+    var cotep = 0;
+    if(bap == 'Fire' || bap == 'Marine Cargo' || bap == 'Marine Hull'){
+        cotep = parseFloat($('#co_ter_premium_' + input).val()) || 0;
+    }
+
     checkAndDistributeTax(input);
     let cgst = parseFloat($('#cgst_' + input).val()) || 0;
     let sgst = parseFloat($('#sgst_' + input).val()) || 0;
@@ -1114,7 +1029,7 @@ function amountCalculation(input) {
 
     let agreed_bp_per = parseFloat($('#agreed_bp_' + input).val()) || 0;
     let agreed_tp_per = parseFloat($('#agreed_tp_' + input).val()) || 0;
-    let agreed_tep_per = parseFloat($('#agreed_ter_' + input).val()) || 0;
+    let agreed_tep_per = parseFloat($('#agreed_tep_' + input).val()) || 0;
 
     let standard_bp_per = parseFloat($('#standard_bp_' + input).val()) || 0;
     let standard_tp_per = parseFloat($('#standard_tp_' + input).val()) || 0;
@@ -1123,31 +1038,43 @@ function amountCalculation(input) {
     let co_share_per = parseFloat($('#co_share_per_' + input).val()) || 0;
     let gst_amount = parseFloat($('#gst_amount_' + input).val()) || 0;
 
-    // console.log(standard_bp_per, standard_tp_per, standard_tep_per);
-
-    // let co_premium_amt = ((bp + tp + tep) *  co_share_per) / 100;
-
-    // $('#co_premium_' + input).val(!isNaN(co_premium_amt) && isFinite(co_premium_amt) ? co_premium_amt.toFixed(2) : '0.00');
-
 
     // 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);
-    console.log('igst', igst);
-    console.log('cgst', cgst);
-    console.log('sgst', sgst);
+    // console.log('gst_per', gst_per);
+    // console.log('igst', igst);
+    // console.log('cgst', cgst);
+    // console.log('sgst', sgst);
 
-    // Calculate the total premium (Base + TP + Co-Premium)
-    let  tpTotal = cop;
+    // Calculate the total premium 
+
+    let base_premium = cop;
+    let third_part_premium = cotp;
+    let terrisom_premium = cotep;
+
+    let  tpTotal = cop + cotp + cotep;
     if($('#bro_payable_by').val() == 1){
+
         tpTotal = bp + tp + tep;
+
+        base_premium = bp;
+        third_part_premium = tp;
+        terrisom_premium = tep;
+    }
+
+    console.log('base_premium', base_premium);
+    console.log('third_part_premium', third_part_premium);
+    console.log('terrisom_premium', terrisom_premium);
+
+    if ($('#cop_yes').val() == 0) {
+        $('#co_premium_' + input).val(bp);
+        $('#co_tp_premium_' + input).val(tp);
+        $('#co_ter_premium_' + input).val(tep);
+        $('#co_share_per_' + input).val(100);
     }
 
     console.log('tpTotal', tpTotal);
@@ -1171,14 +1098,13 @@ function amountCalculation(input) {
         }
     }
 
-
-
     let finalTotal = tpTotal + gst_per_amt + stamp_duty_amt;
-
     console.log('Summed Amount:', finalTotal);
-    // $('#total_amt_' + input).val(finalTotal.toFixed(2));
+
+    //Total Amount
     $('#total_amt_' + input).val(!isNaN(finalTotal) && isFinite(finalTotal) ? finalTotal.toFixed(2) : '0.00');
 
+    //--------------------------------------------------------------------------------------------------- 
 
     let sum_of_agreed_premium = agreed_bp_per + agreed_tp_per + agreed_tep_per;
     // console.log('sum_of_agreed_precentage : ', sum_of_agreed_premium);
@@ -1189,24 +1115,32 @@ function amountCalculation(input) {
         expectedAmount = agreed_amount;
         // console.log('Formula 1 AGREED AMOUNT');
     }else if(sum_of_agreed_premium > 0){
-        //expectedAmount = ((bp + cop) * agreed_bp_per)+ ((tp + tep)*(agreed_tp_per + agreed_tep_per));
+
         let sumOfTheAggreedPer = agreed_bp_per + agreed_tp_per + agreed_tep_per;
-        expectedAmount = (tpTotal * sumOfTheAggreedPer);
-        expectedAmount = expectedAmount / 100;
+
+        let sum_of_bp_amt = (base_premium * agreed_bp_per) /100
+        let sum_of_tp_amt = (third_part_premium * agreed_tp_per) / 100
+        let sum_of_tep_amt = (terrisom_premium * agreed_tep_per) / 100
+
+        expectedAmount = (sum_of_bp_amt + sum_of_tp_amt + sum_of_tep_amt) ?? 0;
+
         // console.log('Formula 2 AGREED BP TP/TEP %');
     }else{
-        // expectedAmount = ((bp + cop) * standard_bp_per)+ ((tp + tep)*(standard_tp_per + standard_tep_per));
+
         let sumOfTheStandardPer = standard_bp_per + standard_tp_per + standard_tep_per;
-        expectedAmount = (tpTotal * sumOfTheStandardPer);
-        console.log(expectedAmount)
-        expectedAmount = expectedAmount / 100;
+
+        let sum_of_bp_amt = (base_premium * standard_bp_per) /100
+        let sum_of_tp_amt = (third_part_premium * standard_tp_per) / 100
+        let sum_of_tep_amt = (terrisom_premium * standard_tep_per) / 100
+
+        expectedAmount = (sum_of_bp_amt + sum_of_tp_amt + sum_of_tep_amt) ?? 0;
+
         // console.log('Formula 3 STANDARD BP TP/TEP %');
     }
 
-    // console.log('expectedAmount', expectedAmount);
+    console.log('expectedAmount', expectedAmount);
 
     //Expected Amount
-    // $('#exp_amt_' + input).val(expectedAmount.toFixed(2));
     $('#exp_amt_' + input).val(!isNaN(expectedAmount) && isFinite(expectedAmount) ? expectedAmount.toFixed(2) : '0.00');
 
 
@@ -1218,17 +1152,51 @@ function amountCalculation(input) {
     // console.log('actual_tp_brokerage_amount', actual_tp_brokerage_amount);
     // console.log('actual_tep_brokerage_amount', actual_tep_brokerage_amount);
 
-
-
-    // let variance = expectedAmount - (actual_bp_brokerage_amount + actual_tp_brokerage_amount + actual_tep_brokerage_amount)
     let variance = (actual_bp_brokerage_amount + actual_tp_brokerage_amount + actual_tep_brokerage_amount) - expectedAmount;
     // console.log('variance', variance);
 
+    // $('#variance_' + input).val(!isNaN(variance) && isFinite(variance) ? variance.toFixed(2) : '0.00');
 
-    // $('#variance_' + input).val(variance.toFixed(2));
-    $('#variance_' + input).val(!isNaN(variance) && isFinite(variance) ? variance.toFixed(2) : '0.00');
+    setCoPremiums(input);
 
-    // console.log('variance', variance);
+    console.log('############################## END AMOUNT CALCULATION ############################################')
+
+}
+
+function setCoPremiums(input) {
+
+    let bp = $('input[name="base_premium[]"]').toArray()
+        .map(input => parseFloat($(input).val()) || 0)
+        .find(value => value > 0) || 0;
+    let tp = $('input[name="tp_premium[]"]').toArray()
+        .map(input => parseFloat($(input).val()) || 0)
+        .find(value => value > 0) || 0;
+    let tep = $('input[name="ter_premium[]"]').toArray()
+        .map(input => parseFloat($(input).val()) || 0)
+        .find(value => value > 0) || 0;
+
+    // let bp = parseFloat($('#base_premium_' + input).val()) || 0;
+    // let tp = parseFloat($('#tp_premium_' + input).val()) || 0;
+    // let tep = parseFloat($('#ter_premium_' + input).val()) || 0;
+    let coSharePer = parseFloat($('#co_share_per_' + input).val()) || 0;
+
+    let cop = (bp * coSharePer) / 100;
+    let cotp = (tp * coSharePer) / 100;
+    let cotep = (tep * coSharePer) / 100;
+
+    // Log all values to console
+    console.log(`Input: ${input}`);
+    console.log(`Base Premium (bp): ${bp}`);
+    console.log(`TP Premium (tp): ${tp}`);
+    console.log(`TEP Premium (tep): ${tep}`);
+    console.log(`Co-Share Percentage (coSharePer): ${coSharePer}`);
+    console.log(`Co Premium (cop): ${cop.toFixed(2)}`);
+    console.log(`Co TP Premium (cotp): ${cotp.toFixed(2)}`);
+    console.log(`Co TEP Premium (cotep): ${cotep.toFixed(2)}`);
+
+    $('#co_premium_' + input).val(cop.toFixed(2));
+    $('#co_tp_premium_' + input).val(cotp.toFixed(2));
+    $('#co_ter_premium_' + input).val(cotep.toFixed(2));
 }
 
 function actualAmountCalculation(input, field = null){
@@ -1444,34 +1412,116 @@ function actualAmountCalculation(input, field = null){
     // console.log('variance', variance);
 }
 
-function co_share_percentage_calculation(input){
+function co_share_percentage_calculation(input, extra = null){
 
-    var inputs = $('[name="co_share_per[]"]');
+    console.log('input', input)
+    var inputs = $('input[name="co_share_per[]"]'); // Specifically select input elements
+    console.log('Number of inputs:', inputs.length);
 
-    // Find the empty input(s)
-    var emptyInputs = inputs.filter(function() {
-        return $(this).val().trim() === ''; // Check for empty values
-    });
+    let insurer_count = insurer_count_array.length;
+    console.log('insurer_count', insurer_count);
+    console.log('insurer_count_array', insurer_count_array);
 
-    // Get the number of empty inputs
-    var emptyCount = emptyInputs.length; 
-    console.log('Number of empty inputs:', emptyCount);
+    if(input){
+        if(insurer_count == 2){
 
-    // If there's exactly one empty input, calculate and set its value
-    if (emptyCount === 1) {
-        // Calculate the sum of filled values
-        let sumFilled = 0;
-        inputs.each(function() {
-            var val = parseFloat($(this).val()) || 0;
-            sumFilled += val;
+            // Find the index of the value
+            let index = insurer_count_array.indexOf(Number(input));
+            let second_value_index = "";
+
+            if (index !== -1) {
+
+                console.log(`Value ${input} exists at index ${index}.`);
+
+                let beforeValue = index > 0 ? insurer_count_array[index - 1] : null;
+                let afterValue = index < insurer_count_array.length - 1 ? insurer_count_array[index + 1] : null;
+
+                if (beforeValue != null) {
+                    second_value_index = beforeValue;
+                } else if (afterValue != null) {
+                    second_value_index = afterValue;
+                }
+
+            } 
+
+            let value1 = $('#co_share_per_' + input).val();
+            let value2 = $('#co_share_per_' + second_value_index).val();
+
+            value1 = Number(value1);
+            value2 = Number(value2);
+
+            console.log('value1', value1);
+            console.log('value2', value2);
+
+            if(extra == "add"){
+
+                if(value2 == 0){
+                    value1 = 50;
+                    value2 = 50;
+                }else{
+                    if(value2 == 100){
+                        value1 = 50;
+                        value2 = 50;
+                    }else{
+                        value1 = 100 - value2;
+                    }
+                }
+
+            }else{
+
+                if(value1 == 100){
+                    value2 = 0;
+                }else{
+                    value2 = 100 - value1;
+                }
+            }
+
+            console.log('value1', value1);
+            console.log('value2', value2);
+
+            $('#co_share_per_' + input).val(value1);
+            $('#co_share_per_' + second_value_index).val(value2);
+
+        }else if(insurer_count > 2){
+
+            let total_val = 0; 
+
+            // Calculate the total sum of input values
+            inputs.each(function () {
+                let val = Number($(this).val()) || 0; 
+                if(val == 0){
+                    $(this).val(0)
+                }
+                total_val += val; 
+            });
+        }
+
+    }else{
+        inputs.each(function (index) {
+            if (inputs.length === 1) {
+                $(this).val(100);
+            } else if(inputs.length === 2) {
+                let first = $('#co_share_per_1').val();
+                first = Number(first)
+                let second_val = 100 - first;
+
+                if (index === 1) {
+                    $(this).val(second_val);
+                }
+            }
         });
 
-        // Calculate the balance percentage
-        let balance_per = 100 - sumFilled;
-        console.log('Balance percentage:', balance_per);
+    }
 
-        // Set the balance value to the empty input
-        emptyInputs.val(balance_per);
+    let val_sum = 0; 
+
+    inputs.each(function () {
+        let val = Number($(this).val()) || 0; 
+        val_sum += val; 
+    });
+
+    if (val_sum > 100) {
+        toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
     }
 
 }
@@ -1537,54 +1587,6 @@ function checkInvoiceStatusToHideSubmitBtn(id){
 
 }
 
-function hidePermiumDetailsBasedOnTheTeam(){
-
-    var teams = <?php echo json_encode(user_team()); ?>;
-    console.log('teams', teams);
-
-    // var teams = <?php echo json_encode(teams()); ?>;
-    // console.log('teams', teams);
-    
-    var ids = [
-        'table_tr_14',
-        'table_tr_15',
-        'table_tr_16',
-        'table_tr_17',
-        'table_tr_18',
-        'table_tr_19',
-        'table_tr_20',
-        'table_tr_21',
-        'table_tr_22',
-        'table_tr_23',
-        'table_tr_24',
-        'table_tr_25',
-        'table_tr_26',
-        'table_tr_27',
-        'table_tr_28',
-        'table_tr_29',
-        'table_tr_30',
-        'table_tr_31',
-        'table_tr_32'
-    ];
-
-    if (teams.includes('4')) {
-        console.log('Finance Team Logged in.');
-        ids.forEach(function(id) {
-            $('#' + id).show();
-            // $('#' + id + ' input, #' + id + ' select, #' + id + ' textarea').prop('disabled', false); // Enable inputs
-        });
-    } else {
-        console.log('Business Team Logged in.');
-        ids.forEach(function(id) {
-            $('#' + id).hide(); // Hide the row
-            // $('#' + id + ' input, #' + id + ' select, #' + id + ' textarea').prop('disabled', true); // Disable inputs
-        });
-
-        $('.hideter').hide();
-        $('.hidetp').hide();
-    }
-}
-
 function getpolicyDataForEndorsement(input){
 
     var client_policy_id = $(input).val();
@@ -1617,29 +1619,15 @@ function getpolicyDataForEndorsement(input){
 
 var insurerCount = 0;
 
-$('#setInsurerCount').on('input', function() {
-    var count = $('#setInsurerCount').val();
-
-    if (count) {
-        for (var i = 0; i < count; i++) {  // Corrected loop condition
-            addInsurerColumn();
-        }
-    } else {
-        toastr.warning('Please enter the insurer count', 'WARNING');
-    }
-});
-
 function addInsurerColumn() {
 
     insurerCount++;
-
-    // hidePermiumDetailsBasedOnTheTeam();
     
     // Update header
     $('#insurerTable thead tr').append(`
         <th>
             Insurer ${insurerCount}
-            ${insurerCount > 1 ? `<a class="text-danger fa fa-trash delete-insurer" style="margin-left: 135px;"></a>` : ''}
+            ${insurerCount > 1 ? `<a class="text-danger fa fa-trash delete-insurer" data-count="${insurerCount}" style="margin-left: 135px;"></a>` : ''}
         </th>
     `);
 
@@ -1664,13 +1652,7 @@ function addInsurerColumn() {
                     </td>`;
                     break;
                 case 1: // Is Leader?
-                    newCell = `<td>                                    
-                                    <label class="switch" style="position: relative; top: 5px; left: 35px;">
-                                        <input data-id="${insurerCount}" id="co_share_type_${insurerCount}" type="checkbox" name="co_share_type[]" onchange="select_leader_disable_premium_amt(this, '${insurerCount}')">
-                                        <span class="slider round" style="height: 27px;"></span>
-                                    </label>
-                                    <label for="inception_type" style="position: relative; top: 5px; left: 40px;">Leader Yes</label>
-                            </td>`;
+                    newCell = `<td><input data-id="${insurerCount}" id="co_share_type_${insurerCount}" type="text" name="co_share_type[]" onchange="select_leader_disable_premium_amt(this, '${insurerCount}')"></td>`;
                     break;
                 case 2: // CD Account Number selectionclass="std_tp_td"
                     newCell = `<td class=""><input type="text" class="readonly-color" id="cd_account_no_${insurerCount}" readonly></td>`;
@@ -1682,7 +1664,7 @@ function addInsurerColumn() {
                     newCell = `<td class=""><input type="text" class="readonly-color" id="follower_policy_no_${insurerCount}" name="follower_policy_no[]" readonly></td>`;
                     break;  
                 case 5: // Co-Share %
-                    newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" name="co_share_per[]" oninput="validateRange(this)" onchange="co_share_percentage_calculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
+                    newCell = `<td class="input-with-percentage"><input type="text" id="co_share_per_${insurerCount}" class="right-align-input" name="co_share_per[]" oninput="validateRange(this)" onchange="co_share_percentage_calculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
                 case 6: // Non commissionable Premium amount %
                     newCell = `<td><input type="text" class="right-align-input" id="non_comm_per_amt_${insurerCount}" name="non_comm_per_amt[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
@@ -1699,73 +1681,81 @@ function addInsurerColumn() {
                 case 10: // co Premium
                     newCell = `<td><input type="text" class="right-align-input" id="co_premium_${insurerCount}" name="co_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 11: // CGST
+
+                case 11: // Co TP Premium
+                    newCell = `<td><input type="text" class="right-align-input" id="co_tp_premium_${insurerCount}" name="co_tp_premium[]" oninput="" onkeypress="return onlyNumbers(event)"></td>`;
+                    break;
+                case 12: // Co Ter Premium
+                    newCell = `<td><input type="text" class="right-align-input" id="co_ter_premium_${insurerCount}" name="co_ter_premium[]" oninput="" onkeypress="return onlyNumbers(event)"></td>`;
+                    break;
+
+                case 13: // CGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="cgst_${insurerCount}" name="cgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 12: // SGST
+                case 14: // SGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="sgst_${insurerCount}" name="sgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 13: // IGST
+                case 15: // IGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="igst_${insurerCount}" name="igst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 14: // GST Amount
+                case 16: // GST Amount
                     newCell = `<td><input type="text" class="right-align-input" id="gst_amount_${insurerCount}" name="gst_amount[]" onchange="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 15: // Stamp Duty
+                case 17: // Stamp Duty
                     newCell = `<td><input type="text" class="right-align-input" id="stamp_duty_${insurerCount}" name="stamp_duty[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 16: // Total
+                case 18: // Total
                     newCell = `<td><input type="text" class="readonly-color right-align-input" id="total_amt_${insurerCount}"  name="total[]" readonly onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 17: // Agreed BP %
+                case 19: // Agreed BP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_bp_${insurerCount}" name="agreed_bp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" ></td>`;
                     break;
-                case 18: // Agreed TP %
+                case 20: // Agreed TP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_tp_${insurerCount}" name="agreed_tp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 19: // Agreed Ter %
+                case 21: // Agreed Ter %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_tep_${insurerCount}" name="agreed_ter[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" ></td>`;
                     break;
-                case 20: // Agreed Amount
+                case 22: // Agreed Amount
                     newCell = `<td><input type="text" class="right-align-input" id="agreed_amount_${insurerCount}"  name="agreed_amount[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 21: // Standard BP %
+                case 23: // Standard BP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" id="standard_bp_${insurerCount}" name="standard_bp[]" onkeypress="return onlyNumbers(event)" readonly></td>`;
                     break;
-                case 22: // Standard TP %
+                case 24: // Standard TP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" name="standard_tp[]" onkeypress="return onlyNumbers(event)" readonly ></td>`;
                     break;
-                case 23: // Standard Ter %
+                case 25: // Standard Ter %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" name="standard_ter[]" onkeypress="return onlyNumbers(event)" readonly></td>`;
                     break;
-                case 24: // Actual BP Amount
+                case 26: // Actual BP Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_bp_amt_${insurerCount}" name="actual_bp_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'bp_amt_for_calc')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 25: // Actual TP Amount
+                case 27: // Actual TP Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_tp_amt_${insurerCount}" name="actual_tp_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'tp_amt_for_calc')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 26: // Actual TEP Amount
+                case 28: // Actual TEP Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_tep_amt_${insurerCount}" name="actual_tep_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'tep_amt_for_calc')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 27: // Actual BP %
+                case 29: // Actual BP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-select right-align-input" id="actual_bp_per_${insurerCount}" name="actual_bp_per[]" onchange="actualAmountCalculation('${insurerCount}', 'bp_per')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 28: // Actual TP %
+                case 30: // Actual TP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-select right-align-input" id="actual_tp_per_${insurerCount}" name="actual_tp_per[]" onchange="actualAmountCalculation('${insurerCount}', 'tp_per')"  onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 29: // Actual TEP %
+                case 31: // Actual TEP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-select right-align-input" id="actual_tep_per_${insurerCount}" name="actual_tep_per[]" onchange="actualAmountCalculation('${insurerCount}', 'tep_per')"  onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 30: // Actual BP Brokerage Amount
+                case 32: // Actual BP Brokerage Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_bp_brokerage_amt_${insurerCount}" name="actual_bp_brokerage_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'bp_broker_amt')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 31: // Actual TP Brokerage Amount
+                case 33: // Actual TP Brokerage Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_tp_brokerage_amt_${insurerCount}" name="actual_tp_brokerage_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'tp_broker_amt' )" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 32: // Actual TEP Brokerage Amount
+                case 34: // Actual TEP Brokerage Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="actual_tep_brokerage_amt_${insurerCount}" name="actual_tep_brokerage_amt[]" onchange="actualAmountCalculation('${insurerCount}', 'tep_broker_amt')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 33: // Expected Amount
+                case 35: // Expected Amount
                     newCell = `<td><input type="text" class="readonly-select right-align-input" id="exp_amt_${insurerCount}" name="exp_amt[]" onchange="actualAmountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
                 // case 30: // Variance
@@ -1774,7 +1764,7 @@ function addInsurerColumn() {
                 // case 31: // Reward
                 //     newCell = `<td><input type="text" class="right-align-input" id="reward_${insurerCount}" name="reward[]" onkeypress="return onlyNumbers(event)"></td>`;
                 //     break;
-                case 34: // ID For Update
+                case 36: // ID For Update
                     newCell = `<td><input type="hidden" name="co_share_id[]" id="co_share_id[]" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
             }
@@ -1795,13 +1785,7 @@ function addInsurerColumn() {
                     </td>`;
                     break;
                 case 1: // Is Leader?
-                    newCell = `<td>                                    
-                                    <label class="switch" style="position: relative; top: 5px; left: 35px;">
-                                        <input data-id="${insurerCount}" id="co_share_type_${insurerCount}" type="checkbox" name="co_share_type[]" onchange="select_leader_disable_premium_amt(this, '${insurerCount}')">
-                                        <span class="slider round" style="height: 27px;"></span>
-                                    </label>
-                                    <label for="inception_type" style="position: relative; top: 5px; left: 40px;">Leader Yes</label>
-                            </td>`;
+                    newCell = `<td><input data-id="${insurerCount}" id="co_share_type_${insurerCount}" type="text" name="co_share_type[]" onchange="select_leader_disable_premium_amt(this, '${insurerCount}')"></td>`;
                     break;
                 case 2: // CD Account Number selectionclass="std_tp_td"
                     newCell = `<td class=""><input type="text" class="readonly-color" id="cd_account_no_${insurerCount}" readonly></td>`;
@@ -1830,43 +1814,51 @@ function addInsurerColumn() {
                 case 10: // co Premium
                     newCell = `<td><input type="text" class="right-align-input" id="co_premium_${insurerCount}" name="co_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 11: // CGST
+
+                case 11: // Co TP Premium
+                    newCell = `<td><input type="text" class="right-align-input" id="co_tp_premium_${insurerCount}" name="co_tp_premium[]" oninput="" onkeypress="return onlyNumbers(event)"></td>`;
+                    break;
+                case 12: // Co Ter Premium
+                    newCell = `<td><input type="text" class="right-align-input" id="co_ter_premium_${insurerCount}" name="co_ter_premium[]" oninput="" onkeypress="return onlyNumbers(event)"></td>`;
+                    break;
+
+                case 13: // CGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="cgst_${insurerCount}" name="cgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 12: // SGST
+                case 14: // SGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="sgst_${insurerCount}" name="sgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 13: // IGST
+                case 15: // IGST
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="igst_${insurerCount}" name="igst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 14: // GST Amount
+                case 16: // GST Amount
                     newCell = `<td><input type="text" class="readonly-color right-align-input" id="gst_amount_${insurerCount}" name="gst_amount[]" oninput="amountCalculation('${insurerCount}')"  readonly onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 15: // Stamp Duty
+                case 17: // Stamp Duty
                     newCell = `<td><input type="text" class="right-align-input" id="stamp_duty_${insurerCount}" name="stamp_duty[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 16: // Total
+                case 18: // Total
                     newCell = `<td><input type="text" class="readonly-color right-align-input" id="total_amt_${insurerCount}"  name="total[]" readonly onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 17: // Agreed BP %
+                case 19: // Agreed BP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_bp_${insurerCount}" name="agreed_bp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" ></td>`;
                     break;
-                case 18: // Agreed TP %
+                case 20: // Agreed TP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_tp_${insurerCount}" name="agreed_tp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
-                case 19: // Agreed Ter %
+                case 21: // Agreed Ter %
                     newCell = `<td class="input-with-percentage"><input type="text" class="right-align-input" id="agreed_tep_${insurerCount}" name="agreed_ter[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" ></td>`;
                     break;
-                case 20: // Standard BP %
+                case 22: // Standard BP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" id="standard_bp_${insurerCount}" name="standard_bp[]" onkeypress="return onlyNumbers(event)" readonly></td>`;
                     break;
-                case 21: // Standard TP %
+                case 23: // Standard TP %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" name="standard_tp[]" onkeypress="return onlyNumbers(event)" readonly ></td>`;
                     break;
-                case 22: // Standard Ter %
+                case 24: // Standard Ter %
                     newCell = `<td class="input-with-percentage"><input type="text" class="readonly-color right-align-input" name="standard_ter[]" onkeypress="return onlyNumbers(event)" readonly></td>`;
                     break;
-                case 23: // ID For Update
+                case 25: // ID For Update
                     newCell = `<td><input type="hidden" name="co_share_id[]" id="co_share_id[]" onkeypress="return onlyNumbers(event)"></td>`;
                     break;
             }
@@ -1880,8 +1872,6 @@ function addInsurerColumn() {
 
         var selectedOption = $('#client_policy_id').find('option:selected');
 
-        console.log('selcted client policy selectedOption', selectedOption);
-
         var ebp = selectedOption.data('ebp');
         var etp = selectedOption.data('etp');
         var etep = selectedOption.data('etep');
@@ -1890,28 +1880,76 @@ function addInsurerColumn() {
         var itep = selectedOption.data('itep');
 
         var bap = selectedOption.data('bap');
-        console.log('selcted client policy BAP', bap);
+
+        var client_type_id = $('#client_type').val() ?? 1;
+        var is_co_pay_yes = $('#cop_yes').val() ? 1 : 0;
+        // console.log('is_co_pay_yes', is_co_pay_yes);
+
 
         if(bap == 'Fire' || bap == 'Marine Cargo' || bap == 'Marine Hull'){
-            // console.log('Fire, Marine Cargo, Marine Hull');
             $('.hideter').show();
             $('.hidetp').hide();
+
+            if(is_co_pay_yes == 1){
+                $('#table_tr_7').show();
+                $('#table_tr_3').show();
+                $('.hidecoter').show()
+                $('.hidecotp').hide()
+            }else{
+                $('#table_tr_7').hide();
+                $('#table_tr_3').hide();
+                $('.hidecoter').hide()
+                $('.hidecotp').hide()
+            }
+
         }else{
             if(bap == 'Motor'){
-                // console.log('Motor');
+
                 $('.hidetp').show()
                 $('.hideter').hide()
+
+                if(is_co_pay_yes == 1){
+                    $('#table_tr_7').show();
+                    $('#table_tr_3').show();
+                    $('.hidecotp').show()
+                    $('.hidecoter').hide()
+                }else{
+                    $('#table_tr_7').hide();
+                    $('#table_tr_3').hide();
+                    $('.hidecoter').hide()
+                    $('.hidecotp').hide()
+                }
+
             }else{
-                // console.log('Not any thing');
                 $('.hideter').hide()
                 $('.hidetp').hide()
+                $('.hidecoter').hide()
+                $('.hidecotp').hide()
             }
         }
 
-        $('#standard_bp_'+insurerCount).val(ebp);
-        // $('[name="standard_bp[]"]').val(ebp);
-        $('[name="standard_tp[]"]').val(etp);
-        $('[name="standard_tep[]"]').val(etep);
+        var std_bp = 0;
+        var std_tp = 0;
+        var std_tep = 0;
+
+        if(client_type_id == 1){
+            std_bp = ebp;
+            std_tp = etp;
+            std_tep = etep;
+        }else{
+            std_bp = iep;
+            std_tp = itp;
+            std_tep = itep;
+        }
+
+        // console.log('client_type_id', client_type_id);
+        // console.log('std_bp', std_bp);
+        // console.log('std_tp', std_tp);
+        // console.log('std_tep', std_tep); 
+        
+        $('#standard_bp_'+insurerCount).val(std_bp);
+        $('[name="standard_tp[]"]').val(std_tp);
+        $('[name="standard_tep[]"]').val(std_tep);
 
         if(insurerCount > 1){
             $('.follow_insurer').prop('required', true);
@@ -1924,12 +1962,13 @@ function addInsurerColumn() {
     // Add click event for delete button
     $('.delete-insurer').off('click').on('click', function() {
         const index = $(this).closest('th').index();
-        removeInsurerColumn(index);
+        const count_index = $(this).data('count') || $(this).attr('data-count'); // Ensure data attribute is retrieved
+        removeInsurerColumn(index, count_index);
     });
     
 }
 
-function removeInsurerColumn(index) {
+function removeInsurerColumn(index, count_index) {
     // Remove the header
     $('#insurerTable thead tr th').eq(index).remove();
 
@@ -1938,7 +1977,12 @@ function removeInsurerColumn(index) {
         $(this).find('td').eq(index).remove();
     });
     
+    insurer_count_array = insurer_count_array.filter(item => item !== count_index);
+
     insurerCount--;
+
+    getColumnIndexes(1);
+
 }
 
 function removeAllColumnsExceptFirst(tableId) {
@@ -1996,13 +2040,14 @@ function populateTable(dataArray, status = false) {
                         cell.find('select').val(insurer);
                         break;
                     case 1: // Is Leader?
-                        cell.find('input[type="checkbox"]').prop('checked', data.co_share_type === '1').change();
+                        $('#co_share_type_'+(index+1)).val(data.co_share_type ?? '')
+                        cell.find('input').val(data.co_share_type ?? '');
                         break;
                     case 2: // CD Account Number
-                        console.log('------- CD Account Number -------')
+                        // console.log('------- CD Account Number -------')
                         break;
                     case 3: // CD AMOUNT
-                        console.log('------- CD AMOUNT -------')
+                        // console.log('------- CD AMOUNT -------')
                         break;
                     case 4: // follower_policy_no
                         cell.find('input').val(data.follower_policy_no);
@@ -2023,75 +2068,81 @@ function populateTable(dataArray, status = false) {
                         cell.find('input').val(status ? data.tep_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
                     case 10: // Co Premium
-                        cell.find('input').val(data.cop_amt).toggleClass('readonly-select', !!disable_td);
+                        cell.find('input').val(status ? data.cop_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 11: // CGST
+                    case 11: // Co TP Premium
+                        cell.find('input').val(status ? data.cotp_amt : '').toggleClass('readonly-select', !!disable_td);
+                        break;
+                    case 12: // Co Ter Premium
+                        cell.find('input').val(status ? data.cotep_amt : '').toggleClass('readonly-select', !!disable_td);
+                        break;
+                    case 13: // CGST
                         cell.find('input').val(data.bp_cgst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 12: // SGST
+                    case 14: // SGST
                         cell.find('input').val(data.bp_sgst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 13: // IGST
+                    case 15: // IGST
                         cell.find('input').val(data.bp_igst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 14: // GST Amount
+                    case 16: // GST Amount
                         cell.find('input').val(status ? data.bp_gst_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 15: // Stamp Duty
+                    case 17: // Stamp Duty
                         cell.find('input').val(status ? data.stamp_duty : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 16: // Total
+                    case 18: // Total
                         cell.find('input').val(status ? data.amount : '');
                         break;
-                    case 17: // Agreed BP %
+                    case 19: // Agreed BP %
                         cell.find('input').val(data.agreed_bp_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 18: // Agreed TP %
+                    case 20: // Agreed TP %
                         cell.find('input').val(data.agreed_tp_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 19: // Agreed Ter %
+                    case 21: // Agreed Ter %
                         cell.find('input').val(data.agreed_tep_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 20: // Agreed Amount
+                    case 22: // Agreed Amount
                         cell.find('input').val(data.agreed_amt).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 21: // Standard BP %
+                    case 23: // Standard BP %
                         cell.find('input').val(data.standerd_bp_per);
                         break;
-                    case 22: // Standard TP %
+                    case 24: // Standard TP %
                         cell.find('input').val(data.standerd_tp_per);
                         break;
-                    case 23: // Standard Ter %
+                    case 25: // Standard Ter %
                         cell.find('input').val(data.standerd_tep_per);
                         break;
-                    case 24: // Actual BP Amount
+                    case 26: // Actual BP Amount
                         cell.find('input').val(status ? data.actual_bp_amt : '');
                         break;
-                    case 25: // Actual TP Amount
+                    case 27: // Actual TP Amount
                         cell.find('input').val(status ? data.actual_tp_amt : '');
                         break;
-                    case 26: // Actual Ter Amount
+                    case 28: // Actual Ter Amount
                         cell.find('input').val(status ? data.actual_tep_amt : '');
                         break;
-                    case 27: // Actual BP %
+                    case 29: // Actual BP %
                         cell.find('input').val(status ? data.actual_bp_per : '');
                         break;
-                    case 28: // Actual TP %
+                    case 30: // Actual TP %
                         cell.find('input').val(status ? data.actual_tp_per : '');
                         break;
-                    case 29: // Actual Ter %
+                    case 31: // Actual Ter %
                         cell.find('input').val(status ? data.actual_tep_per : '');
                         break;
-                    case 30: // Actual BP Brokerage Amount
+                    case 32: // Actual BP Brokerage Amount
                         cell.find('input').val(status ? data.actual_bp_brokerage_amt : '');
                         break;
-                    case 31: // Actual TP Brokerage Amount
+                    case 33: // Actual TP Brokerage Amount
                         cell.find('input').val(status ? data.actual_tp_brokerage_amt : '');
                         break;
-                    case 32: // Actual Ter Brokerage Amount
+                    case 34: // Actual Ter Brokerage Amount
                         cell.find('input').val(status ? data.actual_tep_brokerage_amt : '');
                         break;
-                    case 33: // Expected Amount
+                    case 35: // Expected Amount
                         cell.find('input').val(status ? data.exp_amt : '');
                         break;
                     // case 30: // Variance
@@ -2100,7 +2151,7 @@ function populateTable(dataArray, status = false) {
                     // case 31: // Reward
                     //     cell.find('input').val(status ? data.reward : '');
                     //     break;
-                    case 34: // Co-share ID (hidden field)
+                    case 36: // Co-share ID (hidden field)
                         cell.find('input[type="hidden"]').val(status ? data.id : '');
                         break;
                 }
@@ -2110,13 +2161,14 @@ function populateTable(dataArray, status = false) {
                         cell.find('select').val(insurer);
                         break;
                     case 1: // Is Leader?
-                        cell.find('input[type="checkbox"]').prop('checked', data.co_share_type === '1').change();
+                        $('#co_share_type_'+(index+1)).val(data.co_share_type ?? '')
+                        cell.find('input').val(data.co_share_type ?? '');
                         break;
                     case 2: // CD Account Number
-                        console.log('------- CD Account Number -------')
+                        // console.log('------- CD Account Number -------')
                         break;
                     case 3: // CD AMOUNT
-                        console.log('------- CD AMOUNT -------')
+                        // console.log('------- CD AMOUNT -------')
                         break;
                     case 4: // follower_policy_no
                         cell.find('input').val(data.follower_policy_no);
@@ -2137,45 +2189,51 @@ function populateTable(dataArray, status = false) {
                         cell.find('input').val(status ? data.tep_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
                     case 10: // Co Premium
-                        cell.find('input').val(data.cop_amt).toggleClass('readonly-select', !!disable_td);
+                        cell.find('input').val(status ? data.cop_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 11: // CGST
+                    case 11: // Co TP Premium
+                        cell.find('input').val(status ? data.cotp_amt : '').toggleClass('readonly-select', !!disable_td);
+                        break;
+                    case 12: // Co Ter Premium
+                        cell.find('input').val(status ? data.cotep_amt : '').toggleClass('readonly-select', !!disable_td);
+                        break;
+                    case 13: // CGST
                         cell.find('input').val(data.bp_cgst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 12: // SGST
+                    case 14: // SGST
                         cell.find('input').val(data.bp_sgst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 13: // IGST
+                    case 15: // IGST
                         cell.find('input').val(data.bp_igst).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 14: // GST Amount
+                    case 16: // GST Amount
                         cell.find('input').val(status ? data.bp_gst_amt : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 15: // Stamp Duty
+                    case 17: // Stamp Duty
                         cell.find('input').val(status ? data.stamp_duty : '').toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 16: // Total
+                    case 18: // Total
                         cell.find('input').val(status ? data.amount : '');
                         break;
-                    case 17: // Agreed BP %
+                    case 19: // Agreed BP %
                         cell.find('input').val(data.agreed_bp_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 18: // Agreed TP %
+                    case 20: // Agreed TP %
                         cell.find('input').val(data.agreed_tp_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 19: // Agreed Ter %
+                    case 21: // Agreed Ter %
                         cell.find('input').val(data.agreed_tep_per).toggleClass('readonly-select', !!disable_td);
                         break;
-                    case 20: // Standard BP %
+                    case 22: // Standard BP %
                         cell.find('input').val(data.standerd_bp_per);
                         break;
-                    case 21: // Standard TP %
+                    case 23: // Standard TP %
                         cell.find('input').val(data.standerd_tp_per);
                         break;
-                    case 22: // Standard Ter %
+                    case 24: // Standard Ter %
                         cell.find('input').val(data.standerd_tep_per);
                         break;
-                    case 23: // Co-share ID (hidden field)
+                    case 25: // Co-share ID (hidden field)
                         cell.find('input[type="hidden"]').val(status ? data.id : '');
                         break;
                 }
@@ -2186,6 +2244,8 @@ function populateTable(dataArray, status = false) {
             appendCDData(data.cd_account_no, data.cd_amount, index)
         }
 
+        insurer_count_array.push(insurerCount)
+
     });
 }
 
@@ -2258,4 +2318,24 @@ $('#action_type').on('change', function(){
     }
 })
 
+//-----------------------------------------------------------------------------------------------------------
+
+$(document).on('change', '#insurerTable input, #insurerTable select, #insurerTable textarea', function() {
+    getColumnIndexes()
+});
+
+function getColumnIndexes(count = 0) {
+    $('#insurerTable thead th').each(function(index) {
+        if (index === 0) {
+            console.log("Premium Table columnIndexes is", index);
+        } else {
+            amountCalculation(index);
+            if(count == 1){
+                amountCalculation(index);
+            }
+            co_share_percentage_calculation(index);
+        }
+    });
+}
+
 </script>
\ No newline at end of file