diff --git a/app/Config/Database.php b/app/Config/Database.php
index 2d388192..dcc1c2dd 100755
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -124,7 +124,7 @@ class Database extends Config
             $this->defaultGroup = 'tests';
         }
 
-        $this->enableSSL = env('DB_SSL_ENABLE');
+        $this->enableSSL = env('DB_SSL_ENABLE') ?? false;
 
         if ($this->enableSSL === true || $this->enableSSL === 'true' || $this->enableSSL === 1 || $this->enableSSL === '1') {
 
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 3b0b15a6..5aea3a1f 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -52,10 +52,11 @@ $routes->get("importRules", "RuleImportController::upload");
 // $routes->post("employeeUpload", "EmployeeRestController::employeeUpload");
 
 $routes->post("add_advertise_image", "AppContentManagementController::add_advertise_image");
+$routes->post('remove_advertise_image', 'AppContentManagementController::remove_advertise_image');
 $routes->get("add_image_index", "AppContentManagementController::add_image_index");
 $routes->get("getAdvertiseImage/(:any)", "AppContentManagementController::getAdvertiseImage/$1");
 $routes->get("frontend_content", "AppContentManagementController::frontend_content");
-$routes->get('showAdvertiseImage/(:any)', 'AdvertiseController::showAdvertiseImage/$1');
+$routes->get('showAdvertiseImage/(:any)', 'AppContentManagementController::showAdvertiseImage/$1');
 
 
 // $routes->get('/', 'LoginController::index');
@@ -448,6 +449,8 @@ $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
         $routes->post("create", "PolicyTransactionController::createEndorsementPolicy");
         $routes->get("list/(:any)", "PolicyTransactionController::getEndorsementDataForEdit/$1");
         $routes->get("remove/(:any)", "PolicyTransactionController::removeCDMaster/$1");
+        $routes->get("list2", "PolicyTransactionController::viewEndorsement2");
+        $routes->get("list2/(:any)", "PolicyTransactionController::getEndorsementDataForEdit2/$1");
     });
 
         $routes->group("report", ["filter" => "authMVC"], function ($routes) {
diff --git a/app/Controllers/ApiServiceController.php b/app/Controllers/ApiServiceController.php
index 642b8b87..09264707 100644
--- a/app/Controllers/ApiServiceController.php
+++ b/app/Controllers/ApiServiceController.php
@@ -255,7 +255,7 @@ class ApiServiceController extends BaseController
     public function pushClaimFiles($claimId)
     {
 
-        $claimId = $this->request->getGet('claim_id');
+        // $claimId = $this->request->getGet('claim_id');
        
         $data = $this->db->table('ticket_master tm')
                     ->select('tm.id,tm.tpa_id ')->where('tm.id', $claimId)->get()->getRowArray(); // single record
diff --git a/app/Controllers/AppContentManagementController.php b/app/Controllers/AppContentManagementController.php
index f9e1d356..fcc9a6d6 100755
--- a/app/Controllers/AppContentManagementController.php
+++ b/app/Controllers/AppContentManagementController.php
@@ -10,6 +10,7 @@ use CodeIgniter\API\ResponseTrait;
 
 use App\Models\AddImgModel;
 use App\Models\FEContentModel;
+use App\Models\ClientModel;
 
 class AppContentManagementController extends AdminController
 {   
@@ -17,19 +18,31 @@ class AppContentManagementController extends AdminController
     protected $myLogger;
     protected $addImgModel;
     protected $feContentModel;
+    protected $clientModel;
+    
     
     public function __construct()
     {
         $this->myLogger = \Config\Services::mylogger();
-        $this->addImgModel  = new AddImgModel();                
+        $this->addImgModel     = new AddImgModel();                
         $this->feContentModel  = new FEContentModel();                
+        $this->clientModel     = new ClientModel();
     }
     public function add_image_index()
     {   
         $this->myLogger->logme('error','Addvertisement Image list function called');
         $headerData['tab_name'] = 'Addvertisement Images';
         $headerData['page_name'] = 'Addvertisement Images';
-        $data['addImageList'] = $this->addImgModel->findAll();
+        // $data['addImageList'] = $this->addImgModel->findAll();
+        $data['addImageList'] = $this->addImgModel->select('advertisement_images.*, 
+                                                                clients.client_name,
+                                                                clients.short_name,
+                                                                CASE WHEN advertisement_images.is_active = 1 THEN "Active" ELSE "Inactive" END AS status', false)
+                                ->join('clients', 'advertisement_images.client_id = clients.id', 'left')
+                                ->where('advertisement_images.is_active', 1)
+                                ->findAll();
+
+        $data['client'] = $this->clientModel->where('is_active', 1)->where('client_type', 1)->findAll();
 
         // dd($data);
 
@@ -40,12 +53,14 @@ class AppContentManagementController extends AdminController
         // $this->loadLayout('client_onboarding', $data);
     }
 
+    // using add and edit 
     public function add_advertise_image() {
             try {
                 $file = $this->request->getFile('advertise_image');
+                $client_id = $this->request->getPost('client_id');
                 //1) original file name for vaildations
                 $fileName = $file->getClientName(); //original file name for vaildations
-                $existing = $this->addImgModel->where('name', $fileName)->where('is_active', 1)->first();
+                $existing = $this->addImgModel->where('name', $fileName)->where('client_id', $fileName)->where('is_active', 1)->first();
                 if($existing){ return $this->respond(['status' => false, 'message' => 'This file has already been uploaded in active state.'], 400); }
 
                 //skip 1) and use this 
@@ -62,7 +77,7 @@ class AppContentManagementController extends AdminController
                 $file->move($uploadPath, $fileName);
 
                 $id = $this->request->getPost('add_image_id');
-                $data = ['name' => $fileName];
+                $data = ['name' => $fileName,'client_id'=>$client_id];
 
                 if ($id == 0) {
                     $this->addImgModel->insert($data);
@@ -76,22 +91,57 @@ class AppContentManagementController extends AdminController
         }
     }
 
-    public function showAdvertiseImage($fileName)
+    public function remove_advertise_image()
     {
+        try {
+            $id = $this->request->getPost('add_image_id');
 
-        $filePath = WRITEPATH . 'uploads/advertiseImage/' . $fileName;
+            if (!$id) {
+                return $this->respond(['status' => false, 'message' => 'ID missing'], 400);
+            }
 
-        if (!file_exists($filePath)) {
-            return $this->response->setStatusCode(404, 'File not found');
+            $data = ['is_active' => 0];
+            $this->addImgModel->update($id, $data);
+
+            return $this->respond(['status' => true, 'message' => 'Deleted successfully']);
+            
+        } catch (\Exception $e) {
+            return $this->respond(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+    }
+
+
+    // public function showAdvertiseImage($fileName)
+    // {
+
+    //     $filePath = WRITEPATH . 'uploads/advertiseImage/' . $fileName;
+
+    //     if (!file_exists($filePath)) {
+    //         return $this->response->setStatusCode(404, 'File not found');
+    //     }
+
+    //     $mimeType = mime_content_type($filePath);
+    //     header('Content-Type: ' . $mimeType);
+    //     readfile($filePath);
+    //     exit;
+    // }
+
+    // In AppContentManagementController.php (This is what needs to be fixed if the direct path fails)
+
+    public function showAdvertiseImage($filename)
+    {
+        $path = WRITEPATH . 'uploads/advertiseImage/' . $filename;
+
+        if (!file_exists($path)) {
+            throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
         }
 
-        $mimeType = mime_content_type($filePath);
-        header('Content-Type: ' . $mimeType);
-        readfile($filePath);
-        exit;
+        $mime = mime_content_type($path);
+        return $this->response->setHeader('Content-Type', $mime)->setBody(file_get_contents($path));
     }
 
 
+
     public function getAdvertiseImage($image_id){
 
         $image_data = $this->addImgModel->select('name')->where(['id' => $image_id])->first();
diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index 6a9d90f1..abc1ac14 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -928,7 +928,8 @@ class BDSReportController extends AdminController
             $default_start = new \DateTime();
             $data['default_end'] = $default_start->format('d-m-Y');
             $data['default_start']  = $default_start->modify('-60 days')->format('d-m-Y');
-            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();;
+            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
+            $data['client_list'] = $this->clientModel->where('is_active', 1)->findAll();
             $data['tab_name'] = "Renewal Reports";
             $data['page_name'] = "Renewal Report";
             return $this->loadLayout('renewal_search', $data);
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index b67ae501..e42266d2 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -4832,8 +4832,9 @@ class ClientController extends AdminController
             $client_data = [
                 'client_type' => $postData['client_type'],
                 'client_name' => $postData['client_name'],
-                'email' => $postData['short_name'] ?? $postData['client_name'],
-                'phone' => $postData['mobile'],
+                'short_name' => $postData['short_name'] ?? $postData['client_name'],
+                'email' => $postData['email'] ?? null,
+                'phone' => $postData['mobile'] ?? null,
                 'client_code' => generate_client_code()
             ];
 
@@ -4844,6 +4845,8 @@ class ClientController extends AdminController
                 'client_type' => $postData['client_type'],
                 'client_name' => $postData['client_name'],
                 'short_name' => $postData['short_name'] ?? $postData['client_name'],
+                'email' => $postData['email'] ?? null,
+                'phone' => $postData['mobile'] ?? null,
                 'client_code' => generate_client_code(),
                 'entity_type_id' => 2
             ];
@@ -4958,8 +4961,9 @@ class ClientController extends AdminController
                 $client_data = [
                     'client_type' => $data['client_type'],
                     'client_name' => $data['client_name'],
-                    'email' => $data['short_name'] ?? $data['client_name'],
-                    'phone' => $data['mobile'],
+                    'short_name' => $postData['short_name'] ?? $data['client_name'],
+                    'email' => $data['email'] ?? null,
+                    'phone' => $data['mobile'] ?? null,
                     'client_code' => generate_client_code()
                 ];
 
@@ -4970,6 +4974,8 @@ class ClientController extends AdminController
                     'client_type' => $data['client_type'],
                     'client_name' => $data['client_name'],
                     'short_name' => $data['short_name'] ?? $data['client_name'],
+                    'email' => $data['email'] ?? null,
+                    'phone' => $data['mobile'] ?? null,
                     'client_code' => generate_client_code(),
                     'entity_type_id' => 2
                 ];
@@ -5890,10 +5896,11 @@ class ClientController extends AdminController
         // $response = $ticketServiceController->extractExcelData("claims_dump_form_client.xlsx");
         // dd($response);
 
-        // ---------- TICKET SERVICE CONTROLLER --------------------------------------------------------------------------------
+        // ---------- TICKET CONTROLLER --------------------------------------------------------------------------------
 
         $TicketController = new TicketController();
         // $response = $TicketController->getMoreInfo($requestFrom = 'rest', $ticket_id = 70);
+        // $response = $TicketController->sendAutoMailTrigger($ticket_id = 602);
         // dd($response);
 
         // ---------- EMP SERVICE CONTROLLER --------------------------------------------------------------------------------
diff --git a/app/Controllers/DeployController.php b/app/Controllers/DeployController.php
index de73092a..c763d9a3 100644
--- a/app/Controllers/DeployController.php
+++ b/app/Controllers/DeployController.php
@@ -176,7 +176,7 @@ class DeployController extends AdminController
     public function fedeploy()
     {
         $request = $this->request;
-
+        echo 'HI';die();
         // Single zip file: <input type="file" name="zip_file">
         $file = $request->getFile('zip_file');
 
@@ -186,7 +186,7 @@ class DeployController extends AdminController
                 'message' => 'No valid zip file uploaded',
             ]);
         }
-
+        echo 'cool';die();
         // Read scalar form values
         $zipFolder      = (string) $request->getPost('zip_folder') ?: 'web/';
         $s3Bucket       = (string) $request->getPost('s3_bucket') ?: '';
@@ -283,4 +283,10 @@ class DeployController extends AdminController
         $this->loadLayout('fedeploy');
     }
 
+    public function fetest()
+    {
+        echo 'Hello from DeployController fetest!';
+    
+    }
+
 }
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index ca24ec6b..39298198 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -2308,6 +2308,10 @@ class EmployeeController extends AdminController
         }
         $message  = isset($message) ? ($message . ' not defined for choosed policy') : null;
 
+        if ($policy_details['cd_ac_pk'] == null) {
+            $message  = isset($message) ?  ($message . ' The policy does not have a CD account number.') : null;
+        }
+
         return $this->respond(['dataStatus' => true, 'code' => 200, 'message' => $message, 'si_enhancement' => $si_enhancement_true_or_false, 'insurer_multi_event' => $insurer_details['is_multi_event'], 'tpa_api_service_status' => $tpa_api_service_status], 200);
         
     }
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 0c60223e..d80f9176 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2592,7 +2592,7 @@ class EmployeeRestController extends AdminController
             // print_r($ticketHistory); die;
 
             $currentClaimStatus = $this->claimStatusModel->select("claim_status")->where('id', $data['claims_data']['claim_status_id'])->where('is_active', 1)->first();
-            $ticketClaimStatus = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('is_active', 1)->findAll();
+            $ticketClaimStatus = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('ticket_type', $data['claims_data']['ticket_type_id'])->where('is_active', 1)->findAll();
             $status_list = array_column($ticketClaimStatus, 'display_name', 'claim_status');
             // print_r($currentClaimStatus); die;
 
@@ -2888,9 +2888,13 @@ class EmployeeRestController extends AdminController
         $clientId = $this->request->getGet('client_id');
 
         if (!empty($employeeSelfData) && isset($employeeSelfData->email_corporate)) {
-            $prePolicyCount = $this->getPreEmployeePolicyCount($empMobileNo, $clientId, $employeeSelfData->email_corporate);
+            $prePolicyCountData = $this->getPreEmployeePolicyCount($empMobileNo, $clientId, $employeeSelfData->email_corporate);
+            $prePolicyCount =  $prePolicyCountData['pre_policy_count'] ?? 0;
+            $empNotEnrolledCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
         } else {
-            $prePolicyCount = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
+            $prePolicyCountData = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
+            $prePolicyCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
+            $empNotEnrolledCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
         }
 
         $whereArrayForId = [];
@@ -2950,6 +2954,7 @@ class EmployeeRestController extends AdminController
                 $data['claims_grace_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['claims_grace_date']);
                 $data['policy_status'] = $policy_status_key;
                 $data['pre_policy_count'] = $prePolicyCount;
+                $data['emp_not_enrolled_count'] = $empNotEnrolledCount;
                 // $data['policy_terms'] = $terms;
 
                 // if($ClientPolicyValue['policy_type_id'] == 1){ $data['heading'] = 'Group Personal Accident Coverage'; }else
@@ -3020,13 +3025,12 @@ class EmployeeRestController extends AdminController
                     array_push($result, $data);
                 }
 
-
             }
 
             $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
             $emp_wellness_data = $this->getWellnessUrl($employeeSelfData->id ?? null);
 
-            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'emp_not_enrolled_count' => $empNotEnrolledCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);
         } else {
             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
         }
@@ -3711,6 +3715,7 @@ class EmployeeRestController extends AdminController
 
                 $claimData = [
                     'ticket_type_id'   => $data['policy_type_id'],
+                    'policy_transaction_id'   => $data['policy_transaction_id'],
                     'claim_status_id'  => 62,
                     'policy_no'        => $policy['policy_no'],
                     'client_policy_id' => $policy['client_policy_id'],
@@ -3731,7 +3736,26 @@ class EmployeeRestController extends AdminController
 
                 $ticket_id = $this->ticketMaster->insert($claimData);
 
-                if($ticket_id){
+                if ($ticket_id) {
+
+                    $mail_sent_status = ($this->ticketController->sendAutoMailTrigger($ticket_id));
+
+                    if (gettype($mail_sent_status) == 'array') {
+                        $message = 'Claim Iniated Successfully';
+                        return ['status' => true, 'code' => 200, 'message' => $message];
+                    } else {
+                        $mail_sent_status_object = json_decode($mail_sent_status);
+                    }
+
+                    if ($mail_sent_status_object->status == 'success') {
+                        $message = 'Claim Initiated Successfully';
+                        return ['status' => true, 'code' => 200, 'data' => $ticket_id, 'message' => $message];
+                    } else {
+                        $message = 'Claim Initiated, Failed to send Mail ';
+                        $this->myLogger->logme('error', "Claim initiated, Failed to send Mail :$ticket_id ");
+                        return ['status' => false, 'code' => 400, 'message' => $message];
+                    }
+
                     $message = 'Claim Initiated Successfully';
                     return ['status' => true, 'code' => 200, 'data' => $ticket_id, 'message' => $message];
                 }else{
@@ -3745,7 +3769,6 @@ class EmployeeRestController extends AdminController
         }else{
             $message = 'Claim Initiation failed';
             return ['status' => false, 'code' => 404, 'message' => $message];
-
         }
     }
 
@@ -3910,6 +3933,8 @@ class EmployeeRestController extends AdminController
         $emp_id = $this->request->getGet('emp_id');
         $ticket_type = $this->request->getGet('ticket_type') ?? null;
         $ticket_id = $this->request->getGet('ticket_id') ?? null;
+        $mobile_number = $this->request->getGet('mobile_number') ?? null;
+        $email_id = $this->request->getGet('email_id') ?? null;
         $request = \Config\Services::request();
         $uri = $request->uri->getPath();
         $returnType = "";
@@ -3920,6 +3945,11 @@ class EmployeeRestController extends AdminController
             return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'emp_id is required.'])->setStatusCode(404);
         }
 
+        $retail_ticket_data = [];
+        if(!empty($mobile_number) || !empty($email_id)){
+            $retail_ticket_data = $this->getRetailPolicyClaimData($this->request->getGet());
+        }
+
         $TicketMasterModel = new TicketMasterModel();
         $ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id);
 
@@ -3994,9 +4024,113 @@ class EmployeeRestController extends AdminController
             }
         }
 
+        $ticket_data = array_merge($ticket_data, $retail_ticket_data);
+
         return $this->response->setJSON(['ticket_data' => $ticket_data])->setStatusCode(200);
     }
 
+    public function getRetailPolicyClaimData($receviedPayload)
+    {   
+        try {
+            // Create minimal retail user object
+            $retailUserData = (object) [
+                'id'        => null,
+                'mobile'    => $receviedPayload['mobile_number'] ?? null,
+                'email_id'  => $receviedPayload['email_id'] ?? null
+            ];
+
+            // Get retail policies of user
+            $empRetailPolicyData = $this->getEmpRetailPolicy($retailUserData);
+
+            if (empty($empRetailPolicyData)) {
+                return [];
+            }
+
+            // Fetch ticket data for each policy
+            $retail_ticket_data = [];
+            foreach ($empRetailPolicyData as $policy) {
+                $tickets = $this->ticketMaster
+                    ->select("
+                        ticket_master.*,
+                        vehicle.vehicle_no,
+                        (
+                            SELECT th1.old_value
+                            FROM ticket_history th1
+                            JOIN ticket_claim_status tcs ON th1.old_value = tcs.id
+                            WHERE th1.field_name = 'claim_status_id'
+                            AND th1.ticket_id = ticket_master.id
+                            AND th1.id = (
+                                SELECT MAX(th2.id)
+                                FROM ticket_history th2
+                                WHERE th2.ticket_id = th1.ticket_id
+                                AND th2.field_name = 'claim_status_id'
+                            )
+                        ) AS old_status_id
+                    ")
+                    ->join("vehicle", "ticket_master.vehicle_id = vehicle.id", "left")
+                    ->where('ticket_master.is_active', 1)
+                    ->where('ticket_master.client_id', $policy['client_id'])
+                    ->where('ticket_master.policy_transaction_id', $policy['policy_transaction_id'])
+                    ->findAll();
+
+                if (!empty($tickets)) {
+                    $retail_ticket_data = array_merge($retail_ticket_data, $tickets);
+                }
+            }
+
+            if (empty($retail_ticket_data)) {
+                return [];
+            }
+
+            // Fetch grouped claim statuses
+            $client_claim_status = $this->getClaimStatusGrouped(); // Format expected: [status => [ids]]
+            $claim_type = $this->getClaimTypeMaster('internal');
+
+            // Convert claim type for quick access
+            $typeMap = array_column($claim_type, 'claim_type', 'id');
+
+            // Map status name to each ticket
+            foreach ($retail_ticket_data as &$ticket) {
+                $ticket['claim_status'] = null; // Default
+
+                $ticket['claim_type_name'] = $typeMap[$ticket['claim_type']] ?? null;
+                if($ticket['ticket_type_id'] == 8){
+                    $ticket['ticket_policy_type'] = 'Motor';
+                }
+                foreach ($client_claim_status as $status_name => $status_list) {
+                    if (in_array($ticket['claim_status_id'], $status_list)) {
+                        $ticket['claim_status'] = $status_name;
+                        break;
+                    }
+
+                    if (in_array($ticket['old_status_id'], $status_list)) {
+                        $ticket['claim_status'] = $status_name;
+                        break;
+                    }
+                }
+            }
+
+            return $retail_ticket_data;
+
+        }catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getRetailPolicyClaimData: Exception: " . json_encode($errorData ?? []));
+
+            return [];
+        }
+    }
+
     public function getClaimStatusGrouped()
     {
         // Fetch active claim statuses
@@ -4022,7 +4156,6 @@ class EmployeeRestController extends AdminController
         return $result;
     }
 
-
     // not in use did for testing
     function encrypt_for_sso(): string
     {
@@ -4230,17 +4363,12 @@ class EmployeeRestController extends AdminController
 
         try {
             $response = $this->callThirdPartyAPI($post_data, 'getPreEmployeePolicyCount');
-            log_message('error', 'STEP 6: API raw response: ' . $response);
+            log_message('error', 'STEP 6: API raw response: ' . json_encode($response ?? []));
 
-            $response = json_decode($response, true);
+            $response = json_decode($response ?? '{}', true);
 
-            if (json_last_error() !== JSON_ERROR_NONE) {
-                log_message('error', 'STEP 7: JSON decoding failed: ' . json_last_error_msg());
-                return 0;
-            }
-
-            $count = $response['data'] ?? 0;
-            log_message('error', 'STEP 8: Final count extracted: ' . $count);
+            $count = $response ?? [];
+            log_message('error', 'STEP 8: Final count extracted: ' . json_encode($count ?? []));
 
             return $count;
         } catch (\Throwable $e) {
@@ -4706,6 +4834,18 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status'  => 'failed','code' => 400,'message' => 'emp_id is required' ], 200);
             }
 
+            if(isset($payload['policy_end_date']) && !empty($payload['policy_end_date'])){
+                $payload['policy_end_date'] = change_date_format($payload['policy_end_date'], 'd M Y', 'Y-m-d');
+            }else{
+                 $payload['policy_end_date'] = null;
+            }
+
+            if(isset($payload['policy_start_date']) && !empty($payload['policy_start_date'])){
+                $payload['policy_start_date'] = change_date_format($payload['policy_start_date'], 'd M Y', 'Y-m-d');
+            }else{
+                 $payload['policy_start_date'] = null;
+            }
+
             if(empty($pk)){
                 $payload['created_by'] = $emp_id;
                 $emp_retail_policy_id = $this->employeeRetailPolicy->insert($payload);
@@ -4778,6 +4918,7 @@ class EmployeeRestController extends AdminController
                 $emp_retail_client_data = $this->clientModel
                     ->select("
                         '{$emp_id}' AS emp_id,
+                        clients.id as client_id,
                         clients.client_name as insurerd_name,
                         clients.email as insurerd_mail,
                         clients.phone as insurerd_mobile,
@@ -4810,6 +4951,7 @@ class EmployeeRestController extends AdminController
                 $emp_retail_client_data = $this->clientModel
                     ->select("
                         '{$emp_id}' AS emp_id,
+                        clients.id as client_id,
                         clients.client_name as insurerd_name,
                         clients.email as insurerd_mail,
                         clients.phone as insurerd_mobile,
@@ -4972,7 +5114,7 @@ class EmployeeRestController extends AdminController
         ], 200);
     }
 
-    public function getClaimTypeMaster()
+    public function getClaimTypeMaster($return_type = 'api')
     {
         $data = db_connect()->table('partner_claim_type_master')->select('id,claim_type')->where('is_active',1)->get()->getResultArray();
 
@@ -4980,7 +5122,11 @@ class EmployeeRestController extends AdminController
             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
         }
 
-        return $this->respond(['status' => 'success', 'code' => 200,  'data' => $data]);
+        if($return_type == 'api'){
+            return $this->respond(['status' => 'success', 'code' => 200,  'data' => $data]);
+        }else{
+            return $data;
+        }
     }
 
     public function uploadIRDocs()
