diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 9c09427e..ee9ad2c0 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -51,7 +51,7 @@ $routes->get('/auth/google', 'LoginController::initiateGoogleOAuth');
 $routes->get('/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
 $routes->get('download-e-card/(:any)', 'EmployeeController::generateIDCardForEmployee/$1');
 $routes->get('download-kyc-docs/(:segment)', 'ClientController::downloadKYCDocument/$1');
-
+$routes->get('claim-form-download/(:any)', 'TicketController::downloadClaimForm/$1');
 
 $routes->group("/user", ["filter" => "authMVC"], function ($routes) {
     $routes->post("create", "UserController::create");
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 07fb963a..7a2b57da 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -3679,7 +3679,10 @@ class ClientController extends AdminController
     {
         // ---------for client-----------------------------------------------------------------------------
 
-        $clients = $this->clientModel->where('is_active', 1)->findAll();
+            $clients = $this->clientModel
+            ->select("*, DATE_FORMAT(dob, '%d-%m-%Y') as dob")
+            ->where('is_active', 1)
+            ->findAll();
 
         $clientIds = array_column($clients, 'id');
 
@@ -3814,7 +3817,7 @@ class ClientController extends AdminController
         // Add additional fields if client type is 2
         if ($client_type == 2) {
             $client_data = array_merge($client_data, [
-                'dob' => $postData['dob'],
+                'dob' => change_date_format($postData['dob'],'d/m/Y','Y-m-d'),
                 'aadhar' => $postData['aadhar'],
                 'phone' => $postData['phone'],
                 'email' => $postData['email'],
@@ -4910,16 +4913,10 @@ class ClientController extends AdminController
         if(!empty($data) && count($data) > 0){
 
             $memberData = $this->employeeModel->getEmployeeByEmployeeCode($data['emp_code'], $data['policy_id'], $client_id);
-
-            $acms = $this->clientRMModel
-                ->select('user_profiles.id, user_profiles.first_name')
-                ->join('clients', 'client_rm.client_id = clients.id', 'left')
-                ->join('user_profiles', 'client_rm.user_id = user_profiles.id', 'left')
-                ->where('clients.is_active', 1)
-                ->where('client_rm.is_active', 1)
-                ->where('user_profiles.is_active', 1)
-                ->where('clients.id', $data['client_id'])    
-                ->findAll();
+            $acms_datas = $this->employeeModel->getAcmUsingClientID($data['client_id']);
+            if(!empty($acms_datas)){
+                $acms = $acms_datas;
+            }
         }
 
 
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index fd0c5455..61e0af4a 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -1640,6 +1640,7 @@ class EmployeeServiceController extends AdminController
                                     $value['updated_by'] = $file['created_by'];
                                     $value['id'] = $employee[0]['id'];
                                     $value['emp_status'] = 'active';
+                                     $value['family_floater_key'] = generate_family_floater_key($value['relationship']);
                                     $value['client_branch_id'] = $file['client_branch_id'];
                                     $value['file_id'] = isset($employee[0]['file_id']) && $employee[0]['file_id'] != '' ? $employee[0]['file_id'] : $file['id'] ;
                                     $log_message = 'Update Employee - '.$employee[0]['name'].'('.$employee[0]['emp_code'].') with PK '.$employee[0]['id'];
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index ef741d21..4e1271f8 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -1746,6 +1746,7 @@ class MasterController extends AdminController
             'cache' => WRITEPATH . 'cache',
             'sample_import_excel' => ROOTPATH . 'public/sample_import_excel',
             'lead_files' => WRITEPATH . 'uploads/lead_files/',
+            'claim_sample_forms' => ROOTPATH . 'public/claim_sample_forms/',
         ];
 
         foreach ($folders as $folderName => $folderPath) {
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index a9d3b8ee..4a2a59d6 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -433,7 +433,7 @@ class PolicyTransactionController extends BaseController
                     'pt_id' => $pt_id,
                     'insurer_id' => $insurer_id ?? 0,
                     'insurer_branch_id' => $insurer_branch_id ?? 0,
-                    'co_share_type' => $data['co_share_type'][$index] ?? null,
+                    'co_share_type' => $data['co_share_type'][$index] ?? 1,
                     'co_share_per' => $data['co_share_per'][$index] ?? 0,
                     'bp_amt' => $data['base_premium'][$index] ?? 0,
                     'bp_gst_amt' => $data['gst_amount'][$index] ?? 0,
@@ -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);
         }
-
     }
 
     //------------------------------------------------------------------------------------------------
@@ -1607,8 +1585,15 @@ class PolicyTransactionController extends BaseController
             ->where('policy_transaction.action_type', 'inception')
             ->findAll();
 
+        $is_copay_yes = $this->policyTransactionModel
+            ->where('client_id', $client_id)
+            ->where('client_policy_id', $client_policy_id)
+            ->where('action_type', 'inception')
+            ->where('is_active', 1)
+            ->first();
+            
         if ($totalCount) {
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $totalCount], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $totalCount, 'is_copay_yes' => $is_copay_yes], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to get data'], 200);
         }
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 4b3a9619..a7392860 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -21,7 +21,7 @@ use Kint\Kint;
 use App\Models\EmployeeModel;
 
 use App\Helpers\MailHelper;
-
+use App\Models\InsurerModel;
 use CodeIgniter\API\ResponseTrait;
 
 class TicketController extends BaseController
@@ -119,6 +119,7 @@ class TicketController extends BaseController
             '((RELATIONSHIP))' => 'relationship',
             '((POLICY_TYPE))' => 'policy_type',
             '((AUTO_QUERY_CONTENT))' => 'auto_query_content',
+            '((CLAIM_FORM_LINK))' => 'claim_form_link',
         ];
         $this->extraFields = [
             1 => ['non_id_reason'],
@@ -439,6 +440,11 @@ class TicketController extends BaseController
         // $ticket_data = $this->ticketMasterModel->where('id', $ticket_id)->where('is_active', 1)->first();
         $ticket_data = $this->ticketMasterModel->getTicketDataByTicketID($ticket_id);
         $ticket_data = $this->formatDateForClaim($ticket_data, 'd/m/Y');
+
+        if (in_array($ticket_data['claim_status_id'], [15, 25, 35])) {
+            $ticket_data['auto_query_content'] = $this->getCheckListAndConvertArrayToString($ticket_data);
+        }
+
         // dd($ticket_data);
         $template_data = $this->ticketMasterModel->getTemplateDataByTicketID($ticket_id);
         if (!empty($template_data)) {
@@ -456,8 +462,9 @@ class TicketController extends BaseController
         if (!empty($ticket_data['client_policy_id'])){
             $ticket_data['client_policy_id_text'] = $this->clientPolicyModel->select('concat(policy_type.policy_type,"-",client_policy.policy_no) as client_policy_name')->join('policy_type','policy_type.id = client_policy.policy_type_id and policy_type.is_active = 1')->where('client_policy.id',$ticket_data['client_policy_id'])->first()['client_policy_name'];
         }
-        // dd($ticket_data);
+        // dd($data);
         $data['ticket_data'] = $ticket_data;
+        $data['acms'] =  $this->employeeModel->getAcmUsingClientID($ticket_data['client_id']);
 
         // dd($data);
 
@@ -801,6 +808,13 @@ class TicketController extends BaseController
                 return null;
             }
 
+            if (in_array($ticket_data['claim_status_id'], [15, 25, 35])) {
+                $ticket_data['auto_query_content'] = $this->getCheckListAndConvertArrayToString($ticket_data);
+            }
+
+            // print_r($ticket_data); die;
+            
+
             $this->myLogger->logme('error', "Fetched email template: " . json_encode($template_data));
 
             // Generate Email Content
@@ -853,14 +867,8 @@ class TicketController extends BaseController
                     $replaceData = $ticket_data[$value] ?? '';
                 } else if ($value == "policy_type") {
                     $replaceData = str_replace("Claim-", "", $this->ticketType[$ticket_data['ticket_type_id']] ?? "");
-                } else if ($value == 'emp_name'){
-                    if(empty($ticket_data['emp_id'])){
-                        $replaceData = $ticket_data['emp_name']??"";
-                    }
-                }else if ($value == 'insured_name'){
-                    if(empty($ticket_data['insured_emp_id'])){
-                        $replaceData = $ticket_data['insured_name']?? "";
-                    }
+                } else if ($value == "claim_form_link"){
+                    $replaceData = '<a href="' . base_url('claim-form-download/' . md5($ticket_data['insurer_id'])) . '" target="_blank">Click here to download Claim Form</a>';
                 }else {
                     $replaceData = isset($ticket_data[$value]) ? $ticket_data[$value] : '';
                 }
@@ -1228,136 +1236,7 @@ class TicketController extends BaseController
         }
     }
 