@@ -5011,7 +5157,9 @@ class EmployeeRestController extends AdminController
                 "UPDATE ticket_master SET required_docs = ? WHERE id = ?",
                 [$required_docs, $ticket_id]
             );
-            return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files uploaded successfully'], 200);
+            $apiServiceController = new ApiServiceController();
+            $tpaIrFilePushResponce = $apiServiceController->pushClaimFiles($ticket_id);
+            return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files uploaded successfully', 'tpaIrFilePushResponce' => $tpaIrFilePushResponce], 200);
         }else{
             return $this->respond(['status' => false, 'code' => 400, 'message' => 'Failed to upload the file'], 200);
         }
diff --git a/app/Controllers/InsuranceCommissionController.php b/app/Controllers/InsuranceCommissionController.php
index f2907bf6..6f3f60ac 100644
--- a/app/Controllers/InsuranceCommissionController.php
+++ b/app/Controllers/InsuranceCommissionController.php
@@ -10,6 +10,7 @@ class InsuranceCommissionController extends AdminController
     use ResponseTrait;
 
     private $rules = [];
+    private $myLogger;
 
     public function __construct()
     {
@@ -66,7 +67,7 @@ class InsuranceCommissionController extends AdminController
         $folderName = $month . $year;                 // SEP2025
 
         $insurerId  = $input['insurer_id'];           // 5
-        $department = ucfirst(strtolower($input['department'])); // Motor, Health, Fire
+        $department = (strtolower($input['department'])); // Motor, Health, Fire
 
         // Final Path: WRITEPATH/rules/SEP2025/5_Motor.json
         $rulesPath = WRITEPATH . "uploads/commission/rules/{$folderName}/{$insurerId}_{$department}.json";
@@ -183,6 +184,8 @@ class InsuranceCommissionController extends AdminController
 
     private function compareValues($actual, string $operator, $expected): bool
     {
+        $actual = strtolower($actual);
+        $expected = strtolower($expected);
         switch ($operator) {
             case '==':
                 return $actual == $expected;
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 2708abc4..66798ee5 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -837,6 +837,7 @@
                 ->where('user_teams.team_id', 5)
                 ->where('user_teams.is_active', 1)
                 ->where('user_profiles.is_active', 1)
+                ->groupBy('user_profiles.id', 'asc')
                 ->findAll();
 
             // Fetch Partner Agent
@@ -858,6 +859,7 @@
                     ->join('user_profiles AS rm', 'user_profiles.rm_id = rm.id', 'left')
                     ->where('user_profiles.role', 3)  
                     ->where('user_profiles.is_active', 1)
+                    ->groupBy('user_profiles.id', 'asc')
                     ->findAll();
 
                 // echo '<pre>';
@@ -2078,6 +2080,100 @@
             $this->loadLayout('policy_transaction_endorsement_list', $data);
         }
 
+        public function viewEndorsement2()
+        {
+            // echo '<pre>';
+            // !dd($this->getEndorsementDataForEdit(17));
+            $bds_edit_pt_id = $this->request->getGet('pt_id') ?? null;
+            $data['tab_name'] = 'Endorsements';
+            $data['page_name'] = 'Endorsements';
+            $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
+            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
+            $data['client_type'] = [1 => 'Group', 2 => 'Individual'];
+
+            $data['policy_status'] = [
+                'under_process' => 'Under Process',
+                'client_pending' => 'Client Pending',
+                'insurer_pending' => 'Insurer Pending',
+                'co_insurer_pending' => 'Co-Insurer Pending',
+                'tpa_pending' => 'TPA Pending',
+                'validated' => 'Validated',
+                'cancelled' => 'Cancelled',
+                'instalment_pending' => 'Instalment Pending',
+                'completed' => 'Completed',
+            ];
+
+            $data['invoice_status'] = [
+                'yet_to_generate' => 'Pending',
+                'generated' => 'Generated',
+                'send' => 'Sent',
+                'recived' => 'Payment Received',
+            ];
+
+            $data['action_type'] = [
+                'addition' => 'Addition',
+                'deletion' => 'Deletion',
+                'addition_deletion' => 'Addition & Deletion',
+                'si_enhancement' => 'SI Enhancement',
+                'combo_a_d_si' => 'Combo A, D & SI',
+                'correction' => 'Correction',
+                'baby_addition' => 'Baby Addition',
+                'policy_instalment' => 'Policy Instalment',
+                'addition_inception' => 'Addition-Inception',
+                'bds_correction' => 'BDS Correction',
+                'policy_correction' => 'Policy Correction',
+                'policy_cancellation' => 'Policy Cancellation',
+            ];
+
+            $data['date_type'] = [
+                'policy_issue_date' => 'Policy Issue Date',
+                'policy_start_date' => 'Policy Start Date',
+                'policy_end_date' => 'Policy End Date',
+            ];
+
+            //filter datas
+            $start_date = $this->request->getGet('start_date');
+            $end_date = $this->request->getGet('end_date');
+            $client_id = $this->request->getGet('client_id');
+            $insurer_id = $this->request->getGet('insurer_id');
+            $policy_type_id = $this->request->getGet('policy_type_id');
+            $date_type = $this->request->getGet('date_type');
+            $issuer = $this->request->getGet('issuer');
+            $status = $this->request->getGet('status');
+
+            $start_date = (!isset($start_date) || $start_date === '' || $start_date === null) ? 0 : $start_date;
+            $end_date = (!isset($end_date) || $end_date === '' || $end_date === null) ? 0 : $end_date;
+
+            $client_id = (!isset($client_id) || $client_id === '' || $client_id === null) ? 0 : $client_id;
+            $insurer_id = (!isset($insurer_id) || $insurer_id === '' || $insurer_id === null) ? 0 : $insurer_id;
+            $policy_type_id = (!isset($policy_type_id) || $policy_type_id === '' || $policy_type_id === null) ? 0 : $policy_type_id;
+            $date_type = (!isset($date_type) || $date_type === '' || $date_type === null) ? 0 : $date_type;
+            $issuer = (!isset($issuer) || $issuer === '' || $issuer === null) ? 0 : $issuer;
+            $status = (!isset($issuer) || $status === '' || $status === null) ? 0 : $status;
+
+            if($bds_edit_pt_id == null){
+                $data['endorsement_data_list'] = $this->policyTransactionModel->getEndorsementTranctionListData($start_date, $end_date, $client_id, $insurer_id, $policy_type_id, $date_type, $issuer, $status);
+            }else{
+                $data['endorsement_data_list'] = [];
+            }
+            $data['client'] = $this->clientModel->where('is_active', 1)->findAll();
+            $data['policy_types'] = $this->policyTypeModel->where('is_active', 1)->findAll();
+
+            $data['insurer'] = $this->insurerModel->where('is_active', 1)->findAll();
+            // $data['tpa']           = $this->tpaModel->where('is_active', 1)->findAll();
+            $data['insurer_branch']      = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
+            $data['tpa']           = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
+            list($policyList, $policyListByClient) = $this->getPolicyForEndorsment();
+
+            $data['endorsementPolicies'] = $policyList;
+            $data['endorsementPolicyListByClient'] = $policyListByClient;
+
+            // dd($data);
+            // print_r($data['endorsementPolicies']);die();
+
+            $this->loadLayout('policy_transaction_endorsement_list_2', $data);
+        }
+
         public function createEndorsementPolicy()
         {
             $id = $this->request->getPost('id');
@@ -2214,7 +2310,12 @@
                     'listed_insurers' => $issue_type['listed_insurers'] ?? null,
                     'ppteam' => $issue_type['ppteam'] ?? null,
                     'sales_generated_by' => $issue_type['sales_generated_by'] ?? null,
-                    'serviced_by' => $issue_type['serviced_by'] ?? null
+                    'serviced_by' => $issue_type['serviced_by'] ?? null,
+                    'salse_person_manager_id' => $issue_type['salse_person_manager_id'] ?? null,
+                    'service_person_manager_id' => $issue_type['service_person_manager_id'] ?? null,
+                    'service_person_branch_id' => $issue_type['service_person_branch_id'] ?? null,
+                    'agent_id' => $issue_type['agent_id'] ?? null,
+                    'agent_code' => $issue_type['agent_code'] ?? null,
                 ];
 
                 $data['client_branch_id'] = $client_branch_id;
@@ -2515,6 +2616,220 @@
             }
         }
 
+        public function getEndorsementDataForEdit2($id)
+        {
+            $data = $this->policyTransactionModel
+                ->select('
+                            policy_transaction.*, 
+                            clients.short_name as client_short_name, 
+                            clients.client_type, 
+                            ( 
+                                select last_action_date
+                                from policy_transaction_status
+                                where policy_tran_id = policy_transaction.id
+                                and status = policy_transaction.status
+                                order by id desc
+                                limit 1
+
+                            ) 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)
+                ->orderBy('id', 'asc')
+                ->first();
+
+            $pt_id = null;   
+
+            if(!empty($data)){
+                $inception_data = $this->policyTransactionModel
+                        ->where('policy_no', $data['policy_no'])
+                        ->where('client_id', $data['client_id'])
+                        ->where('action_type', 'inception')
+                        ->first();
+                $pt_id = $inception_data['id'];
+            }    
+
+            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'])) {
+                $data['policy_end_date'] =  change_date_format($data['policy_end_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            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'])) {
+                $data['policy_issue_date'] =  change_date_format($data['policy_issue_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            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'])) {
+                $data['install_due_date'] =  change_date_format($data['install_due_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            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'])) {
+                $data['month'] =  change_date_format($data['month'], 'Y-m-d', 'M/Y');
+            }
+
+            // print_r($data); die;
+
+            //get PT Co-Share Details
+            $data['pt_co_share_details'] = $this->PTCOShareDetailsModel
+
+                ->select("
+                            pt_co_share_details.*,
+                    
+                            (
+                                SELECT
+                                    COUNT(*)
+                                FROM
+                                    co_share_stmt_details
+                                WHERE
+                                    co_share_stmt_details.co_share_id = pt_co_share_details.id
+                                    AND co_share_stmt_details.is_active = 1
+                            ) AS record_count,
+        
+                                (
+                                    SELECT 
+                                        SUM(actual_bp_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_bp_amount,
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tp_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tp_amount,
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tep_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tep_amount,
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_bp_per) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_bp_percentage,
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tp_per) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tp_percentage,
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tep_per) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tep_percentage,
+                                
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_bp_brokerage_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_bp_brokerage_amount,
+                                
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tp_brokerage_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tp_brokerage_amount,
+                                
+                                
+                                (
+                                    SELECT 
+                                        SUM(actual_tep_brokerage_amt) 
+                                    FROM 
+                                        co_share_stmt_details 
+                                    WHERE 
+                                        co_share_id = pt_co_share_details.id 
+                                        AND is_active = 1
+                                        
+                                ) AS actual_tep_brokerage_amount, 
+                                 
+                                DATE_FORMAT(pt_policy_issue_date, '%d/%m/%Y') AS pt_policy_issue_date
+        
+                        ")
+                ->where('pt_id', $id)
+                ->where('is_active', 1)
+                ->orderBy('id', 'asc')
+                ->findAll();
+
+            // print_r($data['endorse_eff_date']); die;
+
+            $pt_bp_amt = $this->PTCOShareDetailsModel
+                ->select('bp_amt, amount')
+                ->where('pt_id', $id)
+                ->where('co_share_type', 1)
+                ->where('is_active', 1)
+                ->first();
+
+            // dd(db_connect()->getLastQuery() ,$pt_bp_amt);
+            $data['base_cd_amount'] = $pt_bp_amt['amount'] ?? null;
+
+            if ($data) {
+                return $this->respond(['status' => true, 'data' => $data, 'pt_id' => $pt_id], 200);
+            } else {
+                return $this->respond(['status' => false], 200);
+            }
+        }
+
         //------------------------------------------------------------------------------------------------
 
         //file upload function 
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index e2ba20fe..ac104bf3 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -910,7 +910,7 @@ class TicketController extends BaseController
         $data['ticket_history'] =  $this->ticketHistory($ticket_id);
         $data['ticket_check_list'] =  db_connect()->table('ticket_check_list')->where('is_active', 1)->where('ticket_type_id', $ticket_data['ticket_type_id'])->get()->getResultArray();
         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'];
+            $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'] ?? "N/A";
         }
         // dd($data);
         $data['ticket_data'] = $ticket_data;
diff --git a/app/Filters/CommissionApiFilter.php b/app/Filters/CommissionApiFilter.php
index d7ae956e..f68e62cd 100644
--- a/app/Filters/CommissionApiFilter.php
+++ b/app/Filters/CommissionApiFilter.php
@@ -10,7 +10,7 @@ class CommissionApiFilter implements FilterInterface
 {
     public function before(RequestInterface $request, $arguments = null)
     {
-        
+        return null;
         // Read API key from header
        // $authHeader = $request->getHeaderLine('X');
         $authHeader = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 0236b837..a44286a9 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -91,6 +91,7 @@ class TicketMasterModel extends Model
         'hospital_phone_no',
         'claim_description',
         'required_docs',
+        'policy_transaction_id',
     ];
 
 
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index ff3770a1..e83cc7d7 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -40,6 +40,8 @@ table.dataTable thead th {
                     <thead class="bg-light">
                         <tr>
                             <th class="font-weight-medium"><div class="column-header">Advertisement Image Name</div></th>
+                            <th class="font-weight-medium"><div class="column-header">Client Name</div></th>
+                            <th class="font-weight-medium"><div class="column-header">Client Short Name</div></th>
                             <th class="font-weight-medium"><div class="column-header">Status</div></th>
                             <th class="font-weight-medium"><div class="column-header">Action</div></th>
                         </tr>
@@ -49,19 +51,18 @@ table.dataTable thead th {
                      <?php foreach($addImageList as $row){ ?>
                         <tr >
                             <td class="client_info" data-id="<?php echo $row['id']; ?>"><?php echo $row['name']; ?></td>
+                            <td class="client_info" ><?php echo $row['client_name']; ?></td>
+                            <td class="client_info" ><?php echo $row['short_name']; ?></td>
+                            <td class="client_info" ><?php echo $row['status']; ?></td>
                             <td>
-                            <?php echo $row['is_active']; ?>
-                            </td>
-                            <td>
-                                <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a class="dropdown-item advertise_image_edit" href="#" data-toggle="modal" data-id="<?php echo $row['id']; ?>" data-name="<?php echo $row['name']; ?>" data-target="#bike_make_login-modal"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                                        <a class="dropdown-item" data-id="<?= $row['id'];?>" onclick="removeClient(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                                    <div class="btn-group dropdown">
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item advertise_image_edit" href="#" data-toggle="modal" data-wholearray='<?php echo json_encode($row, JSON_HEX_APOS); ?>' data-target="#bike_make_login-modal"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                            <a class="dropdown-item" onclick="remove_advertise_image('<?= $row['id'];?>')"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                                        </div>
                                     </div>
-                                </div>
                             </td>
-
                         </tr>
 
                         <?php } ?>
@@ -88,6 +89,7 @@ table.dataTable thead th {
                 <form id="model_form_data" class="px-4" enctype="multipart/form-data">
                     <input type="hidden" name="add_image_id" id="add_image_id" value="0">
 
+                    <!-- old
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
@@ -100,8 +102,63 @@ table.dataTable thead th {
                              <div class="form-group col-md-6 float-left" style="position: relative;top: 0px;">
                                 <img src=" " width="100" height="100" id="uploadPreview" class="avatar img-circle img-thumbnail" alt="avatar"/>
                             </div>
+                            <div class="form-group col-md-3">
+                                    <label for="client_branch">Client<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_id" name="client_id" required>
+                                            <option value="">Select Client</option>
+                                            <?php
+                                                if (isset($client) && count($client)) {
+                                                    foreach ($client as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                                    }
+                                                }
+                                            ?>
+                                    </select>
+                            </div>
                         </div>
                     </div>
+                    -->
+
+                    <div class="row mb-2 align-items-stretch">
+                        <!-- Left column: col-8 -->
+                        <div class="col-md-8 d-flex flex-column justify-content-between">
+                            <!-- Top section -->
+                            <div class="form-group">
+                                <label for="branchname">Upload Image</label>
+                                <div class="input-icon">
+                                    <input type="file" class="form-control" name="advertise_image" id="advertise_image" accept="image/*" onchange="PreviewImage();" required>
+                                    <i class="mdi mdi-upload additional-icon"></i>
+                                </div>
+                            </div>
+
+                            <!-- Bottom section -->
+                            <div class="form-group">
+                                <label for="client_branch">Client <span class="text-danger">*</span></label>
+                                <select class="form-control" id="client_id" name="client_id" required>
+                                    <option value="">Select Client</option>
+                                    <?php
+                                        if (isset($client) && count($client)) {
+                                            foreach ($client as $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <!-- Right column: col-4, preview image -->
+                        <div class="col-md-4 d-flex flex-column align-items-center justify-content-center">
+                            <img src="" class="avatar img-circle img-thumbnail" id="uploadPreview" alt="Preview" style="max-width: 100%; height: auto;">
+
+                            <small style="font-size: x-small; margin-top: 5px; text-align: center;">
+                                dimensions - 1640x664 pixels <br> size - 200kb
+                            </small>
+                        </div>
+
+                    </div>
+
+
                     
                     <div class="form-group text-center">
                         <button type="button" class="btn btn-primary" onclick="submitBranch()">Submit</button>
@@ -116,158 +173,192 @@ table.dataTable thead th {
 <script>
 
 
-    function submitBranch() {
-        const fileInput = $('#advertise_image')[0].files[0]; // get actual file object
-        const imageId = $('#add_image_id').val();
+        function submitBranch() {
+            const fileInput = $('#advertise_image')[0].files[0]; // get actual file object
+            const imageId = $('#add_image_id').val();
+            const clientId = $('#client_id').val();
+            
 
-        if (!fileInput) {
-            toastr.warning('Please upload an image before submitting', 'Warning');
-            $('#advertise_image').focus();
-            return;
+            if (!fileInput) {
+                toastr.warning('Please upload an image before submitting', 'Warning');
+                $('#advertise_image').focus();
+                return;
+            }
+
+            if(!clientId){
+                toastr.warning('Please Select Client.', 'Warning');
+                $('#client_id').focus();
+                return;
+            }
+
+            var url = '<?= base_url("add_advertise_image") ?>';
+            var formData = new FormData();
+            formData.append('advertise_image', fileInput);
+            formData.append('add_image_id', imageId);
+            formData.append('client_id', clientId);
+
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: formData,
+                processData: false,
+                contentType: false,
+                dataType: 'json',
+                success: function(response) {
+                    console.log(response);
+                    if (response.status) {
+                        $('#bike_make_login-modal').modal('hide');
+                        $('#advertise_image').val('');
+                        $('#client_id').val('');
+                        $('#uploadPreview').attr('src', '<?= base_url('public/assets/images/avatar_2x.png') ?>');
+                        toastr.success('Image uploaded successfully!');
+                        window.location.reload();
+                    } else {
+                        toastr.error(response.message || 'Something went wrong.');
+                    }
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error('Status:', status);
+                    console.error('Error:', error);
+
+                    let msg = 'Something went wrong. Please try again later.';
+
+                    switch (xhr.status) {
+                        case 400:
+                            msg = xhr.responseJSON?.message || 'Bad Request — Invalid input.';
+                            break;
+                        case 401:
+                            msg = 'Unauthorized — Please log in again.';
+                            break;
+                        case 403:
+                            msg = 'Forbidden — You do not have permission.';
+                            break;
+                        case 404:
+                            msg = 'Not Found — Requested URL or resource not found.';
+                            break;
+                        case 500:
+                            console.log('Internal Server Error — Please contact support.');
+                            msg = xhr.responseJSON?.message || xhr.responseText || msg;
+                            break;
+                        default:
+                            msg = xhr.responseJSON?.message || xhr.responseText || msg;
+                    }
+                    
+                }
+            });
         }
 
-        var url = '<?= base_url("add_advertise_image") ?>';
-        var formData = new FormData();
-        formData.append('advertise_image', fileInput);
-        formData.append('add_image_id', imageId);
+
+        
+        function PreviewImage() {
+            console.log('function called');
+            var fileInput = document.getElementById("advertise_image");
+            var file = fileInput.files[0];
+
+            if (file) {
+                var allowedExtensions = ["jpg", "jpeg", "png"];
+                var fileExtension = file.name.split('.').pop().toLowerCase();
+
+                if (!allowedExtensions.includes(fileExtension) || file.size > 200 * 1024) {
+                    toastr.warning('Maximum file size allowed is 200KB.', 'File size exceeds limit.');
+                    fileInput.value = ""; // Clear the file input
+                    document.getElementById("uploadPreview").src = "<?= base_url()."public/assets/images/avatar_2x.png" ?>"; // Remove the preview image
+                    return;
+                }
+
+                var reader = new FileReader();
+                reader.readAsDataURL(file);
+
+                reader.onload = function (event) {
+                    var img = new Image();
+                    img.src = event.target.result;
+
+                    img.onload = function () {
+                        if (img.width !== 1640 || img.height !== 664) {
+                            toastr.warning('Image dimensions must be 1640x664 pixels.', 'Invalid image dimensions.');
+                            
+                            fileInput.value = ""; // Clear the file input
+                            document.getElementById("uploadPreview").src = "<?= base_url()."public/assets/images/avatar_2x.png" ?>"; // Remove the preview image
+                        } else {
+                            document.getElementById("uploadPreview").src = img.src;
+                        }
+                    };
+                };
+            }
+        }
+
+
+    var table;
+
+    $(document).ready(function() {
+        $('#add_image_id').val('');
+        $('#client_id').val('');
+        $('#client_id').select2();
+        $('#advertise_image').val('');
+        table = $('#tickets-table').DataTable({
+            // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right
+            //      "<'row'<'col-sm-12'tr>>" +
+            //      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+            dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+            lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
+            buttons: [
+                {
+                    text: '<i class="mdi mdi-plus"></i> <span class="btn-custom">Add</span>',
+                    className: 'btn app-btn-primary',
+                    action: function (e, dt, node, config) {
+                        // ✅ Call your modal logic
+                        callmodal();
+                    }
+                }
+            ],
+            language: {
+                    search: `
+                    <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
+                        <i class="mdi mdi-close-circle datatable-clear-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i>
+                    </div>`,
+                    searchPlaceholder: "Search",
+                    emptyTable: '<div class="text-center text-muted">No Data found</div>'
+            },
+            paging: true
+        });
+    });
+
+    // ✅ Define your modal function separately
+    function callmodal() {
+        $('#add_image_id').val(0);
+        $('#advertise_add_edit').html('Add Advertise Image');
+        $('#uploadPreview').attr('src', '<?= base_url()."public/assets/images/avatar_2x.png" ?>');
+        $('#bike_model_login-modal').modal('show'); // ✅ this shows the modal
+        var myModal = new bootstrap.Modal(document.getElementById('bike_make_login-modal'));
+        myModal.show();
+    }
+
+
+    function remove_advertise_image(id) {
+        if (!confirm("Are you sure you want to delete this image?")) return;
 
         $.ajax({
             type: 'POST',
-            url: url,
-            data: formData,
-            processData: false,
-            contentType: false,
-            dataType: 'json',
-            success: function(response) {
-                console.log(response);
-                if (response.status) {
-                    $('#bike_make_login-modal').modal('hide');
-                    $('#advertise_image').val('');
-                    $('#uploadPreview').attr('src', '<?= base_url('public/assets/images/avatar_2x.png') ?>');
-                    toastr.success('Image uploaded successfully!');
-                    window.location.reload();
-                } else {
-                    toastr.error(response.message || 'Something went wrong.');
-                }
+            url: '<?= base_url("remove_advertise_image"); ?>',
+            data: { add_image_id: id },
+            success: function (response) {
+                toastr.success('Deleted successfully');
+                location.reload(); // refresh page
             },
-            error: function(xhr, status, error) {
+            error: function (xhr) {
                 console.error(xhr.responseText);
-                console.error('Status:', status);
-                console.error('Error:', error);
-
-                let msg = 'Something went wrong. Please try again later.';
-
-                switch (xhr.status) {
-                    case 400:
-                        msg = xhr.responseJSON?.message || 'Bad Request — Invalid input.';
-                        break;
-                    case 401:
-                        msg = 'Unauthorized — Please log in again.';
-                        break;
-                    case 403:
-                        msg = 'Forbidden — You do not have permission.';
-                        break;
-                    case 404:
-                        msg = 'Not Found — Requested URL or resource not found.';
-                        break;
-                    case 500:
-                        console.log('Internal Server Error — Please contact support.');
-                        msg = xhr.responseJSON?.message || xhr.responseText || msg;
-                        break;
-                    default:
-                        msg = xhr.responseJSON?.message || xhr.responseText || msg;
-                }
-                
             }
         });
     }
 
 
-    
-    function PreviewImage() {
-        console.log('function called');
-        var fileInput = document.getElementById("advertise_image");
-        var file = fileInput.files[0];
-
-        if (file) {
-            var allowedExtensions = ["jpg", "jpeg", "png"];
-            var fileExtension = file.name.split('.').pop().toLowerCase();
-
-            if (!allowedExtensions.includes(fileExtension) || file.size > 200 * 1024) {
-                toastr.warning('Maximum file size allowed is 200KB.', 'File size exceeds limit.');
-                fileInput.value = ""; // Clear the file input
-                document.getElementById("uploadPreview").src = "<?= base_url()."public/assets/images/avatar_2x.png" ?>"; // Remove the preview image
-                return;
-            }
-
-            var reader = new FileReader();
-            reader.readAsDataURL(file);
-
-            reader.onload = function (event) {
-                var img = new Image();
-                img.src = event.target.result;
-
-                img.onload = function () {
-                    if (img.width !== 1640 || img.height !== 664) {
-                        toastr.warning('Image dimensions must be 1640x664 pixels.', 'Invalid image dimensions.');
-                        fileInput.value = ""; // Clear the file input
-                        document.getElementById("uploadPreview").src = "<?= base_url()."public/assets/images/avatar_2x.png" ?>"; // Remove the preview image
-                    } else {
-                        document.getElementById("uploadPreview").src = img.src;
-                    }
-                };
-            };
-        }
-    }
-
-
-var table;
-
-$(document).ready(function() {
-    table = $('#tickets-table').DataTable({
-        // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right
-        //      "<'row'<'col-sm-12'tr>>" +
-        //      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-        dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
-             "<'row'<'col-sm-12'tr>>" +
-             "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
-        lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
-        buttons: [
-            {
-                text: '<i class="mdi mdi-plus"></i> <span class="btn-custom">Add</span>',
-                className: 'btn app-btn-primary',
-                action: function (e, dt, node, config) {
-                    // ✅ Call your modal logic
-                    callmodal();
-                }
-            }
-        ],
-        language: {
-                search: `
-                <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
-                    _INPUT_
-                    <i class="mdi mdi-magnify datatable-search-icon" 
-                    style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
-                    <i class="mdi mdi-close-circle datatable-clear-icon" 
-                    style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i>
-                </div>`,
-                searchPlaceholder: "Search",
-                emptyTable: '<div class="text-center text-muted">No Data found</div>'
-        },
-        paging: true
-    });
-});
-
-// ✅ Define your modal function separately
-function callmodal() {
-    $('#add_image_id').val(0);
-    $('#advertise_add_edit').html('Add Advertise Image');
-    $('#uploadPreview').attr('src', '<?= base_url()."public/assets/images/avatar_2x.png" ?>');
-    $('#bike_model_login-modal').modal('show'); // ✅ this shows the modal
-    var myModal = new bootstrap.Modal(document.getElementById('bike_make_login-modal'));
-    myModal.show();
-}
-
     // $('#btnAdd').click(function () {
     //     $('#add_image_id').val(0);
     //     $('#advertise_add_edit').html('Add Advertise Image');
@@ -299,28 +390,51 @@ function callmodal() {
     //     })
     // })
     $(document).on('click', '.advertise_image_edit', function (e) {
-    e.preventDefault();
+        e.preventDefault();
+        
+        // 1. Clear fields first for a clean state (Good practice)
+        $('#add_image_id').val('');
+        $('#client_id').val('');
+        $('#advertise_image').val('');
+        // Reset preview to default before processing to avoid flicker/old image
+        $('#uploadPreview').attr('src', '<?= base_url("public/assets/images/avatar_2x.png") ?>');
+
+        let wholearray = JSON.parse($(this).attr('data-wholearray'));
+        let ad_name = wholearray.name;
+        let ad_id = wholearray.id;
+        let c_id = wholearray.client_id; // This holds the Client ID for the dropdown
+
+        console.log('Whole array:', wholearray);
+        console.log('Clicked ID:', c_id);
+
+        // 2. Set the data fields and title
+        $('#add_image_id').val(ad_id);
+        $('#advertise_add_edit').html('Edit Advertise Image');
+        
+        // 🎯 CRITICAL FIX: Set the value of the Client SELECT dropdown
+        // This pre-selects the client associated with the image.
+        $('#client_id').val(c_id); 
 
 
-    const id = $(this).data('id');
-    const name = $(this).data('name');
-    console.log('Clicked ID:', id);
-    console.log('<?= base_url(); ?>');
+        // 3. Construct the image URL
+        // NOTE: If this path fails (404/403), revert to the previous controller path:
+        const imgUrl = '<?= base_url("showAdvertiseImage/"); ?>' + ad_name;
+        // const imgUrl = '<?= base_url("writable/uploads/advertiseImage/"); ?>' + ad_name;
 
-    $('#add_image_id').val(id);
-    $('#advertise_image').val(name);
-    $('#advertise_add_edit').html('Edit Advertise Image');
-    const imgUrl = '<?= base_url("showAdvertiseImage/"); ?>' + name;
 
-    $('#uploadPreview').attr('src', imgUrl)
-                .on('error', function() {
-                    $(this).attr('src', '<?= base_url()."public/assets/images/avatar_2x.png" ?>');
+        // 4. Set the image source AND add robust error handling for default image
+        $('#uploadPreview').attr('src', imgUrl).on('error', function() {
+            // Fallback: If the image fails to load, set the source to the default image.
+            $(this).attr('src', '<?= base_url("public/assets/images/avatar_2x.png") ?>');
+        });
+
+        // 5. Clear the file input
+        $('#advertise_image').val('');
+        
+        // 6. Show the modal
+        var myModal = new bootstrap.Modal(document.getElementById('bike_make_login-modal'));
+        myModal.show();
     });
 
 
-
-    
-});
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index c4873dda..16bb337a 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -20,12 +20,12 @@ table.dataTable tbody td {
 
 <div class="col-12" id="inception_list">    
         <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
+            <div class="card-body" style="background-color: #F5FFFF !important; border-radius: 10px; box-shadow: 4px 4px 4px 4px #00000040;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Renewal Policy List</h4>
                     </div>
-                </div>
+                </div> -->
                 <div>
                     <div class="table-responsive">
                         <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 68950c44..eb8bfea0 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -2047,6 +2047,12 @@
                                                     <span> Policy 2</span>
                                                 </a>
                                             </li>
+                                            <li>
+                                                <a href="<?= base_url('/policy_tranction/endorsement/list2') ?>">
+                                                    <i class="ri-file-edit-line"></i>
+                                                    <span> Endorsement 2</span>
+                                                </a>
+                                            </li>
                                     <?php } ?>
                                 </ul>
                             </div>
diff --git a/app/Views/policy_transaction_endorsement_form_2.php b/app/Views/policy_transaction_endorsement_form_2.php
new file mode 100644
index 00000000..94180c52
--- /dev/null
+++ b/app/Views/policy_transaction_endorsement_form_2.php
@@ -0,0 +1,2995 @@
+<style>
+    .co_share_table {
+        width: 39% !important;
+        /* margin-bottom: 1rem;
+        color: #212529; */
+    }
+
+    #insurerCardContainer {
+        /* max-height: 400px;  */
+        overflow-y: auto;
+        margin-top: 20px;
+        /* overflow-x: auto; */
+        position: relative;
+    }
+
+</style>
+
+<style>
+    .readonly-color {
+        background-color: #e0e0e0; /* Darker background */
+        color: #666; /* Darker text color */
+    }
+    .readonly-select {
+        pointer-events: none;
+        /* background-color: #f0f0f0;  */
+        background-color: #e0e0e0;
+        color: #666; 
+    }
+
+    .select2-hidden-accessible + .select2-container .select2-dropdown {
+        display: none !important;
+    }
+
+    .select2-container .select2-selection--multiple .select2-selection__choice {
+        color: #000000;
+    }
+
+    .right-align-input {
+        text-align: right;
+    }
+
+    .input-with-percentage {
+        position: relative;
+    }
+
+    .input-with-percentage input {
+        padding-right: 20px; 
+        text-align: right;   
+    }
+
+    .input-with-percentage::after {
+        content: '%';       
+        position: absolute;
+        right: 10px;       
+        top: 50%;
+        transform: translateY(-50%);
+        font-weight: bold;
+        color: #000;
+    }
+
+</style>
+<style>
+.insurer-card .compact-details-section .small {  font-size: 75%;  }
+.insurer-card .compact-details-section .form-control { width: 100%; }
+.insurer-card .compact-details-section .col-md-5 .col-6 label { margin-bottom: 0.2rem; }
+.insurer-card .input-wrap { display: flex; align-items: center; }
+.insurer-card .input-content { flex-grow: 1; padding-right: 1.8rem !important; /* Create space inside the input for the symbol */ }
+.insurer-card .input-symbol { 
+    margin-left: -1.5rem; /* Position the symbol over the padding space */
+    pointer-events: none; /* Prevents symbol from interfering with input clicks */
+    font-weight: bold; 
+    color: #6c757d; /* Optional: Make symbol slightly less prominent */
+}
+
+.readonly-select { background-color: #f3f3f3; cursor: not-allowed; }
+
+.readonly-select:focus {
+    outline: none;
+}
+
+.readonly-select[readonly] {
+    pointer-events: none;
+}
+
+
+</style>
+
+<style>
+    .vehicle-input-wrapper {
+        position: relative;
+    }
+
+    .vehicle-otp-container {
+        display: flex;
+        gap: 3px;
+        flex-wrap: wrap;
+    }
+
+    .vehicle-otp-box {
+        width: 34px;
+        height: 38px;
+        text-align: center;
+        font-size: 16px;
+        font-weight: 100;
+        font-family: 'Courier New', monospace;
+        border: 2px solid #ced4da;
+        border-radius: 6px;
+        text-transform: uppercase;
+        transition: all 0.2s ease;
+    }
+
+    .vehicle-otp-box:focus {
+        outline: none;
+        border-color: #007bff;
+        box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+    }
+
+    .vehicle-otp-box.filled {
+        background-color: #e7f3ff;
+        border-color: #007bff;
+    }
+
+    .vehicle-otp-box.parsley-error {
+        border-color: #dc3545;
+        background-color: #f8d7da;
+    }
+
+    .vehicle-format-info {
+        font-size: 11px;
+        color: #6c757d;
+        margin-top: 5px;
+    }
+
+    .vehicle-result {
+        margin-top: 8px;
+        /* padding: 6px 10px; */
+        background: #f8f9fa;
+        border-radius: 4px;
+        font-family: 'Courier New', monospace;
+        font-size: 13px;
+        font-weight: 600;
+        text-align: center;
+        letter-spacing: 1px;
+        display: none;
+        /* max-width: fit-content; */
+        margin-left: auto;
+        margin-right: auto;
+    }
+
+    .vehicle-result.show {
+        display: block;
+    }
+
+    .vehicle-badge {
+        display: inline-block;
+        padding: 2px 6px;
+        border-radius: 3px;
+        font-size: 10px;
+        font-weight: 700;
+        margin-left: 5px;
+    }
+
+    .vehicle-badge.success {
+        background: #d4edda;
+        color: #155724;
+    }
+
+    .vehicle-badge.error {
+        background: #f8d7da;
+        color: #721c24;
+    }
+
+    /* Parsley error styling */
+    .parsley-errors-list {
+        list-style: none;
+        padding: 0;
+        margin: 5px 0 0 0;
+    }
+
+    .parsley-errors-list li {
+        color: #dc3545;
+        font-size: 12px;
+    }
+</style>
+
+<div class="row" id="endorsement_form" style="display: none;">
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" style="margin-bottom:1rem;">
+                    <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Add Endorsement</h4>
+                    </div>
+                    <div class="col-6" style="text-align: right;">
+                        <a href="<?= base_url('policy_tranction/endorsement/list2') ?>" id="btnAdd" class="btn btn-primary waves-effect waves-light"
+                            >Back</a>
+                    </div>
+                </div>
+                <form role="form" class="parsley-examples" method="post" id="endorsement_form_id" enctype="multipart/form-data">
+                       
+                        <input type="hidden" name="id" id="policy_tranction_primarykey">
+                        <input type="hidden" name="client_id" id="client_id_for_edit">
+                        <input type="hidden" name="insurer_id" id="insurer_id">
+                        <input type="hidden" name="cd_ac_no" id="cd_ac_no">
+                        <input type="hidden" name="cd_ac_pk" id="cd_ac_pk">
+                        <input type="hidden" name="ct_type" id="ct_type">
+                        <input type="hidden" name="bro_payable_by" id="bro_payable_by">
+                        <input type="hidden" name="cop_yes" id="cop_yes">
+                        <input type="hidden" name="base_cd_amount" id="base_cd_amount">
+                        <input type="hidden" name="cd_amt_changed" id="cd_amt_changed" disabled>
+
+
+                        <!-- Client Row -->
+                        <div class="row">
+                            <!-- Section 1 -->
+                            <div class="col-md-12">
+                                <div id="accordion_0" class="mb-0">
+                                    <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                        <span class="font-color-black">Client Details</span>
+                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                            aria-expanded="true">
+                                            <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                        </a>
+                                    </label>
+                                    <div class="card mb-1">
+                                        <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
+                                            <div class="card-body">
+                                            <div class="row">
+
+                                                <div class="form-group col-md-3">
+                                                    <label for="client_type">Client Type<span class="text-danger"></span></label>
+                                                    <select class="form-control" id="client_type" name="client_type" >
+                                                        <option value="">Select Client type</option>
+                                                        <option value="1">Group</option>
+                                                        <option value="2">Individual</option>
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                    <label for="client_branch">Client<span class="text-danger">*</span></label>
+                                                    <select class="form-control" id="client_id" name="client_id" required>
+                                                        <option value="">Select Client</option>
+                                                        <!-- <option value="add_client"> + Add Client</option> -->
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3 branchdiv">
+                                                    <label for="client_branch">Branch<span class="text-danger"></span></label>
+                                                    <select class="form-control" id="client_branch_id" name="client_branch_id">
+                                                        <option value="">Select Branch</option>
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                    <label for="email"> Policy <span class="text-danger">*</span></label>
+                                                    <select class="form-control" id="client_policy_id" name="client_policy_id" required>
+                                                        <option value="">Select Policy</option>
+                                                    </select>
+                                                </div>
+
+                                            </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Endorsement details -->
+                        <div class="row">
+                            <div class="col-md-12">
+                                    <div id="accordion_2" class="mb-0">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                            <span class="font-color-black">Endorsement</span>
+                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                                aria-expanded="true">
+                                                <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                            </a>
+                                        </label>
+                                        <div class="card mb-1">
+                                            <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        
+                                                        <!-- <div class="form-group col-md-3" id="tpa_endorse_div">
+                                                            <label for="tpa"> TPA <span id="tpa_danger"class="text-danger"></span></label>
+                                                            <select class="form-control readonly-select" id="tpa" name="tpa" >
+                                                                <option value="" selected>Select TPA</option>
+                                                                <?php foreach ($tpa as $value) { ?>
+                                                                <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
+                                                                    <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                                                </option>
+                                                                <?php } ?>
+                                                            </select>
+                                                        </div> -->
+                                                        
+                                                        <div class="form-group col-md-3">
+                                                            <label for="addon_policy">Policy No<span id="base_danger"class="text-danger"></span></label>
+                                                            <input type="text" class="form-control" id="policy_no" name="policy_no"placeholder="Enter Policy No" readonly>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="bp_cgst">D.O.C <span id="base_danger" class="text-danger"></span></label>
+                                                            <input id="policy_start_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="bp_igst">D.O.E <span id="base_danger" class="text-danger"></span></label>
+                                                            <input id="policy_end_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="addon_policy"> Endorsement Type <span id="base_danger" class="text-danger">*</span></label>
+                                                            <select class="form-control" id="action_type" name="action_type" required>
+                                                                <option value="" selected>Select Endorsement Type</option>
+                                                                <?php
+                                                                    if (isset($action_type) && count($action_type)) {
+                                                                        foreach ($action_type as $key => $value) {
+                                                                            echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                        }
+                                                                    }
+                                                                ?>
+                                                            </select>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="addon_policy">Endorsement No<span id="base_danger" class="text-danger"></span></label>
+                                                            <input type="text" class="form-control" id="endorsement_no" name="endorsement_no" placeholder="Enter Endorsement No" onchange="validateInput(this, 'policy_transaction', 'endorsement_no')">
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="addon_policy">Data Received Date<span id="base_danger" class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="data_received_date" name="data_received_date" placeholder="DD/MM/YYYY" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="policy_issue_date" class="d-flex align-items-center">
+                                                                <span class="flex-grow-1">Endorsement Issue Date<span id="base_danger" class="text-danger">*</span></span>
+                                                                <small id="policy_issue_month_info" 
+                                                                    class="text-right"
+                                                                    style="font-size: x-small;">
+                                                                </small>
+                                                            </label>
+                                                            <input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date" placeholder="DD/MM/YYYY" required>
+                                                        </div>
+
+                                                        <div class="d-none">
+                                                            <label for="month">Endorsement Issue Month<span id="base_danger" class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control readonly-select" id="month" name="month" placeholder="MM/YYYY" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="endorse_eff_date">Endorsement Effective Date<span id="base_danger" class="text-danger"></span></label>
+                                                            <input type="text" class="form-control" id="endorse_eff_date" name="endorse_eff_date" placeholder="DD/MM/YYYY" >
+                                                        </div>
+
+                                                        <div class="form-group col-md-3" id="no_of_insured_endorse_div">
+                                                            <label for="addon_policy">No of Insured<span id="base_danger"class="text-danger"></span></label>
+                                                            <input type="text" class="form-control" id="emp_count" name="emp_count" placeholder="Enter Employeee" onkeypress="return onlyNumbers(event)">
+                                                        </div>
+
+                                                        <div class="form-group col-md-3" id="no_of_dependents_endorse_div">
+                                                            <label for="addon_policy">No of Dependents<span id="base_danger" class="text-danger"></span></label>
+                                                            <input type="text" class="form-control" id="dependent_count" name="dependent_count" placeholder="Enter Dependent" onkeypress="return onlyNumbers(event)">
+                                                        </div>
+                                                    </div>
+
+                                                    <hr>
+
+                                                    <div class="row">
+
+                                                        <!-- <div class="form-group col-md-3">
+                                                            <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+                                                            <select class="form-control" id="policy_status" name="status" required>
+                                                                <option value="" selected>Select Status</option>
+                                                                <?php
+                                                                        if (isset($policy_status) && count($policy_status)) {
+                                                                            foreach ($policy_status as $key => $value) {
+                                                                                if($key == 'pending'){
+                                                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                                }else{
+                                                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    ?>
+                                                            </select>
+                                                        </div> -->
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="last_action_date">Latest Action Date</label>
+                                                            <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
+                                                        </div>
+
+                                                        <div class="form-group col-md-3 install_due_date_div" style="display: none;">
+                                                            <label for="install_due_date">Installment due Date</label>
+                                                            <input id="install_due_date" type="text" class="form-control" name="install_due_date" placeholder="DD/MM/YYYY">
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label class="card_label_4">Base Premium<span id="base_danger" class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control right-align-input" id="base_premium" name="base_premium" oninput="" onkeypress="return onlyNumbers(event)" onchange="setBPValue(this.value)" required>
+                                                        </div>
+
+                        
+                                                        <div class="form-group col-md-3 hidetp">
+                                                            <label class="card_label_5">TP Premium</label>
+                                                            <input type="text" class="form-control right-align-input" id="tp_premium" name="tp_premium" oninput="" onkeypress="return onlyNumbers(event)" onchange="setTPValue(this.value)">
+                                                        </div>
+
+                        
+                                                        <div class="form-group col-md-3 hideter card_group_6" style="display:none;">
+                                                            <label class="card_label_6">TEP Premium</label>
+                                                            <input type="text" class="form-control right-align-input" id="ter_premium" name="ter_premium" oninput="" onkeypress="return onlyNumbers(event)" onchange="setTEPValue(this.value)">
+                                                        </div>
+
+                                                        <!-- <div class="form-group col-md-3">
+                                                            <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
+                                                                <span class="slider round" style="height: 27px;"></span>
+                                                            </label>
+
+                                                            <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
+                                                        </div> -->
+
+                                                        <!-- <div class="form-group col-md-3">
+                                                            <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
+                                                                <span class="slider round" style="height: 27px;"></span>
+                                                            </label>
+
+                                                            <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="mdi mdi-information-outline" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
+                                                        </div> -->
+
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                            </div>
+                        </div>
+
+                        <!-- Premium Details -->
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div id="accordion_3" class="mb-0">
+                                    <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                        <span class="font-color-black">Premium Details</span>
+                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                            aria-expanded="true">
+                                            <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                        </a>
+                                    </label>
+                                    <div class="card mb-0">
+                                        <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                            <div class="card-body">
+
+                                                <div id="allInsurerCards"></div>
+                                                
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>  
+
+                        <div class="form-group text-right mt-3 m-b-0" id="submitButton">
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                        </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- end form row -->
+
+<script>
+        
+    var team_id = [];
+    var role_id = <?php echo get_role_id(); ?>;
+    console.log(" role_id : ", role_id);
+    var insurer_count_array = [];
+    var pt_co_share_count_data = 0;
+    var redirect_url = '<?= base_url('policy_tranction/endorsement/list') ?>';
+
+    $(document).ready(function(){
+
+        team_id = <?php echo json_encode(user_team()); ?>;
+        console.log('team_id', team_id);
+
+        if (team_id.includes('4')) {
+            console.log('Finance Team Logged in.');
+        } else if (team_id.includes('3')) {
+            console.log('Business Team Logged in.');
+        }
+
+        getURLParamsForReport() 
+    })
+
+    $(document).ready(function(){
+
+        $('#client_id').change(function(){
+
+            let client_id = $(this).val();
+
+            // console.log('client_id', client_id);
+            // console.log('branch_list', branch_list);
+
+            if(client_id == 'add_client') {
+                $('#client_id').val('').change();
+                var myModal = new bootstrap.Modal(document.getElementById('upload_enrollment_model'));
+                myModal.show();
+            }
+
+            if(branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch(data);
+            }
+
+            if(policyListByClient != '') {
+                // console.log(branch_list[client_id]);
+                let data = policyListByClient[client_id];
+                if (data) {
+                appendPolicies(data);
+
+                }
+            }
+
+        })
+
+        $('#client_branch_id').change(function(){
+
+            let branch_id = $(this).val();
+            // console.log(policy_list)
+            // console.log(branch_id)
+
+            if(policy_list != '') {
+                console.log(policy_list[branch_id]);
+                let data = policy_list[branch_id];
+                appendPolicies(data);
+            }
+
+
+        });
+
+        $('#client_policy_id').change(function(){
+            
+            console.log('######################################')
+            console.log('client_policy_id onchange called')
+            console.log('######################################')
+
+            let client_id = $('#client_id').val();
+            let policy_tranction_primarykey = $('#policy_tranction_primarykey').val();
+            let client_policy_id = $(this).val();
+            var policy_no = $(this).find('option:selected').attr('data-policy');
+            var insurer = $(this).find('option:selected').attr('data-insurer');
+            var tpa = $(this).find('option:selected').attr('data-tpa');
+            var cd_ac_no = $(this).find('option:selected').attr('data-cd');
+            var start_date = $(this).find('option:selected').attr('data-sd');
+            var end_date = $(this).find('option:selected').attr('data-ed');
+            var policy_type_id = $(this).find('option:selected').attr('data-ptid');
+
+            // if(policy_type_id == 1 || policy_type_id == 2 || policy_type_id == 3 || policy_type_id == 4 || policy_type_id == 5 || policy_type_id == 6 || policy_type_id == 7){
+            //     $('#is_cd_reduce_from_bds').prop('disabled',true).prop('checked', false)
+            // }else{
+            //     $('#is_cd_reduce_from_bds').prop('disabled',false)
+            // }
+
+            if( policy_type_id > 7 ){
+                $('#tpa_endorse_div').hide();
+                $('#card_label_34').show();
+                $('#card_label_37').show();
+            }else{
+                $('#tpa_endorse_div').show();
+                $('#card_label_34').hide();
+                $('#card_label_37').hide();
+            }
+
+
+            if(policy_type_id == 2 || policy_type_id == 3 || policy_type_id == 4 || policy_type_id == 5){
+                $('#no_of_insured_endorse_div').show();
+                $('#no_of_dependents_endorse_div').show();
+            }else if(policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
+                $('#no_of_insured_endorse_div').show();
+                $('#no_of_dependents_endorse_div').hide();
+            }else{
+                $('#no_of_insured_endorse_div').hide();
+                $('#no_of_dependents_endorse_div').hide();
+            }
+
+
+            // console.log('client_id', client_id);
+            // console.log('client_policy_id', client_policy_id);
+            // console.log('policy_tranction_primarykey', policy_tranction_primarykey);
+            // console.log('policy_no', policy_no);
+            // console.log('cd_ac_no',cd_ac_no);
+            // console.log('tpa',tpa);
+
+            $('#policy_no').val(policy_no);
+            $('#insurer_id').val(insurer);
+            $('#tpa').val(tpa).change();
+            // $('#cd_ac_no').val(cd_ac_no);           
+            $('#policy_start_date').val(start_date);           
+            $('#policy_end_date').val(end_date);  
+
+            if(!policy_tranction_primarykey && client_id && client_policy_id){
+
+                removeAllInsurerCards();
+
+                form_action = '<?= base_url("util/getPTCOShareCount/"); ?>' + client_id + '/' + client_policy_id;
+                
+                $.ajax({
+                    url: form_action,
+                    type: "GET",
+                    dataType: 'json',
+                    processData: false,
+                    contentType: false,
+                    success: function(res) {
+
+                        console.log('policy co share data', res);
+
+                        if(res.status == true){
+                            if(res.data.length > 0){
+
+                                $('#ct_type').val(2);
+                                $('#cd_ac_pk').val(res?.is_copay_yes?.cd_ac_pk || "");
+                                $('#cd_ac_no').val(res?.cd_master_data?.cd_ac_no || "");
+                                $('#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);
+                                }
+
+                                populateCards(res.data);
+
+                                if (res?.data?.length) {
+                                    console.log('PT Co Share Count :', res.data.length);
+                                    pt_co_share_count_data = res.data.length;
+                                }
+
+                                $('#btnSubmit').prop('disabled', false).data('disable', false);
+
+                            }else{
+                                $('#ct_type').val(1)
+                                // addInsurerColumn()
+                                toastr.warning("There is no policy inception data.", 'WARNING!');
+                                $('#btnSubmit').prop('disabled', true).data('disable', true);
+                            }
+                        }else{
+                            $('#ct_type').val(1)
+                            // addInsurerColumn()
+                            toastr.warning(res.message, 'WARNING!');
+                            $('#btnSubmit').prop('disabled', true).data('disable', true);
+                        }
+                    },
+                    error: function (xhr, status, error) {
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                    }
+                });
+            }
+        });
+    })
+
+    $(document).on('change', 'input[type="checkbox"][name="co_share_type[]"]', function() {
+
+        let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
+
+        if (isAnyChecked) {
+            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            $(this).prop('checked', false);
+        }
+    });
+
+    $(document).on('click', '[name="co_share_type[]"]', function() {
+
+        let val = $(this).val();
+        let uniqueid = $(this).data('id');
+        let insurer = $('#follow_insurer_id_'+uniqueid).val()
+
+        var client_id = $('#client_id').val()
+        var insurer_id = $('#follow_insurer_id_'+uniqueid).find('option:selected').attr('data-id');
+        var insurer_branch_id = $('#follow_insurer_id_'+uniqueid).find('option:selected').attr('data-bid');
+
+        console.log('client_id', client_id);
+        console.log('insurer_id', insurer_id);
+
+
+        if(insurer == ""){
+            toastr.warning('Please select the insurer.', 'WARNING!');
+            $(this).prop('checked', false);
+        }else{
+            if(client_id && insurer_id){
+                $('#insurer_id').val(insurer)
+                // getCDAccountNumber(client_id, insurer_id);
+            }else{
+                console.log('getCDAccountNumber cannot be call because of absence of client id and insurer id');
+            }
+        }
+
+        console.log('co_share_type value', val);
+        console.log('co_share_type uniqueid', uniqueid);
+        console.log('co_share_type insurer', insurer);
+    });
+
+    $(document).ready(function() {
+        $(document).on('change', '[name="follow_insurer_id[]"]', function() {
+
+            let insurer = $(this).val();
+            let client_id = $('#client_id').val();
+            let insurer_id = $(this).find('option:selected').attr('data-id');
+            let insurer_branch_id = $(this).find('option:selected').attr('data-bid');
+
+            console.log('insurer', insurer);
+            console.log('follow_insurer_id client_id', client_id);
+            console.log('follow_insurer_id insurer_id', insurer_id);
+            console.log('follow_insurer_id insurer_id', insurer_branch_id);
+
+            if (!$('#cop_yes').is(':checked')) {
+
+                if(client_id && insurer_id){
+                    $('#insurer_id').val(insurer)
+                    // getCDAccountNumber(client_id, insurer_id);
+                } else {
+                    console.log('getCDAccountNumber cannot be called because of the absence of client id and insurer id');
+                }
+            }
+        });
+    });
+
+    //---------------------------------------------------------------------------------------------------------
+
+    $("#endorsement_form_id").submit(function(event) {
+
+        event.preventDefault();
+
+        var isValid = $('#endorsement_form_id').parsley().validate();
+
+        if (!isValid) {
+            $('#endorsement_form_id').find('input, select, textarea').each(function() {
+                if ($(this).parsley().isValid() === false && !$(this).val()) {
+                    console.log('Empty field ID:', this.id);
+                }
+            });
+            console.log('Form is Empty', 'Warning');
+            return;
+        }
+
+        form_action = '<?= base_url('policy_tranction/endorsement/create') ?>';
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var formData = new FormData($('#endorsement_form_id')[0]);
+
+        let bp = document.getElementById("base_premium").value;
+        let tp = document.getElementById("tp_premium").value;
+        let ter = document.getElementById("ter_premium").value;
+
+        for (let i = 0; i < insurerCount; i++) {
+            formData.append(`base_premium[${i}]`, bp);
+            formData.append(`tp_premium[${i}]`, tp);
+            formData.append(`ter_premium[${i}]`, ter);
+        }
+
+        $.ajax({
+            data: formData,
+            url: form_action,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                console.log('ENDORSEMENT FOR SUBMIT RESPONSE : ', res);
+
+                if (res.status == true) {
+                    toastr.success(res.message, 'Success');
+                    $('#policy_tranction_primarykey').val(res.pt_id);
+                    window.location.href = redirect_url;
+                } else {
+                    toastr.error(res.message, 'Error');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    });
+
+    //---------------------------------------------------------------------------------------------------------
+
+    $('#client_type').on('change', function() {
+
+        var selectedClientType = $(this).val();
+
+        if (selectedClientType == 2) {
+            $('.branchdiv').hide(); 
+            $('#card_label_34').hide(); 
+            $('#card_label_37').hide(); 
+        } else {
+            $('.branchdiv').show(); 
+            $('#card_label_34').show(); 
+            $('#card_label_37').show(); 
+        }
+
+        console.log('selectedClientType', selectedClientType);
+
+        // Clear and add default options for client
+        $('#client_id').empty().append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }))
+
+        if (selectedClientType) {
+
+            $.each(client_list, function(index, item) {
+                if (item.client_type == selectedClientType) {
+                    var option = $('<option>', {
+                        value: item.id,
+                        text: item.client_name,
+                        'data-cn': item.client_name,
+                        'data-ct': item.client_type
+                    });
+                    $('#client_id').append(option);
+                }
+            });
+
+        }
+
+        if(selectedClientType == 1){
+            $('#client_policy_id').empty().append($('<option>', {
+                value: '',
+                text: 'Select Policy'
+            }));
+        }
+
+        // Initialize or refresh Select2 for both dropdowns
+        $('#client_id').select2();
+        $('#client_policy_id').select2();
+    });
+
+    $('#endorsement_no').on('change', function(){
+
+        var policy_no = $('#policy_no').val();
+        console.log(policy_no +'-'+policy_no.length);
+        policy_no = policy_no.trim();
+        console.log(policy_no +'-'+policy_no.length);
+
+        var endorsement_no = $(this).val();
+        console.log(endorsement_no +'-'+endorsement_no.length);
+        endorsement_no = endorsement_no.trim();
+        console.log(endorsement_no +'-'+endorsement_no.length);
+
+        if(policy_no && endorsement_no){
+            $.ajax({
+                url: '<?php echo base_url('util/get_client_policy_data_using_policy_no_and_endo_no/');?>',
+                type: "GET",
+                data : {policy_no : policy_no, endorsement_no : endorsement_no},
+                dataType: 'json',
+                success: function (res) {
+
+                    console.log("get_client_policy_data_using_policy_no_and_endo_no Response : ", res);
+                    if(res.status == true){
+                        $('#ct_type').val(1)
+                    }else{
+                        $('#ct_type').val(2)
+                        console.log(res.message, 'warning');
+                    }
+                },
+                error: function (xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                }        
+            });
+        }else{
+            console.log('Policy number or Endorsement Number is empty')
+        }
+
+    })
+
+    //------------- EDIT FUNCTION -----------------------------------------------------------------------------------------------
+
+    function getPolicyTransactionDataForEndorsementEdit(input){   
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        $('#endorsement_form_id')[0].reset();
+        // var id = $(input).attr('data-id');
+        var id = input;
+
+        $.ajax({
+            url: '<?= base_url("/policy_tranction/endorsement/list/") ?>' + id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getPolicyTransactionDataForEndorsementEdit', res);
+                if(res.status == true){
+
+                    hide_list_show_add() 
+                    
+                    var page_title = 'Edit Endorsement' + (res.data.client_short_name || res.data.policy_no || res.data.endorsement_no ? 
+                        ' - ' + [res.data.client_short_name, res.data.policy_no,res.data.endorsement_no]
+                        .filter(Boolean).join('-') : '');
+
+                    $('#page_title').text(page_title);
+
+                    $('#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_type').val(res.data.client_type).trigger('change');
+                    $('#client_id').val(res.data.client_id).change();
+                    $('#base_cd_amount').val(res.data.base_cd_amount);
+
+                    var tpaValue = '';
+                    if (res.data.tpa_branch_id && res.data.tpa_id) {
+                        tpaValue = res.data.tpa_branch_id + '-' + res.data.tpa_id;
+                    }
+                    $('#tpa').val(tpaValue).change();
+
+
+                    setTimeout(function(){
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        $('#client_branch_id').val(res.data.client_branch_id).select2();
+                        // $('#client_policy_id').val(res.pt_id).select2();
+                    }, 1000)
+
+                    if(res.data.client_type == 2){
+                        let data1 = policyListByClient[res.data.client_id];
+                        appendPolicies(data1, res.pt_id);
+                    }else{
+                        let data2 = policy_list[res.data.client_branch_id];
+                        appendPolicies(data2, res.pt_id);
+                    }
+
+                    setTimeout(function(){
+                        $('#policy_start_date').val(res.data.policy_start_date);
+                        $('#policy_end_date').val(res.data.policy_end_date);
+                        $('#insurer_id').val(res.data.insurer_branch_id + '-' + res.data.insurer_id);
+                    }, 1500)
+
+                    $('#policy_no').val(res.data.policy_no);
+                    $('#action_type').val(res.data.action_type);
+                    $('#endorsement_no').val(res.data.endorsement_no);
+                    $('#data_received_date').val(res.data.data_received_date);
+                    $('#policy_issue_date').val(res.data.policy_issue_date);
+                    $('#emp_count').val(res.data.emp_count);
+                    $('#dependent_count').val(res.data.dependent_count);
+                    $('#policy_status').val(res.data.status);
+                    $('#endorse_eff_date').val(res.data.endorse_eff_date);
+                    $('#month').val(res.data.month);setPolicyIssueMonth();
+                    $('#last_action_date').val(res.data.last_action_date);
+                    $('#install_due_date').val(res.data.install_due_date);
+                    $('#bro_payable_by').val(res.data.bro_payable_by);
+                    $('#cd_ac_pk').val(res.data.cd_ac_pk);
+                    $('#cd_ac_no').val(res.data.cd_ac_no);
+                    $('#ct_type').val(res.data.ct_type);
+
+                    if (res.data.policy_with_corr == 1) {
+                        $('#policy_with_corr').prop('checked', true);
+                    } else {
+                        $('#policy_with_corr').prop('checked', false);
+                    }
+
+                    // if (res.data.is_cd_reduce_from_bds == 1) {
+                    //     $('#is_cd_reduce_from_bds').prop('checked', true).prop('checked', false);
+                    // } else {
+                    //     $('#is_cd_reduce_from_bds').prop('checked', false);
+                    // }
+
+                    if (res.data.action_type == 'policy_instalment') {
+                        $('.install_due_date_div').show()
+                    }else{
+                        $('.install_due_date_div').hide()
+                    }
+
+                    if (res?.data?.pt_co_share_details?.length > 0) {
+                        let new_data = res.data.pt_co_share_details[0];
+                        $('#base_premium').val(new_data.bp_amt ?? '');
+                        $('#tp_premium').val(new_data.tp_amt ?? '');
+                        $('#ter_premium').val(new_data.tep_amt ?? '');
+                    }
+
+                    removeAllInsurerCards();
+                    
+                    if(res.data.pt_co_share_details.length > 0){
+                        if (!res.data.pt_co_share_details[0].follower_policy_no) {res.data.pt_co_share_details[0].follower_policy_no = res.data.policy_no;}
+                        setTimeout(function(){
+                            populateCards(res.data.pt_co_share_details, true);
+                        }, 2000);
+                    }else{
+                        addInsurerColumn();
+                    }
+
+                    if (res.data.client_type == 2) {
+                        $('.branchdiv').hide(); 
+                        $('#card_label_34').hide(); 
+                        $('#card_label_37').hide(); 
+                    } else {
+                        $('.branchdiv').show(); 
+                        $('#card_label_34').show(); 
+                        $('#card_label_37').show(); 
+                    }
+
+                    if (res.data.policy_type_id == 1 || res.data.policy_type_id == 2 || res.data.policy_type_id == 3 || res.data.policy_type_id == 4 || res.data.policy_type_id == 5 || res.data.policy_type_id == 6 || res.data.policy_type_id == 7 || res.data.client_type == 2) {
+                        $('#card_label_34').hide();
+                        $('#card_label_37').hide();
+                    } 
+
+                    // if(res.data.policy_type_id == 1 || res.data.policy_type_id == 2 || res.data.policy_type_id == 3 || res.data.policy_type_id == 4 || res.data.policy_type_id == 5 || res.data.policy_type_id == 6 || res.data.policy_type_id == 7){
+                    //     $('#is_cd_reduce_from_bds').prop('disabled',true).prop('checked', false);
+                    // }else{
+                    //     $('#is_cd_reduce_from_bds').prop('disabled',false);
+                    // }
+
+
+                }else{
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+
+        checkInvoiceStatusToHideSubmitBtn(id)
+        
+    }
+
+    //------------- END EDIT FUNCTION --------------------------------------------------------------------------------------------
+
+    // do not remove this 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); 
+
+    //     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); }
+    //         else if(sgst !== 0) { $('#cgst_' + input).val(sgst); }
+            
+    //         $('#igst_' + input).val(0);
+    //     }
+    //     else if((event.target.id).startsWith('igst'))
+    //     {
+    //         $('#cgst_' + input).val(0);
+    //         $('#sgst_' + input).val(0);
+    //     }
+    // }
+
+    // function amountCalculation(input) {
+
+    //     console.log('############################## AMOUNT CALCULATION ############################################')
+    //     console.log('amountCalculation  :  ' + input);
+    //     let selectedOption =  $('#client_policy_id').find('option:selected');
+    //     console.log("selectedOption", selectedOption);
+    //     let bap = selectedOption.data('bap');
+    //     let allocg = selectedOption.data('allocg');
+
+    //     const event = window.event;
+    //     console.log("Event id:", event.target.id); 
+
+    //     let endorsement_type = $('#action_type').val();
+    //     console.log('endorsement_type', endorsement_type);
+
+    //     let isDeletion = (endorsement_type == "deletion");
+    //     console.log('isDeletion:', isDeletion);
+
+    //     // Retrieve and parse the values or default to 0 if not a number
+    //     let bp = parseFloat($('#base_premium_' + input).val()) || 0;
+    //     console.log("bp base premium", bp);
+    //     let ncpa = parseFloat($('#non_comm_per_amt_' + input).val()) || 0;
+    //     console.log("ncpa non comm base premium", ncpa);
+
+    //     var tp = 0;
+    //     if(allocg != 'EB'){
+    //         tp = parseFloat($('#tp_premium_' + input).val()) || 0;
+    //     }
+    //     // do not remove this commented item
+    //     // 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;
+    //     }
+
+    //     //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;
+    //     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 gst_amount = parseFloat($('#gst_amount_' + input).val()) || 0;
+
+
+    //     // Calculate GST percentage
+    //     let gst_per = igst;
+    //     if (igst === 0) {
+    //         gst_per = parseFloat(cgst) + parseFloat(sgst);
+    //     }
+
+    //     // console.log('gst_per', gst_per);
+    //     // console.log('igst', igst);
+    //     // console.log('cgst', cgst);
+    //     // console.log('sgst', sgst);
+
+    //     // 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);
+    //     ncpaTotal = tpTotal + ncpa;
+    //     let ncpa_gst_per_amt = (ncpaTotal * gst_per) / 100;
+    //     console.log('ncpa_gst_per_amt', ncpa_gst_per_amt);
+
+    //     let gst_per_amt = (tpTotal * gst_per) / 100;
+    //     console.log('gst_per_amt', gst_per_amt);
+
+    //     // $('#gst_amount_' + input).val(gst_per_amt.toFixed(2));
+    //     if (event.target.id.startsWith('non_comm_per_amt')) {
+    //         $('#gst_amount_' + input).val(!isNaN(ncpa_gst_per_amt) && isFinite(ncpa_gst_per_amt) ? ncpa_gst_per_amt.toFixed(2) : '0.00');
+    //     }else if (event.target.id.startsWith('gst_amount')) {
+    //         $('#gst_amount_' + input).val(!isNaN(gst_amount) && isFinite(gst_amount) ? gst_amount.toFixed(2) : '0.00');
+    //     }else{
+    //         if(ncpa != 0 && ncpa != ""){
+    //             $('#gst_amount_' + input).val(!isNaN(ncpa_gst_per_amt) && isFinite(ncpa_gst_per_amt) ? ncpa_gst_per_amt.toFixed(2) : '0.00');
+    //         }else{
+    //             $('#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 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);
+
+    //     var expectedAmount = 0;
+
+    //     if(agreed_amount > 0 ){
+    //         expectedAmount = agreed_amount;
+    //         // console.log('Formula 1 AGREED AMOUNT');
+    //     }else if(sum_of_agreed_premium > 0){
+
+    //         let sumOfTheAggreedPer = agreed_bp_per + agreed_tp_per + agreed_tep_per;
+
+    //         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{
+
+    //         let sumOfTheStandardPer = standard_bp_per + standard_tp_per + standard_tep_per;
+
+    //         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);
+
+    //     //Expected Amount
+    //     $('#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;
+
+    //     // console.log('actual_bp_brokerage_amount', actual_bp_brokerage_amount);
+    //     // console.log('actual_tp_brokerage_amount', actual_tp_brokerage_amount);
+    //     // console.log('actual_tep_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');
+
+    //     setCoPremiums(input);
+
+    //     console.log('############################## END AMOUNT CALCULATION ############################################')
+
+    //     applyDeletionSymbolsToFields(input, isDeletion);
+
+    // }
+
+    // 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));
+    // }
+
+        // Apply Deletion (Negative) Values
+    // function applyDeletionSymbolsToFields(input, isDeletion) {
+    //     console.log('========== APPLYING DELETION SYMBOLS ==========');
+
+    //     if (!isDeletion) return;
+
+    //     const fieldIds = [
+    //         'base_premium',
+    //         'tp_premium',
+    //         'ter_premium',
+    //         'co_premium',
+    //         'co_tp_premium',
+    //         'co_ter_premium',
+    //         'gst_amount',
+    //         'agreed_amount',
+    //         'non_comm_per_amt',
+    //         'total_amt',
+    //         'exp_amt'
+    //     ];
+
+    //     fieldIds.forEach(field => {
+    //         const $el = $('#' + field + '_' + input);
+    //         console.log('$el', '#' + field + '_' + input);
+    //         console.log('$el', $el);
+    //         let val = $el.val()?.trim();
+    //         console.log('$val', val);
+    //         if (!val || val.startsWith('-')) return;
+
+    //         let num = parseFloat(val);
+    //         if (!isNaN(num) && num > 0) $el.val(-num);
+    //     });
+
+    //     console.log('========== COMPLETED DELETION SYMBOL APPLICATION ==========');
+    // }
+
+    function checkAndDistributeTax(input){
+
+        const event = window.event;
+        console.log("Event id:", event.target.id); 
+
+        let policy_type_id = $('#client_policy_id').find('option:selected').attr('data-ptid');
+        policy_type_id = parseInt(policy_type_id);
+        console.log('policy_type_id', policy_type_id);
+
+        let cgst = parseFloat($('#cgst_' + input).val());
+        let sgst = parseFloat($('#sgst_' + input).val());
+        let igst = parseFloat($('#igst_' + input).val());
+
+        // ✅ Allow 0 only for policy types 2, 5, 7
+        const allowZero = [1,2,3,4,5,6,7,38,39,40].includes(policy_type_id);
+        console.log("allowZero", allowZero);
+
+        // 🔒 Validation: Disallow 0 or negative values for other policy types
+        if (!allowZero) {
+            if ((cgst <= 0 && (event.target.id).startsWith('cgst')) ||
+                (sgst <= 0 && (event.target.id).startsWith('sgst')) ||
+                (igst <= 0 && (event.target.id).startsWith('igst'))) {
+
+                toastr.warning('Tax value must be greater than 0 for this policy type.');
+                $('#'+ event.target.id).val('');
+                $('#igst_' + input).val('');
+                $('#cgst_' + input).val('');
+                $('#sgst_' + input).val('');
+
+                return;
+            }
+        }
+
+        if (((event.target.id).startsWith('cgst'))) {
+
+            if (!isFinite(cgst) || isNaN(cgst) || cgst === undefined) {
+                cgst = '';
+            }
+
+            $('#cgst_' + input).val(cgst);
+            if(cgst == ""){
+                $('#sgst_' + input).val(0);
+            }else{
+                $('#sgst_' + input).val(cgst);
+            }
+            $('#igst_' + input).val(0);
+        }
+
+        if (((event.target.id).startsWith('sgst'))) {
+
+            if (!isFinite(sgst) || isNaN(sgst) || sgst === undefined) {
+                sgst = '';
+            }
+
+            $('#sgst_' + input).val(sgst);
+            if(sgst == ""){
+                $('#cgst_' + input).val(0);
+            }else{
+                $('#cgst_' + input).val(sgst);
+            }
+            $('#igst_' + input).val(0);
+        }
+
+        if ((event.target.id).startsWith('igst')) {
+            $('#cgst_' + input).val(0);
+            $('#sgst_' + input).val(0);
+        }
+
+        // Ensure IGST, CGST, and SGST are never NaN, undefined, or Infinity
+        $('#igst_' + input).val(isFinite($('#igst_' + input).val()) ? $('#igst_' + input).val() : 0);
+        $('#cgst_' + input).val(isFinite($('#cgst_' + input).val()) ? $('#cgst_' + input).val() : 0);
+        $('#sgst_' + input).val(isFinite($('#sgst_' + input).val()) ? $('#sgst_' + input).val() : 0);
+    }
+
+    // Main calculation function
+    function amountCalculation(input) {
+
+        console.log('############################## AMOUNT CALCULATION ############################################');
+        console.log('amountCalculation:', input);
+
+        let selectedOption = $('#client_policy_id').find('option:selected');
+        let bap = selectedOption.data('bap') || '';
+        let allocg = selectedOption.data('allocg') || '';
+        let endorsement_type = $('#action_type').val();
+        let isDeletion = false;
+        // let isDeletion = endorsement_type === "deletion" || endorsement_type === "policy_cancellation"; 
+        console.log({bap, allocg, isDeletion});
+
+        const event = window.event || {};
+
+        // Helper functions
+        const rawVal = id => {
+            const v = $('#' + id + '_' + input).val();
+            return v === undefined || v === null ? '' : String(v).trim();
+        };
+        const numVal = id => {
+            const n = parseFloat(rawVal(id));
+            return isNaN(n) ? 0 : n;
+        };
+        const absNum = id => Math.abs(numVal(id));
+
+        // Read input values
+        let bp = absNum('base_premium');
+        let ncpa = absNum('non_comm_per_amt');
+        let tp = (allocg !== 'EB') ? absNum('tp_premium') : 0;
+        let tep = (['Fire', 'Marine Cargo', 'Marine Hull'].includes(bap)) ? absNum('ter_premium') : 0;
+        let cop = absNum('co_premium');
+        let cotp = (allocg !== 'EB') ? absNum('co_tp_premium') : 0;
+        let cotep = (['Fire', 'Marine Cargo', 'Marine Hull'].includes(bap)) ? absNum('co_ter_premium') : 0;
+
+        console.log('premiums :', { bp, tp, tep, cop, cotp, cotep, ncpa });
+
+        // let bp_raw_val = parseFloat($('#base_premium_' + input).val());
+        let bp_raw_val = parseFloat($('#base_premium').val()) || 0;
+        console.log('bp_raw_val', bp_raw_val);
+
+        // handel the positive(+), negative(-) symbole add the value 
+        if(endorsement_type === "addition" || endorsement_type === "baby_addition" || endorsement_type === "addition_inception"){
+            isDeletion = false
+        }else if(endorsement_type === "deletion" || endorsement_type === "policy_cancellation"){
+            isDeletion = true
+        }else if(bp_raw_val < 0){
+            isDeletion = true;
+            console.log('Value is negative:', bp_raw_val);
+        }
+
+        let co_share_type_val = numVal('co_share_type');
+        console.log('co_share_type_val :', co_share_type_val);
+
+        // GST & Tax Setup
+        checkAndDistributeTax(input);
+        let cgst = numVal('cgst'), sgst = numVal('sgst'), igst = numVal('igst');
+        let gst_per = igst || (cgst + sgst);
+
+        let stamp_duty_amt = absNum('stamp_duty');
+        let agreed_amount = absNum('agreed_amount');
+        let agreed_bp_per = numVal('agreed_bp');
+        let agreed_tp_per = numVal('agreed_tp');
+        let agreed_tep_per = numVal('agreed_tep');
+        let standard_bp_per = numVal('standard_bp');
+        let standard_tp_per = numVal('standard_tp');
+        let standard_tep_per = numVal('standard_tep');
+
+        let gst_amount = numVal('gst_amount');
+
+        // Premiums for calculation
+        let base_premium = ($('#bro_payable_by').val() == 1) ? bp : cop;
+        let third_part_premium = ($('#bro_payable_by').val() == 1) ? tp : cotp;
+        let terrisom_premium = ($('#bro_payable_by').val() == 1) ? tep : cotep;
+        let tpTotal = base_premium + third_part_premium + terrisom_premium;
+
+        // Co-premium defaults
+        if ($('#cop_yes').val() == 0) {
+            if (!rawVal('co_premium')) $('#co_premium_' + input).val(bp);
+            if (!rawVal('co_tp_premium') && bap === 'Motor') $('#co_tp_premium_' + input).val(tp);
+            if (!rawVal('co_ter_premium') && ['Fire', 'Marine Cargo', 'Marine Hull'].includes(bap)) $('#co_ter_premium_' + input).val(tep);
+            if (!rawVal('co_share_per')) $('#co_share_per_' + input).val(100);
+        }
+
+        // GST Calculations
+        let ncpaTotal = tpTotal + ncpa;
+        let gst_per_amt = (tpTotal * gst_per) / 100;
+        let ncpa_gst_per_amt = (ncpaTotal * gst_per) / 100;
+
+        let gstValue =
+            event.target?.id?.startsWith('non_comm_per_amt') ? ncpa_gst_per_amt :
+            event.target?.id?.startsWith('gst_amount') ? gst_amount :
+            ncpa ? ncpa_gst_per_amt : gst_per_amt;
+
+        $('#gst_amount_' + input).val(isFinite(gstValue) ? gstValue : 0);
+
+        // Final total
+        let finalTotal = tpTotal + gst_per_amt + stamp_duty_amt;
+        $('#total_amt_' + input).val(isFinite(finalTotal) ? finalTotal : 0);
+
+        // Expected amount
+        let expectedAmount = 0;
+        let sum_agreed_per = agreed_bp_per + agreed_tp_per + agreed_tep_per;
+
+        if (agreed_amount > 0) {
+            expectedAmount = agreed_amount;
+        } else if (sum_agreed_per > 0) {
+            expectedAmount =
+                (base_premium * agreed_bp_per) / 100 +
+                (third_part_premium * agreed_tp_per) / 100 +
+                (terrisom_premium * agreed_tep_per) / 100;
+        } else {
+            expectedAmount =
+                (base_premium * standard_bp_per) / 100 +
+                (third_part_premium * standard_tp_per) / 100 +
+                (terrisom_premium * standard_tep_per) / 100;
+        }
+
+        $('#exp_amt_' + input).val(isFinite(expectedAmount) ? expectedAmount : 0);
+
+        setCoPremiums(input);
+
+        // ✅ Apply deletion symbols last (safely);
+        // if (isDeletion) {
+            applyDeletionSymbolsToFields(input, isDeletion);
+        // }
+
+        console.log('############################## END AMOUNT CALCULATION ############################################');
+    }
+
+    // Apply Deletion (Negative) Values
+    function applyDeletionSymbolsToFields(input, isDeletion) {
+
+        console.log('========== APPLYING DELETION SYMBOLS ==========');
+
+        const fieldIds = [
+            'base_premium',
+            'tp_premium',
+            'ter_premium',
+            'co_premium',
+            'co_tp_premium',
+            'co_ter_premium',
+            'gst_amount',
+            'agreed_amount',
+            'non_comm_per_amt',
+            'total_amt',
+            'exp_amt'
+        ];
+
+        fieldIds.forEach(field => {
+            const $el = $('#' + field + '_' + input);
+            let val = $el.val()?.trim();
+            if (!val) return;
+
+            let num = parseFloat(val.replace(/^-/, '')); // remove any existing minus first
+            console.log('num', num);
+            if (isNaN(num)) return;
+
+            if (isDeletion) {
+                // Apply minus sign
+                if (num > 0) $el.val(-num);
+            } else {
+                // Remove minus sign
+                $el.val(num);
+            }
+        });
+
+        console.log('========== COMPLETED DELETION SYMBOL APPLICATION ==========');
+    }
+
+    function setCoPremiums(input) {
+        // Get base, TP, and TEP premiums for the given input row
+        let bp = parseFloat($('#base_premium').val()) || 0;
+        let tp = parseFloat($('#tp_premium').val()) || 0;
+        let tep = parseFloat($('#ter_premium').val()) || 0;
+        let coSharePer = parseFloat($('#co_share_per_' + input).val()) || 0;
+
+        // Calculate co-share premiums
+        let cop = (bp * coSharePer) / 100;
+        let cotp = (tp * coSharePer) / 100;
+        let cotep = (tep * coSharePer) / 100;
+
+        // Log for debugging
+        console.log(`Row: ${input}`);
+        console.log(`Base Premium: ${bp}`);
+        console.log(`TP Premium: ${tp}`);
+        console.log(`TEP Premium: ${tep}`);
+        console.log(`Co-Share %: ${coSharePer}`);
+        console.log(`Co Base Premium: ${cop.toFixed(2)}`);
+        console.log(`Co TP Premium: ${cotp.toFixed(2)}`);
+        console.log(`Co TEP Premium: ${cotep.toFixed(2)}`);
+
+        // Set calculated values
+        $('#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){
+
+        console.log('actualAmountCalculation function called')
+        console.log('actualAmountCalculation function input', input)
+        console.log('actualAmountCalculation function field', field)
+
+        let selectedOption =  $('#client_policy_id').find('option:selected');
+        let bap = selectedOption.data('bap');
+
+        console.log('actualAmountCalculation function bap', bap)
+
+        let actual_bp_amt = parseFloat($('#actual_bp_amt_' + input).val()) || 0;
+        let actual_tp_amt = parseFloat($('#actual_tp_amt_' + input).val()) || 0;
+        let actual_tep_amt = parseFloat($('#actual_tep_amt_' + input).val()) || 0;
+
+        let actual_bp_per = parseFloat($('#actual_bp_per_' + input).val()) || 0;
+        let actual_tp_per = parseFloat($('#actual_tp_per_' + input).val()) || 0;
+        let actual_tep_per = parseFloat($('#actual_tep_per_' + input).val()) || 0;
+
+        let actual_bp_brokerage_amt = parseFloat($('#actual_bp_brokerage_amt_' + input).val()) || 0;
+        let actual_tp_brokerage_amt = parseFloat($('#actual_tp_brokerage_amt_' + input).val()) || 0;
+        let actual_tep_brokerage_amt = parseFloat($('#actual_tep_brokerage_amt_' + input).val()) || 0;
+
+        //------------------------------------------------------------------------------------------
+
+        if (field === 'bp_per') {
+            console.log()
+            if (actual_bp_amt > 0 && actual_bp_per >= 0) {
+                let actual_bp_brokerage_amount = (actual_bp_amt * actual_bp_per) / 100;
+                // $('#actual_bp_brokerage_amt_' + input).val(actual_bp_brokerage_amount.toFixed(2));
+                $('#actual_bp_brokerage_amt_' + input).val(!isNaN(actual_bp_brokerage_amount) && isFinite(actual_bp_brokerage_amount) ? actual_bp_brokerage_amount.toFixed(2) : '0.00');
+
+            }
+        } else if (field === 'bp_broker_amt') {
+            // If brokerage amount is changed, update percentage
+            if (actual_bp_amt > 0 && actual_bp_brokerage_amt >= 0) {
+                let actual_bp_percentage = (actual_bp_brokerage_amt / actual_bp_amt) * 100;
+                // $('#actual_bp_per_' + input).val(actual_bp_percentage.toFixed(2));
+                $('#actual_bp_per_' + input).val(!isNaN(actual_bp_percentage) && isFinite(actual_bp_percentage) ? actual_bp_percentage.toFixed(2) : '0.00');
+
+            }
+        } else if (field === 'bp_amt_for_calc') {
+
+            if(actual_bp_per > 0){
+
+                if (actual_bp_amt > 0 && actual_bp_per >= 0) {
+                    let actual_bp_brokerage_amount = (actual_bp_amt * actual_bp_per) / 100;
+                    // $('#actual_bp_brokerage_amt_' + input).val(actual_bp_brokerage_amount.toFixed(2));
+                    $('#actual_bp_brokerage_amt_' + input).val(!isNaN(actual_bp_brokerage_amount) && isFinite(actual_bp_brokerage_amount) ? actual_bp_brokerage_amount.toFixed(2) : '0.00');
+                }
+
+            }else if(actual_bp_brokerage_amt > 0){
+
+                if (actual_bp_amt > 0 && actual_bp_brokerage_amt >= 0) {
+                    let actual_bp_percentage = (actual_bp_brokerage_amt / actual_bp_amt) * 100;
+                    // $('#actual_bp_per_' + input).val(actual_bp_percentage.toFixed(2));
+                    $('#actual_bp_per_' + input).val(!isNaN(actual_bp_percentage) && isFinite(actual_bp_percentage) ? actual_bp_percentage.toFixed(2) : '0.00');
+                }
+
+            }else{
+
+                if (actual_bp_amt > 0 && actual_bp_per >= 0) {
+                    let actual_bp_brokerage_amount = (actual_bp_amt * actual_bp_per) / 100;
+                    // $('#actual_bp_brokerage_amt_' + input).val(actual_bp_brokerage_amount.toFixed(2));
+                    $('#actual_bp_brokerage_amt_' + input).val(!isNaN(actual_bp_brokerage_amount) && isFinite(actual_bp_brokerage_amount) ? actual_bp_brokerage_amount.toFixed(2) : '0.00');
+                }
+
+                if (actual_bp_amt > 0 && actual_bp_brokerage_amt >= 0) {
+                    let actual_bp_percentage = (actual_bp_brokerage_amt / actual_bp_amt) * 100;
+                    // $('#actual_bp_per_' + input).val(actual_bp_percentage.toFixed(2));
+                    $('#actual_bp_per_' + input).val(!isNaN(actual_bp_percentage) && isFinite(actual_bp_percentage) ? actual_bp_percentage.toFixed(2) : '0.00');
+                }
+            }
+        }
+
+        //-----------------------------------------------------------------------------------------
+
+        if(bap == 'Motor'){
+
+            if (field === 'tp_per') {
+                if (actual_tp_amt > 0 && actual_tp_per >= 0) {
+                    let actual_tp_brokerage_amount = (actual_tp_amt * actual_tp_per) / 100;
+                    // $('#actual_tp_brokerage_amt_' + input).val(actual_tp_brokerage_amount.toFixed(2));
+                    $('#actual_tp_brokerage_amt_' + input).val(!isNaN(actual_tp_brokerage_amount) && isFinite(actual_tp_brokerage_amount) ? actual_tp_brokerage_amount.toFixed(2) : '0.00');
+                }
+            } else if (field === 'tp_broker_amt') {
+                // If brokerage amount is changed, update percentage
+                if (actual_tp_amt > 0 && actual_tp_brokerage_amt >= 0) {
+                    let actual_tp_percentage = (actual_tp_brokerage_amt / actual_tp_amt) * 100;
+                    // $('#actual_tp_per_' + input).val(actual_tp_percentage.toFixed(2));
+                    $('#actual_tp_per_' + input).val(!isNaN(actual_tp_percentage) && isFinite(actual_tp_percentage) ? actual_tp_percentage.toFixed(2) : '0.00');
+                }
+            } else if (field === 'tp_amt_for_calc') {
+
+                if(actual_tp_amt > 0){
+
+                    if (actual_tp_amt > 0 && actual_tp_per >= 0) {
+                        let actual_tp_brokerage_amount = (actual_tp_amt * actual_tp_per) / 100;
+                        // $('#actual_tp_brokerage_amt_' + input).val(actual_tp_brokerage_amount.toFixed(2));
+                        $('#actual_tp_brokerage_amt_' + input).val(!isNaN(actual_tp_brokerage_amount) && isFinite(actual_tp_brokerage_amount) ? actual_tp_brokerage_amount.toFixed(2) : '0.00');
+
+                    }
+
+                }else if(actual_tp_brokerage_amt > 0){
+
+                    if (actual_tp_amt > 0 && actual_tp_brokerage_amt >= 0) {
+                        let actual_tp_percentage = (actual_tp_brokerage_amt / actual_tp_amt) * 100;
+                        // $('#actual_tp_per_' + input).val(actual_tp_percentage.toFixed(2));
+                        $('#actual_tp_per_' + input).val(!isNaN(actual_tp_percentage) && isFinite(actual_tp_percentage) ? actual_tp_percentage.toFixed(2) : '0.00');
+                    }
+
+                }else{
+                    if (actual_tp_amt > 0 && actual_tp_per >= 0) {
+                        let actual_tp_brokerage_amount = (actual_tp_amt * actual_tp_per) / 100;
+                        // $('#actual_tp_brokerage_amt_' + input).val(actual_tp_brokerage_amount.toFixed(2));
+                        $('#actual_tp_brokerage_amt_' + input).val(!isNaN(actual_tp_brokerage_amount) && isFinite(actual_tp_brokerage_amount) ? actual_tp_brokerage_amount.toFixed(2) : '0.00');
+                    }
+
+                    if (actual_tp_amt > 0 && actual_tp_brokerage_amt >= 0) {
+                        let actual_tp_percentage = (actual_tp_brokerage_amt / actual_tp_amt) * 100;
+                        // $('#actual_tp_per_' + input).val(actual_tp_percentage.toFixed(2));
+                        $('#actual_tp_per_' + input).val(!isNaN(actual_tp_percentage) && isFinite(actual_tp_percentage) ? actual_tp_percentage.toFixed(2) : '0.00');
+
+                    }
+                }
+            }
+
+        }else{
+
+            $('#actual_tp_brokerage_amt_' + input).val(0);
+            $('#actual_tp_per_' + input).val(0);
+        }
+
+        //-----------------------------------------------------------------------------------------
+
+
+        if(bap == 'Fire' || bap == 'Marine Cargo' || bap == 'Marine Hull'){
+
+            if (field === 'tep_per') {
+                if (actual_tep_amt > 0 && actual_tep_per >= 0) {
+                    let actual_tep_brokerage_amount = (actual_tep_amt * actual_tep_per) / 100;
+                    // $('#actual_tep_brokerage_amt_' + input).val(actual_tep_brokerage_amount.toFixed(2));
+                    $('#actual_tep_brokerage_amt_' + input).val(!isNaN(actual_tep_brokerage_amount) && isFinite(actual_tep_brokerage_amount) ? actual_tep_brokerage_amount.toFixed(2) : '0.00');
+
+                }
+            } else if (field === 'tep_broker_amt') {
+                // If brokerage amount is changed, update percentage
+                if (actual_tep_amt > 0 && actual_tep_brokerage_amt >= 0) {
+                    let actual_tep_percentage = (actual_tep_brokerage_amt / actual_tep_amt) * 100;
+                    // $('#actual_tep_per_' + input).val(actual_tep_percentage.toFixed(2));
+                    $('#actual_tep_per_' + input).val(!isNaN(actual_tep_percentage) && isFinite(actual_tep_percentage) ? actual_tep_percentage.toFixed(2) : '0.00');
+
+                }
+            } else if (field === 'tep_amt_for_calc') {
+
+                if(actual_tep_amt > 0){
+
+                    if (actual_tep_amt > 0 && actual_tep_per >= 0) {
+                        let actual_tep_brokerage_amount = (actual_tep_amt * actual_tep_per) / 100;
+                        // $('#actual_tep_brokerage_amt_' + input).val(actual_tep_brokerage_amount.toFixed(2));
+                        $('#actual_tep_brokerage_amt_' + input).val(!isNaN(actual_tep_brokerage_amount) && isFinite(actual_tep_brokerage_amount) ? actual_tep_brokerage_amount.toFixed(2) : '0.00');
+
+                    }
+
+                }else if(actual_tep_brokerage_amt > 0){
+
+                    if (actual_tep_amt > 0 && actual_tep_brokerage_amt >= 0) {
+                        let actual_tep_percentage = (actual_tep_brokerage_amt / actual_tep_amt) * 100;
+                        // $('#actual_tep_per_' + input).val(actual_tep_percentage.toFixed(2));
+                        $('#actual_tep_per_' + input).val(!isNaN(actual_tep_percentage) && isFinite(actual_tep_percentage) ? actual_tep_percentage.toFixed(2) : '0.00');
+                    }
+
+                }else{
+
+                    if (actual_tep_amt > 0 && actual_tep_per >= 0) {
+                        let actual_tep_brokerage_amount = (actual_tep_amt * actual_tep_per) / 100;
+                        // $('#actual_tep_brokerage_amt_' + input).val(actual_tep_brokerage_amount.toFixed(2));
+                        $('#actual_tep_brokerage_amt_' + input).val(!isNaN(actual_tep_brokerage_amount) && isFinite(actual_tep_brokerage_amount) ? actual_tep_brokerage_amount.toFixed(2) : '0.00');
+                    }
+
+                    if (actual_tep_amt > 0 && actual_tep_brokerage_amt >= 0) {
+                        let actual_tep_percentage = (actual_tep_brokerage_amt / actual_tep_amt) * 100;
+                        // $('#actual_tep_per_' + input).val(actual_tep_percentage.toFixed(2));
+                        $('#actual_tep_per_' + input).val(!isNaN(actual_tep_percentage) && isFinite(actual_tep_percentage) ? actual_tep_percentage.toFixed(2) : '0.00');
+
+                    }
+                }
+
+            }
+
+        }else{
+
+            $('#actual_tep_brokerage_amt_' + input).val(0);
+            $('#actual_tep_per_' + input).val(0);
+        }
+
+        //-----------------------------------------------------------------------------------------
+
+        let expectedAmount = parseFloat($('#exp_amt_' + input).val()) || 0;
+        var actual_bp_brokerage_amount2 = parseFloat($('#actual_bp_brokerage_amt_' + input).val()) || 0;
+        let actual_tp_brokerage_amount2 = parseFloat($('#actual_tp_brokerage_amt_' + input).val()) || 0;
+        let actual_tep_brokerage_amount2 = parseFloat($('#actual_tep_brokerage_amt_' + input).val()) || 0;
+
+        // let variance = expectedAmount - (actual_bp_brokerage_amount2 + actual_tp_brokerage_amount2 + actual_tep_brokerage_amount2)
+        let variance = (actual_bp_brokerage_amount2 + actual_tp_brokerage_amount2 + actual_tep_brokerage_amount2) - expectedAmount
+
+        // $('#variance_' + input).val(variance.toFixed(2));
+        $('#variance_' + input).val(!isNaN(variance) && isFinite(variance) ? variance.toFixed(2) : '0.00');
+
+        // console.log('expectedAmount', expectedAmount);
+        // console.log('variance', variance);
+    }
+
+    function co_share_percentage_calculation(input, extra = null){
+
+        console.log('input', input)
+        var inputs = $('input[name="co_share_per[]"]'); // Specifically select input elements
+        console.log('Number of inputs:', inputs.length);
+
+        let insurer_count = insurer_count_array.length;
+        console.log('insurer_count', insurer_count);
+        console.log('insurer_count_array', insurer_count_array);
+
+        if(input){
+            if(insurer_count == 2){
+
+                // 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);
+                    }
+                }
+            });
+
+        }
+
+        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');
+        }
+
+    }
+
+    function select_leader_disable_premium_amt(input, value) {
+        if ($(input).is(':checked')) {
+            // Disable and add readonly-select class to all premiums except the one with the given value
+            // $('input[name="base_premium[]"]').addClass('readonly-select');
+            // $('#base_premium_' + value).removeClass('readonly-select');
+
+            // $('input[name="tp_premium[]"]').addClass('readonly-select');
+            // $('#tp_premium_' + value).removeClass('readonly-select');
+
+            // $('input[name="ter_premium[]"]').addClass('readonly-select');
+            // $('#ter_premium_' + value).removeClass('readonly-select');
+
+            $('input[name="base_premium"]').addClass('readonly-select');
+            $('#base_premium').removeClass('readonly-select');
+
+            $('input[name="tp_premium"]').addClass('readonly-select');
+            $('#tp_premium').removeClass('readonly-select');
+
+            $('input[name="ter_premium"]').addClass('readonly-select');
+            $('#ter_premium').removeClass('readonly-select');
+
+            $('input[name="stamp_duty[]"]').addClass('readonly-select');
+            $('#stamp_duty_' + value).removeClass('readonly-select');
+
+            $('input[name="co_premium[]"]').addClass('readonly-select');
+            $('#co_premium_' + value).removeClass('readonly-select');
+        } else {
+            // Enable and remove readonly-select class from all premiums except the one with the given value
+            // $('input[name="base_premium[]"]').removeClass('readonly-select');
+            // $('input[name="tp_premium[]"]').removeClass('readonly-select');
+            // $('input[name="ter_premium[]"]').removeClass('readonly-select');
+            $('input[name="base_premium"]').removeClass('readonly-select');
+            $('input[name="tp_premium"]').removeClass('readonly-select');
+            $('input[name="ter_premium"]').removeClass('readonly-select');
+            $('input[name="stamp_duty[]"]').removeClass('readonly-select');
+            $('input[name="co_premium[]"]').removeClass('readonly-select');
+        }
+    }
+
+    function validateRange(input) {
+        // if (input.value < 1) input.value = 1;
+        if (input.value > 100) input.value = 100;
+    }
+
+    function checkInvoiceStatusToHideSubmitBtn(id){
+
+        $.ajax({
+                url: '<?php echo base_url('util/checkInvoiceStatus/');?>'+ id,
+                type: "GET",
+                dataType: 'json',
+                success: function (res) {
+
+                    console.log(res)
+                    if(res.status == true){
+
+                        if(res.count > 0){
+                            $('#submitButton').hide()
+                        }else{
+                            $('#submitButton').show()
+                        }
+                        
+                    }else{
+                        console.log(res.message, 'warning');
+                    }
+                },
+                error: function (xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                }        
+            });
+
+    }
+
+    function getpolicyDataForEndorsement(input){
+
+        var client_policy_id = $(input).val();
+        console.log(client_policy_id);
+
+        if(client_policy_id){
+            $.ajax({
+                url: '<?php echo base_url('util/get_client_policy_data_using_client_policy_id/');?>'+ client_policy_id,
+                type: "GET",
+                dataType: 'json',
+                success: function (res) {
+
+                    console.log(res)
+                    if(res.status == true){
+                        $('#ct_type').val(1)
+                    }else{
+                        $('#ct_type').val(2)
+                        console.log(res.message, 'warning');
+                    }
+                },
+                error: function (xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                }        
+            });
+        }
+    }
+
+    //---------------------------------------------------------------------------------------------------------
+
+    var insurerCount = 0;
+
+    function addInsurerColumn() {
+        insurerCount++;
+        const isFinanceOrBrokerage = (role_id == 1 || role_id == 5 || team_id.includes('6') || team_id.includes('4'));
+
+        let showDelete = insurerCount > 1 ? `
+                <button type="button"
+                    class="btn btn-sm btn-danger delete-insurer"
+                    data-count="${insurerCount}">
+                    Delete
+                </button>` : '';
+
+
+            let showAdd = insurerCount == 1 ? '' : '';
+
+            let cardHTML = `<div class="p-1 mb-2 insurer-card" id="insurerCardContainer_${insurerCount}" data-count="${insurerCount}">
+    
+                            <div class="d-flex justify-content-between align-items-center border-bottom pb-2 mb-3">
+                                <div class="fw-bold text-primary insurer-card-title">Insurer - ${insurerCount}</div>
+                                
+                                <div class="d-flex align-items-center gap-2">
+                                    ${showAdd}
+                                    ${showDelete}
+                                </div>
+                            </div>
+
+                            <div id="insurerCardContainer">
+
+                                <div class="form-row mb-2">
+
+                                <div class="col-md-4 mb-2 card_group_1">
+    
+                                    <div class="d-flex align-items-center justify-content-between mb-1">
+                                        
+                                        <label class="card_label_1 mb-0 d-flex align-items-center">
+                                            Insurer <span class="text-danger">*</span>
+                                        </label>
+                                        
+                                        <div class="card_group_2" style="display:none">
+                                                <label class="card_label_2 mb-0 d-flex align-items-center">
+                                                    <span class="mr-1">Is Leader?</span>
+
+                                                    <input data-id="${insurerCount}" id="co_share_type_${insurerCount}" 
+                                                        type="checkbox" name="co_share_type[]" 
+                                                        onchange="select_leader_disable_premium_amt(this, '${insurerCount}')"
+                                                        class="mr-1">
+
+
+                                                </label>
+                                        </div>
+                                        
+                                    </div>
+                                    
+                                    <select class="form-control follow_insurer readonly-select" data-count="${insurerCount}" id="follow_insurer_id_${insurerCount}" name="follow_insurer_id[]">
+                                        <option value="" selected>Select Insurer</option>
+                                        <?php foreach ($insurer_branch as $value) { ?>
+                                            <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>" data-id="<?= $value['insurer_id'] ?>" data-bid="<?= $value['id'] ?>">
+                                                <?= $value['insurer_name'] . '-' . $value['branch_code'] ?>
+                                            </option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                                    <div class="col-md-4 mb-2 card_group_34" style="display:none;">
+                                        <!-- <label class="card_label_34">CD Acc No</label> -->
+                                        <label class="card_label_34 d-flex align-items-center">
+                                            <span class="flex-grow-1">CD Acc No</span>
+
+                                            <small id="cd_current_balance_info_${insurerCount}" 
+                                                class="text-right"
+                                                style="font-size: x-small;">
+                                            </small>
+                                        </label>
+                                        <input type="text" class="form-control readonly-color" id="cd_account_no_${insurerCount}" readonly>
+                                        <input type="hidden" class="form-control readonly-color right-align-input" id="cd_current_balance_${insurerCount}" readonly>
+                                    </div>
+                                </div>
+                                
+                                <div class="form-row mb-2">
+                                    <div class="col-md-4 mb-2 card_group_35">
+                                        <label class="card_label_35">Policy No</label>
+                                        <input type="text" class="form-control readonly-color" id="follower_policy_no_${insurerCount}" name="follower_policy_no[]" readonly>
+                                    </div>
+                                    <div class="col-md-4 mb-2 card_group_40">
+                                        <label class="card_label_40"> Endorsement Issue Date </label>
+                                        <input type="text" class="form-control" id="calc_policy_issue_date_${insurerCount}" name="calc_policy_issue_date[]">
+                                    </div>
+                                    <div class="col-md-4 mb-2 card_group_3" id="coshare_wrap_${insurerCount}" style="display:none;">
+                                        <label class="card_label_3">Co-Share %</label>
+                                        <div class="input-wrap">
+                                            <input type="text" class="form-control right-align-input input-content" id="co_share_per_${insurerCount}" name="co_share_per[]" oninput="validateRange(this)" onchange="co_share_percentage_calculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                            <span class="input-symbol">%</span>
+                                        </div>
+                                    </div>
+                                </div>
+                                
+                                <div class="form-row compact-details-section mb-2">
+
+                                    <div class="col-md-6">
+                                        
+                                        <div class="form-row mb-1 text-success small font-weight-bold">
+                                                <div class="col-6">Premium</div>
+                                                <div class="col-6"></div>
+                                        </div>
+
+                                        <div class="form-row mb-2 align-items-center">
+                                            <div class="col-6"><label class="card_label_36">Non Commissionable </label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control right-align-input" id="non_comm_per_amt_${insurerCount}" name="non_comm_per_amt[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2 card_group_7" style="display:none;">
+                                            <div class="col-6"><label class="card_label_7">Base </label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control right-align-input" id="co_premium_${insurerCount}" name="co_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2 card_group_38 hidecotp" style="display:none;">
+                                            <div class="col-6"><label class="card_label_38">TP </label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control right-align-input" id="co_tp_premium_${insurerCount}" name="co_tp_premium[]" oninput="" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2 card_group_39 hidecoter" style="display:none;">
+                                            <div class="col-6"><label class="card_label_39">TEP </label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control right-align-input" id="co_ter_premium_${insurerCount}" name="co_ter_premium[]" oninput="" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2">
+                                            <div class="col-2 card_group_8">
+                                                <label class="card_label_8 small">CGST</label>
+                                                <div class="input-wrap mr-2">
+                                                    <input type="text" class="form-control right-align-input input-content" id="cgst_${insurerCount}" name="cgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                                    <span class="input-symbol">%</span>
+                                                </div>
+                                            </div>
+                                            <div class="col-2 card_group_9">
+                                                <label class="card_label_9 small">SGST</label>
+                                                <div class="input-wrap mr-2">
+                                                    <input type="text" class="form-control right-align-input input-content" id="sgst_${insurerCount}" name="sgst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                                    <span class="input-symbol">%</span>
+                                                </div>
+                                            </div>
+                                            <div class="col-2 card_group_10">
+                                                <label class="card_label_10 small">IGST</label>
+                                                <div class="input-wrap mr-2">
+                                                    <input type="text" class="form-control right-align-input input-content" id="igst_${insurerCount}" name="igst[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                                    <span class="input-symbol">%</span>
+                                                </div>
+                                            </div>
+                                            <div class="col-6 card_group_11">
+                                                <label class="card_label_11">GST Amount</label>
+                                                <input type="text" class="form-control right-align-input" id="gst_amount_${insurerCount}" name="gst_amount[]" onchange="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2 align-items-center">
+                                            <div class="col-6"><label class="card_label_12">Stamp Duty</label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control right-align-input" id="stamp_duty_${insurerCount}" name="stamp_duty[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-row mb-2 align-items-center">
+                                            <div class="col-6"><label class="card_label_13">Total</label></div>
+                                            <div class="col-6">
+                                                <input type="text" class="form-control readonly-color right-align-input" id="total_amt_${insurerCount}"  name="total[]" readonly onkeypress="return onlyNumbers(event)">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-1"></div>
+                                    <div class="col-md-5">
+                                        <div class="form-row">
+                                            <div class="col-12">
+                                                <div class="form-row mb-1 text-success small font-weight-bold">
+                                                    <div class="col-4">Remuneration</div> 
+                                                    <div class="col-4"></div>
+                                                    <div class="col-4 hidetp"></div>
+                                                    <div class="col-4 hideter" style="display:none;"></div>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-12">
+                                                <div class="form-row mb-2 align-items-center">
+                                                    <div class="col-4"><label class="card_label_14">Agreed (%)</label></div>
+                                                    <div class="col-4 card_group_14">
+                                                        <div class="input-wrap mr-2">
+                                                            <span class="input-prefix">BP &nbsp; </span>
+                                                            <input type="text" class="form-control right-align-input input-content" id="agreed_bp_${insurerCount}" name="agreed_bp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" >
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-4 card_group_15 hidetp">
+                                                        <div class="input-wrap mr-2">
+                                                            <span class="input-prefix">TP &nbsp; </span>
+                                                            <input type="text" class="form-control right-align-input input-content" id="agreed_tp_${insurerCount}" name="agreed_tp[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)">
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-4 card_group_16 hideter" style="display:none;">
+                                                        <div class="input-wrap">
+                                                            <span class="input-prefix">TEP &nbsp; </span>
+                                                            <input type="text" class="form-control right-align-input input-content" id="agreed_tep_${insurerCount}" name="agreed_ter[]" oninput="amountCalculation('${insurerCount}'); validateRange(this)" onkeypress="return onlyNumbers(event)" >
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            ${isFinanceOrBrokerage ? `
+                                                <div class="col-12">
+                                                    <div class="form-row mb-2 align-items-center">
+                                                        <div class="col-4"><label class="card_label_17">Agreed Amount</label></div>
+                                                        <div class="col-8 card_group_17">
+                                                            <input type="text" class="form-control right-align-input" id="agreed_amount_${insurerCount}"  name="agreed_amount[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            ` : ''}
+
+                                            <div class="col-12">
+                                                <div class="form-row mb-2 align-items-center">
+                                                    <div class="col-4"><label class="card_label_18">Standard</label></div>
+                                                    <div class="col-4 card_group_18">
+                                                        <div class="input-wrap mr-2">
+                                                            <span class="input-prefix">BP &nbsp;</span>
+                                                            <input type="text" class="form-control readonly-color right-align-input input-content" id="standard_bp_${insurerCount}" name="standard_bp[]" onkeypress="return onlyNumbers(event)" readonly>
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-4 card_group_19 hidetp">
+                                                        <div class="input-wrap mr-2">
+                                                            <span class="input-prefix">TP &nbsp;</span>
+                                                            <input type="text" class="form-control readonly-color right-align-input input-content" id="standard_tp_${insurerCount}"  name="standard_tp[]" onkeypress="return onlyNumbers(event)" readonly >
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-4 card_group_20 hideter" style="display:none;">
+                                                        <div class="input-wrap">
+                                                            <span class="input-prefix">TEP &nbsp;</span>
+                                                            <input type="text" class="form-control readonly-color right-align-input input-content" id="standard_tep_${insurerCount}" name="standard_ter[]" onkeypress="return onlyNumbers(event)" readonly></td>
+                                                            <span class="input-symbol">%</span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            
+                                            ${isFinanceOrBrokerage ? `
+                                                <div class="col-12">
+                                                    <div class="form-row mb-2 align-items-center">
+                                                        <div class="col-4"><label class="card_label_30">Expected</label></div>
+                                                        <div class="col-8 card_group_30">
+                                                            <input type="text" class="form-control readonly-select right-align-input" id="exp_amt_${insurerCount}" name="exp_amt[]" onchange="actualAmountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            
+
+                                                <div class="col-12">
+                                                    <div class="form-row mb-2 align-items-center">
+                                                        <div class="col-4"><label class="card_label_24">Actual (%)</label></div>
+                                                        <div class="col-4 card_group_24">
+                                                            <div class="input-wrap mr-2">
+                                                                <span class="input-prefix">BP &nbsp;</span>
+                                                                <input type="text" class="form-control readonly-select right-align-input input-content" id="actual_bp_per_${insurerCount}" name="actual_bp_per[]" onchange="actualAmountCalculation('${insurerCount}', 'bp_per')" onkeypress="return onlyNumbers(event)">
+                                                                <span class="input-symbol">%</span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-4 card_group_22 hidetp">
+                                                            <div class="input-wrap mr-2">
+                                                                <span class="input-prefix">TP &nbsp;</span>
+                                                                <input type="text" class="form-control readonly-select right-align-input input-content" id="actual_tp_per_${insurerCount}" name="actual_tp_per[]" onchange="actualAmountCalculation('${insurerCount}', 'tp_per')"  onkeypress="return onlyNumbers(event)">
+                                                                <span class="input-symbol">%</span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-4 card_group_23 hideter" style="display:none;">
+                                                            <div class="input-wrap">
+                                                                <span class="input-prefix">TEP &nbsp;</span>
+                                                                <input type="text" class="form-control readonly-select right-align-input input-content" id="actual_tep_per_${insurerCount}" name="actual_tep_per[]" onchange="actualAmountCalculation('${insurerCount}', 'tep_per')"  onkeypress="return onlyNumbers(event)">
+                                                                <span class="input-symbol">%</span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                ` : ''}
+                                                <div class="col-12">
+                                                    <div class="form-row mb-2 align-items-center">
+                                                        <div class="col-4"><label class="card_label_21">Actual brokerage Amount</label></div>
+                                                        <div class="col-4 card_group_21">
+                                                            <div class="input-wrap">
+                                                            <span class="input-prefix">BP &nbsp;</span>
+                                                            <input type="text" class="form-control 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)">
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-4 card_group_22 hidetp">
+                                                            <div class="input-wrap">
+                                                            <span class="input-prefix">TP &nbsp;</span>
+                                                            <input type="text" class="form-control 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)">
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-4 card_group_23 hideter" style="display:none;">
+                                                            <div class="input-wrap">
+                                                            <span class="input-prefix">TEP &nbsp;</span>
+                                                            <input type="text" class="form-control 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)">
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            
+
+                                        </div>
+                                    </div>
+                                    
+                                </div>
+
+                                <div class="form-row mb-2">
+                                    <div class="col-md-12 card_group_33" style="display:none;">
+                                        <label class="card_label_33">all Hidden</label>
+                                        <input type="hidden" name="co_share_id[]" id="co_share_id[]" onkeypress="return onlyNumbers(event)">
+
+                                        <input type="hidden" id="base_premium_${insurerCount}" name="base_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)" class="bp_value">
+                                        <input type="hidden" id="tp_premium_${insurerCount}" name="tp_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)" class="tp_value">
+                                        <input type="hidden" id="ter_premium_${insurerCount}" name="ter_premium[]" oninput="amountCalculation('${insurerCount}')" onkeypress="return onlyNumbers(event)" class="ter_value">
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>`;
+
+            $('#allInsurerCards').append(cardHTML);
+    
+            // --- Post-Insertion Logic (Initializations and dynamic setting) ---
+
+            // 1. Initialize Flatpickr for Policy Issue Date
+            flatpickr(`#calc_policy_issue_date_${insurerCount}`, {
+                dateFormat: "d/m/Y",
+                allowInput: false
+            });
+
+            // 2. Apply Visibility and Set Standard Percentages
+            applyPolicyVisibilityAndStandards(insurerCount);
+
+            // 3. Attach Delete Event Listener
+            $('.delete-insurer').off('click').on('click', function() {
+                const count_index = $(this).data('count');
+                removeInsurerCard(count_index);
+            });
+
+            return insurerCount;
+
+
+    }
+
+    /**
+     * Applies visibility classes and sets standard percentages based on selected policy data.
+     * @param {number} currentInsurerCount - The index of the card to update.
+     */
+    function applyPolicyVisibilityAndStandards(currentInsurerCount) {
+        
+        const cardElement = $(`#insurerCardContainer_${currentInsurerCount}`);
+        
+        // --- 1. Get Policy Data ---
+        var selectedOption = $('#client_policy_id').find('option:selected');
+
+        var ebp = selectedOption.data('ebp');
+        var etp = selectedOption.data('etp');
+        var etep = selectedOption.data('etep');
+        var iep = selectedOption.data('iep');
+        var itp = selectedOption.data('itp');
+        var itep = selectedOption.data('itep');
+
+        var bap = selectedOption.data('bap'); // Base Agreement Policy Type (e.g., 'Fire', 'Motor')
+        var allocg = selectedOption.data('allocg'); // Allocation Group (e.g., "EB")
+
+        console.log('allocg:', allocg);
+
+        var client_type_id = $('#client_type').val() ?? 1;
+        var is_co_pay_yes = $('#cop_yes').val();
+        if(is_co_pay_yes == "" || is_co_pay_yes == null){
+            is_co_pay_yes = 0;
+        }
+
+            console.log('#cop_yes', $('#cop_yes').val());
+            console.log('is_co_pay_yes', is_co_pay_yes);
+
+        // --- 2. Apply Visibility (Hiding/Showing Card Sections) ---
+        // Instead of manipulating global classes like $('.hideter').show(), we manipulate classes on the card elements.
+        
+        // General reset/hide for the current card
+            if(allocg == "EB"){
+                $('.hideter').hide();
+                $('.hidetp').hide();
+                $('.hidecoter').hide()
+                $('.hidecotp').hide()
+            }else{
+
+                $('.hidetp').show();
+                if(is_co_pay_yes == 1){
+                    $('.hidecotp').show();
+                    $('#table_tr_7').show();
+                    $('#table_tr_35').show();
+                    $('#table_tr_3').show();
+                }else{
+                    $('.hidecotp').hide();
+                    $('#table_tr_7').hide();
+                    $('#table_tr_35').hide();
+                    $('#table_tr_3').hide();
+                }
+
+                if(bap == 'Fire' || bap == 'Marine Cargo' || bap == 'Marine Hull'){
+                    $('.hideter').show();
+                    if(is_co_pay_yes == 1){
+                        $('.hidecoter').show();
+                    }else{
+                        $('.hidecoter').hide();
+                    }
+                }else{
+                    $('.hideter').hide();
+                }
+            }
+
+        // --- 3. Set Standard Percentages ---
+        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;
+        }
+
+        // Set values using the unique card IDs
+        $(`#standard_bp_${currentInsurerCount}`).val(std_bp);
+        
+            $('[name="standard_tp[]"]').val(std_tp);
+            $('[name="standard_tep[]"]').val(std_tep);
+
+            if(currentInsurerCount > 1){
+                $('.follow_insurer').prop('required', true);
+            }else{
+                $('.follow_insurer').prop('required', false);
+            }
+
+            var calc_policy_issue_date = flatpickr("#calc_policy_issue_date_" + currentInsurerCount, {
+                dateFormat: "d/m/Y",
+                allowInput: false
+            });
+    }
+
+    $(document).on('click', '.delete-insurer', function () {
+
+        const count_index = $(this).data('count') || $(this).attr('data-count');
+
+        if (!count_index) {
+            console.error('Missing data-count');
+            return;
+        }
+
+        removeInsurerCard(count_index);
+        getCardIndexes(1); // keep if you still use it
+
+    });
+
+
+    function removeInsurerCard(count_index) {
+
+        console.log('#################################### Remove Insurer Card ####################################');
+
+        let removedCoShareIds = [];
+
+        //  Get co_share_id[] only from this card
+        const coShareId = $('#insurerCardContainer_' + count_index)
+            .find('[name="co_share_id[]"]')
+            .val();
+
+        if (coShareId) {
+            removedCoShareIds.push(coShareId);
+        }
+
+        console.log('removedCoShareIds array', removedCoShareIds);
+
+        //  Store removed IDs in hidden input
+        let existing = $('#remove_pt_co_id').val();
+        let finalArr = [];
+
+        if (existing) {
+            finalArr = existing.split(',');
+        }
+
+        finalArr = finalArr.concat(removedCoShareIds);
+        $('#remove_pt_co_id').val(finalArr.join(','));
+
+        console.log('remove_pt_co_id value', $('#remove_pt_co_id').val());
+
+        //  Remove the CARD
+        $('#insurerCardContainer_' + count_index).remove();
+        // renumberCards(); // don't forgot
+
+        //  Remove from insurer_count_array
+        insurer_count_array = insurer_count_array.filter(item => item !== count_index);
+
+        //  Recalculate co-share
+        if (typeof co_share_percentage_calculation === "function") {
+            co_share_percentage_calculation(null, "remove");
+        }
+
+        //  Decrease count
+        insurerCount--;
+
+        if (insurerCount === 0) {
+            $('.follow_insurer').prop('required', false);
+        } else {
+            $('.follow_insurer').prop('required', true);
+        }
+
+        console.log('#################################### END Remove Insurer Card ####################################');
+    }
+
+    function removeAllInsurerCards() {
+        console.log('######################################');
+        console.log('removeAllInsurerCards function called');
+        console.log('######################################');
+
+        // Assuming all insurer cards are contained within #allInsurerCards
+        $('#allInsurerCards').empty();
+
+        // Reset the global counter
+        // Assuming 'insurerCount' and 'insurer_count_array' are global variables
+        insurerCount = 0;
+        insurer_count_array = [];
+    }
+
+
+    function populateCards(dataArray, status = false) {
+    
+    console.log('####################################');
+    console.log('populateCards function called');
+    console.log('####################################');
+
+    // Make sure you define/reset this globally if needed
+    // insurerCount = 0; 
+    
+        dataArray.forEach((data, index) => {
+            
+            // 🚨 MISTAKE 1: You must call the card creation function first!
+            // This function will increment insurerCount and build the HTML card
+            addInsurerColumn(); 
+            
+            // Use the newly incremented global counter, which is now the correct card index.
+            const cardIndex = insurerCount; 
+            
+            let disable_td = false;
+            if(data.record_count > 0){
+                disable_td = true;
+            }
+
+            const cardContainer = $(`#insurerCardContainer_${cardIndex}`);
+            if (cardContainer.length === 0) {
+                console.error(`Card container for index ${cardIndex} not found.`);
+                return; 
+            }
+
+            let insurer = data.insurer_branch_id + '-' + data.insurer_id;
+            
+            // --- Populate fields based on available data (NO ROLE CHECK HERE) ---
+
+            // All fields should be populated if they exist in the card created by addInsurerColumn()
+
+            // Insurer/Basic Details
+            $(`#follow_insurer_id_${cardIndex}`).val(insurer).trigger('change');
+            $(`#co_share_type_${cardIndex}`).val(data.co_share_type ?? '');
+            $(`#follower_policy_no_${cardIndex}`).val(data.follower_policy_no);
+            $(`#calc_policy_issue_date_${cardIndex}`).val(data.pt_policy_issue_date);
+            $(`#co_share_per_${cardIndex}`).val(data.co_share_per).toggleClass('readonly-select', !!disable_td);
+            $(`#non_comm_per_amt_${cardIndex}`).val(data.non_comm_per_amt);
+            
+            // Premium Fields
+            $(`#base_premium_${cardIndex}`).val(status ? data.bp_amt : '').toggleClass('readonly-select', !!disable_td);
+            $(`#tp_premium_${cardIndex}`).val(status ? data.tp_amt : '').toggleClass('readonly-select', !!disable_td);
+            $(`#ter_premium_${cardIndex}`).val(status ? data.tep_amt : '').toggleClass('readonly-select', !!disable_td);
+            
+            $(`#co_premium_${cardIndex}`).val(status ? data.cop_amt : '').toggleClass('readonly-select', !!disable_td);
+            $(`#co_tp_premium_${cardIndex}`).val(status ? data.cotp_amt : '').toggleClass('readonly-select', !!disable_td);
+            $(`#co_ter_premium_${cardIndex}`).val(status ? data.cotep_amt : '').toggleClass('readonly-select', !!disable_td);
+            
+            // GST/Tax Fields
+            $(`#cgst_${cardIndex}`).val(data.bp_cgst).toggleClass('readonly-select', !!disable_td);
+            $(`#sgst_${cardIndex}`).val(data.bp_sgst).toggleClass('readonly-select', !!disable_td);
+            $(`#igst_${cardIndex}`).val(data.bp_igst).toggleClass('readonly-select', !!disable_td);
+            $(`#gst_amount_${cardIndex}`).val(status ? data.bp_gst_amt : '').toggleClass('readonly-select', !!disable_td);
+            $(`#stamp_duty_${cardIndex}`).val(status ? data.stamp_duty : '').toggleClass('readonly-select', !!disable_td);
+            $(`#total_amt_${cardIndex}`).val(status ? data.amount : '');
+
+            // Agreed Percentages
+            $(`#agreed_bp_${cardIndex}`).val(data.agreed_bp_per).toggleClass('readonly-select', !!disable_td);
+            $(`#agreed_tp_${cardIndex}`).val(data.agreed_tp_per).toggleClass('readonly-select', !!disable_td);
+            $(`#agreed_tep_${cardIndex}`).val(data.agreed_tep_per).toggleClass('readonly-select', !!disable_td);
+
+            // Standard Percentages (Read-only)
+            $(`#standard_bp_${cardIndex}`).val(data.standerd_bp_per);
+            // Note: You must ensure standard_tp/ter now have unique IDs in your card HTML if you use ID selector
+            $(`input[name="standard_tp[]"]`).filter((i, el) => $(el).closest('.insurer-card').attr('data-count') == cardIndex).val(data.standerd_tp_per);
+            $(`input[name="standard_ter[]"]`).filter((i, el) => $(el).closest('.insurer-card').attr('data-count') == cardIndex).val(data.standerd_tep_per);
+            
+            // Hidden ID
+            cardContainer.find('input[name="co_share_id[]"]').val(status ? data.id : '');
+
+
+            // --- 🚨 MISTAKE 2: Role-Specific Fields (FIXED) ---
+            // These fields only exist in the card if they were created by addInsurerColumn() 
+            // under the finance/management roles. We check if the field exists before populating.
+            
+            // Finance/Management/Brokerage fields
+            const agreedAmountField = $(`#agreed_amount_${cardIndex}`);
+            if (agreedAmountField.length) {
+                agreedAmountField.val(data.agreed_amt).toggleClass('readonly-select', !!disable_td);
+                
+                // Actual Amounts
+                $(`#actual_bp_amt_${cardIndex}`).val(status ? data.actual_bp_amt : '');
+                $(`#actual_tp_amt_${cardIndex}`).val(status ? data.actual_tp_amt : '');
+                $(`#actual_tep_amt_${cardIndex}`).val(status ? data.actual_tep_amt : '');
+
+                // Actual Percentages
+                $(`#actual_bp_per_${cardIndex}`).val(status ? data.actual_bp_per : '');
+                $(`#actual_tp_per_${cardIndex}`).val(status ? data.actual_tp_per : '');
+                $(`#actual_tep_per_${cardIndex}`).val(status ? data.actual_tep_per : '');
+
+                // Actual Brokerage Amounts
+                $(`#actual_bp_brokerage_amt_${cardIndex}`).val(status ? data.actual_bp_brokerage_amt : '');
+                $(`#actual_tp_brokerage_amt_${cardIndex}`).val(status ? data.actual_tp_brokerage_amt : '');
+                $(`#actual_tep_brokerage_amt_${cardIndex}`).val(status ? data.actual_tep_brokerage_amt : '');
+                
+                // Expected Amount
+                $(`#exp_amt_${cardIndex}`).val(status ? data.exp_amt : '');
+            }
+
+            // --- Post-Population Logic ---
+            
+            if(data.co_share_type == 1){
+                // Ensure appendCDData uses the correct cardIndex
+                appendCDData(data.cd_account_no, data.cd_amount, cardIndex);
+            }
+
+            // We push the final, correct insurerCount
+            insurer_count_array.push(insurerCount)
+
+        });
+    }
+
+
+    
+
+    
+
+    //-----------------------------------------------------------------------------------------------------------
+
+    // function getURLParamsForReport() 
+    // {   
+    //     console.log('getURLParamsForReport()  function called')
+    //     const url = new URL(window.location.href);
+    //     const params = new URLSearchParams(url.search);
+    //     const pt_id = params.get('pt_id') ?? 0
+
+    //     console.log('policy tranction id ', pt_id);
+        
+    //     if(pt_id != 0){
+    //         setTimeout(function(){
+    //             hide_list_show_add()
+    //             getPolicyTransactionDataForEndorsementEdit(pt_id)
+    //         }, 2000)
+    //     }else{
+    //         show_list_hide_add() 
+    //     }
+
+    //     console.log('pt_id', pt_id)
+
+    // }
+
+    function getURLParamsForReport() {   
+        const params = new URLSearchParams(window.location.search);
+        const pt_id = params.get('pt_id') ?? 0;
+
+        // ✅ Get the previous page URL
+        const previousUrl = document.referrer || '';
+
+        console.log("PT ID:", pt_id);
+        console.log("Previous Page URL:", previousUrl);
+
+        if (pt_id != 0) {
+            hide_list_show_add();
+            setTimeout(() => 
+                getPolicyTransactionDataForEndorsementEdit(pt_id), 
+            1500);  // Reduced timeout
+        } else {
+            show_list_hide_add();
+        }
+
+        if(previousUrl != "" && pt_id != 0){
+            redirect_url = previousUrl;
+            $('#btnAdd').attr('href', previousUrl);
+        }
+
+        console.log('getURLParamsForReport pt_id', pt_id);  // Retain the log if necessary
+    }
+
+
+    function onlyNumbers(event) 
+    {
+        var charcode = event.which || event.keyCode;
+
+        // Allow: 0-9 (48-57), dot (46), minus (45)
+        if ((charcode >= 48 && charcode <= 57) || charcode === 46 || charcode === 45) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function validateInput(input, table, field){
+
+        let value = $(input).val();
+        let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
+
+        let message = "Value is duplicate!";
+        if(label){
+            message = 'Given ' + label + " already exists!";
+        }
+
+        checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
+            if (isDuplicate) {
+                toastr.warning(message, 'WARNING');
+                $(input).val('')
+            } 
+        });
+
+    }
+
+    function appendCDData(cd_ac_no, cd_amt, increment){
+
+        increment = increment + 1
+        $('#cd_account_no_'+increment).val(cd_ac_no)
+        $('#cd_current_balance_'+increment).val(cd_amt)
+    }
+
+    $('#action_type').on('change', function(){
+
+        let action_type = $(this).val();
+        console.log('action_type', action_type);
+        console.log('action_type', action_type);
+        if (action_type == 'policy_instalment') {
+            $('.install_due_date_div').show()
+        }else{
+            $('.install_due_date_div').hide()
+        }
+
+        if(action_type == "deletion"){
+            console.log('pt_co_share_count_data', pt_co_share_count_data);
+            for (let i = 1; i <= pt_co_share_count_data; i++) {
+                applyDeletionSymbolsToFields(String(i), true);
+            }
+        }else{
+
+            const fieldIds = [
+                'base_premium',
+                'tp_premium',
+                'ter_premium',
+                'co_premium',
+                'co_tp_premium',
+                'co_ter_premium',
+                'gst_amount',
+                'agreed_amount',
+                'non_comm_per_amt',
+                'total_amt',
+                'exp_amt'
+            ];
+
+            for (let input = 1; input <= pt_co_share_count_data; input++) {
+                fieldIds.forEach(field => {
+                    const $el = $('#' + field + '_' + input);
+                    console.log('$el', '#' + field + '_' + input);
+                    let val = $el.val()?.trim();
+                    console.log('$val', val);
+                    if (!val) return;
+
+                    let num = parseFloat(val);
+                    if (!isNaN(num)) $el.val(Math.abs(num)); // Removes '-' sign
+                });
+            }
+
+        }
+
+
+    })
+
+    $('#policy_issue_date').on('change', function(){
+        let date = $(this).val();
+
+        let date_set = false
+        $('[name="co_share_type[]"]').each(function () {
+            console.log('co_share_type[] value', $(this).val());
+            if($(this).val() == 1){
+                let uniqueid = $(this).data('id');
+                $('#calc_policy_issue_date_' + uniqueid).val(date).addClass('readonly-select');
+                date_set = true;
+            }
+        });
+
+        if(!date_set){
+            $('#calc_policy_issue_date_1').val(date).addClass('readonly-select');
+        }
+
+        let monthDiv = document.getElementById('policy_issue_month_info');
+        monthAbbr = document.getElementById('month').value;
+
+        if (!monthAbbr) {
+            monthDiv.innerHTML = '';
+            monthDiv.classList.remove('show');
+            return;
+        }
+
+        monthDiv.innerHTML =
+            '<span class="text-success">' + monthAbbr + '</span>' +
+            ' <span class="vehicle-badge success">✓ Month</span>';
+
+        monthDiv.classList.add('show');
+    });
+
+
+    //-----------------------------------------------------------------------------------------------------------
+
+
+    // Add the new card-based event listener
+    $(document).on('change', '#allInsurerCards input, #allInsurerCards select, #allInsurerCards textarea', function() {
+        // The changed field is inside a card. Find its index (data-count).
+        const cardIndex = $(this).closest('.insurer-card').data('count');
+    
+        // Call the new card iteration function, passing the specific card index.
+        processCardData(cardIndex); 
+    });
+
+    /**
+     * Processes data and runs calculations for one or all insurer cards.
+     * @param {number} specificIndex - The data-count of the specific card to process. 
+     * If 0 or undefined, processes all cards.
+     */
+    function processCardData(specificIndex = 0) {
+        
+        // If a specific card index is provided (from the change event), run calculations for only that card.
+        if (specificIndex > 0) {
+            // The original logic assumes 'index' is the insurerCount
+            amountCalculation(specificIndex);
+            co_share_percentage_calculation(specificIndex);
+            return; 
+        }
+
+        // If no specific index is provided, iterate through all existing cards.
+        console.log("Processing all insurer cards for full recalculation.");
+
+        $('#allInsurerCards .insurer-card').each(function() {
+            // Retrieve the unique ID/count from the card's data attribute
+            const cardIndex = $(this).data('count');
+            
+            // Check if the cardIndex is valid (index 0 is the fixed column/header, so we start at 1)
+            if (cardIndex >= 1) { 
+                // Note: The original 'getColumnIndexes' called amountCalculation twice if count == 1.
+                // I'm omitting that redundant double call unless specifically requested, 
+                // as it seems like a potential bug or specific timing requirement.
+
+                amountCalculation(cardIndex);
+                co_share_percentage_calculation(cardIndex);
+            }
+        });
+    }
+    
+    function setPolicyIssueMonth(){
+        let monthDiv = document.getElementById('policy_issue_month_info');
+        monthAbbr = document.getElementById('month').value;
+
+        if (!monthAbbr) {
+            monthDiv.innerHTML = '';
+            monthDiv.classList.remove('show');
+            return;
+        }
+
+        monthDiv.innerHTML =
+            '<span class="text-success">' + monthAbbr + '</span>' +
+            ' <span class="vehicle-badge success">✓ Month</span>';
+
+        monthDiv.classList.add('show');
+    }
+
+    function setBPValue(inputValue) {
+        let bpValueField = document.querySelectorAll('.bp_value');
+
+        if(bpValueField){
+            bpValueField.forEach((field) => { field.value = inputValue; });
+            console.log("Updated", bpValueField.length, "hidden base premiums");
+        } else {
+            console.error("Error: Element with class '.bp_value' not found.");
+        }
+
+    }
+
+    function setTPValue(inputValue) {
+        let tpValueField = document.querySelectorAll('.tp_value');
+        
+        if (tpValueField) {
+            tpValueField.forEach((field) => { field.value = inputValue; });
+            console.log("Updated", tpValueFields.length, "hidden tp premiums");
+        } else {
+            console.error("Error: Element with class '.tp_value' not found.");
+        }
+
+    }
+
+    function setTEPValue(inputValue) {
+        let tepValueField = document.querySelectorAll('.ter_value');
+        tepValueField.forEach((field) => { field.value = inputValue; });
+        if (tepValueField) {
+            tepValueField.value = inputValue;
+            console.log("Updated", tepValueField.length, "hidden tep premiums");
+        } else {
+            console.error("Error: Element with class '.tep_value' not found.");
+        }
+
+    }
+
+</script>
diff --git a/app/Views/policy_transaction_endorsement_list_2.php b/app/Views/policy_transaction_endorsement_list_2.php
new file mode 100644
index 00000000..60e37342
--- /dev/null
+++ b/app/Views/policy_transaction_endorsement_list_2.php
@@ -0,0 +1,1036 @@
+<style>
+    .table th,
+    .table td {
+        padding: 8px;
+    }
+
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
+
+    /* 
+table.dataTable thead th {
+    padding: 4px 4px !important;
+} */
+
+
+
+    .dataTables_filter {
+        position: absolute;
+    }
+
+    .column-header {
+        margin-right: 10px;
+        /* Adjust this value as needed */
+    }
+
+    .form-section {
+        border: 1px solid #ccc;
+        padding: 15px;
+        margin-bottom: 20px;
+    }
+
+    .row-box {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 10px;
+    }
+
+    .custom-dropdown-menu {
+        display: none;
+        position: fixed;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, .15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
+
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        clear: both !important;
+        font-weight: 400 !important;
+        color: #212529 !important;
+        text-align: inherit !important;
+        white-space: nowrap !important;
+        background-color: transparent !important;
+        border: 0 !important;
+        text-decoration: none !important;
+        position: relative !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item i {
+        margin-right: 8px !important;
+        vertical-align: middle !important;
+    }
+
+    .table tbody tr {
+        cursor: pointer;
+    }
+
+    /* Ensure the dropdown menu has a solid background */
+    .custom-dropdown-menu::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: #ffffff;
+        z-index: -1;
+    }
+
+    /* Add a subtle backdrop effect */
+    .custom-dropdown-menu::after {
+        content: '';
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.05);
+        z-index: -2;
+        pointer-events: none;
+    }
+</style>
+
+<style>
+    .switch {
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
+    }
+
+    .switch input {
+        opacity: 0;
+        width: 0;
+        height: 0;
+    }
+
+    .slider {
+        position: absolute;
+        cursor: pointer;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #ccc;
+        -webkit-transition: .4s;
+        transition: .4s;
+    }
+
+    .slider:before {
+        position: absolute;
+        content: "";
+        height: 19px;
+        width: 19px;
+        left: 4px;
+        bottom: 4px;
+        background-color: white;
+        -webkit-transition: .4s;
+        transition: .4s;
+    }
+
+    input:checked+.slider {
+        background-color: #2196F3;
+    }
+
+    input:focus+.slider {
+        box-shadow: 0 0 1px #2196F3;
+    }
+    input:checked+.slider:before {
+        -webkit-transform: translateX(26px);
+        -ms-transform: translateX(26px);
+        transform: translateX(26px);
+    }
+
+    /* Rounded sliders */
+    .slider.round {
+        border-radius: 34px;
+    }
+
+    .slider.round:before {
+        border-radius: 50%;
+    }
+    .dataTables_length label {height: 21px !important;}
+</style>
+
+<div class="container-fluid-min">
+    <div class="col-12" id="endorsement_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <div class="form-group">
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Client<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_id_for_search" name="client_id">
+                                            <option value="0">Select Client</option>
+                                            <?php
+                                            if (isset($client) && count($client)) {
+                                                foreach ($client as $key => $value) {
+                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label for="addon_policy"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id_for_search" name="insurer_id">
+                                            <option value="0" selected>Select Insurer</option>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Policy Type <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_type_for_search" name="policy_type_id">
+                                            <option value="0">Select Policy Type</option>
+                                            <?php
+                                            if (isset($policy_types) && count($policy_types)) {
+                                                foreach ($policy_types as $key => $value) {
+                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer_for_search" name="issuer" required>
+                                            <option value="0">Select Issure</option>
+                                            <?php
+                                            if (isset($issuer) && count($issuer)) {
+                                                foreach ($issuer as $key => $value) {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Status <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_status_for_search" name="policy_type_id">
+                                            <option value="0">Select Status</option>
+                                            <?php
+                                            if (isset($policy_status) && count($policy_status)) {
+                                                foreach ($policy_status as $key => $value) {
+                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label>Date Type<span class="text-danger"></span></label>
+                                        <select class="form-control" id="date_type" name="date_type" onchange="hideDateField()">
+                                            <option value="0">Select Date Type</option>
+                                            <?php
+                                            if (isset($date_type) && count($date_type)) {
+                                                foreach ($date_type as $key => $value) {
+                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                            <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                            <span></span> <i class="mdi mdi-menu-down"></i>
+                                        </div>
+                                        <input type="hidden" id="startDate">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
+                                </div>
+
+                                <div class="form-group text-right m-b-0">
+                                    <a href="<?= base_url("/policy_tranction/endorsement/list2"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
+                                    <a href="<?= base_url("/policy_tranction/endorsement/list2"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="col-12" id="endorsement_list">
+        <div class="card">
+            <div class="card-body">
+                 <!-- <div class="row" style="margin-bottom:1rem;">
+                   <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Endorsement List</h4>
+                    </div>
+                    <div class="col-3">
+                        <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" onclick="hide_list_show_add()">Add</button>
+                    </div>
+                </div> -->
+                <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                    <thead class="bg-light">
+                        <tr>
+                            <th>Sno</th>
+                            <th>Issuer</th>
+                            <th>Client</th>
+                            <th>Branch</th>
+                            <th>Insurer</th>
+                            <th>Policy</th>
+                            <th>Endorsement Type</th>
+                            <th>Endorsement No</th>
+                            <th>Data Recived Date</th>
+                            <th>No of Insured</th>
+                            <th>No of Dependence</th>
+                            <th>Policy Issue Date</th>
+                            <th>Status</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($endorsement_data_list as $index => $row) { ?>
+                            <tr>
+                                <td class="text-center"><?php echo $index + 1; ?></td>
+                                <td><?php echo $issuer[$row['issuer']] ?? 'N/A'; ?></td><!-- Issuer -->
+                                <td><?php echo $row['client_short_name'] ?: 'N/A'; ?></td><!-- Client -->
+                                <td><?php echo $row['client_branch_name'] ?: 'N/A'; ?></td><!-- Branch -->
+                                <td><?php echo $row['insurer_short_name'] ?: 'N/A'; ?></td><!-- Insurer -->
+                                <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td><!-- Policy -->
+                                <td><?php echo $action_type[$row['action_type']] ?: 'N/A';?></td>
+                                <td><?php echo $row['endorsement_no'] ?: 'N/A'; ?></td>
+                                <td><?php echo empty($row['data_received_date']) ? 'N/A' : date('d/m/Y', strtotime($row['data_received_date'])); ?></td>
+                                <td class="right-align-input"><?php echo $row['emp_count'] ?: '0'; ?></td>
+                                <td class="right-align-input"><?php echo $row['dependent_count'] ?: '0'; ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
+                                <td><?php echo $policy_status[$row['status']] ?: 'N/A'; ?></td>
+                                <td>
+                                    <div class="btn-group dropdown">
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="getPolicyTransactionDataForEndorsementEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
+                                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                            </a>
+                                            <?php if(get_role_id() == 5): ?>
+                                                <a class="dropdown-item delete" data-id="<?= $row['id'];?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>', <?= $row['policy_type_id'] ?>)">
+                                                    <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                        <?php } ?>
+                    </tbody>
+                </table><!-- table -->
+            </div><!-- card-body -->
+        </div><!-- card -->
+    </div><!-- end col -->
+</div>
+
+
+<!-- end table row -->
+
+<?php include('policy_transaction_endorsement_form_2.php'); ?>
+<script>
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("tickets-table");
+
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
+
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+            customDropdown.innerHTML = originalDropdown.innerHTML;
+
+            // Remove inline onclick handlers and store them in data attributes
+            const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
+            customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
+                const originalOnclick = originalItems[index].getAttribute('onclick');
+                item.removeAttribute('onclick'); // Remove the inline handler
+                item.setAttribute('data-onclick', originalOnclick); // Store in data attribute
+            });
+
+            return customDropdown;
+        }
+
+        let activeDropdown = null;
+
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
+
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the first column
+                if (event.target.closest('td:first-child')) return;
+
+                if (activeDropdown) activeDropdown.style.display = 'none';
+
+                const rect = event.target.getBoundingClientRect();
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`;
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Handle custom dropdown clicks
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    e.preventDefault();
+
+                    // Execute the original onclick from data attribute
+                    const onclickAttr = this.getAttribute('data-onclick');
+                    if (onclickAttr) eval(onclickAttr);
+
+                    // Handle href navigation
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') window.location.href = href;
+
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
+            });
+        });
+
+        // Close dropdown on outside click
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
+    });
+</script>
+<script>
+    var client_list = '';
+    var branch_list = '';
+    var policy_list = <?= json_encode($endorsementPolicies) ?>;
+    // console.log("POLICY List",policy_list);
+    var policyListByClient = <?= json_encode($endorsementPolicyListByClient) ?>;
+    var branch_policy = '';
+    var unit_list = '';
+
+    // select2 document ready
+    $(document).ready(function() {
+
+        getClientAndBranchAndPolicy()
+
+        <?php if (session()->has('create_failed')) : ?>
+            toastr.error('<?= session()->getFlashdata('create_failed') ?>', 'Failed');
+        <?php endif; ?>
+
+        <?php if (session()->has('update_failed')) : ?>
+            toastr.error('<?= session()->getFlashdata('update_failed') ?>', 'Failed');
+        <?php endif; ?>
+
+        <?php if (session()->has('create_success')) : ?>
+            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+        <?php endif; ?>
+
+        <?php if (session()->has('update_success')) : ?>
+            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+        <?php endif; ?>
+
+
+        $('#client_id').select2();
+        $('#client_branch_id').select2();
+        $('#client_policy_id').select2();
+
+    })
+
+    //DataTable document ready
+    $(document).ready(function() {
+        var ticketsTable = $('#tickets-table');
+
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right
+                // dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+                //     "<'row'<'col-sm-12'tr>>" +
+                //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+            lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
+            buttons: [            
+                   {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function (e, dt, node, config) {
+                            hide_list_show_add();
+                        },
+                        attr: { id: 'btnAdd' }
+                    },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Policy-Tranction-Endorsement-List',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
+                language: {
+                    search: `
+                    <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
+                        <i class="mdi mdi-close-circle datatable-clear-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i>
+                    </div>`,
+                    searchPlaceholder: "Search",
+                    emptyTable: '<div class="text-center text-muted">No Data found</div>'
+                },
+                paging: true, // Enable pagination
+                pageLength: 10, // Set default number of rows per page (optional)
+                ordering: false,
+            });
+        } else {
+            console.error("Table not found.");
+        }
+        $('#btnAdd').wrap('<div id="status_change"></div>');
+    });
+
+    // Date document ready
+    $(document).ready(function() {
+
+        var today = new Date();
+
+        var data_received_date = flatpickr("#data_received_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false,
+            parseDate: (datestr, format) => {
+                return new Date(datestr.replace(/(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3"));
+            },
+            onOpen: function(selectedDates, dateStr, instance) {
+                instance.setDate(instance.input.value, false);
+            },
+            onInput: function(selectedDates, dateStr, instance) {
+                let inputValue = instance.input.value;
+                let formattedDate = inputValue.replace(/(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3");
+                instance.input.value = formattedDate;
+            }
+        });
+
+        var last_action_date = flatpickr("#last_action_date", {
+            dateFormat: "d/m/Y", // Display format in DD/MM/YYYY
+            defaultDate: today, // Today's date as the default value
+            allowInput: false,
+            maxDate: today // Disallow future dates
+        });
+
+        var month = flatpickr("#month", {
+            dateFormat: "M/Y", // Format as month and year
+            allowInput: false, // Disable manual input
+        });
+
+        var policy_issue_date = flatpickr("#policy_issue_date", {
+            dateFormat: "d/m/Y", // Format as day-month-year
+            allowInput: false, // Disable manual input
+            onChange: function(selectedDates, dateStr, instance) {
+                // Get the selected date
+                var selectedDate = new Date(selectedDates[0]);
+
+                // Format the selected date to "M-Y"
+                var formattedMonth = flatpickr.formatDate(selectedDate, "M/Y");
+
+                // Set the value of the #month input
+                month.setDate(formattedMonth);
+            }
+        });
+
+        var install_due_date = flatpickr("#install_due_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false
+        });
+
+        var endorse_eff_date = flatpickr("#endorse_eff_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false
+        });
+
+    });
+
+    function hide_list_show_add() {
+        removeAllInsurerCards();
+        $('.hideter').hide()
+        $('.hidetp').hide()
+        $('#endorsement_form_id')[0].reset();
+        $('#client_id').val('').change();
+        $('#client_policy_id').val('').change();
+        $('#endorsement_form').show();
+        $('#endorsement_list').hide();
+        $('#endorsement_filter').hide();
+        $('#invoice_no_div').hide();
+        $('#invoice_no').attr('required', false)
+    }
+
+    function show_list_hide_add() {
+        $('#endorsement_form').hide()
+        $('#endorsement_list').show()
+        $('#endorsement_filter').show()
+
+    }
+
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+
+                if (res.status == true) {
+                    branch_list = res.branch_data;
+                    // policy_list = res.policy_data;
+                    // policyListByClient = res.policyListByClient;
+                    client_list = res.client_data;
+                    unit_list = res.unit_data;
+                    appendClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        // $('#client_id').append($('<option>', {
+        //     value: 'add_client',
+        //     text: '+ Add Client'
+        // }));
+
+        $.each(data, function(index, item) {
+
+            if (item.client_policy_count > 0) {
+
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.client_name
+                });
+                $('#client_id').append(option);
+            }
+
+        });
+    }
+
+    function appendBranch(data) {
+
+        $('#client_branch_id').empty();
+
+        $('#client_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#client_branch_id').append(option);
+        });
+    }
+
+    function appendPolicies(data, policy_id=null) {
+        if (!data) {
+
+            toastr.warning("There are no policies in Inception for the selected client and branch.");
+        }
+        console.log('appendPolicies', data);
+        console.log('appendPolicies', $('#client_policy_id'));
+
+        $('#client_policy_id').empty();
+        $('#client_policy_id').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.policy_type + '-' + item.policy_no,
+                'data-sd': item.policy_start_date,
+                'data-ed': item.policy_end_date,
+                'data-insurer': item.insurer_branch_id + '-' + item.insurer_id,
+                'data-policy': item.policy_no,
+                'data-cd': item.cd_ac_no,
+                'data-ebp': item.ebp,
+                'data-etp': item.etp,
+                'data-iep': item.iep,
+                'data-itp': item.itp,
+                'data-bap': item.bap,
+                'data-allocg': item.allocg,
+                'data-tpa': item.tpa_branch_id + '-' + item.tpa_id,
+                'data-ptid': item.policy_type_id,
+            });
+
+            if (policy_id == item.id) {
+                option.attr('selected', true);
+            }
+
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    function logSelectedIds() {
+        var selectedIds = [];
+        $('.row-select:checked').each(function() {
+            selectedIds.push($(this).data('id'));
+        });
+
+        console.log('Selected IDs:', selectedIds);
+
+        return selectedIds;
+
+    }
+
+    //--------------------------------------------------------------------------------------------
+
+    $("#invoiceForm").submit(function(event) {
+
+        event.preventDefault();
+
+        var isValid = $('#invoiceForm').parsley().validate();
+        if (!isValid) {
+            console.log('Form is Empty', 'Warning');
+            return;
+        }
+
+        form_action = '<?= base_url("util/updateInvoiceStatus"); ?>';
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var ids = logSelectedIds();
+        console.log(ids);
+
+        var formData = new FormData($('#invoiceForm')[0]);
+        formData.append('ids', JSON.stringify(ids));
+
+        $.ajax({
+            data: formData,
+            url: form_action,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if (res.status == true) {
+                    toastr.success(res.message, 'Success');
+                } else {
+                    toastr.error(res.message, 'Error');
+                }
+
+                window.location.reload();
+                $('.close').click();
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    });
+
+    $('#invoice_status').change(function() {
+
+        let value = $(this).val()
+
+        if (value == 'generated') {
+            $('#invoice_no_div').show()
+            $('#invoice_no').attr('required', true)
+        } else {
+            $('#invoice_no_div').hide()
+            $('#invoice_no').attr('required', false)
+        }
+    })
+
+    $('#invoice_status_modal').change(function() {
+
+        let value = $(this).val()
+
+        if (value == 'generated') {
+            $('#invoice_no_div_modal').show()
+            $('#invoice_no_modal').attr('required', true)
+        } else {
+            $('#invoice_no_div_modal').hide()
+            $('#invoice_no_modal').attr('required', false)
+
+        }
+    })
+</script>
+
+
+<script>
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id_for_search').select2();
+        $('#insurer_id_for_search').select2();
+        $('#policy_type_for_search').select2();
+    })
+
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
+
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id_for_search').val();
+        var insurer_id = $('#insurer_id_for_search').val();
+        var policy_type_id = $('#policy_type_for_search').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer_for_search').val();
+        var status = $('#policy_status_for_search').val();
+
+        console.log(start_date + '-' + end_date);
+
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+            status: status,
+        };
+
+        console.log(queryParams)
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
+
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
+        const status = params.get('status') || 0; // Default to 0 if not found
+
+        hideDateField(date_type)
+
+        // console.log('startDate', startDate)
+        // console.log('endDate', endDate)
+        // console.log('client_id', client_id)
+        // console.log('insurer_id', insurer_id)
+        // console.log('policy_type_id', policy_type_id)   
+        // console.log('date_type', date_type)
+        // console.log('issuer', issuer)
+        // console.log('status', status)
+
+        // Log the values or use them as needed
+        // console.log('Start Date:', startDate);
+        // console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id_for_search').val(client_id).change()
+                $('#insurer_id_for_search').val(insurer_id).change()
+                $('#policy_type_for_search').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer_for_search').val(issuer)
+                $('#policy_status_for_search').val(status)
+            }, 1000)
+
+        }
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD/MM/YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD/MM/YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD/MM/YYYY');
+        var end = moment(endDateParam, 'DD/MM/YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange span').html(start.format('D/MM/YYYY') + ' - ' + end.format('D/MM/YYYY'));
+            $('#startDate').val(start.format('DD/MM/YYYY'));
+            $('#endDate').val(end.format('DD/MM/YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id_for_search').val('0').change();
+            $('#insurer_id_for_search').val('0').change();
+            $('#policy_type_for_search').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer_for_search').val('0');
+            $('#policy_status_for_search').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
+    });
+
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
+
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
+    }
+
+    function removePolicyTransaction(input, pt_id, policy_type_id) {
+
+        let string = "Do you want to delete this transaction?";
+        if(policy_type_id > 7){
+            string = "Do you want to delete this transaction? Deleting this will also remove the linked CRM policy entry.";
+        }
+
+        confirmActionSweertAlert(string, "Yes, Proceed!", "No, Cancel").then((confirmed) => {
+            if (confirmed) {
+
+                let type = '1';
+                let url = '<?= base_url('policy_tranction/inception/removePolicyTransaction/') ?>' + pt_id + '/' + type;
+
+                // Include `pt_id` in the AJAX request if necessary
+                let requestData = { 
+                    pt_id: pt_id ,
+                    type: 1 ,
+                };
+
+                sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+                    console.log('Data fetched successfully:', response);
+
+                    if (response.status === true) {
+                        toastr.success(response.message, 'SUCCESS');
+                        window.location.reload();
+                    } else {
+                        toastr.warning(response.message, 'WARNING');
+                    }
+                }, function(xhr, status, error) {
+                    console.error('Error fetching data:', error);
+                    console.error(xhr.responseText);
+                });
+            }
+        });
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_inception_form_2.php b/app/Views/policy_transaction_inception_form_2.php
index a1db7f44..edbfa453 100644
--- a/app/Views/policy_transaction_inception_form_2.php
+++ b/app/Views/policy_transaction_inception_form_2.php
@@ -718,10 +718,9 @@
                                                 </div> -->
 
                                                 <div class="form-group col-md-3">
-                                                    <label class="card_label_4">Base Premium</label>
-                                                    <input type="text" class="form-control right-align-input" id="base_premium" name="base_premium" oninput="" onkeypress="return onlyNumbers(event)" onchange="setBPValue(this.value)">
+                                                    <label class="card_label_4">Base Premium<span id="base_danger" class="text-danger">*</span></label>
+                                                    <input type="text" class="form-control right-align-input" id="base_premium" name="base_premium" oninput="" onkeypress="return onlyNumbers(event)" onchange="setBPValue(this.value)" required>
                                                 </div>
-
                         
                                                 <div class="form-group col-md-3 hidetp">
                                                     <label class="card_label_5">TP Premium</label>
@@ -1831,11 +1830,6 @@
 
                     // $('#cd_ac_no_for_edit').val(res.data.cd_ac_no);
                     $('#cd_ac_pk_for_leader').val(res.data.cd_ac_pk);
-
-                    // $('#entity_type_id').val(res.data.entity_type_id);
-                    // getKYCEntityDocument(res.data.entity_type_id, res.data.client_id);
-                    // appendKycTableListData(res.data.client_kyc);
-
                     
                     // please don't forgot this ==> look at here please don't don't forgot 
                     $('#docs_type_id').empty();   // ✅ clear old options
@@ -1843,133 +1837,6 @@
                     $('#tbody').empty();
                     $('#tbody').append(res.data.client_kyc_single_table);
 
-                    
-                    //                     let tbody = $('#tbody');
-                    //                     tbody.empty();   // ✅ Always clear first
-
-                    //                     let ckdlist = res.data.client_kyc_document_list;
-
-                    //                     if (!ckdlist || ckdlist.length === 0) {
-
-                    //                         // ✅ Show single merged row when no data
-                    //                         let emptyRow = `
-                    //                             <tr>
-                    //                                 <td colspan="4" class="text-center text-muted">
-                    //                                     No data found
-                    //                                 </td>
-                    //                             </tr>
-                    //                         `;
-
-                    //                         tbody.append(emptyRow);
-                    //                         // return; // ✅ Stop further execution
-                    //                     }
-                    //                     else{
-                    //                         $.each(ckdlist, function (index, value) {
-
-                    //                             let sno = index + 1;
-
-                    //                             // ✅ If kyc_doc_type_id is null → use other_docs_name
-                    //                             let docName = (value.kyc_doc_type_id === null || value.kyc_doc_type_id === '')
-                    //                                 ? value.other_docs_name
-                    //                                 : value.kyc_doc_type_id;
-
-                    //                             let fileName = value.file_name ? value.file_name : '-';
-
-                    //                             let downloadBtn = `
-                    //                                 <a id="download_${value.id}"
-                    //                                 data-id="${value.id}"
-                    //                                 data-file="${value.file_name}"
-                    //                                 class="mdi mdi-download mr-1 btn-download-kyc"
-                    //                                 style="font-size:18px;">
-                    //                                 </a>
-                    //                             `;
-
-                    //                             // Inside your $.each(list, function (index, value) { ... }) loop
-                    //                             let editBtn = `<a href="javascript:void(0);"
-                    //                                                 id="edit_${value.id}"
-                    //                                                 class="mdi mdi-pencil mr-1 btn-edit-kyc"
-                    //                                                 style="font-size:18px;"
-                    //                                                 data-id="${value.id}"
-                    //                                                 data-client_id="${value.client_id}"
-                    //                                                 data-old_file_name="${value.file_name}"
-                    //                                                 data-kyc_doc_type_id="${value.kyc_doc_type_id}">
-                    //                                             </a>`;
-
-                    //                                 // The edit UI block to be toggled
-                    //                                 let editUI = `
-                    //                                     <tr id="edit_row_${value.id}" class="d-none">
-                    //                                         <td colspan="4"> 
-                    //                                             <form id="kyc_form_${value.id}" class="kyc-edit-form">
-                    //                                                 <input type="hidden" id="kyc_id_${value.id}" name="id" value="${value.id}">
-                    //                                                 <input type="hidden" id="client_id_${value.id}" name="client_id" value="${value.client_id}">
-                    //                                                 <input type="hidden" id="old_file_name_${value.id}" name="old_file_name" value="${value.file_name}">
-                                                                    
-                    //                                                 <div class="row align-items-end">
-
-                    //     <div class="col-md-8">
-                    //         <label for="kyc_docs_file_${value.id}">Change File - ${value.ui_docs_name} (${fileName}) </label>
-                    //         <input type="file"
-                    //                id="kyc_docs_file_${value.id}"
-                    //                name="file_name"
-                    //                class="form-control"
-                    //                style="box-shadow:none!important;
-                    //                       outline:none!important;
-                    //                       border:none;
-                    //                       height:unset!important;
-                    //                       padding:0!important;
-                    //                       background:transparent!important;">
-                    //     </div>
-
-                    //     <div class="col-md-2">
-                    //         <button type="button"
-                    //                 class="btn btn-primary btn-sm btn-update-kyc w-100"
-                    //                 data-id="${value.id}">
-                    //             Update
-                    //         </button>
-                    //     </div>
-
-                    //     <div class="col-md-2">
-                    //         <button type="button"
-                    //                 class="btn btn-secondary btn-sm btn-cancel-kyc w-100"
-                    //                 data-id="${value.id}">
-                    //             Cancel
-                    //         </button>
-                    //     </div>
-
-                    // </div>
-
-                    //                                             </form>
-                    //                                         </td>
-                    //                                     </tr>
-                    //                                 `;
-
-
-
-                    //                             let deleteBtn = `
-                    //                                             <a id="delete_${value.id}"
-                    //                                                 data-id="${value.id}"
-                    //                                                 class="mdi mdi-delete mr-1 btn-delete-kyc"
-                    //                                                 style="font-size:18px;"
-                    //                                                 download>
-                    //                                             </a>`;
-
-                    //                             let row = `
-                    //                                     <tr id="data_row_${value.id}"> <td>${sno}</td>
-                    //                                         <td>${value.ui_docs_name}</td>
-                    //                                         <td>${fileName}</td>
-                    //                                         <td>
-                    //                                             ${downloadBtn}
-                    //                                             ${editBtn} 
-                    //                                             ${deleteBtn}
-                    //                                         </td>
-                    //                                     </tr>
-                    //                                     ${editUI} `;
-
-                    //                                 tbody.append(row);
-                    //                         });                                        
-                    //                     }
-                    //                     // docs_type_id
-                    //                     // res.data.client_kyc_dd_data
 
                     // Setting values to correct fields
                     $('#policy_tranction_primarykey').val(res.data.id);
@@ -2045,6 +1912,18 @@
                         setTimeout(function() {
                             // populateTable(res.data.pt_co_share_details, res.data.cd_ac_pk);
                             populateCards(res.data.pt_co_share_details, res.data.cd_ac_pk);
+                                let s = res.data.policy_start_date.split('/'); // ["DD","MM","YYYY"]
+                                let e = res.data.policy_end_date.split('/');   // ["DD","MM","YYYY"]
+
+                                let start = new Date(s[2], s[1] - 1, s[0]); // YYYY, MM-1, DD
+                                let end   = new Date(e[2], e[1] - 1, e[0]);
+                                let months = (end.getFullYear() - start.getFullYear()) * 12 + (end.getMonth() - start.getMonth());
+                                if (end.getDate() >= start.getDate()) {  months += 1; }
+                                let yearDiff = Math.ceil(months / 12); 
+                                // let yearDiff = (parseInt(e[2]) - parseInt(s[2])) + 1;
+                                console.log("yearDiff =", yearDiff);
+                                if (yearDiff > 1) { updateInsurerTitles(yearDiff); }
+
                         }, 1000);
                     }
 
@@ -3657,6 +3536,17 @@
         co_share_type.forEach((value, index) => {
             formData.append(`co_share_type[${index}]`, value);
         });
+
+        let bp = document.getElementById("base_premium").value;
+        let tp = document.getElementById("tp_premium").value;
+        let ter = document.getElementById("ter_premium").value;
+
+        for (let i = 0; i < insurerCount; i++) {
+            formData.append(`base_premium[${i}]`, bp);
+            formData.append(`tp_premium[${i}]`, tp);
+            formData.append(`ter_premium[${i}]`, ter);
+        }
+
         //covert date to mysql format
         // alert(formData.get('policy_issue_date'));
         
@@ -4427,7 +4317,7 @@
             let cardHTML = `<div class="p-1 mb-2 insurer-card" id="insurerCardContainer_${insurerCount}" data-count="${insurerCount}">
     
                             <div class="d-flex justify-content-between align-items-center border-bottom pb-2 mb-3">
-                                <div class="fw-bold text-primary">Insurer - ${insurerCount}</div>
+                                <div class="fw-bold text-primary insurer-card-title">Insurer - ${insurerCount}</div>
                                 
                                 <div class="d-flex align-items-center gap-2">
                                     ${showAdd}
@@ -4492,7 +4382,7 @@
                                 <div class="form-row mb-2">
                                     <div class="col-md-4 mb-2 card_group_35">
                                         <label class="card_label_35">Policy No</label>
-                                        <input type="text" class="form-control follower_policy_no" id="follower_policy_no_${insurerCount}" name="follower_policy_no[]" onchange="validateInput(this, 'client_policy', 'policy_no')" readonly>
+                                        <input type="text" class="form-control follower_policy_no" id="follower_policy_no_${insurerCount}" name="follower_policy_no[]" onchange="validateInput(this, 'client_policy', 'policy_no')">
                                     </div>
                                     <div class="col-md-4 mb-2 card_group_40">
                                         <label class="card_label_40"> Policy Issue Date </label>
@@ -4774,6 +4664,9 @@
                         </div>`;
 
             $('#allInsurerCards').append(cardHTML);
+            setBPValue($('#base_premium').val());
+            setTEPValue($('#ter_premium').val());
+            setTPValue($('#tp_premium').val());
 
     
             $('#follow_insurer_id_' + insurerCount).select2();
@@ -4891,8 +4784,27 @@
         }
 
         console.log("UpdatedCa:", insurerCount);
+        updateInsurerTitles(yearDiff);
     }
 
+    function updateInsurerTitles(yearDiff) {
+
+        $(".insurer-card-title").each(function (index) {
+            let cardIndex = index + 1;
+
+            // Base title: Insurer - X
+            let title = `Insurer - ${cardIndex}`;
+
+            // Add "(Year X)" only for the first yearDiff cards
+            if (cardIndex <= yearDiff) {
+                title += ` (Year ${cardIndex})`;
+            }
+
+            $(this).text(title);
+        });
+    }
+
+
 
 
     function resetInsurerCards() {
@@ -6714,9 +6626,11 @@
     }
 
     function setBPValue(inputValue) {
-        const bpValueField = document.querySelector('.bp_value');
-        if (bpValueField) {
-            bpValueField.value = inputValue;
+        let bpValueField = document.querySelectorAll('.bp_value');
+
+        if(bpValueField){
+            bpValueField.forEach((field) => { field.value = inputValue; });
+            console.log("Updated", bpValueField.length, "hidden base premiums");
         } else {
             console.error("Error: Element with class '.bp_value' not found.");
         }
@@ -6724,9 +6638,11 @@
     }
 
     function setTPValue(inputValue) {
-        const tpValueField = document.querySelector('.tp_value');
+        let tpValueField = document.querySelectorAll('.tp_value');
+        
         if (tpValueField) {
-            tpValueField.value = inputValue;
+            tpValueField.forEach((field) => { field.value = inputValue; });
+            console.log("Updated", tpValueFields.length, "hidden tp premiums");
         } else {
             console.error("Error: Element with class '.tp_value' not found.");
         }
@@ -6734,9 +6650,11 @@
     }
 
     function setTEPValue(inputValue) {
-        const tepValueField = document.querySelector('.tep_value');
+        let tepValueField = document.querySelectorAll('.ter_value');
+        tepValueField.forEach((field) => { field.value = inputValue; });
         if (tepValueField) {
             tepValueField.value = inputValue;
+            console.log("Updated", tepValueField.length, "hidden tep premiums");
         } else {
             console.error("Error: Element with class '.tep_value' not found.");
         }
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index 6cdca11d..f6b8c348 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -1,75 +1,80 @@
-<div class="container-fluid-min">
+<div class="container-fluid-min" style="margin-left: 30px;">
     <div class="col-xl-12">
-        <div class="card-body">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h4 class="m-1">
-                        <span>Filter</span>
-                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                            aria-expanded="true">
-                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                        </a>
-                    </h4>
-                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                        <div class="card-body">
-                            <!-- <div class="text-center"> -->
-                            <div class="form-row">
-                                <div class="form-group col-md-3" id="date_div">
-                                    <label>Date<span class="text-danger"></span></label>
-                                    <!-- <div id="reportrange" class="form-control"
-                                    style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                    <span></span> <i class="mdi mdi-menu-down"></i>
-                                </div> -->
-                                    <div class="input-icon">
-                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
-                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
-                                    </div>
-                                    <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                    <input type="hidden" id="endDate" value=<?= $default_end ?>>
+        <div id="accordion" class="mb-3">
+            <div class="card mb-1" style="background-color: #F5FFFF !important; border-radius: 10px; box-shadow: 4px 4px 4px 4px #00000040;">
+                <h4 class="m-1" style="display: flex;justify-content: space-between;padding: 12px;">
+                    <span>Filter</span>
+                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                        aria-expanded="true">
+                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                    </a>
+                </h4>
+                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                    <div class="card-body" style="margin-top: -30px;">
+                        <!-- <div class="text-center"> -->
+                        <div class="form-row">
+                            <div class="form-group col-md-3" id="date_div">
+                                <label>Date<span class="text-danger"></span></label>
+                                <!-- <div id="reportrange" class="form-control"
+                                style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                <span></span> <i class="mdi mdi-menu-down"></i>
+                            </div> -->
+                                <div class="input-icon">
+                                    <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                    <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
                                 </div>
+                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
+                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
+                            </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Nhance Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="issuer_branch" name="issuer_branch">
-                                        <option value="">Select Branch</option>
-                                        <?php
-                                        if (isset($issuer_branch) && count($issuer_branch)) {
-                                            foreach ($issuer_branch as $key => $value) {
-                                                echo "<option value=" . $value['id'] . ">" . $value['branch_name'] . "</option>";
-                                            }
+                            <div class="form-group col-md-3">
+                                <label for="client_branch">Nhance Branch<span class="text-danger"></span></label>
+                                <select class="form-control" id="issuer_branch" name="issuer_branch">
+                                    <option value="">Select Branch</option>
+                                    <?php
+                                    if (isset($issuer_branch) && count($issuer_branch)) {
+                                        foreach ($issuer_branch as $key => $value) {
+                                            echo "<option value=" . $value['id'] . ">" . $value['branch_name'] . "</option>";
                                         }
-                                        ?>
-                                    </select>
-                                </div>
-
-
-                                <div class="form-group col-md-3 client_type_div">
-                                    <label for="client_type">Client Type<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_type" name="client_type">
-                                        <option value="">Select Client type</option>
-                                        <option value="1">Group</option>
-                                        <option value="2">Individual</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id">
-                                        <option value="">Select Client</option>
-                                    </select>
-                                </div>
-
+                                    }
+                                    ?>
+                                </select>
                             </div>
-                            <div class="row justify-content-end">
 
-                                <div class="col-auto">
-                                    <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
-                                        onclick="fetchReportPage(event);">Submit</a>
-                                </div>
+
+                            <div class="form-group col-md-3 client_type_div">
+                                <label for="client_type">Client Type<span class="text-danger"></span></label>
+                                <select class="form-control" id="client_type" name="client_type">
+                                    <option value="">Select Client type</option>
+                                    <option value="1">Group</option>
+                                    <option value="2">Individual</option>
+                                </select>
                             </div>
-                            <!-- </div> -->
+
+                            <div class="form-group col-md-3">
+                                <label for="client_branch">Client<span class="text-danger"></span></label>
+                                <select class="form-control" id="client_id" name="client_id">
+                                    <option value="">Select Client</option>
+                                    <?php
+                                    if (isset($client_list) && count($client_list)) {
+                                        foreach ($client_list as $key => $value) {
+                                            echo "<option value=" . $value['id'] . ">" . $value['client_name'] . "</option>";
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
                         </div>
+                        <div class="row justify-content-end">
+
+                            <div class="col-auto">
+                                <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
+                                    onclick="fetchReportPage(event);">Submit</a>
+                            </div>
+                        </div>
+                        <!-- </div> -->
                     </div>
                 </div>
             </div>
@@ -85,8 +90,9 @@
     let client_list = [];
 
     $(document).ready(function() {
-        getClientAndBranchAndPolicy();
+        // getClientAndBranchAndPolicy();
         $('#client_id').select2();
+        $('#issuer_branch').select2();
     })
 
     $(function() {
@@ -173,9 +179,13 @@
 
     //get client , branch, policy data
     function getClientAndBranchAndPolicy() {
+
+        return_type = 'client';
+
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
+            data:{ return_type : return_type},
             dataType: 'json',
             success: function(res) {