-    // public function accountManagerWiseReport($policy_type = null ,$start_date = null, $end_date = null){
-
-    //     if ($policy_type == 1) {
-    //         $sql = "SELECT 
-    //                 u.first_name AS acc_manager_name,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'ID NOT GENERATED' AND master.ticket_type_id = 1 THEN master.id END) AS id_not_generated,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'NON ID' AND master.ticket_type_id = 1 THEN master.id END) AS non_id,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'CDA' AND master.ticket_type_id = 1 THEN master.id END) AS cda,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'INFORMATION REQUIRED' AND master.ticket_type_id = 1 THEN master.id END) AS information_required,
-    //                 COUNT(CASE WHEN tcs.claim_status LIKE '%UNDER PROCESS%' AND master.ticket_type_id = 1 THEN master.id END) AS under_process,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = 1 THEN master.id END) AS approved,
-    //                 COUNT(CASE WHEN tcs.claim_status = 'PAYMENT INITIATED' AND master.ticket_type_id = 1 THEN master.id END) AS payment_initiated,
-    //                 (
-    //                     COUNT(CASE WHEN tcs.claim_status = 'ID NOT GENERATED' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status = 'NON ID' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status = 'CDA' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status = 'INFORMATION REQUIRED' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status LIKE '%UNDER PROCESS%' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = 1 THEN master.id END) +
-    //                     COUNT(CASE WHEN tcs.claim_status = 'PAYMENT INITIATED' AND master.ticket_type_id = 1 THEN master.id END)
-    //                 ) AS total
-    //             FROM 
-    //                 ticket_master master 
-    //             JOIN 
-    //                 user_profiles u ON master.acm_id = u.id and u.is_active = 1
-    //             JOIN 
-    //                 ticket_claim_status tcs ON tcs.id = master.claim_status_id and tcs.is_active = 1
-    //             WHERE
-    //                 master.created_at <= '$end_date' and master.created_at >= '$start_date' and master.is_active = 1
-    //             GROUP BY 
-    //                 u.id;
-    //         ";
-    //         $result = $this->ticketMasterModel->query($sql)->getResultArray();
-    //         // dd($result);
-
-    //         return $result;
-        
-
-    //     }else{
-    //         $sql = "SELECT u.first_name AS acc_manager_name,
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLAIM INTIMATION' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS claim_intimation,
-    //             COUNT(CASE WHEN tcs.claim_status = 'INTIMATION TO INSURER' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS int_to_insurer,
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLIENT PENDING' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS client_pending,
-    //             COUNT(CASE WHEN tcs.claim_status = 'INSURER PENDING' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS information_required,
-    //             COUNT(CASE WHEN tcs.claim_status = 'INVESTIGATION' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS investigation,
-    //             COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS approved,
-    //             COUNT(CASE WHEN tcs.claim_status = 'ON HOLD' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS on_hold,
-                
-    //             (
-    //                 COUNT(CASE WHEN tcs.claim_status = 'CLAIM INTIMATION' AND master.ticket_type_id = '$policy_type' THEN master.id END)+
-    //             COUNT(CASE WHEN tcs.claim_status = 'INTIMATION TO INSURER' AND master.ticket_type_id = '$policy_type' THEN master.id END)+
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLIENT PENDING' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'INSURER PENDING' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'INVESTIGATION' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'ON HOLD' AND master.ticket_type_id = '$policy_type' THEN master.id END)  
-    //             ) AS total1,
-    //             COUNT(CASE WHEN tcs.claim_status = 'NOT COVERED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS not_covered,
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLOSED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS closed,
-    //             COUNT(CASE WHEN tcs.claim_status = 'SETTLED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS settled,
-    //             (
-    //             COUNT(CASE WHEN tcs.claim_status = 'NOT COVERED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLOSED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //             COUNT(CASE WHEN tcs.claim_status = 'SETTLED' AND master.ticket_type_id = '$policy_type' THEN master.id END) 
-    //             ) AS total2
-    //         FROM 
-    //             ticket_master master 
-    //         JOIN 
-    //             user_profiles u ON master.acm_id = u.id and u.is_active = 1
-    //         JOIN 
-    //             ticket_claim_status tcs ON tcs.id = master.claim_status_id and tcs.is_active = 1
-    //         WHERE
-    //             master.created_at <= '$end_date' and master.created_at >= '$start_date' and master.is_active = 1 and master.ticket_type_id = '$policy_type'
-    //         GROUP BY 
-    //             u.id;
-    //         ";
-    //         $result = $this->ticketMasterModel->query($sql)->getResultArray();
-
-    //         return $result;
-    //     }
-    // }
-
-    // public function tpaWiseReport($policy_type = null ,$start_date = null,$end_date = null ){
-    //     // $policy_type = 1;
-    //     $sql = "SELECT 
-    //             tpa.name AS tpa_name,
-    //             COUNT(CASE WHEN tcs.claim_status = 'ID NOT GENERATED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS id_not_generated,
-    //             COUNT(CASE WHEN tcs.claim_status = 'NON ID' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS non_id,
-    //             COUNT(CASE WHEN tcs.claim_status = 'CDA' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS cda,
-    //             COUNT(CASE WHEN tcs.claim_status = 'INFORMATION REQUIRED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS information_required,
-    //             COUNT(CASE WHEN tcs.claim_status LIKE '%UNDER PROCESS%' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS under_process,
-    //             COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS approved,
-    //             COUNT(CASE WHEN tcs.claim_status = 'PAYMENT INITIATED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS payment_initiated,
-    //             (
-    //                 COUNT(CASE WHEN tcs.claim_status = 'ID NOT GENERATED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'NON ID' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'CDA' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'INFORMATION REQUIRED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status LIKE '%UNDER PROCESS%' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'APPROVED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'PAYMENT INITIATED' AND master.ticket_type_id = '$policy_type' THEN master.id END)
-    //             ) AS total,
-    //             COUNT(CASE WHEN tcs.claim_status = 'CLOSED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS closed,
-    //             COUNT(CASE WHEN tcs.claim_status = 'SETTLED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS settled,
-    //             COUNT(CASE WHEN tcs.claim_status = 'RETURNED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS returned,
-    //             COUNT(CASE WHEN tcs.claim_status = 'REJECTED' AND master.ticket_type_id = '$policy_type' THEN master.id END) AS denied,
-    //             (
-    //                 COUNT(CASE WHEN tcs.claim_status = 'CLOSED' AND master.ticket_type_id = '$policy_type'THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'SETTLED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'RETURNED' AND master.ticket_type_id = '$policy_type' THEN master.id END) +
-    //                 COUNT(CASE WHEN tcs.claim_status = 'REJECTED' AND master.ticket_type_id = '$policy_type' THEN master.id END)
-    //             ) AS total2
-    //         FROM 
-    //             ticket_master master 
-    //         JOIN 
-    //             tpa ON master.tpa_id = tpa.id and tpa.is_active = 1
-    //         JOIN 
-    //             ticket_claim_status tcs ON tcs.id = master.claim_status_id and  tcs.is_active = 1
-    //         WHERE
-    //             master.created_at <= '$end_date' and master.created_at >= '$start_date' and master.is_active = 1
-    //         GROUP BY 
-    //             tpa.id;
-
-        
-    //     ";
-    //         $result = $this->ticketMasterModel->query($sql)->getResultArray();
-
-    //         return $result;
-    // }
-
+    // -------------------------------------------------------------------------------------------------------------------------
 
     // function for Reject ticket Head Approvel mail sent function
     public function sendMailToTheHead($ticket_data)
@@ -1468,8 +1347,11 @@ class TicketController extends BaseController
 
             if (!empty($empData) && $empData != "" && $empData != null ) {
                 foreach ($empData as &$emp) { // Loop through the data
+                    $doi = $this->employeePolicyModel->select('date_coverage,basic_cover_si')->where('client_policy_id',$client_policy_id)->first();
                     $emp['dob'] = date('d/m/Y', strtotime($emp['dob']));
                     $emp['doj'] = date('d/m/Y', strtotime($emp['doj']));
+                    $emp['date_of_inception'] = date('d/m/Y', strtotime($doi['date_coverage']));
+                    $emp['basic_cover_si'] = $doi['basic_cover_si'];
                 }
             }
             
@@ -1508,7 +1390,7 @@ class TicketController extends BaseController
     
         // Fetch all policy names and IDs in one query
         $policyNameandID = $this->clientPolicyModel
-            ->select('CONCAT(policy_type.policy_type, "-", client_policy.policy_no) as client_policy_name, client_policy.id as client_policy_value,client_policy.policy_type_id')
+            ->select('CONCAT(policy_type.policy_type, "-", client_policy.policy_no) as client_policy_name, client_policy.id as client_policy_value,client_policy.policy_type_id,client_policy.policy_no')
             ->join('policy_type', 'policy_type.id = client_policy.policy_type_id AND policy_type.is_active = 1')
             ->whereIn('client_policy.id', $policy_ids)
             ->findAll();
@@ -1521,5 +1403,45 @@ class TicketController extends BaseController
             return $this->respond(['status'=>false,'message'=> "Policy Not Found"]);
         }
     }
+
+    public function getCheckListAndConvertArrayToString($ticket_data)
+    {
+        $data = db_connect()->table('ticket_check_list')
+            ->where('is_active', 1)
+            ->where('ticket_type_id', $ticket_data['ticket_type_id'])
+            ->get()->getResultArray();
+
+        $data = !empty($data) ? implode("", array_map(fn($doc) => "<p>{$doc['document']}</p>", $data)) : "";
+        // $data = !empty($data) ? implode(", ", array_column($data, 'document')) : "";
+        // print_r($data); die;
+
+        return $data;
+    }
+
+    public function downloadClaimForm($insurer_id)
+    {   
+        $insurerModel = new InsurerModel();
+        $insurer_data = $insurerModel->where('MD5(id)', $insurer_id)->where('is_active', 1)->first();
+    
+        if (!$insurer_data) {
+            $data['message'] = 'The Physical File Not Found';
+            echo view('errors/404', $data);
+        }
+    
+        $fileName = $insurer_data['short_name'] . '.pdf';
+        $filePath = ROOTPATH . 'public/claim_sample_forms/' . $fileName;
+    
+        try {
+            if (file_exists($filePath)) {
+                return $this->response->download($filePath, null);
+            } else {
+                $data['message'] = 'The Physical File Not Found';
+                echo view('errors/404', $data);
+            }
+        } catch (\Exception $e) {
+            $this->myLogger->logme('error', $e->getMessage());
+            return $this->response->setStatusCode(500)->setBody('An error occurred while downloading the file.');
+        }
+    }
     
 }
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index 57ac791b..524eb18b 100755
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -287,5 +287,21 @@ class EmployeeModel extends Model
 
     }
 
+    public function getAcmUsingClientID($client_id)
+    {
+        return $this->db->table('client_rm')
+            ->select('user_profiles.id, user_profiles.first_name')
+            ->join('user_profiles', 'client_rm.user_id = user_profiles.id')
+            ->where([
+                'client_rm.level' => 3,
+                'user_profiles.role' => 3,
+                'client_rm.is_active' => 1,
+                'user_profiles.is_active' => 1,
+                'client_rm.client_id' => $client_id
+            ])
+            ->get()
+            ->getResultArray();
+    }
+    
 }
 
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
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index a2d0ee4c..11f601cc 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -802,8 +802,8 @@
                             </div>
 
                             <div class="form-group col-md-12">
-                                <label for="cost_center">PAN<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="pan" placeholder="Enter PAN No" name="pan" onchange="validateInput(this, 'clients', 'pan')" required>
+                                <label for="cost_center">PAN</label>
+                                <input type="text" class="form-control" id="pan" placeholder="Enter PAN No" name="pan" onchange="validateInput(this, 'clients', 'pan')">
                             </div>
                         </div>
 
@@ -827,9 +827,8 @@
                                 <label for="cost_center">Email<span class="text-danger">*</span></label>
                                 <input type="email" class="form-control" id="email" placeholder="Enter Email" name="email">
                             </div>
-
                             <div class="form-group col-md-12">
-                                <label for="aadhar">Aadhar<span class="text-danger">*</span></label>
+                                <label for="aadhar">Aadhar</label>
                                 <input type="text" class="form-control" id="aadhar" placeholder="Enter Aadher No" name="aadhar"  maxlength="12" onchange="validateInput(this, 'clients', 'aadhar')">
                             </div>
 
@@ -1052,6 +1051,9 @@ $(document).ready(function(){
         }
     });
 
+    $('#aadhar').attr('data-parsley-required', 'false');
+    $('#aadhar').removeAttr('required');
+
     
     team_id = <?php echo json_encode(user_team()); ?>;
     console.log('team_id', team_id);
@@ -2655,7 +2657,7 @@ function appendOwner(data) {
 
         let client_show_name = item.client_name;
         if (item.client_type == 2) {
-            client_show_name = item.client_name + ' - ' + (item.pan ?? 'N/A');
+            client_show_name = item.client_name + ' - ' + (item.dob ?? 'N/A');
         }
 
         var option = $('<option>', {
@@ -3129,6 +3131,12 @@ $("#client_form").submit(function(event) {
     console.log('client_type', $('#client_type').val());
 
     event.preventDefault(); 
+
+    
+    $('#aadhar').attr('data-parsley-required', 'false');
+    $('#aadhar').removeAttr('required');
+
+
     isClientFormSubmitting = true;
     var isValid = $('#client_form').parsley().validate();    
     if (!isValid) { 
@@ -3525,7 +3533,8 @@ $('#client_type').on('change', function() {
 
                 let client_show_name = item.client_name;
                 if (item.client_type == 2) {
-                    client_show_name = item.client_name + ' - ' + (item.pan ?? 'N/A');
+                    // client_show_name = item.client_name + ' - ' + (item.dob ?? '') + (item.pan ?? '');
+                    client_show_name = item.client_name +  (item.dob ? ('- (' + item.dob + ' )' ) : '') + (item.pan ? ('- ' + item.pan ) : '');
                 }
                 var option = $('<option>', {
                     value: item.id,
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index 3108ff12..f51f5382 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -737,7 +737,8 @@ function appendClients(data)
 
         let client_show_name = item.client_name;
         if (item.client_type == 2) {
-            client_show_name = item.client_name + ' - ' + (item.pan ?? 'N/A');
+            client_show_name = item.client_name +  (item.dob ? ('- (' + item.dob + ' )' ) : '') + (item.pan ? ('- ' + item.pan ) : '');
+            // console.log(client_show_name);
         }
 
         var option = $('<option>', {
diff --git a/app/Views/ticket_auto_query.php b/app/Views/ticket_auto_query.php
index 24dcef21..5caf68d4 100644
--- a/app/Views/ticket_auto_query.php
+++ b/app/Views/ticket_auto_query.php
@@ -58,6 +58,7 @@
 <!-- end -->
 
 <script>
+    
     $(document).ready(function() {
 
         // $('#ticket_mail_auto_query_customButton').select2();
@@ -99,13 +100,8 @@
                 toastr.warning('Please focus on the text area first', 'Warning');
             }
         });
-    })
 
-    // $("#ticket_mail_auto_query_customButton").change(function (){
-    //     event.stopPropagation();
-    // })
-
-    $(document).ready(function() {
+        // --------------------------------------------------------------------------------------------------------------
 
         url = '<?= base_url('ticket/note/1') ?>';
         data = {
@@ -119,7 +115,11 @@
             success: function(res) {
                 console.log('auto query res', res)
                 if (res.status == true) {
-                    $('.jodit-wysiwyg').html(res.data.note);
+
+                    $('#ticket_auto_query_note').val(res.data.note);
+                    if (auto_query_editor) {
+                        auto_query_editor.value = res.data.note;
+                    }
                     $('#query_note_id').val(res.data.id);
                 }
             },
@@ -162,22 +162,24 @@
             })
             console.log(formData);
             sendAjaxRequestForGlobal(url, 'POST', formData, function(response) {
+
                 if (response.status == true) {
+                    
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     toastr.success('Note Added Successfully', 'Success');
                     // console.log("Respone id is ")
                     // console.log(response.id);    
                     $('#query_note_id').val(response.id);
-
-
                 } else {
+
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     let message = response.message;
                     toastr.error(message, 'ERROR');
                 }
 
+                window.location.reload();
 
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 337aa48a..6ab344ba 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -931,7 +931,8 @@
             value: '',
             text: 'Select Client Policy'
         }));
-
+        console.log("got data from backend ",data);
+        let policyCount = 1;
         var policyAppendCount = 0;
         $.each(data, function(index, item) {
             // console.log(item);
@@ -941,6 +942,15 @@
                         value: item.client_policy_value,
                         text: item.client_policy_name
                     }));
+                    $("#policy_no").val("");
+                if (policyCount == 1){
+                    console.log("policy count from if",item.policy_no);
+                    $("#policy_no").val(item.policy_no);
+                }else{
+                    console.log("policy count from greter if ","");
+                    $("#policy_no").val("");
+                }
+                policyCount++;
                     policyAppendCount++;
                 if (hiddenData['searchType'] != null && hiddenData['searchType'] != "" && hiddenData['policy_id'] != null && hiddenData['policy_id'] != "") {
                     // $('#emp_client_policy').select2();
@@ -962,12 +972,18 @@
     }
     // $('#emp_client_policy').select2();
     $("#emp_client_policy").on('change', function() {
+        var policy_name = $("#emp_client_policy option:selected").text();
+        var policy_no = policy_name.split("-")[1];
+        $("#policy_no").val(policy_no);
         console.log("change function called ");
         policy_id = $("#emp_client_policy").val();
         setMinDateDOA(policy_id);
     })
 
     function setMinDateDOA(policy_id) {
+        var policy_name = $("#emp_client_policy option:selected").text();
+        var policy_no = policy_name.split("-")[1];
+        $("#policy_no").val(policy_no);
         console.log("Function set min date called ");
         console.log("Existing DOA instance: ", doa);
         console.log('sent data ',policy_id);
diff --git a/app/Views/ticket_form_gpa.php b/app/Views/ticket_form_gpa.php
index 3181f9bf..f701312b 100644
--- a/app/Views/ticket_form_gpa.php
+++ b/app/Views/ticket_form_gpa.php
@@ -642,14 +642,26 @@
         }));
 
         var policyAppendCount = 0;
+        console.log("got data from backend ",data);
+        let policyCount = 1;
         $.each(data, function(index, item) {
-            // console.log(item);
+            // console.log("item len",item.length);
 
             if (ticket_type != 1 && item.policy_type_id != 2) {
                 $('#emp_client_policy').append($('<option>', {
                     value: item.client_policy_value,
                     text: item.client_policy_name
                 }));
+                console.log("policy count from loop","");
+                $("#policy_no").val("");
+                if (policyCount == 1){
+                    console.log("policy count from if",item.policy_no);
+                    $("#policy_no").val(item.policy_no);
+                }else{
+                    console.log("policy count from greter if ","");
+                    $("#policy_no").val("");
+                }
+                policyCount++;
                 policyAppendCount++;
                 if (hiddenData['searchType'] != null && hiddenData['searchType'] != "" && hiddenData['policy_id'] != null && hiddenData['policy_id'] != "") {
                     // $('#emp_client_policy').select2();
@@ -671,12 +683,20 @@
     // $('#emp_client_policy').select2();
     $("#emp_client_policy").on('change', function() {
         console.log("change function called ");
-        policy_id = $("#emp_client_policy").val();
+        policy_id = $("#emp_client_policy").val();    
         // setMinDateDOA(policy_id);
         setDateValidation(policy_id, true);
     })
 
+    function setPolicyNo(){
+        var policy_name = $("#emp_client_policy option:selected").text();
+        var policy_no = policy_name.split("-")[1];
+        $("#policy_no").val(policy_no);
+        console.log("after text split",policy_no);
+    }
+
     function setDateValidation(policy_id, memberset = null) {
+        setPolicyNo();
         $.ajax({
             url: '<?= base_url("ticket/getPolicyStartDate") ?>',
             method: "POST",
@@ -688,17 +708,27 @@
                 console.log(response);
                 if (response.status) {
                     if (memberset) {
+                        var dateOfInception = response.empData[0].date_of_inception;
                         var dobValue = response.empData[0].dob;
                         var doj = response.empData[0].doj;
+                        var basicCoverSI = response.empData[0].basic_cover_si
                         console.log('data received fro controller ', dob, doj);
                         if (dobValue) {
                             $("#dob").val(dobValue);
                             $("#dob").addClass('readonly-select');
                         }
+                        if (dateOfInception){
+                            $("#date_of_incep").val(dateOfInception);
+                            $("#date_of_incep").addClass('readonly-select');
+                        }
                         if (doj) {
                             $("#date_of_join").val(doj);
                             $("#date_of_join").addClass('readonly-select');
                         }
+
+                        $("#si_amt").val(basicCoverSI);
+                        $("#si_amt").addClass('readonly-select');
+                       
                     }else{
                         if ($("#dob").hasClass('readonly-select')){
                             $("#dob").removeClass('readonly-select')
diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php
index 76ab3b7f..2feb0d1b 100644
--- a/app/Views/ticket_form_handler.php
+++ b/app/Views/ticket_form_handler.php
@@ -817,7 +817,7 @@ if (!isset($view_ticket_page)) {
         $('#tpa_no').val(tpaNo);
         $('#insured_emp_id').val(empId);
         $('#insured_name').val(empName);
-        $('#policy_no').val(policyNo);
+        // $('#policy_no').val(policyNo);
 
         $('#relationship option').each(function() {
             if ($(this).text() === relationship) {
diff --git a/app/Views/ticket_reply.php b/app/Views/ticket_reply.php
index 3b6cb2a3..c4d34c24 100644
--- a/app/Views/ticket_reply.php
+++ b/app/Views/ticket_reply.php
@@ -96,7 +96,13 @@ $(document).ready(function() {
 
     const editor = Jodit.make("#ticket_mail_editor", editorConfig);
     var mail_content = `<?=isset($reply_data['mail_content'])?$reply_data['mail_content']:'' ?>`;
-    $('.jodit-wysiwyg').html(mail_content); 
+    // console.log(mail_content);
+
+    if (editor) {
+        editor.value = mail_content;
+    }
+    
+    // $('.jodit-wysiwyg').html(mail_content); 
 
     let lastActiveField = null;
 
diff --git a/public/claim_sample_forms/DIGITLIF.pdf b/public/claim_sample_forms/DIGITLIF.pdf
new file mode 100644
index 00000000..ca2cfd64
Binary files /dev/null and b/public/claim_sample_forms/DIGITLIF.pdf differ
diff --git a/public/claim_sample_forms/ICICIPRU.pdf b/public/claim_sample_forms/ICICIPRU.pdf
new file mode 100644
index 00000000..e619f17f
Binary files /dev/null and b/public/claim_sample_forms/ICICIPRU.pdf differ
diff --git a/public/claim_sample_forms/MAXLIFE.pdf b/public/claim_sample_forms/MAXLIFE.pdf
new file mode 100644
index 00000000..3084073d
Binary files /dev/null and b/public/claim_sample_forms/MAXLIFE.pdf differ
diff --git a/public/claim_sample_forms/NIA.pdf b/public/claim_sample_forms/NIA.pdf
new file mode 100644
index 00000000..b68d68d9
Binary files /dev/null and b/public/claim_sample_forms/NIA.pdf differ
diff --git a/public/claim_sample_forms/OIC.pdf b/public/claim_sample_forms/OIC.pdf
new file mode 100644
index 00000000..d60301a8
Binary files /dev/null and b/public/claim_sample_forms/OIC.pdf differ
diff --git a/public/claim_sample_forms/PIFL.pdf b/public/claim_sample_forms/PIFL.pdf
new file mode 100644
index 00000000..049e8a32
Binary files /dev/null and b/public/claim_sample_forms/PIFL.pdf differ
diff --git a/public/claim_sample_forms/RELIANCE.pdf b/public/claim_sample_forms/RELIANCE.pdf
new file mode 100644
index 00000000..b9716380
Binary files /dev/null and b/public/claim_sample_forms/RELIANCE.pdf differ