diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index be0e2476..62b24b8d 100755
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -101,6 +101,6 @@ class Autoload extends AutoloadConfig
      * @phpstan-var list<string>
      */
     public $helpers = ['uuid','session','utility', 'form', 'url', 'oauth', 'fileupload',
-    'excel_import_export', 'file', 'drive','ExcelSanitizeHelper', 'api_helper','exception'
+    'excel_import_export', 'file', 'drive','ExcelSanitizeHelper', 'api_helper','exception','sms_helper'
 ];
 }
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index a9cd0ae2..31453be4 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -90,11 +90,13 @@ $routes->group("/dashboard", ["filter" => "authMVC"], function ($routes) {
 $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
 
     $routes->get("list", "ClientController::index");
+    $routes->get("type/(:any)", "ClientController::type/$1");
     $routes->get("create", "ClientController::clientOnboarding");
     $routes->get('deposit/(:num)', 'ClientController::deposit/$1');
     $routes->get('remove/(:num)', 'ClientController::removeClient/$1');
     $routes->get("list/(:any)", "ClientController::editClientOnboarding/$1");
     $routes->post('wipe', 'ClientController::wipeDemoClient');
+    $routes->get("typeList/(:any)", "ClientController::typeList/$1");
 
     // application/config/routes.php
 
@@ -124,6 +126,8 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
         $routes->post("edit", "ClientController::editClientBranch");
         $routes->get("list/(:any)", "ClientController::getSingleBranchDataById/$1");
         $routes->get("remove/(:any)", "ClientController::removeClientBranch/$1");
+        $routes->post("auto_fetch_branch","ClientController::auto_fetch_branch");
+        $routes->post("auto_fetch_branch_details","ClientController::auto_fetch_branch_details");
     });
 
     $routes->group("relation", ["filter" => "authMVC"], function ($routes) {
@@ -168,6 +172,7 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
 
     $routes->group("others", ["filter" => "authMVC"], function ($routes) {
         $routes->post("create", "ClientController::createOtherTabContent");
+        $routes->post('check-duplicate', 'ClientController::validateDuplicateByClientBranch');
     });
 });
 
@@ -384,6 +389,12 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('getClaimDumpFileErrorData', 'TicketController::getClaimDumpFileErrorData');
     $routes->get("claim_dump_excel_error/(:any)", "TicketController::getClaimDumpExcelFileErrors/$1");
     $routes->get("download_claim_dump_file/(:any)", "TicketController::downloadClaimDumpFile/$1");
+    $routes->post('uploadMultiFileFromRfq', 'LeadsController::uploadMultiFileFromRfq');
+    $routes->get('downloadMemberFile/(:any)', 'LeadsController::downloadMemberFile/$1');
+    $routes->get('downloadFullMemberDataExcelErrorFile/(:any)', 'LeadsController::downloadFullMemberDataExcelErrorFile/$1');
+    $routes->get('getMemberDataExcelFileErrors', 'LeadsController::getMemberDataExcelFileErrors');
+    $routes->post('savePlacementDataAndValidateMemberDataFile', 'LeadsController::savePlacementDataAndValidateMemberDataFile');
+    $routes->get('checkMemberDataFileValidationStatus', 'LeadsController::checkMemberDataFileValidationStatus');
 });
 
 $routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
@@ -516,6 +527,7 @@ $routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMp
 $routes->post("employeeRest/getPostEmployeeDataForAuth", "RestAuthenticationController::getPostEmployeeDataForAuth");
 // $routes->post("logHrActivity", "RestAuthenticationController::logHrActivity");
 
+$routes->get("employeeRest/getClientDetails", "EmployeeRestController::getClientDetails");
 
 $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
 
@@ -540,7 +552,7 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->get("deleteDependence", "EmployeeRestController::deleteDependence");
     $routes->get("getEmployeeAndDependenceByClientId", "EmployeeRestController::getEmployeeAndDependenceByClientId");
     $routes->get("getClientPolicy", "EmployeeRestController::getClientPolicy");
-    $routes->get("getClientDetails", "EmployeeRestController::getClientDetails");
+   
     $routes->get("getAddOnPolicy", "EmployeeRestController::getAddOnPolicy");
     $routes->post("iAgreeForAddOn", "EmployeeRestController::iAgreeForAddOn");
 
@@ -674,6 +686,7 @@ $routes->post('claimStatusCheck','VidalApiController::claimStatusCheck');
 $routes->post('newClaim','VidalApiController::newClaim');
 $routes->post('enrollment','VidalApiController::enrollment');
 
+// General Tickets
 
 $routes->post("ticketSave", "ThzController::ticketSave");
 $routes->get("ticketList", "ThzController::ticketList");
@@ -692,6 +705,12 @@ $routes->group('test', function($routes) {
     $routes->get('viewPDF', 'TestingController::viewPDF');
     $routes->get('generate-pdf-view', 'TestingController::generatePDFWithView');
     $routes->get('param/(:any)', 'TestingController::ptedfitdata/$1');
+    $routes->get('viewrfq', 'TestingController::viewRFQNonEb');
+    $routes->get('exportexcel', 'TestingController::exportExcel');
+    $routes->post('saverfq', 'TestingController::saverfq');
+    $routes->get('mapping_client_id_and_branch_id','TestingController::mapping_client_id_and_branch_id');
+    $routes->get('membervalidation', 'TestingController::membervalidation');
+    $routes->get('generateExcel', 'TestingController::generateExcel');
 });
 $routes->cli('cli/testcli', 'TestingController::testcli');
 
diff --git a/app/Controllers/AppContentManagementController.php b/app/Controllers/AppContentManagementController.php
index 300036be..33d6ce1d 100755
--- a/app/Controllers/AppContentManagementController.php
+++ b/app/Controllers/AppContentManagementController.php
@@ -27,7 +27,8 @@ class AppContentManagementController extends AdminController
     public function add_image_index()
     {   
         $this->myLogger->logme('error','Addvertisement Image list function called');
-        $headerData['page_name'] = 'Addvertisement Image List';
+        $headerData['tab_name'] = 'Addvertisement Images';
+        $headerData['page_name'] = 'Addvertisement Images';
         $data['addImageList'] = $this->addImgModel->findAll();
 
         // dd($data);
@@ -86,6 +87,7 @@ class AppContentManagementController extends AdminController
     public function frontend_content(){
 
         $data['test'] = $this->feContentModel->findAll();
+        $headerData['tab_name'] = 'Front-End Content';
         $headerData['page_name'] = 'Front-End Content';
 
         echo view('layout/header', $headerData);
diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index c3005aac..355df367 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -180,6 +180,9 @@ class BDSReportController extends AdminController
                 'BAP-Insurer' => 'bapInsurer',
                 'Client'    => 'client'
             ];
+
+            $data['page_name'] = "IRBA Report";
+
             return $this->loadLayout('irba_report', $data);
         } else {
 
@@ -914,6 +917,7 @@ class BDSReportController extends AdminController
             $data['default_end'] = $default_start->format('d-m-Y');
             $data['default_start']  = $default_start->modify('-60 days')->format('d-m-Y');
             $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
+            $data['tab_name'] = "Renewal Report";
             $data['page_name'] = "Renewal Report";
             return $this->loadLayout('renewal_search', $data);
         } else {
@@ -1013,6 +1017,7 @@ class BDSReportController extends AdminController
 
     public function accountMangerStatusBDSReport()
     {
+        $data['tab_name'] = "Account Manager BDS Report";
         $data['page_name'] = "Account Manager BDS Report";
 
         $sql = "
@@ -1130,6 +1135,7 @@ class BDSReportController extends AdminController
 
     public function getMultiReport($report_type){
 
+        $data['tab_name'] = "BDS Report";
         $data['page_name'] = "BDS Report";
 
         if ($report_type == 1){
diff --git a/app/Controllers/Chatbot/EcardDownloadConversation.php b/app/Controllers/Chatbot/EcardDownloadConversation.php
index a0a644a0..e0d63294 100644
--- a/app/Controllers/Chatbot/EcardDownloadConversation.php
+++ b/app/Controllers/Chatbot/EcardDownloadConversation.php
@@ -14,11 +14,63 @@ class EcardDownloadConversation extends Conversation
     public function run()
     {
         $this->bot->types();
-        sleep(0.5);
+        // sleep(0.5);
         $this->showEcardMenu();
     }
 
-    protected function showEcardMenu()
+   protected function showEcardMenu()
+{
+// Log entry for debugging
+log_message('error', 'showEcardMenu function called');
+
+
+// Get chat session and policies
+$chat_session_info = get_chatbot_session_info();
+$policy_list = ChatbotHelper::getListOfPolicies($chat_session_info);
+
+// If policies found, build an HTML list of links (and raw URLs as fallback)
+if (is_array($policy_list) && count($policy_list)) {
+    $parts = [];
+    foreach ($policy_list as $policy) {
+        // Resolve rand string (defensive)
+        $randString = '';
+        if (isset($policy['rand_string']) && $policy['rand_string'] !== '') {
+            $randString = $policy['rand_string'];
+        } elseif (isset($policy['rand']) && $policy['rand'] !== '') {
+            $randString = $policy['rand'];
+        } elseif (isset($policy['emp_policy_id'])) {
+            // As a last resort, use emp_policy_id (not ideal but prevents broken links)
+            $randString = $policy['emp_policy_id'];
+        }
+
+        // Build link; make sure base_url produces correct path
+        $link = base_url('/download-e-card/' . $randString . '/1');
+
+        // Escape policy name to avoid HTML injection
+        $safeName = isset($policy['policy_name']) ? htmlspecialchars($policy['policy_name'], ENT_QUOTES, 'UTF-8') : 'Policy';
+
+        // Add to parts; include anchor and raw URL fallback
+        $parts[] = "🔹 <a href=\"{$link}\" target=\"_blank\">{$safeName}</a><br>";
+    }
+
+    $message = "Choose a policy to download (click the policy name below):<br><br>" . implode('<br><br>', $parts);
+    log_message('error', 'Ecard links displayed: ' . json_encode(array_column($policy_list, 'policy_name')));
+    $this->say($message);
+} else {
+    log_message('error', 'No policies found for ecard download');
+    $this->say('No policy found.');
+}
+
+// After showing links, move to confirmation conversation (Do you want to continue?)
+// This keeps the UX identical to previous flow where we asked the user if they want to continue.
+$this->bot->startConversation(new doYouWantToContinueConversation());
+
+
+}
+
+
+
+    protected function showEcardMenuOLD()
     {
         log_message('error', ('showEcardMenu function called'));
 
@@ -27,17 +79,13 @@ class EcardDownloadConversation extends Conversation
         $buttons = [];
         
         $question = 'Choose Policy to Download Ecard:';
-        // log_message('error', ('policy_list : ' . json_encode($policy_list)));
+        log_message('error', ('policy_list : ' . json_encode($policy_list)));
 
         if(is_array($policy_list) && count($policy_list))
         {
             foreach($policy_list as $policy)
             {
-                // $question = Question::create("Choose Policy to Download Ecard:")
-                //             ->addButtons([
-                //                 Button::create("🔹 $policy['policy_name']")->value("$policy['emp_policy_id']"),
-                //                 Button::create("◀️ Go Back")->value("go_back"),
-                //             ]);
+    
                 $this->buttonsData[$policy['emp_policy_id'].'#'.$policy['rand_string']] = ['response_text' => "🔹 {$policy['policy_name']}"] ;
                  $buttons[] = Button::create("{$policy['policy_name']}")->value($policy['emp_policy_id'].'#'.$policy['rand_string']);
             }
@@ -63,10 +111,9 @@ class EcardDownloadConversation extends Conversation
                 case is_string($answer->getValue()) && is_array(explode('#',$answer->getValue())) &&  count((explode('#',$answer->getValue()))) == 2:
                     
                     $link = base_url().'/download-e-card/' . explode('#',$answer->getValue())[1].'/1';
-                    $this->say('Click here to downlad: <a href="'.$link.'" target="_blank">Ecard</a>');
-
+                    log_message('error',  $link);
+                    $this->say('Click here to downlad: <a href="'.$link.'" target="_blank">GMC</a><br>Click here to downlad: <a href="'.$link.'" target="_blank">GMC Parent</a>');
                     $this->bot->startConversation(new doYouWantToContinueConversation()); // ✅ Restart the 
-
                     break;
                 
                 default:
@@ -76,4 +123,7 @@ class EcardDownloadConversation extends Conversation
             }
         });
     }
+
+   
+
 }
diff --git a/app/Controllers/Chatbot/MainMenuConversation.php b/app/Controllers/Chatbot/MainMenuConversation.php
index f06fd078..e5bf7a3d 100644
--- a/app/Controllers/Chatbot/MainMenuConversation.php
+++ b/app/Controllers/Chatbot/MainMenuConversation.php
@@ -23,7 +23,7 @@ class MainMenuConversation extends Conversation
     {
         $this->bot->userStorage()->delete();
         $this->bot->types(); // Typing indicator for the first message
-        sleep(0.5); // Delay
+        // sleep(0.5); // Delay
         $this->showMainMenu();
     }
 
diff --git a/app/Controllers/Chatbot/NetworkHospitalConversation.php b/app/Controllers/Chatbot/NetworkHospitalConversation.php
index 34e44f2b..57bb13de 100644
--- a/app/Controllers/Chatbot/NetworkHospitalConversation.php
+++ b/app/Controllers/Chatbot/NetworkHospitalConversation.php
@@ -16,11 +16,11 @@ class NetworkHospitalConversation extends Conversation
     public function run()
     {
          $this->bot->types(); // Typing indicator for the first message
-           sleep(0.5); // Delay
+           // sleep(0.5); // Delay
         $this->showHospitalMenu();
     }
 
-    protected function showHospitalMenu()
+    protected function showHospitalMenuOLD()
     {
        $chat_session_info = get_chatbot_session_info();
        $policy_list = ChatbotHelper::getListOfPolicies($chat_session_info);
@@ -92,4 +92,54 @@ class NetworkHospitalConversation extends Conversation
         });
     }
 
+    protected function showHospitalMenu()
+{
+log_message('error', 'showHospitalMenu function called');
+
+
+// Get chat session and policies
+$chat_session_info = get_chatbot_session_info();
+$policy_list = ChatbotHelper::getListOfPolicies($chat_session_info);
+
+if (is_array($policy_list) && count($policy_list)) {
+    $parts = [];
+    foreach ($policy_list as $policy) {
+        // Resolve rand string (defensive)
+        $randString = '';
+        if (isset($policy['rand_string']) && $policy['rand_string'] !== '') {
+            $randString = $policy['rand_string'];
+        } elseif (isset($policy['rand']) && $policy['rand'] !== '') {
+            $randString = $policy['rand'];
+        } elseif (isset($policy['emp_policy_id'])) {
+            $randString = $policy['emp_policy_id'];
+        }
+
+        $emp_policy_id = isset($policy['emp_policy_id']) ? $policy['emp_policy_id'] : '';
+        $hospital_link = ChatbotHelper::getHospitalLink($emp_policy_id);
+
+        $safeName = isset($policy['policy_name']) ? htmlspecialchars($policy['policy_name'], ENT_QUOTES, 'UTF-8') : 'Policy';
+
+        if ($hospital_link) {
+            $parts[] = "🔹 <a href=\"{$hospital_link}\" target=\"_blank\">{$safeName}</a><br>";
+        } else {
+            $parts[] = "🔹 {$safeName} — No Data found, please contact support team";
+        }
+
+        log_message('error', 'Hospital link for policy ' . $emp_policy_id . ': ' . $hospital_link);
+    }
+
+    $message = "Access hospital details for your policies below:<br><br>" . implode('<br><br>', $parts);
+    $this->say($message);
+} else {
+    log_message('error', 'No policies found for hospital menu');
+    $this->say('No policy found.');
+}
+
+// After showing links, move to confirmation conversation
+$this->bot->startConversation(new doYouWantToContinueConversation());
+
+
+}
+
+
 }
diff --git a/app/Controllers/ChatbotControllerNew.php b/app/Controllers/ChatbotControllerNew.php
index 67d31c37..8b0a979b 100644
--- a/app/Controllers/ChatbotControllerNew.php
+++ b/app/Controllers/ChatbotControllerNew.php
@@ -111,7 +111,7 @@ class ChatbotControllerNew extends BaseController
         log_message("error","Inside Bot Type Function");
 
            $bot->types(); // Typing indicator for the first message
-           sleep(0.1); // Delay
+           // sleep(0.5); // Delay
         });
         // Start the Main Menu when user says "hi" or "start"
         $this->botman->hears('start|hi|hello|help|help me', function (BotMan $bot) {
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 164bee10..ee7ae376 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -132,6 +132,15 @@ class ClientController extends AdminController
 
     //--------------------------------------------------------------------------------------------------------
 
+    public function validateDuplicateByClientBranch()
+    {
+        $value = $this->request->getPost('value');
+        $clientId = $this->request->getPost('client_id');
+        $branchId = $this->request->getPost('branch_id');
+        $field = $this->request->getPost('field');
+        $isDuplicate = $this->clientModel->isDuplicateByClientBranch($value, $field, $clientId, $branchId);
+        return $this->response->setJSON(['isDuplicate' => $isDuplicate]);
+    }
     public function checkDuplicateTableFieldValue()
     {
         $table = $this->request->getPost('table');
@@ -143,9 +152,9 @@ class ClientController extends AdminController
 
         // Perform the query
         $builder = $db->table($table);
-        if(is_array($value)){
+        if (is_array($value)) {
             $isDuplicate = $builder->where($value)->where('is_active', 1)->countAllResults() > 0;
-        }else{
+        } else {
             $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0;
         }
 
@@ -154,9 +163,9 @@ class ClientController extends AdminController
     }
 
     public function smapletest()
-    {   
+    {
         $headers = [
-            'S.No', 
+            'S.No',
             'NAME OF EMP/DEP',
             'EMP ID',
             // 'EMP/DEP TYPE',
@@ -177,13 +186,13 @@ class ClientController extends AdminController
             'PRO RATA PREMIUM',
             'GST',
             'TOTAL AMOUNT'
-        ];        
+        ];
         $filePath = generateExcelWithHeader($headers);
-        echo "Excel file created at: $filePath";   
+        echo "Excel file created at: $filePath";
     }
 
     public function testMailAttachments($email = 'venkateshraman786@gmail.com')
-    {           
+    {
         $message = '<style>body{font-family:Arial,sans-serif;color:#333;line-height:1.6;margin:0;padding:0}.email-container{width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9}.header{background-color:#4a90e2;color:#fff;padding:15px;text-align:center}.header h1{margin:0;font-size:24px}.content{padding:20px;background-color:#fff}.content h2{color:#4a90e2;font-size:20px;margin-top:0}.content p{margin:10px 0}.details-table{width:100%;border-collapse:collapse;margin-top:20px}.details-table td,.details-table th{border:1px solid #ddd;padding:10px;text-align:left}.details-table th{background-color:#f2f2f2}.footer{margin-top:20px;font-size:12px;color:#777;text-align:center}.attachment-note{margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic}</style><div class=email-container><div class=header><h1>Request for Quotation (RFQ)</h1></div><div class=content><h2>Dear {{RECIPIENT_NAME}},</h2><p>We are reaching out to request a quotation for the following insurance coverage. Please review the details below and provide your quote at your earliest convenience.<h2>RFQ Details</h2><table data-custom-table-css="table" class=details-table><tr><th>Client name<td>{{CLIENT_NAME}}<tr><th>Coverage Type<td>{{POLICY_LONG_NAME}}<tr><th>Policy Start Date<td>{{POLICY_START_DATE}}<tr><th>Policy Duration<td>{{DURATION}}</table><div class=attachment-note>Please note: Additional terms and details are included in the attachment for your reference.</div><p>Please feel free to reach out if you require any further information to prepare the quote. We look forward to receiving your proposal.<p>Best regards,<p><strong>Nhance India Pvt Ltd</strong><br></div><div class=footer><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
 
         // $attachments = [
@@ -192,8 +201,8 @@ class ClientController extends AdminController
         //     ["filePath" => ROOTPATH."public/assets/images/login_bg.jpg","fileName" => "login_bg.jpg"]
         // ];
         $attachments = [];
-        $res = MailHelper::send_email(['mail' => $email, 'subject' => 'Mail Via Attachment Testing URL', 'message' => $message,'attachments' => $attachments]);
-        
+        $res = MailHelper::send_email(['mail' => $email, 'subject' => 'Mail Via Attachment Testing URL', 'message' => $message, 'attachments' => $attachments]);
+
         print_rr($res);
         echo '------------------------------------------------------------------------------------------';
         // print_rr($attachments);
@@ -205,21 +214,20 @@ class ClientController extends AdminController
 
         // dd($client_id, $emp_code, $policy_id, $mail_active);
 
-        if(empty($policy_id)){
+        if (empty($policy_id)) {
 
             $client_policy_ids = $this->employeeModel
-                                ->select('employee_polices.client_policy_id')
-                                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                                ->where('employees.client_id', $client_id ) 
-                                ->where('employees.emp_code', $emp_code )
-                                ->where('employee_polices.is_active', 1 )
-                                ->where('employees.is_active', 1 )
-                                ->findAll();
+                ->select('employee_polices.client_policy_id')
+                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+                ->where('employees.client_id', $client_id)
+                ->where('employees.emp_code', $emp_code)
+                ->where('employee_polices.is_active', 1)
+                ->where('employees.is_active', 1)
+                ->findAll();
 
             $client_policy_ids2 = array_column($client_policy_ids, 'client_policy_id');
             $client_policy_id = array_unique($client_policy_ids2);
-
-        }else{
+        } else {
             $client_policy_id = json_decode($policy_id, true);
         }
 
@@ -233,39 +241,37 @@ class ClientController extends AdminController
         $mail_send_return1 = '';
         $mail_send_return2 = '';
 
-        if (!is_null($client_policy_id) && is_array($client_policy_id))
-        {
+        if (!is_null($client_policy_id) && is_array($client_policy_id)) {
 
-            $empData = $this->employeeModel->where('emp_code', $emp_code )->where('client_id', $client_id ) ->where('is_active', 1 )->findAll();
+            $empData = $this->employeeModel->where('emp_code', $emp_code)->where('client_id', $client_id)->where('is_active', 1)->findAll();
             // dd($empData);
             $filteredEmpData = array_filter($empData, fn($item) => $item['relationship'] === 'Self');
 
             // dd($filteredEmpData);
 
             $array_list = [];
-            foreach ($client_policy_id as $key => $value) 
-            {   
-                $find = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: $value,emp_code: $emp_code,client_id: $client_id,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']);
-                if(count($find) > 0){
+            foreach ($client_policy_id as $key => $value) {
+                $find = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: $value, emp_code: $emp_code, client_id: $client_id, emp_status: ['draft', 'enrolled'], policy_status: ['draft', 'enrolled']);
+                if (count($find) > 0) {
                     $array_list[] = $find;
                 }
             }
 
             // dd($array_list);
 
-            $notification = $this->notificationModel->where('client_id' ,$client_id)->where('template_name', 'member_review_and_summary_mail')->first();
+            $notification = $this->notificationModel->where('client_id', $client_id)->where('template_name', 'member_review_and_summary_mail')->first();
 
 
             if (isset($notification) && $notification['enabled'] == 1) {
 
-                $params ['array_list'] = $array_list;
-                $params ['client_policy_id'] = $client_policy_id;
-                $params ['emp_code'] = $emp_code;
-                $params ['client_id'] = $client_id;
-                $params ['notification'] = $notification;
+                $params['array_list'] = $array_list;
+                $params['client_policy_id'] = $client_policy_id;
+                $params['emp_code'] = $emp_code;
+                $params['client_id'] = $client_id;
+                $params['notification'] = $notification;
                 $params['common'] = [
-                    'client_id' => $filteredEmpData[0]['client_id'], 
-                    'client_branch_id' => $filteredEmpData[0]['client_branch_id'], 
+                    'client_id' => $filteredEmpData[0]['client_id'],
+                    'client_branch_id' => $filteredEmpData[0]['client_branch_id'],
                     'client_policy_id' => null,
                     'employee_policy_id' => null,
                     'employee_id' => $filteredEmpData[0]['id'],
@@ -274,16 +280,16 @@ class ClientController extends AdminController
 
                 // dd($params);
 
-                $wholeData =sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
+                $wholeData = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
                 // print_r($wholeData); die;
 
-                if($mail_active == 1){
+                if ($mail_active == 1) {
                     $mail_send_return =  MailHelper::send_email($wholeData[0]);
                     $this->myLogger->logme("error", $mail_send_return);
                 }
 
                 // if (isset($wholeData)) {
-                    
+
                 //     $params['common']['mail_type'] = 'account_maneger_summary_mail';
                 //     $account_manager_wholeData =sendMailNotification::sendMailNotification('account_maneger_summary_mail', $params);
                 //     // print_r($account_manager_wholeData); die;
@@ -322,12 +328,11 @@ class ClientController extends AdminController
                 //     }
                 // }
 
-            }else{
+            } else {
                 $this->myLogger->logme("error", 'Member Review Mail Configuration not Enable for this client');
             }
-
         }
-    
+
         print_r($wholeData);
 
         echo '<pre>';
@@ -346,26 +351,25 @@ class ClientController extends AdminController
     {
         // dd($client_id, $emp_code, $policy_id, $mail_active);
 
-        if(empty($policy_id)){
+        if (empty($policy_id)) {
 
             $client_policy_ids = $this->employeeModel
-                                ->select('employee_polices.client_policy_id')
-                                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                                ->where('employees.client_id', $client_id ) 
-                                ->where('employees.emp_code', $emp_code )
-                                ->where('employee_polices.is_active', 1 )
-                                ->where('employees.is_active', 1 )
-                                ->findAll();
+                ->select('employee_polices.client_policy_id')
+                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+                ->where('employees.client_id', $client_id)
+                ->where('employees.emp_code', $emp_code)
+                ->where('employee_polices.is_active', 1)
+                ->where('employees.is_active', 1)
+                ->findAll();
 
             $client_policy_ids2 = array_column($client_policy_ids, 'client_policy_id');
             $client_policy_id = array_unique($client_policy_ids2);
-
-        }else{
+        } else {
             $client_policy_id = json_decode($policy_id, true);
         }
 
         // dd($client_policy_id);
-    
+
         if (!is_null($client_policy_id) && is_array($client_policy_id)) {
 
             $empData = $this->employeeModel
@@ -373,9 +377,9 @@ class ClientController extends AdminController
                 ->where('client_id', $client_id)
                 ->where('is_active', 1)
                 ->findAll();
-    
+
             $filteredEmpData = array_filter($empData, fn($item) => $item['relationship'] === 'Self');
-    
+
             if (empty($filteredEmpData)) {
                 return $this->respond([
                     'status' => 'error',
@@ -383,7 +387,7 @@ class ClientController extends AdminController
                     'message' => 'No active employee data found for the given criteria.',
                 ], 404);
             }
-    
+
             $array_list = [];
             foreach ($client_policy_id as $value) {
                 $find = $this->employeeModel->getEmpFamilybyEmpCode(
@@ -393,17 +397,17 @@ class ClientController extends AdminController
                     emp_status: ['draft', 'enrolled'],
                     policy_status: ['draft', 'enrolled']
                 );
-    
+
                 if (count($find) > 0) {
                     $array_list[] = $find;
                 }
             }
-    
+
             $notification = $this->notificationModel
                 ->where('client_id', $client_id)
                 ->where('template_name', 'member_review_and_summary_mail')
                 ->first();
-    
+
             if ($notification && $notification['enabled'] == 1) {
 
                 $params = [
@@ -421,14 +425,14 @@ class ClientController extends AdminController
                         'mail_type' => 'member_review_and_summary_mail',
                     ],
                 ];
-    
+
                 $wholeData = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
-    
+
                 if ($mail_active == 0) {
 
                     // $mail_send_result = [];
                     $mail_send_result = MailHelper::send_email($wholeData[0]);
-    
+
                     if ($mail_send_result['status'] === 'success') {
                         return $this->respond([
                             'status' => 'success',
@@ -445,7 +449,7 @@ class ClientController extends AdminController
                         ], 500);
                     }
                 }
-    
+
                 return $this->respond([
                     'status' => 'success',
                     'code' => 200,
@@ -453,29 +457,30 @@ class ClientController extends AdminController
                     'data' => $wholeData,
                 ], 200);
             }
-    
+
             return $this->respond([
                 'status' => 'error',
                 'code' => 400,
                 'message' => 'Member Review Mail configuration is not enabled for this client.',
             ], 400);
         }
-    
+
         return $this->respond([
             'status' => 'error',
             'code' => 404,
             'message' => 'No active client policy IDs found.',
         ], 404);
     }
-    
+
 
     //--------------------------------------------------------------------------------------------------------
 
     public function index()
     {
         $this->myLogger->logme('error', 'Client list function called');
-        $headerData['page_name'] = 'Client List';
-        $data['clientList'] = $this->clientModel->getCreatedByUserName();
+        $headerData['tab_name'] = 'Client List';
+        $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
+        $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
         $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
 
@@ -488,6 +493,29 @@ class ClientController extends AdminController
         // $this->loadLayout('client_onboarding', $data);
     }
 
+    
+    public function typeList($id = null)
+    {
+        try {
+            $data = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            if (empty($data)) {
+                return $this->response
+                    ->setJSON(['status' => 'error', 'message' => 'No Records found'])
+                    ->setStatusCode(404);
+            }
+
+            return $this->response
+                ->setJSON(['status' => 'success', 'data' => $data])
+                ->setStatusCode(200);
+
+        } catch (\Throwable $e) {
+            return $this->response
+                ->setJSON(['status' => 'error', 'message' => $e->getMessage()])
+                ->setStatusCode(500);
+        }
+    }
+
+
     public function updateEmpAndPolicyStatus()
     {
 
@@ -599,7 +627,8 @@ class ClientController extends AdminController
     public function clientOnboarding()
     {
         $this->myLogger->logme('error', 'Client Onboarding function called');
-        $headerData['page_name'] = 'Client Onboarding';
+        $headerData['tab_name'] = 'Client Onboarding';
+        $headerData['page_name'] = 'Clients';
 
         $data['entity']        = $this->kycEntityTypeModel->findAll();
         $data['kyc_docs']      = $this->kycDocsModel->findAll();
@@ -621,20 +650,24 @@ class ClientController extends AdminController
 
         // dd($data['placeHolders']);
 
+        // auto fetch client list and branch list from pre
+        $data['auto_fetch_client_list'] =  $this->getClientListFromPre();
+
+
         echo view('layout/header', $headerData);
         echo view('client_onboarding', $data);
         echo view('layout/footer');
     }
 
     // In your controller
-    public function deposit($id = null , $requestFrom = null , $policyId = null)
+    public function deposit($id = null, $requestFrom = null, $policyId = null)
     {
-       
-        $headerData['page_name'] = 'Client Deposit';
-        
+        $headerData['tab_name'] = 'Client Deposit';
+        $headerData['page_name'] = 'Clients';
+
         $data['clientName'] = $this->clientModel->where('id', $id)->find();
-        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id,$policyId);
-        
+        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id, $policyId);
+
         $data['depositsummary'] = $this->clientPolicyModel->getDepositlistsummary($id);
 
         // Fetch associated insurer names and balances
@@ -642,14 +675,16 @@ class ClientController extends AdminController
         $data['balances'] = $balances;
 
         // dd($data);
-        if($requestFrom == 'rest'){ return $data; }
+        if ($requestFrom == 'rest') {
+            return $data;
+        }
 
         echo view('layout/header', $headerData);
         echo view('client_deposit_list', $data);
         echo view('layout/footer');
     }
 
-    public function view_Deposit($insurerId , $requestFrom = null , $param = null)
+    public function view_Deposit($insurerId, $requestFrom = null, $param = null)
     {
         // Load your model to fetch data based on $clientId and $insurerId
         // $subTypeOptions = [
@@ -671,26 +706,28 @@ class ClientController extends AdminController
         ];
 
         $data['subTypeOptions'] = $subTypeOptions;
-        $headerData['page_name'] = 'Client Deposit';
+        $headerData['tab_name'] = 'Client Deposit';
+        $headerData['page_name'] = 'Clients';
         $loggedInUserID = get_session_userid();
         // $data['clientData']= $this->clientPolicyModel->getinsurerswithinsurenceid($insurerId);
-        if($requestFrom == 'rest')
-        { 
+        if ($requestFrom == 'rest') {
             $clientId = $param['client_id'];
             $cd_ac_pk = $param['cd_ac_pk'];
-        }else{
+        } else {
             $clientId = $this->request->getGet('client_id');
             $cd_ac_pk = $this->request->getGet('cd_ac_pk');
         }
-        
+
         $data['insurerName'] = $this->insurerModel->getInsurerName($insurerId, $clientId);
         $data['depositdata'] = $this->clientPolicyModel->getdepositData($clientId, $insurerId, $cd_ac_pk, $subTypeOptions);
         $data['clientData'] = $this->clientPolicyModel->getClientById($clientId);
         $data['deposiamount'] = $this->clientPolicyModel->getDepositSummary($clientId, $insurerId, $cd_ac_pk);
         $data['cd_ac_pk'] = $cd_ac_pk;
 
-        if($requestFrom == 'rest'){ return $data; }
-        
+        if ($requestFrom == 'rest') {
+            return $data;
+        }
+
         // Load the view for the new list page;
         echo view('layout/header', $headerData);
         echo view('view_deposit', $data);
@@ -712,12 +749,12 @@ class ClientController extends AdminController
             ->where('is_active', 1)
             ->first();
 
-        
-        if(!empty($record_date)){
+
+        if (!empty($record_date)) {
             // Prepare the array with data
             $date = \DateTime::createFromFormat('d/m/Y', $record_date);
             $record_date = $date->format('Y-m-d');
-        }else{
+        } else {
             $record_date = null;
         }
 
@@ -751,7 +788,8 @@ class ClientController extends AdminController
     {
 
         $this->myLogger->logme('error', 'Edit Client Onboarding function called');
-        $headerData['page_name'] = 'Edit Client Onboarding';
+        $headerData['tab_name'] = 'Edit Client Onboarding';
+        $headerData['page_name'] = 'Clients';
 
         $editData['RM']             = $this->userModel->where('is_active', 1)->findAll();
         $editData['tpa']            = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
@@ -792,8 +830,14 @@ class ClientController extends AdminController
         $editData['client_policy']['role'] = get_role_id();
         $editData['notification'] = $this->notificationModel->select('template_name,enabled')->where('client_id', $id)->findAll();
         $editData['placeHolders'] = ['member_name', 'member_mobile', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
-        $editData['api_data'] = $this->clientApi->where("client_id", $id)->where("is_active",1)->first();
+        $editData['api_data'] = $this->clientApi->where("client_id", $id)->where("is_active", 1)->first();
         // dd($editData);
+
+        $edit['pre_branch_id'] =  $this->clientBranchModel->select('pre_branch_id')->where('client_id',$id)->get()->getResultArray()[0]['pre_branch_id']??"";
+
+        $editData['auto_fetch_client_list'] =  $this->getClientListFromPre();
+
+
         echo view('layout/header', $headerData);
         echo view('client_onboarding', $editData);
         echo view('layout/footer');
@@ -817,7 +861,7 @@ class ClientController extends AdminController
             $data['is_download_btn'] = 1;
         }
 
-        if(empty($data['parent_client_id'])){
+        if (empty($data['parent_client_id'])) {
             $data['parent_client_id'] = null;
         }
 
@@ -851,7 +895,7 @@ class ClientController extends AdminController
             $data['is_download_btn'] = 1;
         }
 
-        if(empty($data['parent_client_id'])){
+        if (empty($data['parent_client_id'])) {
             $data['parent_client_id'] = null;
         }
         // print_r($data);die;
@@ -890,9 +934,9 @@ class ClientController extends AdminController
         $insert = $this->clientKYCDocsModel->insert($data);
         if ($insert) {
             // $kycDocs = $this->clientKYCDocsModel->where('client_id', $this->request->getPost('client_id'))->findAll();
-            if($form_type == "others"){
+            if ($form_type == "others") {
                 $kycDocs = $this->generateKycOthersTable($this->request->getPost('client_id'));
-            }else{
+            } else {
                 $kycDocs = $this->generateKycPrimaryTable($this->request->getPost('client_id'));
             }
             return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs, 'file_name' => $File], 200);
@@ -920,9 +964,9 @@ class ClientController extends AdminController
 
         if ($insert) {
             // $kycDocs = $this->clientKYCDocsModel->getKycDocsName($id);
-            if($form_type == "others"){
+            if ($form_type == "others") {
                 $kycDocs = $this->generateKycOthersTable($this->request->getPost('client_id'));
-            }else{
+            } else {
                 $kycDocs = $this->generateKycPrimaryTable($this->request->getPost('client_id'));
             }
             return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs], 200);
@@ -1070,7 +1114,7 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error', 'Client branch CREATE function called');
         $data   = $this->request->getPost();
-        // var_dump($data); die;
+
         if (!isset($data['sez'])) {
             $data['sez'] = 0;
         } elseif ($data['sez']) {
@@ -1086,14 +1130,47 @@ class ClientController extends AdminController
         }
 
         $data['created_by'] = get_session_userid();
+
+        
+        // before updating check if pre_branch_id is already existing in the current db
+
+        if(isset($data['pre_branch_id']) && !empty($data['pre_branch_id']))
+        {
+            $existing_pre_branch = $this->clientBranchModel
+                                    ->where('pre_branch_id',$data['pre_branch_id'])
+                                    //->where('id !=',$post_branch_id)
+                                    ->first();
+
+            if($existing_pre_branch)
+            {
+                return $this->respond([
+                    'status' => false,
+                    'code' => 409,
+                    'message' => 'The  branch  is already mapped with another branch. Please check.',
+                ], 409);
+            }
+        }
+
+
+
         $insert = $this->clientBranchModel->insert($data);
 
+        $post_branch_id = $insert;
+
         if ($insert) {
             $level_contact_data = $this->request->getPost('level_contect_data');
             $level_contact_data = !empty($level_contact_data) ? json_decode($level_contact_data, true) : null;
             $this->saveLevelContacts($level_contact_data, $insert);
         }
 
+        if($post_branch_id && isset($data['pre_branch_id']) && !empty($data['pre_branch_id']))
+        {
+            // need to update the client_branch in the pre
+            $result = $this->updatePreClientBranch($data['pre_branch_id'],$post_branch_id , "create");
+
+            log_message('error','Pre client_branch update result for pre_branch_id '.$data['pre_branch_id'].' and post_branch_id '.$post_branch_id.' is '.json_encode($result));
+        }
+
         if ($insert) {
             $branchData = $this->clientBranchModel->where('client_id', $this->request->getPost('client_id'))->findAll();
             $branchData['role'] = get_role_id();
@@ -1118,13 +1195,17 @@ class ClientController extends AdminController
         $this->myLogger->logme('error', 'Client branch EDIT function called');
         $id     = $this->request->getPost('branch_id_primarykey');
         $client_id     = $this->request->getPost('client_id');
+        $pre_branch_id = $this->request->getPost('pre_branch_id') ?? '';
+
         $data   = $this->request->getPost();
+        $data['pre_branch_id']  = $pre_branch_id;
+
         $units   = $this->request->getPost('units');
 
         $emp_unit_count = 0;
-        $rr_unit_count = 0;
+        $rr_unit_count  = 0;
         $rr_unit_count2 = 0;
-        $total_count = 0;
+        $total_count    = 0;
 
         $list_of_branch_units = $this->clientBranchModel->find($id);
         $units = json_decode($list_of_branch_units['units']);
@@ -1177,7 +1258,41 @@ class ClientController extends AdminController
         }
 
         $data['updated_by'] = get_session_userid();
+
+        $post_branch_id = $id;
+
+        // before updating check if pre_branch_id is already existing in the current db
+
+        if(isset($data['pre_branch_id']) && !empty($data['pre_branch_id']))
+        {
+            $existing_pre_branch = $this->clientBranchModel
+                                    ->where('pre_branch_id',$data['pre_branch_id'])
+                                    ->where('id !=',$post_branch_id)
+                                    ->first();
+
+            if($existing_pre_branch)
+            {
+                return $this->respond([
+                    'status' => false,
+                    'code' => 409,
+                    'message' => 'The  branch  is already mapped with another branch. Please check.',
+                ], 409);
+            }
+        }
+
         $insert = $this->clientBranchModel->update($id, $data);
+
+
+
+        if($post_branch_id && isset($data['pre_branch_id']) && !empty($data['pre_branch_id']))
+        {
+            // need to update the client_branch in the pre
+            $result = $this->updatePreClientBranch($data['pre_branch_id'],$post_branch_id , "update");
+
+            log_message('error','Pre client_branch update result for pre_branch_id '.$data['pre_branch_id'].' and post_branch_id '.$post_branch_id.' is '.json_encode($result));
+        }
+
+
         $this->myLogger->logme('error', 'Client branch EDITED by {data}', ['data' => get_session_userid()]);
 
 
@@ -1383,9 +1498,9 @@ class ClientController extends AdminController
         $data['insurer_id']        = $insurerId;
 
         $tpaValue                  = (string) $this->request->getPost('tpa');
-        if(!empty($tpaValue) || $tpaValue !== ''){
+        if (!empty($tpaValue) || $tpaValue !== '') {
             list($tpaBranchId, $tpaId) = explode('-', $tpaValue);
-        }else{
+        } else {
             $tpaBranchId = null;
             $tpaId = null;
         }
@@ -1461,7 +1576,7 @@ class ClientController extends AdminController
             $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($client_id);
             $clientPoliceData['role'] = get_role_id();
 
-            if($policy_transaction_data > 0){
+            if ($policy_transaction_data > 0) {
                 $r = Jobs::addJob(['job_name' => 'updatePolicyTransactionDataWhileClinetPolicyUpdate', 'payload' => [
                     'old_client_policy_data' => $old_client_policy_data ?? null,
                     'new_client_policy_data' => $new_client_policy_data ?? null,
@@ -1497,14 +1612,13 @@ class ClientController extends AdminController
             $update = $this->clientPolicyModel->where('id', $id)->set($data)->update();
 
             if ($update) {
-                
+
                 $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id);
 
                 return $this->respond(['status' => true, 'code' => 200], 200);
             } else {
                 return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to remove policy'], 200);
             }
-
         } else {
 
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'The policy has active employees'], 200);
@@ -1536,7 +1650,7 @@ class ClientController extends AdminController
         }
     }
 
-    
+
 
     // Save Rack Rate function
     public function createClientPolicyPremium()
@@ -1990,8 +2104,15 @@ class ClientController extends AdminController
 
             // Check differences and prepare update data
             $fields_to_check = [
-                'client_branch_id', 'policy_type', 'insurer_id', 'insurer_branch_id',
-                'cd_ac_pk', 'policy_end_date', 'policy_start_date', 'tpa_id', 'tpa_branch_id'
+                'client_branch_id',
+                'policy_type',
+                'insurer_id',
+                'insurer_branch_id',
+                'cd_ac_pk',
+                'policy_end_date',
+                'policy_start_date',
+                'tpa_id',
+                'tpa_branch_id'
             ];
 
             foreach ($fields_to_check as $field) {
@@ -2039,18 +2160,16 @@ class ClientController extends AdminController
                 }
 
                 $this->myLogger->logme("error", "Policy transaction(s) updated successfully. Updated IDs: " . json_encode($updated_pt_ids));
-                
+
                 return [
                     'status' => "Success",
                     'message' => "Policy transaction(s) updated.",
                     'updated_ids' => $updated_pt_ids
                 ];
-
             } else {
                 $this->myLogger->logme("error", "No active policy_transaction records found for update.");
                 return ['status' => "Failed", 'message' => "No active policy_transaction records found."];
             }
-
         } catch (\Throwable $e) {
             $this->myLogger->logme("error", "Exception during policy_transaction update: " . $e->getMessage());
             return [
@@ -2096,7 +2215,6 @@ class ClientController extends AdminController
                         $errors[] = "No change or failed update for ID {$row['id']}";
                     }
                 }
-
             } catch (\Exception $e) {
                 $errors[] = "Error updating pt_id {$pt_id}: " . $e->getMessage();
             }
@@ -2185,7 +2303,8 @@ class ClientController extends AdminController
         }
     }
 
-    public function generateKycPrimaryTable($client_id){
+    public function generateKycPrimaryTable($client_id)
+    {
 
         $db = db_connect();
         $builder = $db->table('kyc_docs kd');
@@ -2210,16 +2329,17 @@ class ClientController extends AdminController
 
     }
 
-    public function generateKycOthersTable($client_id){
-        
+    public function generateKycOthersTable($client_id)
+    {
+
         $result['data'] = $this->clientKYCDocsModel
-                ->where('is_active', 1)
-                ->where('client_id', $client_id)
-                ->groupStart()
-                    ->where('kyc_doc_type_id', null)
-                    ->orWhere('kyc_doc_type_id', 0)
-                ->groupEnd()
-                ->findAll();
+            ->where('is_active', 1)
+            ->where('client_id', $client_id)
+            ->groupStart()
+            ->where('kyc_doc_type_id', null)
+            ->orWhere('kyc_doc_type_id', 0)
+            ->groupEnd()
+            ->findAll();
 
         $result['client_id'] = $client_id;
         $table = view('client_kyc_other_table', $result);
@@ -2647,7 +2767,7 @@ class ClientController extends AdminController
             // $data['special_condition_label'] = str_replace(',', '', $this->request->getPost("special_condition_label")) ?? [];
             // $data['special_condition_input'] = str_replace(',', '', $this->request->getPost("special_condition_input")) ?? [];
             // $data['multiple_sum_insured'] = str_replace(',', '', $this->request->getPost("multiple_sum_insured")) ?? [];
-            
+
             $fields = [
                 'waiverofpreexistingdiseases' => false,
                 'waiverof1,2,3&4thyearexclusions' => false,
@@ -2694,17 +2814,17 @@ class ClientController extends AdminController
                 'special_condition_input' => true,
                 'multiple_sum_insured' => true,
             ];
-                       
+
             foreach ($fields as $field => $needsCleanup) {
                 $value = $this->request->getPost($field);
-            
+
                 if ($value !== null && $value !== '') {
                     $data[$field] = $needsCleanup ? str_replace(',', '', $value) : $value;
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             $data['enrollment_display_key'] = $this->enrollmentGMCDisplayValueTransform();
             $this->myLogger->logme('error', "contructed post data : " . json_encode($data ?? []));
             // print_r($data);die;
@@ -2747,11 +2867,11 @@ class ClientController extends AdminController
     //     if ($this->request->getPost("waiverofpreexistingdiseases_display")) {
     //         $data['Waiver of Pre-existing Diseases'] = $this->request->getPost("waiverofpreexistingdiseases");
     //     }
-        
+
     //     if ($this->request->getPost("waiverof1234thyearexclusions_display")) {
     //         $data['Waiver of 1, 2, 3 & 4th year Exclusions'] = $this->request->getPost("waiverof1,2,3&4thyearexclusions");
     //     }
-        
+
     //     if ($this->request->getPost("waiverof30dayswaitingperiod_display")) {
     //         $data['Waiver of 30 days waiting period'] = $this->request->getPost("waiverof30dayswaitingperiod");
     //     }
@@ -2759,157 +2879,157 @@ class ClientController extends AdminController
     //     if ($this->request->getPost("suminsuredenhancement_display")) {
     //         $data['Sum Insured Enhancement'] = $this->request->getPost("suminsuredenhancement");
     //     }
-        
+
     //     if ($this->request->getPost("waiver_of_90_days_waiting_period_display")) {
     //         $data['Waiver of 90 Days Waiting Period'] = $this->request->getPost("waiver_of_90_days_waiting_period");
     //     }
-        
+
     //     if ($this->request->getPost("waiver_of_other_waiting_periods_display")) {
     //         $data['Waiver of Other Waiting Periods'] = $this->request->getPost("waiver_of_other_waiting_periods");
     //     }
-        
+
     //     if ($this->request->getPost("maternity_benefit_display")) {
     //         $data['Maternity Benefit'] = $this->request->getPost("maternity_benefit");
     //     }
-        
+
     //     if ($this->request->getPost("9monthwaitingperiodwaived_display")) {
     //         $data['9-month waiting Period - waived'] = $this->request->getPost("9monthwaitingperiodwaived");
     //     }
-        
+
     //     if ($this->request->getPost("maternitycoverage_display")) {
     //         $data['Maternity Coverage'] = $this->request->getPost("maternitycoverage");
     //     }
-        
+
     //     if ($this->request->getPost("twindelivery_display")) {
     //         $data['Twin Delivery'] = $this->request->getPost("twindelivery");
     //     }
-        
+
     //     if ($this->request->getPost("well_baby_well_mother_expenses_display")) {
     //         $data['Well baby / Well Mother Expenses'] = $this->request->getPost("well_baby_well_mother_expenses");
     //     }
-        
+
     //     if ($this->request->getPost("preandpostnatal_display")) {
     //         $data['Pre and Post natal'] = $this->request->getPost("preandpostnatal");
     //     }
-        
+
     //     if ($this->request->getPost("infertility_treatment_coverage_display")) {
     //         $data['Infertility Treatment Coverage'] = $this->request->getPost("infertility_treatment_coverage");
     //     }
-        
+
     //     if ($this->request->getPost("babyday1cover_display")) {
     //         $data['Baby Day 1 Cover'] = $this->request->getPost("babyday1cover");
     //     }
-        
+
     //     if ($this->request->getPost("coverfromthedateofjoining_display")) {
     //         $data['Cover from the date of Joining'] = $this->request->getPost("coverfromthedateofjoining");
     //     }
-        
+
     //     if ($this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse_display")) {
     //         $data['Mid Term Addition of New Born / Newly Wedded Spouse'] = $this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse");
     //     }
-        
+
     //     if ($this->request->getPost("prehospitalizationcover_display")) {
     //         $data['Pre Hospitalization Cover'] = $this->request->getPost("prehospitalizationcover");
     //     }
-        
+
     //     if ($this->request->getPost("posthospitalizationcover_display")) {
     //         $data['Post Hospitalization Cover'] = $this->request->getPost("posthospitalizationcover");
     //     }
-        
+
     //     if ($this->request->getPost("congenitaldiseasesinternal_display")) {
     //         $data['Congenital Diseases - Internal'] = $this->request->getPost("congenitaldiseasesinternal");
     //     }
-        
+
     //     if ($this->request->getPost("congenitaldiseasesexternal_display")) {
     //         $data['Congenital Diseases - External'] = $this->request->getPost("congenitaldiseasesexternal");
     //     }
-        
+
     //     if ($this->request->getPost("copayzonewisecopay_display")) {
     //         $data['Co-Pay/Zone wise Co Pay'] = $this->request->getPost("copayzonewisecopay");
     //     }
-        
+
     //     if ($this->request->getPost("roomrentlimit_display")) {
     //         $data['Room Rent Limit'] = $this->request->getPost("roomrentlimit");
     //     }
-        
+
     //     if ($this->request->getPost("icu_limit_display")) {
     //         $data['ICU Limit'] = $this->request->getPost("icu_limit");
     //     }
-        
+
     //     if ($this->request->getPost("proportionatedeductionclause_display")) {
     //         $data['Proportionate Deduction Clause'] = $this->request->getPost("proportionatedeductionclause");
     //     }
-        
+
     //     if ($this->request->getPost("ailmentcapping_display")) {
     //         $data['Ailment capping'] = $this->request->getPost("ailmentcapping");
     //     }
-        
+
     //     if ($this->request->getPost("ailment_capping_details_display")) {
     //         $data['Ailment capping Details'] = $this->request->getPost("ailment_capping_details");
     //     }
-        
+
     //     if ($this->request->getPost("corporatebuffer_display")) {
     //         $data['Corporate Buffer'] = $this->request->getPost("corporatebuffer");
     //     }
-        
+
     //     if ($this->request->getPost("non_admissible_contingency_corporate_buffer_display")) {
     //         $data['Non-Admissible / Contingency Corporate Buffer'] = $this->request->getPost("non_admissible_contingency_corporate_buffer");
     //     }
-        
+
     //     if ($this->request->getPost("ambulancecharges_display")) {
     //         $data['Ambulance Charges'] = $this->request->getPost("ambulancecharges");
     //     }
-        
+
     //     if ($this->request->getPost("airambulance_display")) {
     //         $data['Air Ambulance'] = $this->request->getPost("airambulance");
     //     }
-        
+
     //     if ($this->request->getPost("reasonableandcustomarycharges_display")) {
     //         $data['Reasonable and Customary Charges'] = $this->request->getPost("reasonableandcustomarycharges");
     //     }
-        
+
     //     if ($this->request->getPost("daycaretreatment_display")) {
     //         $data['Day Care Treatment'] = $this->request->getPost("daycaretreatment");
     //     }
-        
+
     //     if ($this->request->getPost("lasiksurgery_display")) {
     //         $data['Lasik Surgery'] = $this->request->getPost("lasiksurgery");
     //     }
-        
+
     //     if ($this->request->getPost("ayushtreatmentcover_display")) {
     //         $data['AYUSH treatment cover'] = $this->request->getPost("ayudhtreatmentcover");
     //     }
-        
+
     //     if ($this->request->getPost("moderntreatmentsasperirdai_display")) {
     //         $data['Modern treatments as per IRDAI'] = $this->request->getPost("moderntreatmentsasperirdai");
     //     }
-        
+
     //     if ($this->request->getPost("opd_treatment_display")) {
     //         $data['OPD Treatment'] = $this->request->getPost("opd_treatment");
     //     }
-        
+
     //     if ($this->request->getPost("days_of_discharge_display")) {
     //         $data['Claim Intimation Clause'] = $this->request->getPost("days_of_discharge");
     //     }
-        
+
     //     if ($this->request->getPost("days_from_dod_display")) {
     //         $data['Claim Submission'] = $this->request->getPost("days_from_dod");
     //     }
-        
+
     //     if ($this->request->getPost("terrorism_display")) {
     //         $data['Terrorism'] = $this->request->getPost("terrorism");
     //     }
-        
+
     //     if ($this->request->getPost("widower_cover_display")) {
     //         $data['Widower Cover'] = $this->request->getPost("widower_cover");
     //     }
-        
+
     //     if ($this->request->getPost("breavement_cover_display")) {
     //         $data['Breavement Cover'] = $this->request->getPost("breavement_cover");
     //     }
 
     //     if ($this->request->getPost("special_condition_display_value")) {
-            
+
     //         $specialConditionKeyValue = $this->request->getPost("special_condition_display_value") ?? [];
     //         $specialConditionKeyValue = json_decode($specialConditionKeyValue, true);
 
@@ -2918,14 +3038,14 @@ class ClientController extends AdminController
     //             $data = array_merge($data, $mergedArray);
     //         }
     //     }
-        
+
     //     if(isset($data) && !empty($data)){
     //         return $data;
     //     }else{
     //         $data = [];
     //         return $data;
     //     }
-    
+
     // }
 
     public function enrollmentGMCDisplayValueTransform()
@@ -3092,7 +3212,7 @@ class ClientController extends AdminController
                 'gpa_special_condition_input',
                 'multiple_sum_insured',
             ];
-            
+
             $fieldsWithoutCommaRemoval = [
                 'permanentPartialDisablement',
                 'temporaryTotalDisablementBenefit',
@@ -3109,27 +3229,27 @@ class ClientController extends AdminController
                 'animalSnakeInsectBite',
                 'air_ambulance'
             ];
-            
+
             // Remove commas and assign if present
             foreach ($fieldsWithCommaRemoval as $field) {
                 $value = $this->request->getPost($field);
                 if ($value !== null) {
                     $data[$field] = str_replace(',', '', $value);
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             // Direct assign if present
             foreach ($fieldsWithoutCommaRemoval as $field) {
                 $value = $this->request->getPost($field);
                 if ($value !== null) {
                     $data[$field] = $value;
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             $data['enrollment_display_key'] = $this->enrollmentGPADisplayValueTransform();
 
             // print_r($data); die;
@@ -3819,10 +3939,10 @@ class ClientController extends AdminController
 
         $cd_data = array_merge($cd_data, $client_cd_data);
 
-        if($return_type == "internal"){
-            if(!empty($cd_data)){
+        if ($return_type == "internal") {
+            if (!empty($cd_data)) {
                 return $cd_data;
-            }else{
+            } else {
                 return [];
             }
         }
@@ -3850,7 +3970,7 @@ class ClientController extends AdminController
 
         $client_policy_id = $this->request->getPost("client_policy_id");
         $policy_terms = $this->request->getPost("policy_terms");
-        $policy_terms = json_decode($policy_terms, true); 
+        $policy_terms = json_decode($policy_terms, true);
 
         $data = [];
 
@@ -3858,12 +3978,11 @@ class ClientController extends AdminController
 
             if (str_ends_with($key, '_display')) {
 
-                $original_key = substr($key, 0, -8); 
+                $original_key = substr($key, 0, -8);
 
                 $newKey = implode(' ', array_map('ucfirst', explode('_', $original_key)));
 
                 $data['enrollment_display_key'][$newKey] = $policy_terms[$original_key] ?? " ";
-
             } else {
 
                 $data[$key] = $value;
@@ -3871,10 +3990,10 @@ class ClientController extends AdminController
         }
 
         if (!empty($data)) {
-            $policy_terms['is_payable_employee']['self'] = 0; 
-            $policy_terms = json_encode($data); 
+            $policy_terms['is_payable_employee']['self'] = 0;
+            $policy_terms = json_encode($data);
         }
-        
+
 
         $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
 
@@ -4296,9 +4415,9 @@ class ClientController extends AdminController
         // -----------for vehicle ---------------------------------------------------------------------------
 
         $vehicles = $this->vehicleModel
-        ->select('vehicle.*, clients.client_type')
-        ->join('clients', 'clients.id=vehicle.owner')
-        ->where('vehicle.is_active', 1)->findAll();
+            ->select('vehicle.*, clients.client_type')
+            ->join('clients', 'clients.id=vehicle.owner')
+            ->where('vehicle.is_active', 1)->findAll();
 
         // -----------for Insurer ---------------------------------------------------------------------------
 
@@ -4421,12 +4540,12 @@ class ClientController extends AdminController
         $cd_data = array_merge($cd_data, $client_cd_data);
 
         if (!empty($cd_data)) {
-            return $this->respond([ 'status' => true,'code' => 200, 'data' => $cd_data], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_data], 200);
         } else {
-            return $this->respond(['status' => false,'code' => 404,'client_id' => $client_id,'insurer_id' => $insurer_id,'insurer_branch_id' => $insurer_branch_id ], 200);
+            return $this->respond(['status' => false, 'code' => 404, 'client_id' => $client_id, 'insurer_id' => $insurer_id, 'insurer_branch_id' => $insurer_branch_id], 200);
         }
     }
-    
+
     // public function getCDAccNoByClientAndInsurer($client, $insurer, $insurer_branch_id)
     // {
     //     $cdmData = $this->CDMasterModel
@@ -4461,7 +4580,7 @@ class ClientController extends AdminController
         // Add additional fields if client type is 2
         if ($client_type == 2) {
             $client_data = array_merge($client_data, [
-                'dob' => change_date_format($postData['dob'],'d/m/Y','Y-m-d'),
+                'dob' => change_date_format($postData['dob'], 'd/m/Y', 'Y-m-d'),
                 'aadhar' => $postData['aadhar'],
                 'phone' => $postData['phone'],
                 'entity_type_id' => 7
@@ -4519,7 +4638,7 @@ class ClientController extends AdminController
         $client_type = $postData['client_type'] ?? null;
 
         $client_insert = null;
-        if($client_type == 2){
+        if ($client_type == 2) {
 
             $client_data = [
                 'client_type' => $postData['client_type'],
@@ -4530,8 +4649,7 @@ class ClientController extends AdminController
             ];
 
             $client_insert = $this->clientModel->insert($client_data);
-
-        }else if($client_type == 1){
+        } else if ($client_type == 1) {
 
             $client_data = [
                 'client_type' => $postData['client_type'],
@@ -4539,10 +4657,10 @@ class ClientController extends AdminController
                 'short_name' => $postData['short_name'] ?? $postData['client_name'],
                 'client_code' => generate_client_code(),
                 'entity_type_id' => 2
-            ]; 
-        
-             $client_insert = $this->clientModel->insert($client_data);
-        }        
+            ];
+
+            $client_insert = $this->clientModel->insert($client_data);
+        }
 
         if (!$client_insert) {
             return $this->respond(['status' => false, 'message' => 'Failed to create client'], 200);
@@ -4551,11 +4669,11 @@ class ClientController extends AdminController
         // Additional logic for non-individual clients (client_type != 2)
         $branch_insert = null;
         if ($client_type != 2) {
-            $unit[] = $postData['short_name'] . '-' . 001;
+            $unit[] = $postData['short_name'] . '-' . $postData['branch_code'] ?? 001;
             $branch_data = [
                 'client_id' => $client_insert,
                 'branch_name' => $postData['branch_name'],
-                'branch_code' => 001,
+                'branch_code' => $postData['branch_code'] ?? 001,
                 'gst' => $postData['gst'],
                 'units' => json_encode($unit) ?? null,
             ];
@@ -4567,6 +4685,7 @@ class ClientController extends AdminController
                     'contact_type' => 'client',
                     'name' => $postData['name'],
                     'email' => $postData['email'],
+                    'mobile' => $postData['mobile'] ?? null,
                 ];
                 $this->levelContactModel->insert($contact_data);
             }
@@ -4582,7 +4701,7 @@ class ClientController extends AdminController
             ->where('client_id', $client_insert)
             ->where('is_active', 1)
             ->findAll();
-            
+
         return $this->respond([
             'status' => true,
             'data' => $postData,
@@ -4613,12 +4732,12 @@ class ClientController extends AdminController
             $vehicle_insert = $this->vehicleModel->insert($data);
 
             if ($vehicle_insert) {
-                
+
                 // $vehicles = $this->vehicleModel->where('is_active', 1)->findAll();
                 $vehicles = $this->vehicleModel->select('vehicle.*, clients.client_type')
-                            ->join('clients', 'clients.id=vehicle.owner')
-                            ->where('vehicle.is_active', 1)
-                            ->findAll();
+                    ->join('clients', 'clients.id=vehicle.owner')
+                    ->where('vehicle.is_active', 1)
+                    ->findAll();
 
                 return $this->respond([
                     'status' => true,
@@ -4656,7 +4775,6 @@ class ClientController extends AdminController
                 ];
 
                 $client_insert = $this->clientModel->insert($client_data);
-
             } else if ($client_type == 1) {
 
                 $client_data = [
@@ -4717,7 +4835,7 @@ class ClientController extends AdminController
                     ->where('is_active', 1)
                     ->findAll();
 
-                    // Fetch branches in a single query
+                // Fetch branches in a single query
                 $branches = $this->clientBranchModel
                     ->where('client_id', $client_insert)
                     ->where('is_active', 1)
@@ -4734,11 +4852,9 @@ class ClientController extends AdminController
                     'vehicles' => $vehicles,
                     'message' => 'Vehicle created successfully'
                 ], 200);
-
             } else {
                 return $this->respond(['status' => false, 'message' => 'Failed to created vehicle'], 200);
             }
-
         } else if (isset($data['owner']) && !empty($data['owner'])) {
 
             $vehicle_data = [
@@ -4750,7 +4866,7 @@ class ClientController extends AdminController
             ];
 
             $vehicle_insert = $this->vehicleModel->insert($vehicle_data);
-            
+
             $vehicles = $this->vehicleModel->select('vehicle.*, clients.client_type')
                 ->join('clients', 'clients.id = vehicle.owner')
                 ->where('vehicle.is_active', 1)
@@ -4761,7 +4877,7 @@ class ClientController extends AdminController
                 ->where('is_active', 1)
                 ->findAll();
 
-                // Fetch branches in a single query
+            // Fetch branches in a single query
             $branches = $this->clientBranchModel
                 ->where('client_id', $data['owner'])
                 ->where('is_active', 1)
@@ -4780,7 +4896,6 @@ class ClientController extends AdminController
                     'vehicles' => $vehicles,
                     'message' => 'Vehicle created successfully'
                 ], 200);
-                
             } else {
                 return $this->respond(['status' => false, 'message' => 'Failed to created vehicle'], 200);
             }
@@ -4928,7 +5043,7 @@ class ClientController extends AdminController
     //                 return $this->respond(['status' => true, 'code' => 409, "message" => $message, 'received_data' => $received_data, 'db_data' => $data], 200);
     //             }
     //         }
-            
+
     //     } else {
     //         return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data], 200);
     //     }
@@ -4944,10 +5059,10 @@ class ClientController extends AdminController
         $client_type = $this->request->getGet('client_type');
 
         $data = $this->policyTransactionModel
-                        ->where('is_active', 1)
-                        ->where('action_type', 'inception')
-                        ->where('policy_no', $policy_no)
-                        ->countAllResults();
+            ->where('is_active', 1)
+            ->where('action_type', 'inception')
+            ->where('policy_no', $policy_no)
+            ->countAllResults();
 
         if ($data > 0) {
             return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data], 200);
@@ -4957,7 +5072,7 @@ class ClientController extends AdminController
     }
 
     public function get_client_policy_data_using_policy_no_and_endo_no()
-    {   
+    {
         $policy_no = $this->request->getGet('policy_no');
         $endorsement_no = $this->request->getGet('endorsement_no');
 
@@ -4980,10 +5095,10 @@ class ClientController extends AdminController
     {
         if ($id) {
             $branch_data = $this->clientBranchModel
-                    ->select('client_branch.*, clients.pan')
-                    ->join('clients', 'client_branch.client_id = clients.id')
-                    ->where(['client_branch.id' => $id, 'client_branch.is_active' => 1])
-                    ->first();
+                ->select('client_branch.*, clients.pan')
+                ->join('clients', 'client_branch.client_id = clients.id')
+                ->where(['client_branch.id' => $id, 'client_branch.is_active' => 1])
+                ->first();
             $branch_contact_data = $this->levelContactModel->where(['ref_id' => $id, 'contact_type' => 'client', 'is_active' => 1])->findAll();
             // print_rr($branch_contact_data);die();
             return $this->respond(['status' => true, 'code' => 200, 'data' => $branch_data, 'contact' => $branch_contact_data], 200);
@@ -4993,7 +5108,7 @@ class ClientController extends AdminController
     }
 
     public function getClientData()
-    {   
+    {
         $client_id = $this->request->getGet('client_id') ?? null;
         $result = $this->clientModel->getClientData($client_id);
         dd($result);
@@ -5010,17 +5125,17 @@ class ClientController extends AdminController
             ->where("policy_terms IS NOT NULL AND policy_terms <> ''")
             ->where('is_active', 1);
 
-        
+
         if (!empty($client_id)) {
             $query->where('client_id', $client_id);
         }
-        
+
         if (!empty($policy_type_id)) {
             $query->where('policy_type_id', $policy_type_id);
         }
-        
+
         $data = $query->findAll();
-        
+
         for ($i = 0; $i < count($data); $i++) {
 
             // dd($data[$i]);
@@ -5036,30 +5151,28 @@ class ClientController extends AdminController
             $is_addon = $data[$i]['is_addon'];
 
             $payable_arr = [];
-            if (in_array($data[$i]['policy_type_id'], [2,3]) && $is_addon == 1) {
-
-                $payable_arr = [ "self" => 0, "spouse" => 0, "childern" => 0, "elders" => 0, ];
+            if (in_array($data[$i]['policy_type_id'], [2, 3]) && $is_addon == 1) {
 
+                $payable_arr = ["self" => 0, "spouse" => 0, "childern" => 0, "elders" => 0,];
             } else if ($data[$i]['policy_type_id'] == 3 && $is_addon == 3) {
 
-                $payable_arr = ["self" => 1,"spouse" => 1,"childern" => 1,"elders" => 1,];
-
+                $payable_arr = ["self" => 1, "spouse" => 1, "childern" => 1, "elders" => 1,];
             } else if (in_array($data[$i]['policy_type_id'], [4, 5])) {
 
-                $payable_arr = ["self" => 1,"spouse" => 1,"childern" => 1,"elders" => 1,];
+                $payable_arr = ["self" => 1, "spouse" => 1, "childern" => 1, "elders" => 1,];
             }
 
             // Initialize an empty array for the ordered policy terms
             $orderedPolicyTerms = [];
 
-            if(in_array($data[$i]['policy_type_id'], [2,3,4,5])){
+            if (in_array($data[$i]['policy_type_id'], [2, 3, 4, 5])) {
 
                 // Set default value of copayzonewisecopay to "empty"
                 // $ans = isset($policyTerms['copayzonewisecopay']) ? $policyTerms['copayzonewisecopay'] : 'empty';
 
                 // add is_payable_employee for the GMC Policy
                 if (isset($policyTerms['age_ratio'])) {
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $aliment_index = array_search('age_ratio', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
@@ -5097,7 +5210,7 @@ class ClientController extends AdminController
 
                 // Add ailmentcapping and ailmentcappingdata if they exist
                 if (isset($policyTerms['ailmentcapping'])) {
-                    if(!isset($policyTerms['ailment_capping_details'])){
+                    if (!isset($policyTerms['ailment_capping_details'])) {
                         $aliment_index = array_search('ailmentcapping', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "ailment_capping_details",
@@ -5106,12 +5219,11 @@ class ClientController extends AdminController
                         ];
                     }
                 }
-
-            }else {
+            } else {
 
                 // add is_payable_employee for the GMC Policy
                 if (isset($policyTerms['age_ratio'])) {
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $aliment_index = array_search('age_ratio', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
@@ -5121,9 +5233,9 @@ class ClientController extends AdminController
                             "position" => $aliment_index + 1,
                         ];
                     }
-                }else{
+                } else {
 
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
                             "value" => [
@@ -5133,7 +5245,6 @@ class ClientController extends AdminController
                         ];
                     }
                 }
-
             }
 
             foreach ($orderedPolicyTerms as $term) {
@@ -5155,12 +5266,12 @@ class ClientController extends AdminController
                 }
             }
 
-            if(in_array($data[$i]['policy_type_id'], [2,3,4,5])){
+            if (in_array($data[$i]['policy_type_id'], [2, 3, 4, 5])) {
 
                 if (!isset($policyTerms['waiver_of_90_days_waiting_period'])) {
                     $policyTerms['waiver_of_90_days_waiting_period'] = "";
                 }
-                
+
                 if (!isset($policyTerms['waiver_of_other_waiting_periods'])) {
                     $policyTerms['waiver_of_other_waiting_periods'] = "";
                 }
@@ -5168,7 +5279,7 @@ class ClientController extends AdminController
                 if (!isset($policyTerms['maternity_benefit'])) {
                     $policyTerms['maternity_benefit'] = "";
                 }
-                
+
                 if (!isset($policyTerms['well_baby_well_mother_expenses'])) {
                     $policyTerms['well_baby_well_mother_expenses'] = "";
                 }
@@ -5196,61 +5307,59 @@ class ClientController extends AdminController
                 if (!isset($policyTerms['widower_cover'])) {
                     $policyTerms['widower_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['breavement_cover'])) {
                     $policyTerms['breavement_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['enrollment_display_key'])) {
                     $policyTerms['enrollment_display_key'] = $this->existingGMCDisplayValueTransform($policyTerms);
                 }
-
-            } else if($data[$i]['policy_type_id'] == 1){
+            } else if ($data[$i]['policy_type_id'] == 1) {
 
                 if (!isset($policyTerms['medical_expenses_medical_extension'])) {
                     $policyTerms['medical_expenses_medical_extension'] = "";
                 }
-                
+
                 if (!isset($policyTerms['opd_treatment_cover'])) {
                     $policyTerms['opd_treatment_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['repatriation_of_mortal_remains'])) {
                     $policyTerms['repatriation_of_mortal_remains'] = "";
                 }
-                
+
                 if (!isset($policyTerms['family_transportation_benefits'])) {
                     $policyTerms['family_transportation_benefits'] = "";
                 }
-                
+
                 if (!isset($policyTerms['fractures_dislocation_burns'])) {
                     $policyTerms['fractures_dislocation_burns'] = "";
                 }
-                
+
                 if (!isset($policyTerms['coma'])) {
                     $policyTerms['coma'] = "";
                 }
-                
+
                 if (!isset($policyTerms['travel_expenses_for_medical_treatment'])) {
                     $policyTerms['travel_expenses_for_medical_treatment'] = "";
                 }
-                
+
                 if (!isset($policyTerms['daily_cash_allowance'])) {
                     $policyTerms['daily_cash_allowance'] = "";
                 }
-                
+
                 if (!isset($policyTerms['artifical_limb_and_prosthesis'])) {
                     $policyTerms['artifical_limb_and_prosthesis'] = "";
                 }
-                
+
                 if (!isset($policyTerms['air_ambulance'])) {
                     $policyTerms['air_ambulance'] = "";
                 }
-                                
+
                 if (!isset($policyTerms['enrollment_display_key'])) {
                     $policyTerms['enrollment_display_key'] = $this->existingGPADisplayValueTransform($policyTerms);
                 }
-                
             }
 
             // dd($policyTerms);
@@ -5431,7 +5540,7 @@ class ClientController extends AdminController
     }
 
     public function existingGPADisplayValueTransform($data)
-    {   
+    {
         $transformedData = [];
 
         if (isset($data["accidentalDeathBenefit"])) {
@@ -5474,7 +5583,7 @@ class ClientController extends AdminController
             $transformedData['Fractures / Dislocation / Burns'] = $data["fractures_dislocation_burns"];
         }
         if (isset($data["coma"])) {
-            $transformedData['Coma'] = $data["coma"]; 
+            $transformedData['Coma'] = $data["coma"];
         }
         if (isset($data["carriageofDeadBody"])) {
             $transformedData['Carriage of Dead Body'] = $data["carriageofDeadBody"];
@@ -5509,24 +5618,24 @@ class ClientController extends AdminController
             ->where('is_active', 1)
             ->get()
             ->getResultArray();
-    
+
         $days = [];
         foreach ($data as $value) {
 
             $reminderDate = strtotime($value['reminder_date']);
             if ($reminderDate) {
                 $date_of_date = date('d', $reminderDate);
-                $days[] = $date_of_date; 
+                $days[] = $date_of_date;
                 $days[] = $value['reminder_date'];
                 db_connect()->table('client_policy')->where('id', $value['id'])->set('reminder_date', $date_of_date)->update();
-            } 
+            }
         }
-    
+
         dd($days);
     }
 
     public function sendextraparam()
-    {   
+    {
         //     $data = db_connect()->table('jobs')->where('id', 1677)->get()->getRowArray();
         //     // dd($data);
         //    $return = $this->updatePolicyTransactionDataWhileClinetPolicyUpdate(json_decode($data['payload'], true));
@@ -5557,7 +5666,7 @@ class ClientController extends AdminController
         // $res = $empServiceController->employeesSIEnhanceProcess(['file_id' => '978']);
         // $res = $empServiceController->employeeDisembark(['file_id' => '1681']); 
         // $res = $empServiceController->employeesCorrectionProcess(['file_id' => '2033']); 
-        dd( $res); 
+        dd($res);
 
         $EmployeeMultiEventServiceController = new EmployeeMultiEventServiceController();
         // $res = $EmployeeMultiEventServiceController->constructMultiEventData(['file_id' => '1069']); 
@@ -5588,7 +5697,7 @@ class ClientController extends AdminController
             'event_type' => "correction",
             'actions' => "export",
             'file_name' => "deletion_enhancement_test_file.xlsx",
-        ]; 
+        ];
 
         // $batch_data = [
         //     'client_id' => 20,
@@ -5610,7 +5719,7 @@ class ClientController extends AdminController
 
         // $emp_data = $this->employeePolicyModel->getEmployeePolicyForEcard(12);
         // $ids = array_column($emp_data, 'id');
-        
+
         $EmpDataServiceController = new EmpDataServiceController();
         // $res = $EmpDataServiceController->generateExcelForDeletion($batch_data); dd($return); die;
         // $res = $EmpDataServiceController->generateExcelForSIEnhancement($batch_data); die;
@@ -5636,7 +5745,7 @@ class ClientController extends AdminController
         // ];
         // $res = $EmpDataServiceController->makeEntryForBDSPolicyTransaction($params);
         // dd($res);
-        
+
         // $array = [
         //         "employeeIds" => ["12800", "12798", "12797", "12799"],
         //         "client_id" => "159",
@@ -5649,7 +5758,7 @@ class ClientController extends AdminController
         //         "policy_name" => "GMC",
         //         "user_id" => "1"
         // ];
-        
+
         // $EmpDataServiceController->cashDepositCalculationForDeletion($array);
 
         // $result = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($batch_data);
@@ -5679,11 +5788,11 @@ class ClientController extends AdminController
         // dd($res);
 
         // -----------BDS REPORT CONTROLLER---------------------------------------------------------------------------------
-        
+
         // $BDSReportController = new BDSReportController();
 
         // $data['data'] = $BDSReportController->getBAPInsurerData();
-        
+
         // return $this->loadLayout('irda_bap_insurer_report_list', $data);
 
         // $data['data'] = $BDSReportController->getBAPClientData();
@@ -5700,7 +5809,7 @@ class ClientController extends AdminController
         // $email_id = 'venkateshraman786@gmail.com';
         // $common = ['mail_type'=>'test_mail_cli'];
         // $bcc = "vitvelz@gmail.com";
-        
+
         // $data = db_connect()
         // ->table('jobs')
         // ->where('id', 2264)
@@ -5708,7 +5817,7 @@ class ClientController extends AdminController
         // ->getResultArray();
 
         // $data = json_decode($data[0]['payload'], true);
-        
+
         // // dd($data);
         // // Send email and get response
         // $result = MailHelper::send_email($data[0]);
@@ -5722,7 +5831,7 @@ class ClientController extends AdminController
         // print_rr($reportData);
         // $this->loadLayout('tat_report_band_wise_list', $reportData);
         // $data = $ticketModel->getTATReport(1);
-        
+
         // $empmodel = new EmployeeModel();
         // $data = $empmodel->getEmployeePolicy(348);
         // dd($data);
@@ -5786,7 +5895,7 @@ class ClientController extends AdminController
         // $return_value = check_cd_entry_exist($baseWhere);
         // dd($return_value);
 
-        
+
 
 
         // $param = 9715454901;
@@ -5807,7 +5916,7 @@ class ClientController extends AdminController
     }
 
     // -------------------------------------------------------------------------------------------------------
-    
+
 
     public function createOtherTabContent()
     {
@@ -5830,20 +5939,16 @@ class ClientController extends AdminController
     // -------------------------------------------------------------------------------------------------------
 
     public function enrollmentAddonSIAmountDropdown($client_policy_id)
-    {   
-        if(!empty($client_policy_id)){
+    {
+        if (!empty($client_policy_id)) {
             $client_policy_details = $this->clientPolicyModel->where('id', $client_policy_id)->where('policy_status', 1)->where('is_active', 1)->first();
 
-            if(!empty($client_policy_details) && $client_policy_details['policy_type_id'] == 3 && $client_policy_details['is_addon'] == 3){
+            if (!empty($client_policy_details) && $client_policy_details['policy_type_id'] == 3 && $client_policy_details['is_addon'] == 3) {
 
                 $base_policy_id = $client_policy_details['base_policy'] ?? 0;
 
-                if(!empty($base_policy_id)){
-
-                    
-                    
+                if (!empty($base_policy_id)) {
                 }
-
             }
         }
     }
@@ -5853,12 +5958,12 @@ class ClientController extends AdminController
         $cd_ac_pk = $this->request->getGet('cd_ac_pk');
 
         $cd_amount = $this->clientDepositModel
-                ->where('is_active', 1)
-                ->where('cd_ac_pk', $cd_ac_pk)
-                ->orderBy('id', 'desc')
-                ->first();
+            ->where('is_active', 1)
+            ->where('cd_ac_pk', $cd_ac_pk)
+            ->orderBy('id', 'desc')
+            ->first();
 
-        if($cd_amount){
+        if ($cd_amount) {
             return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_amount], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
@@ -5907,9 +6012,9 @@ class ClientController extends AdminController
             ->getResultArray();
 
         // print_r(db_connect()->getLastQuery()); die;
-       
+
         $dataForClientAndInsurer = $this->clientPolicyModel
-                ->select("
+            ->select("
                         clients.id AS client_id,
                         clients.client_name,
                         insurers.id AS insurer_id,
@@ -5917,12 +6022,12 @@ class ClientController extends AdminController
                         tpa.id AS tpa_id,
                         tpa.name AS tpa_name,
                     ")
-                ->join('clients', 'client_policy.client_id = clients.id', 'left')
-                ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
-                ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
-                ->where('client_policy.id', $param)
-                ->first();
-                
+            ->join('clients', 'client_policy.client_id = clients.id', 'left')
+            ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
+            ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
+            ->where('client_policy.id', $param)
+            ->first();
+
         $memberData = [];
 
         // Respond based on the query result
@@ -6097,9 +6202,9 @@ class ClientController extends AdminController
     {
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('client_id IS NOT NULL')
-        ->where('is_inserted != 1')
-        ->get()
+            ->where('client_id IS NOT NULL')
+            ->where('is_inserted != 1')
+            ->get()
             ->getResultArray();
         // dd($renewalData);
 
@@ -6123,8 +6228,8 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set(['is_inserted' => 1])
+                ->where('id', $value['id'])
+                ->set(['is_inserted' => 1])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'client' => $value['insured']];
@@ -6137,8 +6242,8 @@ class ClientController extends AdminController
     {
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('insurer_id IS NULL')
-        ->get()
+            ->where('insurer_id IS NULL')
+            ->get()
             ->getResultArray();
         // dd($renewalData);
 
@@ -6165,11 +6270,11 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set([
-                'insurer_id' => $value['insurer_id'],
-                'insurer_branch_id' => $value['insurer_branch_id'],
-            ])
+                ->where('id', $value['id'])
+                ->set([
+                    'insurer_id' => $value['insurer_id'],
+                    'insurer_branch_id' => $value['insurer_branch_id'],
+                ])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'insurer' => $value['insurer_name'], 'insurer_id' => $value['insurer_id'], 'insurer_branch_id' => $value['insurer_branch_id'],];
@@ -6184,9 +6289,9 @@ class ClientController extends AdminController
         $group = $this->request->getGet('group') ?? 2;
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('client_id IS NULL')
-        ->where('is_inserted = 0')
-        ->where('client_type_id', $group)
+            ->where('client_id IS NULL')
+            ->where('is_inserted = 0')
+            ->where('client_type_id', $group)
             // ->limit($limit)
             ->get()
             ->getResultArray();
@@ -6221,8 +6326,8 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set(['is_inserted' => 1])
+                ->where('id', $value['id'])
+                ->set(['is_inserted' => 1])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'client' => $value['insured'], 'vehicle_id' => $value['vehicle_id']];
@@ -6313,8 +6418,8 @@ class ClientController extends AdminController
         }
 
         $vehicleData = $VehicleModel->where('owner', $renewalData['client_id'])
-        ->where('is_active', 1)
-        ->findAll();
+            ->where('is_active', 1)
+            ->findAll();
 
         if (!empty($vehicleData)) {
             $increment = count($vehicleData);
@@ -6554,17 +6659,17 @@ class ClientController extends AdminController
         return $id;
     }
 
-    private function reorderProposalsByInsurerTotal(array $data): array 
+    private function reorderProposalsByInsurerTotal(array $data): array
     {
 
         Kint::dump($data);
         if (!isset($data['premium_data']['data'])) return $data;
-    
+
         $original = $data['premium_data']['data'];
         $proposals = [];
         $others = [];
         $emptyKeyData = [];
-    
+
         foreach ($original as $key => $value) {
             // Match only keys that look like 'Proposal X'
             if (preg_match('/^Proposal\s+\d+$/', $key)) {
@@ -6573,7 +6678,7 @@ class ClientController extends AdminController
                     if ($subKey !== 'Quote Asked' && isset($subVal['Total'])) {
                         $proposals[$key] = $value;
                         break;
-                    }else{
+                    } else {
                         $proposals[$key] = $value;
                     }
                 }
@@ -6582,51 +6687,50 @@ class ClientController extends AdminController
                 if ($key === '' && isset($value['']) && is_array($value[''])) {
                     // Capture empty key to push it later
                     $emptyKeyData[$key] = $value;
-                }else{
+                } else {
                     $others[$key] = $value;
-
                 }
             }
         }
-    
+
         // dd($proposals, $others, $emptyKeyData);
         // Sort proposals by their insurer's total
-        uasort($proposals, function($a, $b) {
+        uasort($proposals, function ($a, $b) {
             $totalA = 0;
             $totalB = 0;
-    
+
             foreach ($a as $key => $val) {
                 if ($key !== 'Quote Asked' && isset($val['Total'])) {
                     $totalA = floatval($val['Total']);
                     break;
                 }
             }
-    
+
             foreach ($b as $key => $val) {
                 if ($key !== 'Quote Asked' && isset($val['Total'])) {
                     $totalB = floatval($val['Total']);
                     break;
                 }
             }
-    
+
             return $totalA <=> $totalB;
         });
-    
+
         // Merge back the sorted proposals into the full structure
         $data['premium_data']['data'] = array_merge($others, $proposals, $emptyKeyData);
         $data = $this->reorderProposalDataByPremiumOrder($data);
         return $data;
     }
 
-    private function reorderProposalDataByPremiumOrder(array $data): array 
+    private function reorderProposalDataByPremiumOrder(array $data): array
     {
         if (!isset($data['premium_data']['data'], $data['proposal_data']['over_all_column_data'])) {
             return $data;
         }
-    
+
         $premiumProposals = array_keys($data['premium_data']['data']);
         $filteredProposals = [];
-    
+
         // Collect proposal keys that match the pattern "Proposal X"
         foreach ($premiumProposals as $key) {
             if (preg_match('/^Proposal\s+\d+$/', $key) && isset($data['proposal_data']['over_all_column_data'][$key])) {
@@ -6635,13 +6739,13 @@ class ClientController extends AdminController
         }
 
         // dd($premiumProposals, $filteredProposals);
-    
+
         $data['proposal_data']['over_all_column_data'] = $filteredProposals;
         $data = $this->reorderProposalInHeaderAndData($data);
         return $data;
     }
-    
-    private function reorderProposalInHeaderAndData(array $data): array 
+
+    private function reorderProposalInHeaderAndData(array $data): array
     {
 
         // Kint::dump($data);
@@ -6649,7 +6753,7 @@ class ClientController extends AdminController
         $sortedProposalOrder = $data['proposal_data']['over_all_column_data'];
         $headers = $tableData['headers'] ?? [];
         $dataRows = $tableData['data'] ?? [];
-    
+
         // Step 1: Separate static and proposal headers
         $staticHeaders = [];
         $proposalHeaders = [];
@@ -6658,16 +6762,16 @@ class ClientController extends AdminController
             if (in_array($header['parentHeader'], array_keys($sortedProposalOrder))) {
                 $proposalHeaders[$header['parentHeader']] = $header;
             } else {
-                if($header['parentHeader'] == "Action"){
+                if ($header['parentHeader'] == "Action") {
                     $actionHeader[] = $header;
-                }else{
+                } else {
                     $staticHeaders[] = $header;
                 }
             }
         }
-    
+
         // dd($staticHeaders, $proposalHeaders, $sortedProposalOrder);
-        
+
         // Step 2: Reorder headers
         $reorderedHeaders = [];
         foreach ($sortedProposalOrder as $proposalKey => $proposalValue) {
@@ -6681,29 +6785,29 @@ class ClientController extends AdminController
             $value['parentHeader'] = 'Proposal ' . ($key + 1);
         }
         unset($value);
-        
+
 
         $reorderedHeaders = array_merge($staticHeaders, $reorderedHeaders, $actionHeader);
 
-    
+
         // Step 3: Reorder each row's `data` by matching parentth
         foreach ($dataRows as $dataRowIndex => &$row) {
             $staticData = [];
             $proposalData = [];
             $actionData = [];
-    
+
             foreach ($row['data'] as $entry) {
                 if (in_array($entry['parentth'], array_keys($sortedProposalOrder))) {
                     $proposalData[$entry['parentth']][] = $entry;
                 } else {
-                    if($entry['parentth'] == "Action"){
+                    if ($entry['parentth'] == "Action") {
                         $actionData[] = $entry;
-                    }else{
+                    } else {
                         $staticData[] = $entry;
                     }
                 }
             }
-    
+
             $reorderedProposalData = [];
             foreach ($sortedProposalOrder as $proposalKey => $proposalValue) {
                 if (isset($proposalData[$proposalKey])) {
@@ -6717,19 +6821,19 @@ class ClientController extends AdminController
             $increament = 0;
             foreach ($reorderedProposalData as $key => &$value) {
 
-                if($dubParTh == $value['parentth']){
+                if ($dubParTh == $value['parentth']) {
                     $value['parentth'] = 'Proposal ' . ($increament);
-                }else{
+                } else {
                     $dubParTh = $value['parentth'];
                     $increament = $increament + 1;
                     $value['parentth'] = 'Proposal ' . ($increament);
                 }
             }
             unset($value);
-    
+
             $row['data'] = array_merge($staticData, $reorderedProposalData, $actionData);
         }
-    
+
         $data['table_data']['headers'] = $reorderedHeaders;
         $data['table_data']['data'] = $dataRows;
 
@@ -6738,15 +6842,15 @@ class ClientController extends AdminController
         $updatedDataSet = $this->renumberProposalKeys($data['premium_data']['data']);
         $data['proposal_data']['over_all_column_data'] =  !empty($renumberedArray) ? $renumberedArray : $data['proposal_data']['over_all_column_data'];
         $data['premium_data']['data'] = !empty($updatedDataSet) ? $updatedDataSet : $data['premium_data']['data'];
-        
+
         return $data;
     }
-     
-    private function renumberProposalKeys(array $input): array 
+
+    private function renumberProposalKeys(array $input): array
     {
         $result = [];
         $counter = 1;
-    
+
         foreach ($input as $key => $value) {
             if (strpos($key, 'Proposal') === 0) {
                 $newKey = 'Proposal ' . $counter++;
@@ -6755,7 +6859,7 @@ class ClientController extends AdminController
                 $result[$key] = $value;
             }
         }
-    
+
         return $result;
     }
 
@@ -6764,20 +6868,18 @@ class ClientController extends AdminController
 
         $receivedData = $this->request->getPost();
 
-        if (!empty($receivedData['id'])){
+        if (!empty($receivedData['id'])) {
             $status = $this->clientApi->save($receivedData);
-
-        }else{
+        } else {
             $status = $this->clientApi->insert($receivedData);
         }
 
 
-        if ($status){
-            return $this->respond(['status'=>"Sucesss",'message'=>"Submitted Successfully"],200);
-        }else{
-            return $this->respond(['status'=>"Failed",'message'=>"Submission Faild"],500);
+        if ($status) {
+            return $this->respond(['status' => "Sucesss", 'message' => "Submitted Successfully"], 200);
+        } else {
+            return $this->respond(['status' => "Failed", 'message' => "Submission Faild"], 500);
         }
-
     }
 
     public function sendToken()
@@ -6787,17 +6889,17 @@ class ClientController extends AdminController
 
         $token = ClientTokenHelper::generateKey($client_id);
 
-        if ($token){
-            return $this->respond(['status' => 'success', 'token' => $token,'message' => "Token Generated Successfully"],200);
-        }else{
-            return $this->respond(['status' => "Failed","message"=>"Token Generation Failed, Try Again After some time"],500);
+        if ($token) {
+            return $this->respond(['status' => 'success', 'token' => $token, 'message' => "Token Generated Successfully"], 200);
+        } else {
+            return $this->respond(['status' => "Failed", "message" => "Token Generation Failed, Try Again After some time"], 500);
         }
     }
-    
+
     // ---------------- HR ACCESS CONTROL -----------------------------------------------------------------------------------
 
     public function viewHrAccessData()
-    {   
+    {
         $client_id = $this->request->getGet('client_id');
         $data = $this->getHrAccessData($client_id);
         // $data = [];
@@ -6817,7 +6919,8 @@ class ClientController extends AdminController
         $post_client_data = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
 
         $hrAccessData['post_hr_data'] = $this->clientBranchModel
-            ->select('lc.id as post_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail')
+            ->select('lc.id as post_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail , 
+            client_branch.id as post_branch_id , client_branch.branch_name as post_branch_name')
             ->join('level_contacts lc', 'client_branch.id = lc.ref_id')
             ->where('client_branch.is_active', 1)
             ->where('lc.is_active', 1)
@@ -6826,7 +6929,7 @@ class ClientController extends AdminController
             ->findAll();
 
         $hrAccessData['post_policy_data'] = $this->clientPolicyModel
-            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status')
+            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status , client_policy.client_branch_id as branch_id')
             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id')
             ->where('client_policy.is_active', 1)
             ->where('client_policy.client_id', $client_id)
@@ -6855,22 +6958,31 @@ class ClientController extends AdminController
 
             $hrAccessData['pre_hr_data'] = [];
             $hrAccessData['pre_policy_data'] = [];
-            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id , $pre_client_data['id']??'');
             return $combinedHrAccessData;
         }
 
-        $pre_client_data = $db2->table('clients')->where('is_active', 1)->where('short_name', $post_client_data['short_name'])->get()->getRowArray();
+        $post_branch = $this->clientBranchModel->select('pre_branch_id')->where('client_id',$client_id)->get()->getResultArray()[0]??[];
+        
+        $pre_client_data = $db2->table('client_branch cb')
+                                ->join('clients c', "c.id = cb.client_id")
+                                ->where('c.is_active',1)
+                                ->where('cb.is_active', 1)
+                                ->where('cb.id', $post_branch['pre_branch_id']??'')
+                                ->get()->getRowArray();  
 
-        if(empty($pre_client_data)){
+
+        if (empty($pre_client_data)) {
 
             $hrAccessData['pre_hr_data'] = [];
             $hrAccessData['pre_policy_data'] = [];
-            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id , $pre_client_data['id']??'');
             return $combinedHrAccessData;
         }
 
         $hrAccessData['pre_hr_data'] = $db2->table('client_branch')
-            ->select('lc.id as pre_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail')
+            ->select('lc.id as pre_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail 
+            , client_branch.id as pre_branch_id , client_branch.branch_name as pre_branch_name ' )
             ->join('level_contacts lc', 'client_branch.id = lc.ref_id')
             ->where('client_branch.is_active', 1)
             ->where('lc.is_active', 1)
@@ -6878,9 +6990,9 @@ class ClientController extends AdminController
             ->where('client_branch.client_id', $pre_client_data['id'])
             ->get()
             ->getResultArray();
-
+        
         $hrAccessData['pre_policy_data'] = $db2->table('client_policy')
-            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status')
+            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status , client_policy.client_branch_id as branch_id')
             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id')
             ->where('client_policy.is_active', 1)
             ->where('client_policy.client_id',  $pre_client_data['id'])
@@ -6888,16 +7000,16 @@ class ClientController extends AdminController
             ->orderBy('client_policy.policy_status', 'desc')
             ->get()
             ->getResultArray();
-
         // dd($hrAccessData);
 
-        $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+        $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id ,$pre_client_data['id']);
         return $combinedHrAccessData;
     }
 
-    public function constructHrAccessData($data, $client_id)
-    {   
-        // dd($data);
+    public function constructHrAccessData($data, $client_id , $pre_client_id)
+    {
+        // print_rr($data);die;
+
         $preHrs = $data['pre_hr_data'];
         $postHrs = $data['post_hr_data'];
         $hrAccessTableData = $data['hr_access_table_data'];
@@ -6907,13 +7019,18 @@ class ClientController extends AdminController
         foreach ($postHrs as $post) {
             $found = false;
             foreach ($preHrs as $index => $pre) {
-                if ($post['hr_mobile'] === $pre['hr_mobile'] && $post['hr_mail'] === $pre['hr_mail']) {
+
+                if ( trim($post['hr_mobile']) == trim($pre['hr_mobile'])  &&  trim($post['hr_mail']) == trim($pre['hr_mail']) ) {
+
                     $merged[] = [
                         'pre_hr_id' => $pre['pre_hr_id'],
                         'post_hr_id' => $post['post_hr_id'],
                         'hr_name' => $post['hr_name'],
                         'hr_mobile' => $post['hr_mobile'],
-                        'hr_mail' => $post['hr_mail']
+                        'hr_mail' => $post['hr_mail'],
+                        'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                        'post_branch_id'   => $post['post_branch_id'] ?? null,
+                        'post_branch_name' => $post['post_branch_name'] ?? null 
                     ];
                     unset($preHrs[$index]); // remove matched pre_hr
                     $found = true;
@@ -6927,19 +7044,32 @@ class ClientController extends AdminController
                     'post_hr_id' => $post['post_hr_id'],
                     'hr_name' => $post['hr_name'],
                     'hr_mobile' => $post['hr_mobile'],
-                    'hr_mail' => $post['hr_mail']
+                    'hr_mail' => $post['hr_mail'],
+                    'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                    'post_branch_id' => $post['post_branch_id'] ?? null ,
+                    'post_branch_name' => $post['post_branch_name'] ?? null
                 ];
             }
         }
 
         // Remaining preHrs (not matched)
         foreach ($preHrs as $pre) {
+
+            foreach ($merged as $value) {
+                if ( trim($pre['hr_mobile']) == trim($value['hr_mobile'])  &&  trim($pre['hr_mail']) == trim($value['hr_mail']) ) {
+                    continue 2; // Skip adding this pre_hr as it's already matched
+                }
+            }
+            
             $merged[] = [
                 'pre_hr_id' => $pre['pre_hr_id'],
                 'post_hr_id' => null,
                 'hr_name' => $pre['hr_name'],
                 'hr_mobile' => $pre['hr_mobile'],
-                'hr_mail' => $pre['hr_mail']
+                'hr_mail' => $pre['hr_mail'],
+                'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                'post_branch_id' => $post['post_branch_id'] ?? null ,
+                'post_branch_name' => $post['post_branch_name'] ?? null
             ];
         }
 
@@ -6964,81 +7094,90 @@ class ClientController extends AdminController
                     'hr_name' => $hr['hr_name'] ?? null,
                     'hr_mobile' => $hr['hr_mobile'] ?? null,
                     'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
                 ];
             }
-
         } else {
-                    // First create a map of HR data by post_hr_id for quick lookup
-                    $hrMap = [];
-                    foreach ($merged as $hr) {
-                        $hrMap[$hr['post_hr_id']] = $hr;
-                    }
-                    
-                    // Process access data first
-                    foreach ($hrAccessTableData as $access) {
-                        $post_hr_id = $access['post_hr_id'];
-                        
-                        // Check if this HR exists in our merged data
-                        if (isset($hrMap[$post_hr_id])) {
-                            $hr = $hrMap[$post_hr_id];
-                            $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-                            
-                            // Parse allowed modules
-                            $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
-                            $allowed_pre_modules = $allowed_modules['pre'] ?? [];
-                            $allowed_post_modules = $allowed_modules['post'] ?? [];
-                            
-                            $result[$temp_arr_key] = [
-                                'hr_access_table_pk' => $access['id'] ?? null,
-                                'post_client_id' => $access['post_client_id'] ?? null,
-                                'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-                                'post_hr_id' => $hr['post_hr_id'] ?? null,
-                                'allowed_pre_modules' => $allowed_pre_modules,
-                                'allowed_post_modules' => $allowed_post_modules,
-                                'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
-                                'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
-                                'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
-                                'hr_name' => $hr['hr_name'],
-                                'hr_mobile' => $hr['hr_mobile'],
-                                'hr_mail' => $hr['hr_mail']
-                            ];
-                            
-                            // Remove from map so we know it's been processed
-                            unset($hrMap[$post_hr_id]);
-                        }
-                    }
-                    
-                    // Now process any remaining HRs that didn't have access records
-                    foreach ($hrMap as $hr) {
-                        $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-                        
-                        $result[$temp_arr_key] = [
-                            'hr_access_table_pk' => null,
-                            'post_client_id' => $client_id ?? null,
-                            'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-                            'post_hr_id' => $hr['post_hr_id'] ?? null,
-                            'allowed_pre_modules' => [],
-                            'allowed_post_modules' => [],
-                            'allowed_pre_policies' => [],
-                            'allowed_active_policies' => [],
-                            'allowed_cd' => [],
-                            'hr_name' => $hr['hr_name'] ?? null,
-                            'hr_mobile' => $hr['hr_mobile'] ?? null,
-                            'hr_mail' => $hr['hr_mail'] ?? null,
-                        ];
-                    }
-        }
-        
+            // First create a map of HR data by post_hr_id for quick lookup
+            $hrMap = [];
+            foreach ($merged as $hr) {
+                $hrMap[$hr['post_hr_id']] = $hr;
+            }
 
-        $resultData['hr_access_data'] = array_values($result);
-        $resultData['pre_policy_data'] = $data['pre_policy_data'];
+            // Process access data first
+            foreach ($hrAccessTableData as $access) {
+                $post_hr_id = $access['post_hr_id'];
+
+                // Check if this HR exists in our merged data
+                if (isset($hrMap[$post_hr_id])) {
+                    $hr = $hrMap[$post_hr_id];
+                    $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                    // Parse allowed modules
+                    $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
+                    $allowed_pre_modules = $allowed_modules['pre'] ?? [];
+                    $allowed_post_modules = $allowed_modules['post'] ?? [];
+
+                    $result[$temp_arr_key] = [
+                        'hr_access_table_pk' => $access['id'] ?? null,
+                        'post_client_id' => $access['post_client_id'] ?? null,
+                        'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                        'post_hr_id' => $hr['post_hr_id'] ?? null,
+                        'allowed_pre_modules' => $allowed_pre_modules,
+                        'allowed_post_modules' => $allowed_post_modules,
+                        'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
+                        'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
+                        'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
+                        'hr_name' => $hr['hr_name'],
+                        'hr_mobile' => $hr['hr_mobile'],
+                        'hr_mail' => $hr['hr_mail'],
+                        'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                        'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                        'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                        'pre_client_id'    => $pre_client_id ?? null
+                    ];
+
+                    // Remove from map so we know it's been processed
+                    unset($hrMap[$post_hr_id]);
+                }
+            }
+
+            // Now process any remaining HRs that didn't have access records
+            foreach ($hrMap as $hr) {
+                $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                $result[$temp_arr_key] = [
+                    'hr_access_table_pk' => null,
+                    'post_client_id' => $client_id ?? null,
+                    'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                    'post_hr_id' => $hr['post_hr_id'] ?? null,
+                    'allowed_pre_modules' => [],
+                    'allowed_post_modules' => [],
+                    'allowed_pre_policies' => [],
+                    'allowed_active_policies' => [],
+                    'allowed_cd' => [],
+                    'hr_name' => $hr['hr_name'] ?? null,
+                    'hr_mobile' => $hr['hr_mobile'] ?? null,
+                    'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
+                ];
+            }
+        }
+
+
+        $resultData['hr_access_data']   = array_values($result);
+        $resultData['pre_policy_data']  = $data['pre_policy_data'];
         $resultData['post_policy_data'] = $data['post_policy_data'];
-        $resultData['post_cd_data'] = $data['post_cd_data'];
-        // echo '**********************************************';
-        // print_rr($resultData);die();
+        $resultData['post_cd_data']     = $data['post_cd_data'];
 
         return $resultData;
-    }
+    }       
 
     public function saveHrAccessData()
     {
@@ -7076,8 +7215,23 @@ class ClientController extends AdminController
                     $post = array_values(array_filter($allowed_modules, fn($v) => $v !== 1));
                     $value['allowed_modules'] = json_encode(['pre' => $pre, 'post' => $post]);
 
+                    $post_client_id = $value['post_client_id'];
+                    $post_branch_id = $value['post_branch_id'];
+                    $post_hr_id     = $value['post_hr_id'];
+
+                    $preBranchId = $this->getPreBranchIdByPostBranchId($post_branch_id);
+
+                    if (!empty($preBranchId)) {
+                        $value['pre_branch_id']  = $preBranchId;
+                        $value['pre_client_id']  = $this->getPreClientIdByPreBranchId($preBranchId);
+                        $value["pre_hr_id"]      = $this->getPreHrIdByPreBranchId($preBranchId);
+                    }
+                    
+
+
                     // INSERT or UPDATE
                     if (empty($value['pk']) || (int)$value['pk'] === 0) {
+
                         unset($value['pk']); // Prevent insert error
                         $insertedId = $this->HRAccessControlModel->insert($value);
                         if ($insertedId === false) {
@@ -7086,6 +7240,7 @@ class ClientController extends AdminController
                         $success[] = "Inserted row at index {$index} with ID {$insertedId}.";
                     } else {
                         $update = $this->HRAccessControlModel->update($value['pk'], $value);
+
                         if ($update === false) {
                             throw new \Exception('Update failed for ID ' . $value['pk'] . ': ' . json_encode($this->HRAccessControlModel->errors()));
                         }
@@ -7119,7 +7274,6 @@ class ClientController extends AdminController
                     'details' => $success,
                     'data' => $html,
                 ], 200);
-
             } else {
                 return $this->respond([
                     'status' => false,
@@ -7140,6 +7294,28 @@ class ClientController extends AdminController
         }
     }
 
+    private function getPreClientIdByPreBranchId($pre_branch_id){
+        $db2 = \Config\Database::connect('preDB');
+        $pre_client_id = $db2->table('client_branch')->where('id',$pre_branch_id)->where('is_Active',1)->get()->getResultArray()[0]['client_id']??"";
+        return $pre_client_id;
+    }
+
+    private function getPreHrIdByPreBranchId($pre_branch_id){
+        $db2 = \Config\Database::connect('preDB');
+        $pre_hr_id = $db2->table('client_branch cb')
+        ->select('lc.id')
+        ->join('level_contacts lc','lc.ref_id = cb.id')
+        ->where('cb.id',$pre_branch_id)->where('cb.is_Active',1)->where('lc.is_Active',1)->get()->getResultArray()[0]['id']??"";
+        return $pre_hr_id;
+    }
+
+    private function getPreBranchIdByPostBranchId($post_branch_id){
+        $db = \Config\Database::connect();
+        $pre_branch_id = $db->table('client_branch')->where('id',$post_branch_id)->where('is_Active',1)->get()->getResultArray()[0]['pre_branch_id']??"";
+        return $pre_branch_id;
+    }
+
+
     // ------------------- DEMO CLIENT FUNCTION --------------------------------------------------------------------------------
 
     public function wipeDemoClient()
@@ -7457,6 +7633,104 @@ class ClientController extends AdminController
 
         return $this->respond(['status' => true, 'message' => 'Demo client data wiped successfully'], 200);
     }
+
+    private function getClientlistFromPre (){
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_client_list = $db2->table('clients')
+        ->select('id,client_name')
+        ->where('is_active',1)
+        ->get()->getResultArray()??[];
+
+        return $auto_fetch_client_list;
+
+    }
+
+    public function auto_fetch_branch(){
+
+        $data = $this->request->getPost();
+
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_branch_list = $db2->table('client_branch')
+        ->select('id,branch_name')
+        ->where('client_id',$data['client_id'])
+        ->where('is_active',1)
+        ->get()->getResultArray()??[];
+
+        return 
+
+        empty($auto_fetch_branch_list)
+
+        ? $this->response->setJSON([
+                'status' => false,
+                'message' => 'branch list is empty',
+                'data' => []
+            ])->setStatusCode(400)
+        
+        :   $this->response->setJSON([
+                'status' => true,
+                'message' => 'branch list is found' ,
+                 'data' => $auto_fetch_branch_list
+            ])->setStatusCode(200);
+    }
+
+    public function auto_fetch_branch_details(){
+
+        $data = $this->request->getPost();
+
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_branch_details = $db2->table('client_branch')
+                                        ->where('client_id',$data['client_id'])
+                                        ->where('id',$data['branch_id'])
+                                        ->where('is_active',1)
+                                        ->get()->getResultArray()??[];
+
+        return empty($auto_fetch_branch_details)
+
+                    ? $this->response->setJSON([
+                            'status' => false,
+                            'message' => 'branch details is empty',
+                            'data' => []
+                        ])->setStatusCode(400)
+                    
+                    :   $this->response->setJSON([
+                            'status' => true,
+                            'message' => 'branch details found' ,
+                            'data' => $auto_fetch_branch_details
+                        ])->setStatusCode(200);
+
+    }
+
+
+    private function updatePreClientBranch($pre_branch_id,$post_branch_id ,$operation)
+    {
+
+
+
+        $preDB = \Config\Database::connect('preDB');
+
+        if($operation != 'create'){
+
+            $builder = $preDB->table('client_branch');
+            $builder->where('post_branch_id', $post_branch_id);
+            $builder->update(['post_branch_id' => null]);
+        }
+
+        $builder = $preDB->table('client_branch');
+        $builder->where('id', $pre_branch_id);
+        $builder->update(['post_branch_id' => $post_branch_id]);
+
+        return true;
+    }
+
+
+
+
+
+
+
+
+
 }
-
-
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index b9ed11a4..73c2e31a 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -259,7 +259,7 @@ class DashboardController extends AdminController
 
         // dd(get_role_id(),user_team());
         // dd($data);
-        
+        $data['tab_name'] = 'Dashboard';
         $data['page_name'] = 'Dashboard';
 
         echo view('layout/header',  $data);
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 3751da86..a4666518 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -135,6 +135,9 @@ class EmployeeController extends AdminController
 
         // dd($this->request->getGet());
         $this->myLogger->logme('error', 'list called');
+
+        $data['page_name'] = "Members";
+
         $this->loadLayout('employee_list', $data);
     }
 
@@ -307,6 +310,7 @@ class EmployeeController extends AdminController
             return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
         }
 
+        $data['tab_name'] = 'View Inception';
         $data['page_name'] = 'View Inception';
 
         //for TPA/insurer upload
@@ -786,6 +790,9 @@ class EmployeeController extends AdminController
         }
 
         $this->myLogger->logme('error', 'list called');
+        
+        $data['page_name'] = "Endorsement";
+
         $this->loadLayout('endorsement_list', $data);
     }
 
@@ -830,6 +837,9 @@ class EmployeeController extends AdminController
         // dd($data);
 
         $this->myLogger->logme('error', 'list called');
+
+        $data['page_name'] = "Enrollment";
+
         return $this->loadLayout('enrollment_list', $data);
     
      }
@@ -3039,6 +3049,8 @@ class EmployeeController extends AdminController
             // print_r($data); die;
         // }
 
+        $data['page_name'] = "Retail Endorsement";
+
         $this->loadLayout('retail_endorsement_list', $data);
     }
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 341bfcf2..1b7310b6 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2868,14 +2868,14 @@ class EmployeeRestController extends AdminController
 
                 }else if($ClientPolicyValue['policy_type_id'] == 6)
                 { 
-                    $policyGroup = 'gpa';
+                    $policyGroup = 'other';
                     $data['ticket_type_id'] = 3;
                     $data['claim_subject'] = "Claim EDLI";
                     $data['sum_insured_label'] = "Sum Assured";
 
                 }else if($ClientPolicyValue['policy_type_id'] == 7)
                 { 
-                    $policyGroup = 'gpa';
+                    $policyGroup = 'other';
                     $data['ticket_type_id'] = 4;
                     $data['claim_subject'] = "Claim GTLI";
                     $data['sum_insured_label'] = "Sum Assured";
@@ -2969,9 +2969,6 @@ class EmployeeRestController extends AdminController
 
     function policyTermsFiter($terms , $type)
     {
-
-      
-    
         $gpa = [
             "sumInsured2" => "Sum Insured",
             "totalSumInsured" => "Total Sum Assured",
@@ -3021,8 +3018,6 @@ class EmployeeRestController extends AdminController
             "moderntreatmentsasperirdai" => "Modern Treatment "
         ];
 
-
-        
         $finalarray = [];
         if($type == 'gpa'){
             foreach ($gpa as $key => $value) {
@@ -3046,6 +3041,18 @@ class EmployeeRestController extends AdminController
                     $finalarray[$terms->gpa_special_condition_label[$i]] = $terms->gpa_special_condition_input[$i];
                 }
             }
+        }else if($type == 'other'){
+            foreach ($terms as $key => $value) {
+                if($key != "multiple_sum_insured" && $value != ""){
+                    $result = ucwords(str_replace('_', ' ', $key));
+                    $finalarray[$result] = $value;
+                }
+            }
+            if(isset(($terms->gpa_special_condition_label)) && is_array($terms->gpa_special_condition_label) && is_array($terms->gpa_special_condition_input)){
+                for ($i=0; $i < count($terms->gpa_special_condition_label); $i++) { 
+                    $finalarray[$terms->gpa_special_condition_label[$i]] = $terms->gpa_special_condition_input[$i];
+                }
+            }
         }else{
             foreach ($gmc as $key => $value) {
                 if(isset($terms->$key))
@@ -3070,9 +3077,7 @@ class EmployeeRestController extends AdminController
             }
         }
 
-
         return $finalarray;
-        
     }
 
 
diff --git a/app/Controllers/ICICILombardController.php b/app/Controllers/ICICILombardController.php
index 928fbc2f..5c5bc627 100644
--- a/app/Controllers/ICICILombardController.php
+++ b/app/Controllers/ICICILombardController.php
@@ -67,24 +67,57 @@ class ICICILombardController extends AdminController
 
 
         //Prepare body data
-        $db = \Config\Database::connect();
-        $data = $db->table('employee_polices ep')
-                    ->select('cp.policy_no as policyNumber, cp.cd_ac_no as CDBGAccountNumber,
-                            e.id,e.emp_code as MemberEmpId, e.doj as DOJ, e.name as InsuredName, e.dob as DOB, e.relationship as Relationship,
-                            e.gender as Gender, ep.date_coverage as DOC,ep.basic_cover_si as SumInsured, e.email_corporate as EmailId
-                            ')
-                    ->join('employees e', 'e.id = ep.employee_id')
-                    ->join('client_policy cp', 'ep.client_policy_id = cp.id')
-                    ->where('ep.client_policy_id', $policy_id)
-                    ->where('ep.status', 'active')
-                    ->where('ep.is_active', 1)
-                    // ->where('ep.uhid', null)
-                    ->get()
-                    ->getResultArray();
+        // $db = \Config\Database::connect();
+        // $data = $db->table('employee_polices ep')
+        //             ->select('cp.policy_no as policyNumber, cp.cd_ac_no as CDBGAccountNumber,
+        //                     e.id,e.emp_code as MemberEmpId, e.doj as DOJ, e.name as InsuredName, e.dob as DOB, e.relationship as Relationship,
+        //                     e.gender as Gender, ep.date_coverage as DOC,ep.basic_cover_si as SumInsured, e.email_corporate as EmailId
+        //                     ')
+        //             ->join('employees e', 'e.id = ep.employee_id')
+        //             ->join('client_policy cp', 'ep.client_policy_id = cp.id')
+        //             ->where('ep.client_policy_id', $policy_id)
+        //             ->where('ep.status', 'active')
+        //             ->where('ep.is_active', 1)
+        //             // ->where('ep.uhid', null)
+        //             ->get()
+        //             ->getResultArray();
     
-        $body = $this->formatPolicyData($data);       
+        // $body = $this->formatPolicyData($data);       
         // dd($body); 
 
+
+          $body = [
+            "PolicyNumber" => "4016/A/O/53130557/00/000",
+            "CDBGAccountNumber" => "CD-MUM-0026",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440010",
+            "MemberDetails" => [
+                [
+                    "MemberEmpId" => "EMPID3625557",
+                    "DOJ" => "21-MAR-2019",
+                    "InsuredName" => "Kumar",
+                    "DOB" => "7-JUL-1983",
+                    "Relationship" => "SELF",
+                    "Gender" => "MALE",
+                    "DOC" => "05-SEP-2025",
+                    "SumInsured" => "400000",
+                    "EmailId" => "KUMAR@GMAIL.COM",
+                    "FlagStatus" => "A"
+                ],
+                [
+                    "MemberEmpId" => "EMPID3625557",
+                    "DOJ" => "21-MAR-2019",
+                    "InsuredName" => "Saranya",
+                    "DOB" => "8-AUG-1970",
+                    "Relationship" => "MOTHER",
+                    "Gender" => "FEMALE",
+                    "DOC" => "05-SEP-2025",
+                    "SumInsured" => "400000",
+                    "EmailId" => "Saranya@GMAIL.COM",
+                    "FlagStatus" => "A"
+                ],
+            ]
+        ];
+
         $response = call_third_party_api($url, 'POST', $headers, $body, true); // true = raw body mode
         //  print_rr(json_encode($response));die();
         return $this->response->setJSON($response);
@@ -115,9 +148,9 @@ class ICICILombardController extends AdminController
         // dd($headers);
 
          $body = [
-            "PolicyNumber" => "4016/A/O/53077718/00/000",
-            "BatchId" => "3646145",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440001"
+            "PolicyNumber" => "4016/A/O/53130557/00/000",
+            "BatchId" => "3658147",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440010"
         ];
 
         $response = call_third_party_api($url, 'POST', $headers, $body, true);
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 1f322c84..50c9820b 100755
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -167,6 +167,10 @@ class JobWorker extends AdminController
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\EmployeeMultiEventServiceController',
     ],
+    'memberDataListExcelFileFormatValidation' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\LeadsController',
+    ],
 ];
 
     
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index d5f8ea12..59608e7e 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -81,11 +81,13 @@ class LeadsController extends BaseController
     protected $claim_type_for_gpa;
     protected $cause_of_death;
     protected $buisnessType;
+    protected $member_data_excel_columns;
+    protected $general_relationships;
 
 
     public function __construct()
     {
-        set_session_context('Leads');
+        set_session_context('LEAD CONTROLLER');
         $this->myLogger = \Config\Services::mylogger();
 
         $this->clientModel        = new ClientModel();
@@ -136,12 +138,171 @@ class LeadsController extends BaseController
         $this->cause_of_death = [
             'natural_death' => 'Natural Death',
             'suicide'       => 'Suicide',
-            'accident'      => 'Accident'
+            'accident'      => 'Accident',
+            'cardiac_arrest' => 'Cardiac Arrest',
+            'septic_shock' => 'Septic shock',
+            'heart_attack' => 'Heart Attack',
         ];
+
+        $this->member_data_excel_columns = [
+            'sno' => [
+                'col_idx' => 0,
+                'col_cell_name' => 'A',
+                'col_name' => 'Sl no',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'emp_code' => [
+                'col_idx' => 1,
+                'col_cell_name' => 'B',
+                'col_name' => 'Emp Code',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'name' => [
+                'col_idx' => 2,
+                'col_cell_name' => 'C',
+                'col_name' => 'Name',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'relationship' => [
+                'col_idx' => 3,
+                'col_cell_name' => 'D',
+                'col_name' => 'Relationship',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => [
+                    'Self', 'Spouse', 'Son', 'Daughter', 'Father', 'Mother',
+                    'Father-in-law', 'Mother-in-law',
+                    'self', 'spouse', 'son', 'daughter', 'father', 'mother',
+                    'father-in-law', 'mother-in-law'
+                ],
+                'custom' => 'check_relationship_for_member_data',
+                'params' => ['row', 'relationship', 'columns_to_check']
+            ],
+            'gender' => [
+                'col_idx' => 4,
+                'col_cell_name' => 'E',
+                'col_name' => 'Gender',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => ['M', 'F']
+            ],
+            'dob' => [
+                'col_idx' => 5,
+                'col_cell_name' => 'F',
+                'col_name' => 'DOB',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => 'd-M-Y',
+                'allowed_values' => null,
+                'age_validation' => true,
+                // 'custom' => 'check_dob_diff',
+                // 'params' => ['row', 'relationship', 'default_age_ratio', 'policy_details']
+            ],
+            'age' => [
+                'col_idx' => 6,
+                'col_cell_name' => 'G',
+                'col_name' => 'Age',
+                'is_mandatory' => true,
+                'data_type' => 'int',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'email' => [
+                'col_idx' => 7,
+                'col_cell_name' => 'H',
+                'col_name' => 'Email',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'mobile' => [
+                'col_idx' => 8,
+                'col_cell_name' => 'I',
+                'col_name' => 'Mobile',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            'si' => [
+                'col_idx' => 9,
+                'col_cell_name' => 'J',
+                'col_name' => 'SI',
+                'is_mandatory' => false,
+                'data_type' => 'int',
+                'format' => null,
+                'allowed_values' => null,
+            ]
+        ];
+
+        $this->general_relationships = [
+            'self' => [
+                'name' => 'Self',
+                'gender' => 'M',
+                'age_min' => 18,
+                'age_max' => null
+            ],
+            'spouse' => [
+                'name' => 'Spouse',
+                'gender' => 'F',
+                'age_min' => 18,
+                'age_max' => null
+            ],
+            'son' => [
+                'name' => 'Son',
+                'gender' => 'M',
+                'age_min' => null,
+                'age_max' => 25
+            ],
+            'daughter' => [
+                'name' => 'Daughter',
+                'gender' => 'F',
+                'age_min' => null,
+                'age_max' => 25
+            ],
+            'father' => [
+                'name' => 'Father',
+                'gender' => 'M',
+                'age_min' => 18,
+                'age_max' => null
+            ],
+            'mother' => [
+                'name' => 'Mother',
+                'gender' => 'F',
+                'age_min' => 18,
+                'age_max' => null
+            ],
+            'father-in-law' => [
+                'name' => 'Father in Law',
+                'gender' => 'M',
+                'age_min' => 18,
+                'age_max' => null
+            ],
+            'mother-in-law' => [
+                'name' => 'Mother in Law',
+                'gender' => 'F',
+                'age_min' => 18,
+                'age_max' => null
+            ]
+        ];
+                
     }
 
     public function viewLeadsList()
     {
+        $data['tab_name'] = 'Leads';
         $data['page_name'] = 'Leads';
 
         // Set basic data
@@ -504,7 +665,7 @@ class LeadsController extends BaseController
             if ($value['lead_form_type'] == 1) {
                 //for this push the job to the  calculateMembersDemography() function
                 $job_details  = new Jobs();
-                $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => [
+                $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
                     'lead_id' => $insert,
                 ]]);
             }
@@ -528,7 +689,7 @@ class LeadsController extends BaseController
         return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Lead", 'data' => $data], 200);
     }
 
-    // Get the Single Lead data for edit uisng ajax ( do not delete)
+    // Get the Single Lead data for edit uisng ajax (do not delete)
     public function getLeadDataForEdit($id)
     {
 
@@ -567,7 +728,11 @@ class LeadsController extends BaseController
         //     $data['premium_date'] = null;
         // }
 
-        $data['multi_file_data'] = $this->leadFilesModel->where('lead_id', $id)->first() ?? null;
+        $data['multi_file_data'] = $this->leadFilesModel
+                        ->where('lead_id', $id)
+                        ->where('type !=', 2)
+                        ->where('is_active', 1)
+                        ->first() ?? null;
 
         $data['lastFiveYears'] = $this->getLastFiveFinancialYears();
         $data['gpaClaimType'] = $this->claim_type_for_gpa;
@@ -603,7 +768,7 @@ class LeadsController extends BaseController
     }
 
     public function uploadMultiFiles($files, $docs_names, $primaryKey)
-    {
+    {   
         $uploadFilePath = WRITEPATH . 'uploads/lead_files/';
 
         $multi_file_data = [];
@@ -644,7 +809,7 @@ class LeadsController extends BaseController
                         if (!empty($lead_form_type) && $lead_form_type == 1 && $key == 0) {
                             //for this push the job to the  calculateMembersDemography() function
                             $job_details  = new Jobs();
-                            $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => [
+                            $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
                                 'lead_id' => $lead_id,
                             ]]);
                             log_message('info', "calculateMembersDemography JOB PUSHED");
@@ -696,63 +861,299 @@ class LeadsController extends BaseController
 
     //--------RFQ-----------------------------------------------------------------------------------------------
 
+    // public function viewRFQ($id, $type = 1)
+    // {
+
+    //     $data['rfq_data'] = $this->RFQModel
+    //         ->where('lead_id', $id)
+    //         // ->where('type', $type)
+    //         ->where('is_active', 1)
+    //         ->orderBy('id', 'desc')
+    //         ->first();
+    //     // dd($data);
+
+    //     $data['rfq_count'] = $this->RFQModel
+    //         ->where('lead_id', $id)
+    //         // ->where('type', 1)
+    //         ->where('is_active', 1)
+    //         ->countAllResults();
+
+    //     $data['qcr_count'] = $this->RFQModel
+    //         ->where('lead_id', $id)
+    //         ->where('type', 2)
+    //         ->where('is_active', 1)
+    //         ->countAllResults();
+
+    //     // dd(count($data['rfq_data']));
+
+    //     $data['lead_id'] = $id;
+    //     $lead_data = $this->leadsModel
+    //         ->select('
+    //                 leads.*, 
+    //                 policy_type.question_json, 
+    //                 policy_type.policy_type,
+    //                 policy_type.long_name, 
+    //                 user_profiles.email as created_person_email
+    //             ')
+    //         ->join('policy_type', 'leads.policy_type_id = policy_type.id')
+    //         ->join('user_profiles', 'leads.created_by = user_profiles.id', 'left')
+    //         ->where('leads.id', $id)
+    //         ->where('leads.is_active', 1)
+    //         ->first();
+
+    //     // dd($lead_data);
+
+    //     if ($lead_data['lead_type'] != 1) {
+    //         $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $lead_data['source_policy_id'])->first();
+    //         if (isset($client_policy_data)) {
+    //             $data['policy_terms'] = $client_policy_data['policy_terms'];
+    //         }
+    //     }
+
+    //     $data['question_json'] = $lead_data['question_json'];
+    //     $data['page_name'] = $type == 2 ? 'QCR' : 'RFQ';
+    //     $data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
+    //     $data['userList'] = $this->userModel->getUserListForRFQ();
+    //     $data['exclusiveUserList'] = $this->userModel->getexclusiveUserListForRFQ();
+    //     $data['lead_data'] = $lead_data;
+    //     $data['tpa_list'] = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
+    //     $data['account_manager'] = $this->userModel->where('is_active', 1)->where('role', 3)->findAll();
+
+
+    //     $mail_content = '
+    //         <p>Dear Sir,</p>
+    //         <p>Greetings From Nhance India!</p>
+    //         <p>Please find attached the {{RFQ_OR_QCR}} for <strong>{{POLICY_TYPE}}</strong> policy pertaining to <strong>{{CLIENT_NAME}}</strong>.</p>
+    //         <p>Kindly request you to share the competitive quotes at the earliest.</p>
+    //         <p>In case of any query, please feel free to contact us.</p>
+    //         <p>Thank You!</p><br>
+    //         <p>Best regards,</p>
+
+    //         <div style=\"margin: 0; padding: 0; line-height: 1.2;\">
+    //             <div>{{LOGGED_USER_NAME}}</div>
+    //             <div>Mobile: {{LOGGED_USER_MOBILE}}</div>
+    //         </div>
+
+    //          <img src="{{LOGO_PATH}}" alt="Nhance Logo" width="100" style="margin-top:10px;">
+    //     ';
+
+    //     if ($data['lead_data']['policy_end_date'] != null) {
+    //         $subject = "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}} {{POLICY_END_DATE}}";
+    //     } else {
+    //         $subject = "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}}";
+    //     }
+
+    //     if ($lead_data['policy_type_id'] == 1) {
+    //         $data['totalSumAssured'] = $this->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' =>  $id]);
+    //     } else {
+    //         $data['totalSumAssured'] = [];
+    //     }
+
+    //     $data['mail_content'] = $this->transformMailContent($lead_data, $mail_content, $data['page_name']);
+    //     $data['subject'] = $this->transformMailContent($lead_data, $subject, $data['page_name']);
+
+    //     $data['placement_mail_content'] = $this->transformMailContent($lead_data, $mail_content, 'Placement');
+    //     $data['placement_subject'] = $this->transformMailContent($lead_data, $subject, 'Placement');
+
+    //     $data['multi_file_data'] = $this->leadFilesModel->where('lead_id', $id)->where('is_active', 1)->findAll() ?? null;
+    //     $installment_data['installments'] = $this->leadInstallmentPaymentDetails->where('lead_id', $id)->where('is_active', 1)->findAll() ?? null;
+    //     $data['lead_data']['installment_data'] = view('rfq/installment_fields', $installment_data) ?? null;
+    //     $data['attachment_html'] = view('rfq/attachment_files', $data) ?? "";
+    //     $data['user_team'] = $this->userModel->select("ut.team_id")->join("user_teams ut", "ut.user_id = user_profiles.id and ut.is_active = 1")->where("user_profiles.is_active", 1)->first()['team_id'];
+    //     $data['multi_file_data_html'] = $this->renderFileFields($data['multi_file_data']);
+    //     // dd($data);
+
+    //     if ($data['lead_data']['lead_form_type'] == 1) {
+    //         $data['demogrphy_html_data'] = $this->generateDemographyDataTable(['lead_id' => $id]);
+    //         $this->loadLayout('view_rfq.php', $data);
+    //     } else if ($data['lead_data']['lead_form_type'] == 2) {
+
+    //         $data['occupancy'] = $this->occupancyModel->findAll();
+    //         // dd($data['occupancy']);
+
+    //         if ($lead_data['lead_type'] != 1 && $data['rfq_count'] == 0) {
+    //             $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $lead_data['source_policy_id'])->first();
+    //             if (isset($client_policy_data)) {
+
+    //                 $data['rfq_data']['json'] = $client_policy_data['placement_json'];
+    //             }
+    //         }
+
+    //         if (!empty($data['question_json'])) {
+    //             $data['policies'] = json_decode($data['question_json'], true)['policies'];
+    //             $data["child_table_data"] = json_decode($data['question_json'], true)['child_table_data'];
+    //         }
+
+    //         $data['product'] = $this->leadsModel->select("policy_type.policy_type")->join('policy_type', 'leads.policy_type_id = policy_type.id')->where('leads.id', $id)->first()['policy_type'];
+    //         // $data['lead_register_data'] = json_decode($data['lead_data']['custom_fields']);
+    //         // dd($data['lead_register_data']);
+    //         // $data['entity_type'] = $this->kycEntityTypeModel->where('is_active', 1)->findAll();
+    //         $data['buisness_type'] = $this->buisnessType;
+
+    //         // dd($data);
+    //         $data['client_type'] = $this->clientType;
+    //         $this->loadLayout('view_rfq_non_eb', $data);
+    //     }
+    // }
+
     public function viewRFQ($id, $type = 1)
     {
+        // 1. Combine RFQ queries into a single query
+        $rfqStats = $this->RFQModel
+            ->select('
+            COUNT(*) as total_count,
+            SUM(CASE WHEN type != 2 THEN 1 ELSE 0 END) as rfq_count,
+            SUM(CASE WHEN type = 2 THEN 1 ELSE 0 END) as qcr_count
+        ')
+            ->where('lead_id', $id)
+            ->where('is_active', 1)
+            ->first();
 
+        $data['rfq_count'] = $rfqStats['rfq_count'] ?? 0;
+        $data['qcr_count'] = $rfqStats['qcr_count'] ?? 0;
+
+        // 2. Get RFQ data separately (only if needed)
         $data['rfq_data'] = $this->RFQModel
             ->where('lead_id', $id)
-            // ->where('type', $type)
             ->where('is_active', 1)
             ->orderBy('id', 'desc')
             ->first();
-        // dd($data);
-
-        $data['rfq_count'] = $this->RFQModel
-            ->where('lead_id', $id)
-            // ->where('type', 1)
-            ->where('is_active', 1)
-            ->countAllResults();
-
-        $data['qcr_count'] = $this->RFQModel
-            ->where('lead_id', $id)
-            ->where('type', 2)
-            ->where('is_active', 1)
-            ->countAllResults();
-
-        // dd(count($data['rfq_data']));
 
         $data['lead_id'] = $id;
+
+        // 3. Optimize lead data query with specific field selection
         $lead_data = $this->leadsModel
             ->select('
-                    leads.*, 
-                    policy_type.question_json, 
-                    policy_type.policy_type,
-                    policy_type.long_name, 
-                    user_profiles.email as created_person_email
-                ')
+                leads.id, 
+                leads.policy_type_id, 
+                leads.lead_type, 
+                leads.source_policy_id,
+                leads.policy_end_date, 
+                leads.lead_form_type, 
+                leads.created_by, 
+                leads.client_name,
+                lead_files.status as demography_file_status,
+                policy_type.question_json, 
+                policy_type.policy_type, 
+                policy_type.long_name,
+                user_profiles.email as created_person_email
+            ')
             ->join('policy_type', 'leads.policy_type_id = policy_type.id')
             ->join('user_profiles', 'leads.created_by = user_profiles.id', 'left')
+            ->join('lead_files', 'leads.id = lead_files.lead_id AND lead_files.type = 2 AND lead_files.is_active = 1', 'left')
             ->where('leads.id', $id)
             ->where('leads.is_active', 1)
             ->first();
 
-        // dd($lead_data);
+        if (!$lead_data) {
+            // Handle case where lead doesn't exist
+            throw new \Exception('Lead not found');
+        }
 
+        // 4. Conditional query - only fetch if needed
         if ($lead_data['lead_type'] != 1) {
-            $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $lead_data['source_policy_id'])->first();
-            if (isset($client_policy_data)) {
+            $client_policy_data = $this->clientPolicyModel
+                ->select('policy_terms, placement_json')
+                ->where('is_active', 1)
+                ->where('id', $lead_data['source_policy_id'])
+                ->first();
+
+            if ($client_policy_data) {
                 $data['policy_terms'] = $client_policy_data['policy_terms'];
+
+                // Store for later use in lead_form_type == 2 condition
+                if ($lead_data['lead_form_type'] == 2 && $data['rfq_count'] == 0) {
+                    $data['rfq_data']['json'] = $client_policy_data['placement_json'];
+                }
             }
         }
 
+        // 5. Cache decoded JSON to avoid multiple decodes
+        $question_json_decoded = !empty($lead_data['question_json'])
+            ? json_decode($lead_data['question_json'], true)
+            : null;
+
         $data['question_json'] = $lead_data['question_json'];
+        $data['tab_name'] = $type == 2 ? 'QCR' : 'RFQ';
         $data['page_name'] = $type == 2 ? 'QCR' : 'RFQ';
+        $data['lead_data'] = $lead_data;
+
+        // 6. Parallel/batch data fetching for independent queries
         $data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
         $data['userList'] = $this->userModel->getUserListForRFQ();
         $data['exclusiveUserList'] = $this->userModel->getexclusiveUserListForRFQ();
-        $data['lead_data'] = $lead_data;
+        $data['tpa_list'] = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
+        $data['account_manager'] = $this->userModel
+            ->where('is_active', 1)
+            ->where('role', 3)
+            ->findAll();
 
-        $mail_content = '
+        // 7. Define mail templates as constants or config
+        $mail_content = $this->getMailTemplate();
+        $subject = $this->getSubjectTemplate($lead_data);
+
+        // 8. Pre-calculate sum assured only for GPA
+        $data['totalSumAssured'] = ($lead_data['policy_type_id'] == 1) ? $this->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' => $id]) : [];
+
+        // 9. Transform mail content once
+        $data['mail_content'] = $this->transformMailContent($lead_data, $mail_content, $data['page_name']);
+        $data['subject'] = $this->transformMailContent($lead_data, $subject, $data['page_name']);
+        $data['placement_mail_content'] = $this->transformMailContent($lead_data, $mail_content, 'Placement');
+        $data['placement_subject'] = $this->transformMailContent($lead_data, $subject, 'Placement');
+
+        // 10. Combine related queries
+        $data['multi_file_data'] = $this->leadFilesModel
+            ->where('lead_id', $id)
+            ->where('type !=', 2)
+            ->where('is_active', 1)
+            ->findAll();
+
+        $installment_data['installments'] = $this->leadInstallmentPaymentDetails
+            ->where('lead_id', $id)
+            ->where('is_active', 1)
+            ->findAll();
+
+        // 11. Generate views efficiently
+        $data['lead_data']['installment_data'] = !empty($installment_data['installments'])
+            ? view('rfq/installment_fields', $installment_data)
+            : null;
+
+        $data['attachment_html'] = view('rfq/attachment_files', $data);
+
+        $user_team = $this->userModel
+            ->select("ut.team_id")
+            ->join("user_teams ut", "ut.user_id = user_profiles.id and ut.is_active = 1")
+            ->where("user_profiles.is_active", 1)
+            ->first();
+        $data['user_team'] = $user_team['team_id'] ?? null;
+
+        $data['multi_file_data_html'] = $this->renderFileFields($data['multi_file_data']);
+
+        // 12. Conditional rendering based on lead_form_type
+        if ($lead_data['lead_form_type'] == 1) {
+            $data['demogrphy_html_data'] = $this->generateDemographyDataTable(['lead_id' => $id]);
+            $this->loadLayout('view_rfq.php', $data);
+        } else if ($lead_data['lead_form_type'] == 2) {
+            $data['occupancy'] = $this->occupancyModel->findAll();
+
+            // Use cached decoded JSON
+            if ($question_json_decoded) {
+                $data['policies'] = $question_json_decoded['policies'] ?? [];
+                $data["child_table_data"] = $question_json_decoded['child_table_data'] ?? [];
+            }
+
+            $data['product'] = $lead_data['policy_type'];
+            $data['buisness_type'] = $this->buisnessType;
+            $data['client_type'] = $this->clientType;
+
+            $this->loadLayout('view_rfq_non_eb', $data);
+        }
+    }
+
+    // 13. Extract mail template to separate method for reusability
+    private function getMailTemplate()
+    {
+        return '
             <p>Dear Sir,</p>
             <p>Greetings From Nhance India!</p>
             <p>Please find attached the {{RFQ_OR_QCR}} for <strong>{{POLICY_TYPE}}</strong> policy pertaining to <strong>{{CLIENT_NAME}}</strong>.</p>
@@ -761,70 +1162,21 @@ class LeadsController extends BaseController
             <p>Thank You!</p><br>
             <p>Best regards,</p>
             
-            <div style=\"margin: 0; padding: 0; line-height: 1.2;\">
+            <div style="margin: 0; padding: 0; line-height: 1.2;">
                 <div>{{LOGGED_USER_NAME}}</div>
                 <div>Mobile: {{LOGGED_USER_MOBILE}}</div>
             </div>
         
-             <img src="{{LOGO_PATH}}" alt="Nhance Logo" width="100" style="margin-top:10px;">
+            <img src="{{LOGO_PATH}}" alt="Nhance Logo" width="100" style="margin-top:10px;">
         ';
+    }
 
-        if ($data['lead_data']['policy_end_date'] != null) {
-            $subject = "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}} {{POLICY_END_DATE}}";
-        } else {
-            $subject = "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}}";
-        }
-
-        if ($lead_data['policy_type_id'] == 1) {
-            $data['totalSumAssured'] = $this->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' =>  $id]);
-        } else {
-            $data['totalSumAssured'] = [];
-        }
-
-        $data['mail_content'] = $this->transformMailContent($lead_data, $mail_content, $data['page_name']);
-        $data['subject'] = $this->transformMailContent($lead_data, $subject, $data['page_name']);
-
-        $data['placement_mail_content'] = $this->transformMailContent($lead_data, $mail_content, 'Placement');
-        $data['placement_subject'] = $this->transformMailContent($lead_data, $subject, 'Placement');
-
-        $data['multi_file_data'] = $this->leadFilesModel->where('lead_id', $id)->where('is_active', 1)->findAll() ?? null;
-        $installment_data['installments'] = $this->leadInstallmentPaymentDetails->where('lead_id', $id)->where('is_active', 1)->findAll() ?? null;
-        $data['lead_data']['installment_data'] = view('rfq/installment_fields', $installment_data) ?? null;
-        $data['attachment_html'] = view('rfq/attachment_files', $data) ?? "";
-        $data['user_team'] = $this->userModel->select("ut.team_id")->join("user_teams ut", "ut.user_id = user_profiles.id and ut.is_active = 1")->where("user_profiles.is_active", 1)->first()['team_id'];
-        // dd($data);
-
-        if ($data['lead_data']['lead_form_type'] == 1) {
-            $data['demogrphy_html_data'] = $this->generateDemographyDataTable(['lead_id' => $id]);
-            $this->loadLayout('view_rfq.php', $data);
-        } else if ($data['lead_data']['lead_form_type'] == 2) {
-
-            $data['occupancy'] = $this->occupancyModel->findAll();
-            // dd($data['occupancy']);
-
-            if ($lead_data['lead_type'] != 1 && $data['rfq_count'] == 0) {
-                $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $lead_data['source_policy_id'])->first();
-                if (isset($client_policy_data)) {
-
-                    $data['rfq_data']['json'] = $client_policy_data['placement_json'];
-                }
-            }
-
-            if (!empty($data['question_json'])) {
-                $data['policies'] = json_decode($data['question_json'], true)['policies'];
-                $data["child_table_data"] = json_decode($data['question_json'], true)['child_table_data'];
-            }
-
-            $data['product'] = $this->leadsModel->select("policy_type.policy_type")->join('policy_type', 'leads.policy_type_id = policy_type.id')->where('leads.id', $id)->first()['policy_type'];
-            // $data['lead_register_data'] = json_decode($data['lead_data']['custom_fields']);
-            // dd($data['lead_register_data']);
-            // $data['entity_type'] = $this->kycEntityTypeModel->where('is_active', 1)->findAll();
-            $data['buisness_type'] = $this->buisnessType;
-
-            // dd($data);
-            $data['client_type'] = $this->clientType;
-            $this->loadLayout('view_rfq_non_eb', $data);
-        }
+    // 14. Extract subject template to separate method
+    private function getSubjectTemplate($lead_data)
+    {
+        return $lead_data['policy_end_date'] != null
+            ? "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}} {{POLICY_END_DATE}}"
+            : "{{CLIENT_NAME}} _ {{POLICY_TYPE}} _ {{RFQ_OR_QCR}} _ {{POLICY_YEAR}}";
     }
 
     public function savePolicyInfo()
@@ -1452,20 +1804,22 @@ class LeadsController extends BaseController
                     'Policy Type' => $this->leadType[$rfq_data['lead_type']] ?? "",
                 ];
             }
+            
         } else {
+
             if (in_array($rfq_data['policy_type_id'], [2, 3, 4, 5])) {
                 $lead_data = [
 
                     'Insured' => $rfq_data['client_name'],
                     'Policy Type' => $this->leadType[$rfq_data['lead_type']] ?? "",
 
-                    'No of Employees at Inception' => $rfq_data['incept_emp_count'],
-                    'No of Dependents at Inception' => $rfq_data['incept_dept_count'],
-                    'Total Lives at Inception ' => $rfq_data['incept_no_of_lives'],
+                    // 'No of Employees at Inception' => $rfq_data['incept_emp_count'],
+                    // 'No of Dependents at Inception' => $rfq_data['incept_dept_count'],
+                    // 'Total Lives at Inception ' => $rfq_data['incept_no_of_lives'],
 
-                    'No of Employees at Expiry' => $rfq_data['exp_emp_count'],
-                    'No of Dependents at Expiry' => $rfq_data['exp_dept_count'],
-                    'Total Lives at Expiry ' => $rfq_data['exp_no_of_lives'],
+                    // 'No of Employees at Expiry' => $rfq_data['exp_emp_count'],
+                    // 'No of Dependents at Expiry' => $rfq_data['exp_dept_count'],
+                    // 'Total Lives at Expiry ' => $rfq_data['exp_no_of_lives'],
 
                     'No of Employees at Renewal' => $rfq_data['renewal_emp_count'],
                     'No of Dependents at Renewal' => $rfq_data['renewal_dept_count'],
@@ -1474,30 +1828,32 @@ class LeadsController extends BaseController
                     'Period of Insurance ' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
                     'Insurer' => $rfq_data['insurer_name'] ?? " - ",
                     'TPA' => $rfq_data['tpa_name'] ?? " - ",
-                    'Policy Run Days' => $rfq_data['policy_run_days'],
-                    'Inception Premium' => formatIndianCurrency($rfq_data['premium_at_inception']),
-                    'Premium as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['premium_date']),
-                    'Earned Premium' => formatIndianCurrency(intval($rfq_data['earned_premium'])),
-                    'Incurred Claims as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['incurred_claims']),
-                    'Annualised Claims' => formatIndianCurrency(intval($rfq_data['annualised_claims'])),
-                    'Incurred Claims Ratio' => $rfq_data['incurred_claims_ratio'] . " %",
-                    'Earned Claims Ratio' => $rfq_data['earned_claims_ratio'] . " %",
+
+                    // 'Policy Run Days' => $rfq_data['policy_run_days'],
+                    // 'Inception Premium' => formatIndianCurrency($rfq_data['premium_at_inception']),
+                    // 'Premium as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['premium_date']),
+                    // 'Earned Premium' => formatIndianCurrency(intval($rfq_data['earned_premium'])),
+                    // 'Incurred Claims as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['incurred_claims']),
+                    // 'Annualised Claims' => formatIndianCurrency(intval($rfq_data['annualised_claims'])),
+                    // 'Incurred Claims Ratio' => $rfq_data['incurred_claims_ratio'] . " %",
+                    // 'Earned Claims Ratio' => $rfq_data['earned_claims_ratio'] . " %",
                 ];
             } else if (in_array($rfq_data['policy_type_id'], [1, 6, 7])) {
+
                 $lead_data = [
                     'Insured' => $rfq_data['client_name'],
                     'No of Employees at Inception' => $rfq_data['incept_emp_count'],
-                    'Total Lives at Inception' => $rfq_data['total_lives_at_incept'],
                     'Total Sum Insured at Inception' => $rfq_data['total_si_at_incept'],
                     'Premium at inception' => $rfq_data['premium_at_incept'],
-                    'No of Employees at Renewal' => $rfq_data['renewal_emp_count'],
-                    'Total Sum Insured at Renewal ' => $rfq_data['total_si_at_renewal'],
                     'Policy Period' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
-                    // 'Insurer' => $rfq_data['insurer_name'] ?? " - ",
-                    // 'TPA' => $rfq_data['tpa_name'] ?? " - ",
                     'Policy Type' => $this->leadType[$rfq_data['lead_type']] ?? "",
                     'Existing Insurer' => $rfq_data['insurer_name'],
-                    // 'TPA ' => $rfq_data['tpa_name'],
+                    'No of Employees at Renewal' => $rfq_data['renewal_emp_count'],
+                    'Total Sum Insured at Renewal' => $rfq_data['total_si_at_renewal'],
+                    'Claims Experience for last 3 years' => "Mentioned in Claims sheet",
+                    // 'Insurer' => $rfq_data['insurer_name'] ?? " - ",
+                    // 'TPA' => $rfq_data['tpa_name'] ?? " - ",
+                    // 'Total Lives at Inception' => $rfq_data['total_lives_at_incept'],
                 ];
             }
         }
@@ -2055,8 +2411,11 @@ class LeadsController extends BaseController
                 $row = 2;
                 foreach ($claim_details['finyear'] as $record) {
                     $col = 'A';
-                    foreach ($record as $value) {
+                    foreach ($record as $array_key => $value) {
                         $label = ucwords(str_replace('_', ' ', ($value ??  "")));
+                        if(in_array($array_key, ['sum_insured', 'claim_amount', 'settled'])){
+                            $label = formatIndianCurrency(intval($label));
+                        }
                         $sheet->setCellValue($col . $row, $label);
                         $col++;
                     }
@@ -2074,19 +2433,27 @@ class LeadsController extends BaseController
                 }
 
                 // Enable wrap text for all cells
-                $maxColLetter = chr(64 + count($headers)); // Last column letter
-                $sheet->getStyle("A2:{$maxColLetter}{$row}")->getAlignment()->setWrapText(true);
+                // $maxColLetter = chr(64 + count($headers)); // Last column letter
+                // $sheet->getStyle("A2:{$maxColLetter}{$row}")->getAlignment()->setWrapText(true);
 
-                // Optional: center vertically for neatness
-                $sheet->getStyle("A2:{$maxColLetter}{$row}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
+                // // Optional: center vertically for neatness
+                // $sheet->getStyle("A2:{$maxColLetter}{$row}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
 
-                // Optional: Make row height auto (helps when wrap text is on)
-                for ($i = 2; $i < $row; $i++) {
-                    $sheet->getRowDimension($i)->setRowHeight(-1);
-                }
+                $maxColLetter = chr(64 + count($headers));
+                $dataRange = "A1:{$maxColLetter}" . ($row - 1);
 
-            }
-        }
+                $sheet->getStyle($dataRange)->getAlignment()
+                    ->setWrapText(true)
+                    ->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER)
+                    ->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
+
+                            // Optional: Make row height auto (helps when wrap text is on)
+                            for ($i = 2; $i < $row; $i++) {
+                                $sheet->getRowDimension($i)->setRowHeight(-1);
+                            }
+
+                        }
+                    }
 
         // Save to temporary location
         $uploadFilePath = WRITEPATH . 'tmp/' . $filename;
@@ -2825,6 +3192,22 @@ class LeadsController extends BaseController
             }
         }
 
+        if($recipient_type == 'placement' && isset($params['acm_email']) && !empty($params['acm_email'])){
+
+            $common['mail_type'] = "internal acm";
+            $acm_mail_content = '
+                <p>Dear Sir,</p>
+                <p>The placement for the <strong>{{POLICY_TYPE}}</strong> policy pertaining to <strong>{{CLIENT_NAME}}</strong> has been successfully won.</p>
+                <p>Please proceed with the next steps accordingly.</p>
+                <p>Thank You!</p><br>
+                <p>Best regards,</p>
+
+                <img src="{{LOGO_PATH}}" alt="Nhance Logo" width="100" style="margin-top:10px;">
+            ';
+            $acm_mail_content = $this->transformMailContent($lead_data, $acm_mail_content, $data['page_name'] = 'QCR');
+            $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $params['acm_email'], 'subject' => $subject, 'message' => $acm_mail_content, 'attachments' => $attachments, 'common' => $common]);
+        }
+
         $is_placement = false;
         if ($recipient_type == 'placement') {
 
@@ -2850,8 +3233,15 @@ class LeadsController extends BaseController
                 'cd_amount' => $params['cd_amount'] ?? null,
                 'no_of_installment' => $params['no_of_installment'] ?? null,
                 'is_installment' => $params['is_installment'] ?? null,
+                'acm_id' => $params['acm_pk'] ?? null,
             ];
 
+            if(isset($params['tpa_id']) && !empty($params['tpa_id'])){
+                list($tpaBranchId, $tpaId) = explode('-', $params['tpa_id']);
+                $data['tpa_branch_id'] = $tpaBranchId;
+                $data['tpa_id']        = $tpaId;
+            }
+
             $this->leadsModel->where('id', $lead_id)->set($data)->update();
 
             if (isset($params['installments']) && !empty($params['installments'])) {
@@ -3404,6 +3794,13 @@ class LeadsController extends BaseController
                 $input_value = $cellData['input_value'] != "" ? $cellData['input_value'] : ($cellData['value'] ?? '');
                 $value = $cellData['value'] ?? '';
 
+                if( $item == "family_composition" && $subth == $insurer_name && $policy_type == 2){
+                    $age_ratio_array = json_decode($input_value, true)['age_ratio'] ?? null;
+                    if(!empty($age_ratio_array)){
+                        $age_ratio = $age_ratio_array;
+                    }
+                }
+
                 // Skip unwanted keys
                 if (in_array($parentth, ['Sno', 'Item Key', 'Particulars', 'Action']) || in_array($subth, ['Quote Asked'])) {
                     continue;
@@ -3565,7 +3962,6 @@ class LeadsController extends BaseController
         return json_encode($placement_json_data);
     }
 
-
     //------------------------------------------------------------------------------------------------
 
 
@@ -3609,7 +4005,6 @@ class LeadsController extends BaseController
         }
     }
 
-
     public function getLastFiveFinancialYears()
     {
         $currentYear = date('Y');
@@ -3639,7 +4034,7 @@ class LeadsController extends BaseController
         $this->loadLayout('view_rfq_non_eb');
     }
 
-    // get lead data for edit bot EB and NON-EB
+    // get lead data for edit both EB and NON-EB
     public function getLeadNonEB($type, $id = null)
     {
         // Set basic data
@@ -3673,7 +4068,11 @@ class LeadsController extends BaseController
 
             $data['lead_edit_data'] = $this->leadsModel->where('id', $id)->first() ?? [];
 
-            $data['lead_edit_data']['multi_file_data'] = $this->leadFilesModel->where('lead_id', $id)->where('is_active', 1)->findAll() ?? null;
+            $data['lead_edit_data']['multi_file_data'] = $this->leadFilesModel
+                                    ->where('lead_id', $id)
+                                    ->where('type !=', 2)
+                                    ->where('is_active', 1)
+                                    ->findAll() ?? null;
             $data['lead_edit_data']['lead_file_count'] = count($data['lead_edit_data']['multi_file_data']);
 
             // Decode and merge custom fields if present
@@ -4819,6 +5218,7 @@ class LeadsController extends BaseController
                 $lead_file = $this->leadFilesModel
                     ->where('lead_id', $lead_id)
                     ->where('id', $id)
+                    ->where('type !=', 2)
                     ->where('is_active', 1)
                     ->first();
 
@@ -4856,7 +5256,6 @@ class LeadsController extends BaseController
         return $attachments;
     }
 
-
     public function handleMemberDataGPATotalSumInsurerFromExcel($params)
     {
         $lead_id = $params['lead_id'];
@@ -4899,7 +5298,7 @@ class LeadsController extends BaseController
 
             $lower_headers = array_map('strtolower', $members_heading);
             foreach ($lower_headers as $index => $header) {
-                if (preg_match('/^sa\s*-\s*option\s*\d*$/i', $header)) {
+                if (preg_match('/^(sa\s*-\s*option|proposed\s+sum\s+insured)\s+\d+$/i', $header)) {
                     $column_name = $members_heading[$index];
                     $sum = 0;
 
@@ -4924,7 +5323,6 @@ class LeadsController extends BaseController
         return [];
     }
 
-
     public function generateDemographyDataTable($param)
     {
         $returnData = $this->calculateMembersDemography($param, "internal");
@@ -5166,5 +5564,867 @@ class LeadsController extends BaseController
         return ['status' => true, "data" => $reminder_sended_lead];
     }
 
+    public function uploadMultiFileFromRfq()
+    {
+        try {
+
+            $this->myLogger->logme('error', "uploadMultiFileFromRfq START");
+            $this->myLogger->logme('error', "Files received: " . json_encode($this->request->getPost() ?? []));
+
+            $lead_id = $this->request->getPost('lead_id');
+            $lead_form_type = $this->request->getPost('lead_form_type');
+            $leads_file_primary_key = $this->request->getPost('leads_file_id') ?? [];
+            $docs_name = $this->request->getPost('docs_name') ?? [];
+            $files = $this->request->getFileMultiple('file_name');
+
+            if (empty($files) || empty($docs_name)) {
+                $this->myLogger->logme('error', "No files or document names provided");
+                return $this->respond([
+                    'status' => false,
+                    'code'   => 400,
+                    'message' => 'No files or document names provided'
+                ], 400);
+            }
+
+            // Upload process
+            $multi_file_data = $this->uploadMultiFiles($files, $docs_name, $leads_file_primary_key) ?? [];
+
+            $this->myLogger->logme('error', "uploadMultiFiles result: " . json_encode($multi_file_data ?? []));
+
+            if (!empty($multi_file_data)) {
+                $this->insertMultiFilesData($multi_file_data, $lead_id, $lead_form_type);
+                $this->myLogger->logme('error', "Files inserted successfully into DB");
+
+                // update lead file name if change
+                if(isset($multi_file_data[0]['file_name']) && !empty($multi_file_data[0]['file_name'])){
+                    $this->leadsModel->where('id', $lead_id)->set('file_name', $multi_file_data[0]['file_name'])->update();
+                }
+
+            } else {
+                $this->myLogger->logme('error', "uploadMultiFiles returned empty");
+            }
+
+
+            // Get the updated lead file data
+            $lead_file_data = $this->leadFilesModel
+                ->where('is_active', 1)
+                ->where('type !=', 2)
+                ->where('lead_id', $lead_id)
+                ->findAll();
+
+            $this->myLogger->logme('error', "Fetched " . count($lead_file_data) . " lead file records");
+
+            $document_data = $this->renderFileFields($lead_file_data);
+            $attch_data['multi_file_data'] =  $lead_file_data;
+            $attachment_html = view('rfq/attachment_files', $attch_data) ?? "";
+
+            $this->myLogger->logme('error', "uploadMultiFileFromRfq END");
+
+            return $this->respond([
+                'status'         => true,
+                'code'           => 200,
+                'message'        => "File uploaded Successfully",
+                'document_data'  => $document_data,
+                'attachment_html' => $attachment_html,
+            ], 200);
+
+        } catch (\Throwable $e) {
+
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+
+            // Catch any error/exception and log with trace
+            $this->myLogger->logme('error', "Exception in uploadMultiFileFromRfq: " . json_encode($errorDetails));
+
+            return $this->respond([
+                'status'  => false,
+                'code'    => 500,
+                'message' => "File upload failed: " . $e->getMessage(),
+                'errorDetails'    => $errorDetails,
+            ], 500);
+        }
+    }
+
+    public function renderFileFields($multi_file_data = [])
+    {   
+        $uploadFilePath = WRITEPATH . 'uploads/lead_files/';
+        $html = '';
+
+        // If data exists (edit mode)
+        if (!empty($multi_file_data)) {
+
+            foreach ($multi_file_data as $index => $value) {
+
+                $sample_dwn_link = '&nbsp;[ <a href="' . base_url("util/downloadMemberFile/") . $value['file_name'] . '" data-toggle="tooltip" data-placement="top" title="Download Member List" target="_blank">Download</a> ]';
+                $isFirstField = ($index === 0);
+                $placeholder = $isFirstField ? 'First file must be Demography.' : '';
+                $first_file_name = $isFirstField ? 'Member List' : '';
+                $member_data_link = $isFirstField ? $sample_dwn_link : '';
+                $read_only = $isFirstField ? 'readonly' : '';
+                $accept = $isFirstField ? '.xls,.xlsx' : '';
+                $displayIndex = $index + 1;
+
+                $html .= '
+                <div class="form-row d-flex align-items-end" id="fileField_' . $displayIndex . '">
+                    <input type="hidden" name="leads_file_id[]" value="' . htmlspecialchars($value['id']) . '" id="file_id_' . $displayIndex . '">
+
+                    <div class="form-group col-md-5">
+                        <label>Document Name</label>
+                        <input type="text" class="form-control" name="docs_name[]" 
+                            placeholder="' . $placeholder . '" 
+                            value="' . htmlspecialchars(!empty($first_file_name) ? $first_file_name : $value['docs_name']) . '" id="docs_name_' . $displayIndex . '" '.$read_only.'>
+                    </div>
+
+                    <div class="form-group col-md-5">
+                        <label>
+                            File Upload<br>
+                            <small id="file_name_display_' . $displayIndex . '" class="text-muted">' . 
+                            (!empty($value['file_name']) ? htmlspecialchars($value['file_name']) : 'No file chosen') . 
+                            '</small> '.$member_data_link.'
+                        </label>
+                        <input type="file" class="form-control" id="file_name_' . $displayIndex . '" 
+                            name="file_name[]" accept="' . $accept . '" 
+                            onchange="showFileName(this, ' . $displayIndex . ')">
+                    </div>
+
+                    <div class="col-md-2" style="position: relative; bottom: 16px;">
+                        <button type="button" class="btn btn-danger" onclick="removeFileField(' . $displayIndex . ', ' . htmlspecialchars($value['id']) . ')">x</button>
+                        <button type="button" class="btn btn-primary" onclick="addFileField()">+</button>
+                    </div>
+                </div>';
+            }
+        } else {
+            // Default (add mode)
+            $html .= '
+            <div class="form-row d-flex align-items-end" id="fileField_1">
+                <input type="hidden" name="leads_file_id[]" value="">
+
+                <div class="form-group col-md-5">
+                    <label>Document Name</label>
+                    <input type="text" class="form-control" name="docs_name[]" 
+                        placeholder="First file must be Demography." id="docs_name_1">
+                </div>
+
+                <div class="form-group col-md-5">
+                    <label>
+                        File Upload<br>
+                        <small id="file_name_display_1" class="text-muted">No file chosen</small>
+                    </label>
+                    <input type="file" class="form-control" id="file_name_1" 
+                        name="file_name[]" accept=".xls,.xlsx" onchange="showFileName(this, 1)">
+                </div>
+
+                <div class="col-md-2" style="position: relative; bottom: 16px;">
+                    <button type="button" class="btn btn-danger" onclick="removeFileField(1, \'\')">x</button>
+                    <button type="button" class="btn btn-primary" onclick="addFileField()">+</button>
+                </div>
+            </div>';
+        }
+
+        return $html;
+    }
+
+    public function downloadMemberFile($fileName)
+    {
+        $filePath = WRITEPATH . 'uploads/lead_files/' . $fileName;
+
+        if (!file_exists($filePath)) {
+            $data['message'] = 'The Physical File Not Found';
+            echo view('errors/404', $data);
+        }
+
+        // force download
+        return $this->response->download($filePath, null);
+    }
+
+    // ----------- MEMBER DATA VALIDAATION ------------------------------------------------------------------------------------------------------
+
+    public function memberDataListValidation()
+    {
+        $lead_id = $this->request->getPost('lead_id');
+        $this->memberDataListExcelFileFormatValidation(['lead_id' => $lead_id]);
+    }
+
+    public function memberDataListExcelFileFormatValidation($params)
+    {
+        helper('excel_util_helper');
+
+        $this->myLogger->logme('error', 'Start memberDataListExcelFileFormatValidation');
+        $this->myLogger->logme('error', "Received params: " . json_encode($params));
+
+        $lead_id = $params['lead_id'];
+        $age_validation_check = $params['age_validation'] ?? null;
+        $lead_data = $this->leadsModel->where('id', $lead_id)->first();
+        // dd($lead_data);
+
+        $return = [];
+        if (!isset($lead_data)) {
+            $this->myLogger->logme('error', "Lead not found for lead_id: {$lead_id}");
+            $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->set(['status' => 'failed', 'error_data' => json_encode(['error_summary' => array_count_values([12]),'error_data' => 'file not found in DB'])])->update();
+            return array('status' => false, 'msg' => 'file not found in DB');
+        }
+
+        //get the lead files data
+        $lead_file_data = $this->leadFilesModel->where('is_active', 1)->where('type', 2)->first();
+
+        //check the lead file table has the error data entry if not than create new entry
+        if(empty($lead_file_data)){
+            $data['type'] = 2;
+            $data['file_name'] = $lead_data['file_name'];
+            $data['docs_name'] = "Member List";
+            $data['lead_id'] = $lead_id;
+            $lead_file_last_insert_id = $this->leadFilesModel->insert($data);
+            $this->myLogger->logme('error', "New lead file entry created for store the error data, insert_id : '{$lead_file_last_insert_id}'");
+        }
+
+        $family_composition = [];
+        if($age_validation_check && !empty($lead_data['proposel_data'])){
+            $family_composition = $this->getAgeRatioFromRfqJson($lead_id, $lead_data['proposel_data']);
+            $this->myLogger->logme('info', 'Family composition :',json_encode($family_composition));
+        }
+        // dd($family_composition);
+
+        // get the file path
+        $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $lead_data['file_name'];
+        $this->myLogger->logme('error', "File path: {$file_name_with_path}");
+
+        //check physical file
+        if (!file_exists($file_name_with_path)) {
+            //file not found  update status and reason 
+            $message = "Physcial file not found";
+            $this->myLogger->logme('error', ($message . ' for lead id ' . $lead_id));
+            $this->leadFilesModel
+                ->where('lead_id', $lead_id)
+                ->where('type', 2)
+                ->set(['status' => 'failed','error_data' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])
+                ->update();
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
+
+        $this->myLogger->logme('info', 'File exists, starting validation process');
+
+        //start validation process
+        $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
+        $sheet = $spreadsheet->getActiveSheet();
+
+        $highestRowAndColumn = $sheet->getHighestRowAndColumn();
+        // dd($highestRowAndColumn);
+
+        $columns_to_check = $this->member_data_excel_columns;
+
+        $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
+        $keys = array_keys($columns_to_check);
+        $allowedHighestColumn = end($columns_to_check);
+        $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']);
+        $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
+        $this->myLogger->logme('error', 'Excel data sanitized count : {row_count}', ['row_count' => count($excel_data)]);
+        // dd($excel_data);
+
+        //check number of columns in excel
+        $excel_columns = ($excel_data[0]);
+
+        //check columns order in excel
+        $column_count_res = check_columns_name_exist($columns_to_check, $excel_columns);
+        // dd($column_count_res);
+
+        if (isset($column_count_res) && count($column_count_res)) {
+            //columns count mismatch
+            $message = implode("\n", $column_count_res);
+            // echo $message;
+            $this->myLogger->logme('error', ($message . ' for lead id ' . $lead_id));
+            $this->leadFilesModel
+                ->where('lead_id', $lead_id)
+                ->where('type', 2)
+                ->set(['status' => 'failed','error_data' => json_encode(['error_summary' => array_count_values([6]),'error_data' => $message])])
+                ->update();
+            return  array('error_summary' => [6], 'error_data' => $message);
+        }
+
+        $relationship = $this->general_relationships;
+
+        $column_count_res = update_excel_column_indexes($columns_to_check, $excel_columns);
+        // dd($column_count_res);
+
+        //remove header
+        unset($excel_data[0]);
+        $member_family_data = [];
+        foreach ($excel_data as $row_key => $row) {
+
+            //1. avoid empty rows
+            if (check_row_is_empty_or_null($row)) {
+                $this->myLogger->logme('error', "Empty row found at index {$row_key}, stopping row iteration");
+                break;
+            }
+
+            //iterate each row for columns validations
+            foreach ($row as $col_key => $col) {
+
+                $is_mandatory = $columns_to_check[$keys[$col_key]]['is_mandatory'];
+                $format = $columns_to_check[$keys[$col_key]]['format'];
+                $allowed_values = $columns_to_check[$keys[$col_key]]['allowed_values'];
+                $custom_function = isset($columns_to_check[$keys[$col_key]]['custom']) ? $columns_to_check[$keys[$col_key]]['custom'] : null;
+                $binding_params = isset($columns_to_check[$keys[$col_key]]['params']) ? $columns_to_check[$keys[$col_key]]['params'] : null;
+
+                $column_dispaly_name = $columns_to_check[$keys[$col_key]]['col_name'];
+                $column_index = $columns_to_check[$keys[$col_key]]['col_idx'];
+                $column_cell = $columns_to_check[$keys[$col_key]]['col_cell_name'];
+
+
+                //mandatory check
+                if (is_bool($is_mandatory) && $is_mandatory === true) {
+                    if ($col == "" || $col == NULL) {
+                        array_push($result['error_summary'], 1); //push error code for summary
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+                        $result['error_data'][$row_key][$keys[$col_key]]['error'][] = 'Value is mandatory'; //push exact error desc
+                    }
+                }
+
+                //if is_mandatory is array (action based mandatory check)
+                if (is_array($is_mandatory)) {
+                    $allowed_actions = $columns_to_check[$keys[$col_key]]['is_mandatory'];
+                    if ($col == "" || $col == NULL) {
+                        array_push($result['error_summary'], 1);
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+                        $result['error_data'][$row_key][$keys[$col_key]]['error'][] = 'Value is mandatory for this action/event';
+                    }
+                }
+
+                //format check
+                if (isset($format)) {
+                    $format_error = check_excel_date_format($col, $format);
+                    if (!$format_error['status']) {
+                        array_push($result['error_summary'], 2);
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+                        $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $format_error['error'];
+                    }
+                }
+
+                //allowed values check
+                if (($is_mandatory === true && isset($allowed_values) && is_array($allowed_values)) || (is_array($is_mandatory) && (isset($allowed_values) && is_array($allowed_values)))) {
+                    if (!in_array((trim($col)), $allowed_values)) {
+                        array_push($result['error_summary'], 3);
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+                        $result['error_data'][$row_key][$keys[$col_key]]['error'][] = "Value not allowed: Expected " . implode(",", $allowed_values) . " and received $col";
+                    }
+                }
+
+                //custom function check
+                if (isset($custom_function)) {
+                    //convert string params into PHP variables
+                    // Create an array of variables to pass custom helper funcitons 
+                    $param_values = [];
+                    foreach ($binding_params as $bkey => $bparam) {
+                        $param_values[] = ($$bparam);
+                    }
+                    // dd(($param_values));//die();
+                    $res = call_user_func_array($custom_function, $param_values);
+                    if ($res['status'] === false) {
+                        array_push($result['error_summary'], 4);
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+                        $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+                        $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $res['error'];
+                    }
+                }
+            } 
+
+            //age validation
+            $age_validation = isset($columns_to_check['dob']['age_validation']) ?? null;
+            if (isset($age_validation) && $age_validation && $age_validation_check && !empty($family_composition)) {
+                $format_error = check_age_validation($row, $family_composition);
+                if (!$format_error['status']) {
+                    array_push($result['error_summary'], 2);
+                    $result['error_data'][$row_key][$keys[$columns_to_check['dob']['col_idx']]]['col_name'] = $columns_to_check['dob']['col_name']; //push column name
+                    $result['error_data'][$row_key][$keys[$columns_to_check['dob']['col_idx']]]['col_idx'] = $columns_to_check['dob']['col_idx']; //push column index
+                    $result['error_data'][$row_key][$keys[$columns_to_check['dob']['col_idx']]]['error'][] = $format_error['error'];
+                }
+            }
+
+            $row['row_index'] = $row_key;
+            $relation_idx = $columns_to_check['relationship']['col_idx'];
+            $emp_code_idx = $columns_to_check['emp_code']['col_idx'];
+
+            if (isset($row[$relation_idx]) && strtolower($row[$relation_idx]) == 'self' && isset($member_family_data[$row[$emp_code_idx]])) {
+                array_unshift($member_family_data[$row[$emp_code_idx]], $row);
+            } else {
+                $member_family_data[$row[$emp_code_idx]][] = $row;
+            }
+        }
+        // dd($member_family_data);
+
+        $this->myLogger->logme('info', 'Row validation completed, starting duplicate check');
+        $check_row_dublicate = check_duplicate_rows_and_contacts($excel_data, $columns_to_check, $result);
+        // dd($check_row_dublicate);
+
+        if(count($check_row_dublicate)){
+            $result = $check_row_dublicate;
+        }
+
+        $this->myLogger->logme('info', 'Starting family validation');
+        $result = validateFamily($member_family_data, $columns_to_check, $result);
+        // dd($family_validation);
+
+        if (isset($result['error_summary']) && count($result['error_summary'])) {
+            $result['error_summary'] = array_count_values($result['error_summary']);
+            $status = 'failed';
+            $failure_reason = ((json_encode($result)));
+            $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->set(['status' => $status,'error_data' => $failure_reason])->update();
+            $this->myLogger->logme("error", '{lead_id} uploaded failed for this lead id', ['lead_id' => $lead_id]);
+        } else {
+            $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->set(['status' => 'success','error_data' => ''])->update();
+            $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => ['lead_id' => $lead_id]]);
+        }
+
+        return $result;
+    }
+
+    public function getAgeRatioFromRfqJson($lead_id, $porposel_data)
+    {   
+        $age_ratio = [];
+        $rfq_data = $this->RFQModel->where('is_active', 1)->where('lead_id', $lead_id)->orderBy('id', 'desc')->first();
+        if(empty($rfq_data) || empty($rfq_data['json'])){
+            return $age_ratio;
+        }
+
+        $data = json_decode($rfq_data['json'], true);
+        $proposal_and_insurer = json_decode($porposel_data, true);
+        $insurer_key = $proposal_and_insurer['insurer_name'] ?? null;
+
+        if(isset($data['table_data']['data'])){
+            foreach ($data['table_data']['data'] as $key => $value) {
+                if($value['items'] == 'family_composition'){
+                    foreach ($value['data'] as $family_composition) {
+                        if($family_composition['subth'] == $insurer_key){
+                            $age_ratio = json_decode($family_composition['input_value'] ?? "", true) ?? [];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $age_ratio;
+    }
+
+    public function getMemberDataExcelFileErrors()
+    {
+        $lead_id = $this->request->getGet('lead_id');
+        // $lead_id = 329;
+
+        // Render views and capture output
+        $result = $this->getMemberDataListExcelErrorData($lead_id);
+
+        if ($result != 0) {
+
+            $result['lead_id'] = $lead_id;
+            echo view('excel_errors', $result);
+        } else if ($result == 0) {
+
+            $data['message'] = 'File Not Found Physically';
+            return view('errors/404', $data);
+        } else {
+
+            echo view('errors/html/production');
+        }
+    }
+
+    public function getMemberDataListExcelErrorData($lead_id)
+    {
+        try {
+            $file = $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->where('is_active', 1)->first();
+            $error_data = json_decode($file['error_data']);
+            // dd($error_data);
+            //  return $error_data;
+
+            $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $file['file_name'];
+
+            //check the file exist or not
+            if (!file_exists($file_name_with_path)) {
+                $error_message = "File not found";
+                $this->myLogger->logme('error', ($error_message . ' for file id ' . $lead_id));
+                return 0;
+            }
+
+            $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
+            $sheet = $spreadsheet->getActiveSheet();
+
+            $highestRowAndColumn = $sheet->getHighestRowAndColumn();
+            $excel_data = $sheet->rangeToArray('A1:' . $highestRowAndColumn['column'] . $highestRowAndColumn['row']);
+            $excelErrorData['excel_header'] = $excel_data[0];
+            unset($excel_data[0]);
+            // Kint::dump($excel_data);
+
+            if ($error_data->error_type == 1) {
+
+                $finalArray = [];
+                foreach ($error_data->error_data as $key => $value) {
+
+                    foreach ($value as $key2 => $value2) {
+                        $error_data = $value2->error;
+                        $data = ['value' => $excel_data[$key][$value2->col_idx], 'error' => $error_data,];
+                        $excel_data[$key][$value2->col_idx] = $data;
+                    }
+                    array_push($finalArray, $excel_data[$key]);
+                }
+
+                foreach ($finalArray as $fkey => $value) {
+                    foreach ($value as $vkey => $arrayData) {
+                        if (!is_array($arrayData)) {
+                            $data = ['value' => $arrayData];
+                            $finalArray[$fkey][$vkey] =  $data;
+                        }
+                    }
+                }
+
+                $excelErrorData['excel_data'] = $finalArray;
+                return $excelErrorData;
+            } else if ($error_data->error_type == 2) {
+
+
+                $allErrors = [];
+                $typeTowArray = [];
+
+                foreach ($error_data->error_data as $index => $item) {
+
+                    foreach ($item as $field) {
+                        if (!isset($allErrors[$index])) {
+                            $allErrors[$index] = [];
+                        }
+                        $allErrors[$index] = array_merge($allErrors[$index], $field->error);
+                    }
+                }
+
+                // dd(array_keys($allErrors));
+                foreach ($allErrors as $key => $value) {
+                    // echo $key;
+                    // print_r($value);
+                    foreach ($excel_data as $excel_data_index => $excel_data_value) {
+                        if ($excel_data_value[0] == $key) {
+                            $data = ['value' => $excel_data[$excel_data_index][1], 'error' => $value,];
+                            $excel_data[$excel_data_index][1] = $data;
+                            array_push($typeTowArray, $excel_data[$excel_data_index]);
+                            break;
+                        }
+                    }
+                }
+                // dd($data);
+                foreach ($typeTowArray as $fkey => $value) {
+                    foreach ($value as $vkey => $arrayData) {
+                        if (!is_array($arrayData)) {
+                            $data = ['value' => $arrayData];
+                            $typeTowArray[$fkey][$vkey] =  $data;
+                        }
+                    }
+                }
+
+                $excelErrorData['excel_data'] = $typeTowArray;
+                return $excelErrorData;
+            }
+        } catch (\Exception $e) {
+            // Handle any exceptions
+            $errorMessage = $e->getMessage(); //die();
+            $this->myLogger->logme('error', $errorMessage);
+            return false; // You can return an error response here
+        }
+    }
+
+    public function downloadFullMemberDataExcelErrorFile($lead_id, $rowIndex = 1, $colIndex = 1)
+    {
+        // Get file data from the database
+        $file_data = $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->where('is_active', 1)->first();
+
+        $error =  json_decode($file_data['error_data']);
+
+        // Check if the file exists
+        if (!$file_data) {
+            $error_message = "File not found";
+            $this->myLogger->logme('error', $error_message . ' for file id ' . $lead_id);
+            return $error_message;
+        }
+
+        $fileName = $file_data['file_name'];
+        $filePath = WRITEPATH . '/uploads/lead_files/' . $fileName;
+
+        // Check if the file exists
+        if (!file_exists($filePath)) {
+            $error_message = "File not found";
+            $this->myLogger->logme('error', $error_message . ' for file id ' . $lead_id);
+            $data['message'] = 'Physical File Not Found';
+            return view('errors/404', $data);
+        }
+
+        // Load the Excel file
+        $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($filePath);
+        $sheet = $spreadsheet->getActiveSheet();
+
+        foreach ($error->error_data as $index => $error_data) {
+
+            $rowIndex = $index + 1;
+
+            if ($error->error_type == 1) {
+
+                foreach ($error_data as $key => $value) {
+
+                    $colIndex = $value->col_idx + 1;
+
+                    $originalValue = $sheet->getCell([$colIndex, $rowIndex])->getValue();
+
+                    $newValue =  implode(', ', $value->error);
+                    $val = $originalValue . ' ( ' . $newValue . ' )';
+                    $sheet->setCellValue([$colIndex, $rowIndex],  $val);
+
+                    $style = [
+                        'fill' => [
+                            'fillType' => \PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID,
+                            'startColor' => ['rgb' => 'ffad99'] // Red color
+                        ]
+                    ];
+
+                    $sheet->getStyle([$colIndex, $rowIndex])->applyFromArray($style);
+                }
+            } else if ($error->error_type == 2) {
+
+
+                foreach ($error_data as $key => $value) {
+
+
+                    $originalValue = $sheet->getCell([1, $rowIndex])->getValue();
+
+                    $newValue =  implode(', ', $value->error);
+                    $val = $originalValue . ' ( ' . $newValue . ' )';
+                    $sheet->setCellValue([$colIndex, $rowIndex],  $val);
+
+                    $style = [
+                        'fill' => [
+                            'fillType' => \PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID,
+                            'startColor' => ['rgb' => 'ffad99'] // Red color
+                        ]
+                    ];
+                    $sheet->getStyle([$colIndex, $rowIndex])->applyFromArray($style);
+                }
+            }
+        }
+
+        // Create a new filename for the modified Excel file
+        $newFileName = 'error_with_highlight_' . $fileName;
+
+        // Save the modified Excel file to a new location
+        $newFilePath = WRITEPATH . '/uploads/lead_files/' . $newFileName;
+        $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
+        $writer->save($newFilePath);
+
+        // Set headers to force download
+        $response = service('response');
+        $response->setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        $response->setHeader('Content-Disposition', 'attachment;filename="' . $newFileName . '"');
+        $response->setHeader('Cache-Control', 'max-age=0');
+        $response->setHeader('Content-Length', filesize($newFilePath));
+        $response->setBody(file_get_contents($newFilePath));
+
+        // Delete the temporary file
+        unlink($newFilePath);
+
+        // Return the response
+        return $response;
+    }
+
+    public function savePlacementDataAndValidateMemberDataFile()
+    {
+        try {
+
+            $this->myLogger->logme('error', '--- savePlacementDataAndValidateMemberDataFile START ---');
+
+            $params = $this->request->getPost();
+            $this->myLogger->logme('error', 'Received params: ' . json_encode($params));
+
+            if (empty($params['lead_id'])) {
+                $this->myLogger->logme('error', 'Lead ID missing');
+                return $this->respond([
+                    'status'  => false,
+                    'code'    => 400,
+                    'message' => 'Lead ID is required'
+                ], 400);
+            }
+
+            $lead_id = $params['lead_id'];
+            $proposal_insurer = $params['proposal_insurer'] ?? '';
+
+            // Handle proposal and insurer details
+            if (!empty($proposal_insurer) && strpos($proposal_insurer, '-') !== false) {
+                list($proposal_key, $insurer_key) = explode('-', $proposal_insurer, 2);
+                $lead_update_data = json_encode([
+                    'proposel_name' => $proposal_key,
+                    'insurer_name'  => $insurer_key,
+                    'insurer'       => $params['insurer_and_branch'] ?? null,
+                ]);
+                $this->myLogger->logme('error', "Proposal/Insurer parsed successfully: $proposal_key - $insurer_key");
+            } else {
+                $lead_update_data = null;
+                $this->myLogger->logme('error', 'Proposal/Insurer not provided or invalid format');
+            }
+
+            $data = [
+                'proposel_data'     => $lead_update_data,
+                'placement_date'    => !empty($params['placement_date']) ? change_date_format($params['placement_date']) : null,
+                'payment_date'      => !empty($params['payment_date']) ? change_date_format($params['payment_date']) : null,
+                'utr_no'            => $params['utr_no'] ?? null,
+                'is_cd'             => $params['is_cd'] ?? null,
+                'premium_amount'    => $params['premium_amount'] ?? null,
+                'total_amount'      => $params['total_amount'] ?? null,
+                'cd_amount'         => $params['cd_amount'] ?? null,
+                'no_of_installment' => $params['no_of_installment'] ?? null,
+                'is_installment'    => $params['is_installment'] ?? null,
+                'acm_id'            => $params['acm_pk'] ?? null,
+            ];
+
+            // get lead data
+            $lead_data = $this->leadsModel->where('id', $lead_id)->first();
+
+            // Compare and update only if changed the start and end date
+            if (!empty($params['policy_start_date'])) {
+                $converted_start = change_date_format($params['policy_start_date']);
+                if ($converted_start !== $lead_data['policy_start_date']) {
+                    $data['policy_start_date'] = $converted_start;
+                    $this->myLogger->logme('error', "Policy start date updated: $converted_start");
+                }
+            }
+
+            if (!empty($params['policy_end_date'])) {
+                $converted_end = change_date_format($params['policy_end_date']);
+                if ($converted_end !== $lead_data['policy_end_date']) {
+                    $data['policy_end_date'] = $converted_end;
+                    $this->myLogger->logme('error', "Policy end date updated: $converted_end");
+                }
+            }
+
+            // Handle TPA details
+            if (!empty($params['tpa_id']) && strpos($params['tpa_id'], '-') !== false) {
+                list($tpaBranchId, $tpaId) = explode('-', $params['tpa_id']);
+                $data['tpa_branch_id'] = $tpaBranchId;
+                $data['tpa_id']        = $tpaId;
+                $this->myLogger->logme('error', "TPA details added: branch=$tpaBranchId, id=$tpaId");
+            }
+
+            $this->myLogger->logme('error', 'Prepared lead update data: ' . json_encode($data));
+
+            // Update main lead record
+            $this->leadsModel->update($lead_id, $data);
+            $this->myLogger->logme('error', "Lead updated successfully for ID: $lead_id");
+
+            // Save installment details
+            if (!empty($params['installments'])) {
+                $installments = json_decode($params['installments'], true);
+                $this->myLogger->logme('error', "Installments data received: " . json_encode($installments));
+
+                if (is_array($installments) && !empty($installments)) {
+                    foreach ($installments as $installment) {
+                        $installment['payment_date'] = !empty($installment['payment_date']) && strtotime($installment['payment_date'])
+                            ? date('Y-m-d', strtotime($installment['payment_date']))
+                            : null;
+
+                        $installment['lead_id'] = $lead_id;
+
+                        if (!empty($installment['id'])) {
+                            $this->leadInstallmentPaymentDetails->update($installment['id'], $installment);
+                            $this->myLogger->logme('error', "Installment updated: " . json_encode($installment));
+                        } else {
+                            $this->leadInstallmentPaymentDetails->insert($installment);
+                            $this->myLogger->logme('error', "Installment inserted: " . json_encode($installment));
+                        }
+                    }
+                }
+            } else {
+                $this->myLogger->logme('error', "No installments provided");
+            }
+
+            // Update lead file status to pending
+            $this->leadFilesModel->where('lead_id', $lead_id)->where('type', 2)->set(['status' => 'pending'])->update();
+
+            // Queue job after save
+            $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => ['lead_id' => $lead_id, 'age_validation' => true]]);
+            $this->myLogger->logme('error', "Job queued successfully: " . json_encode($r));
+
+            $this->myLogger->logme('error', "--- savePlacementDataAndValidateMemberDataFile END (SUCCESS) ---");
+
+            return $this->respond([
+                'status'  => true,
+                'code'    => 200,
+                'message' => 'Placement data saved successfully. File being validated',
+                'lead_id' => $lead_id,
+                'data'    => $data,
+                'params'  => $params
+            ], 200);
+
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $this->myLogger->logme('error', "--- savePlacementDataAndValidateMemberDataFile ERROR --- " . json_encode($errorDetails));
+            return $this->respond([
+                'status'  => false,
+                'code'    => 500,
+                'message' => 'Error while validating the member data',
+                'error'   => $errorDetails
+            ], 500);
+        }
+    }
+
+    public function checkMemberDataFileValidationStatus()
+    {
+        $lead_id = $this->request->getVar('lead_id');
+        if (empty($lead_id)) {
+            return $this->respond([
+                'status'  => false,
+                'code'    => 400,
+                'message' => 'lead_id is required'
+            ], 400);
+        }
+
+        // Fetch file validation status
+        $lead_file = $this->leadFilesModel
+            ->select('id, lead_id, status')
+            ->where('lead_id', $lead_id)
+            ->where('type', 2)
+            ->first();
+
+        if (!$lead_file) {
+            return $this->respond([
+                'status'  => false,
+                'code'    => 404,
+                'message' => 'No file found for this lead_id'
+            ], 404);
+        }
+
+        // If validation is still running
+        if ($lead_file['status'] === 'pending' || $lead_file['status'] === null) {
+            return $this->respond([
+                'status'  => true,
+                'code'    => 202, // Accepted - still processing
+                'message' => 'Validation in progress',
+                'data'    => ['status' => $lead_file['status']]
+            ], 200);
+        }
+
+        // If validation finished (success or failed)
+        return $this->respond([
+            'status'  => true,
+            'code'    => 200,
+            'message' => 'Validation completed',
+            'data'    => $lead_file
+        ], 200);
+    }
+
+
+    // ----------- END OF MEMBER DATA VALIDAATION ------------------------------------------------------------------------------------------------------
+
 
 }
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index c26d6fb8..013a9324 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -107,7 +107,8 @@ class MasterController extends AdminController
     public function insurerList()
     {   
         $this->myLogger->logme('error','Insurer list function called');
-        $headerData['page_name'] = 'Insurer List';
+        $headerData['tab_name'] = 'Insurer List';
+        $headerData['page_name'] = 'Insurers';
         $data['insurerList'] = $this->insurerModel->where('is_active',1)->findAll();
         $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -154,7 +155,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit Insurer Onboarding function called');
-        $headerData['page_name'] = 'Edit Insurer Master';
+        $headerData['tab_name'] = 'Edit Insurer Master';
+        $headerData['page_name'] = 'Insurers';
 
         $types = array(
             (object) array('id' => 'pvt', 'name' => 'PVT'),
@@ -245,7 +247,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','Insurer Onboarding function called');
-        $headerData['page_name'] = 'Insurer Master';
+        $headerData['tab_name'] = 'Insurer Master';
+        $headerData['page_name'] = 'Insurers';
 
         $types = array(
             (object) array('id' => 'pvt', 'name' => 'PVT'),
@@ -504,7 +507,8 @@ class MasterController extends AdminController
     public function tpaList()
     {   
         $this->myLogger->logme('error','TPA list function called');
-        $headerData['page_name'] = 'TPA List';
+        $headerData['tab_name'] = 'TPA List';
+        $headerData['page_name'] = 'TPA';
         $data['tpaList'] = $this->tpaModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -550,7 +554,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','TPA Onboarding function called');
-        $headerData['page_name'] = 'TPA Master';
+        $headerData['tab_name'] = 'TPA Master';
+        $headerData['page_name'] = 'TPA';
 
 
         // print_r($data['types']);die();
@@ -664,7 +669,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit TPA Onboarding function called');
-        $headerData['page_name'] = 'Edit TPA Master';
+        $headerData['tab_name'] = 'Edit TPA Master';
+        $headerData['page_name'] = 'TPA';
 
         $tpa_data = $this->tpaModel->where(['id' => $id, 'is_active' => 1])->first();
 
@@ -833,7 +839,8 @@ class MasterController extends AdminController
     public function kycList()
     {   
         $this->myLogger->logme('error','KYC list function called');
-        $headerData['page_name'] = 'KYC List';
+        $headerData['tab_name'] = 'KYC List';
+        $headerData['page_name'] = 'KYC';
         $data['kycList'] = $this->kycEntityTypeModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -879,7 +886,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','KYC Onboarding function called');
-        $headerData['page_name'] = 'KYC Master';
+        $headerData['tab_name'] = 'KYC Master';
+        $headerData['page_name'] = 'KYC';
 
 
         // print_r($data['types']);die();
@@ -944,7 +952,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit KYC Onboarding function called');
-        $headerData['page_name'] = 'Edit KYC Master';
+        $headerData['tab_name'] = 'Edit KYC Master';
+        $headerData['page_name'] = 'KYC';
 
         $editData['kyc']           = $this->kycEntityTypeModel->where(['id' => $id, 'is_active' => 1])->first();
         $editData['kyc_docs']    = $this->kycDocsModel->where(['kyc_type_id' => $id, 'is_active' => 1])->findAll();
@@ -1022,7 +1031,8 @@ class MasterController extends AdminController
     public function policyTypeList()
     {   
         $this->myLogger->logme('error','Policy Type list function called');
-        $headerData['page_name'] = 'Policy Type List';
+        $headerData['tab_name'] = 'Policy Type List';
+        $headerData['page_name'] = 'Policy Type';
         $data['policyList'] = $this->policyTypeModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -1068,7 +1078,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','Policy Type Onboarding function called');
-        $headerData['page_name'] = 'Policy Type Master';
+        $headerData['tab_name'] = 'Policy Type Master';
+        $headerData['page_name'] = 'Policy Type';
 
 
         // print_r($data['types']);die();
@@ -1130,7 +1141,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit KYC Onboarding function called');
-        $headerData['page_name'] = 'Edit Policy Type';
+        $headerData['tab_name'] = 'Edit Policy Type';
+        $headerData['page_name'] = 'Policy Type';
 
         $editData['policytype']   = $this->policyTypeModel->where(['id' => $id, 'is_active' => 1])->first();
         $editData['policies']     = $this->policesModel->select('policies.*, insurers.name as insurer_name')
@@ -1222,7 +1234,8 @@ class MasterController extends AdminController
     //start CD Master list
     public function CDMasterList()
     {   
-        $data['page_name'] = 'CD Master List';
+        $data['tab_name'] = 'CD Master List';
+        $data['page_name'] = 'CD Master';
         $data['CD_Master_Data'] = $this->CDMasterModel->getCDMasterList();
         $data['insurers'] = $this->insurerModel->where('is_active', 1)->findAll();
         $data['insurer_branch'] = $this->insurerBranchModel->where('is_active', 1)->findAll();
@@ -1605,8 +1618,8 @@ class MasterController extends AdminController
     //Vehicle Master data Function
 
     public function VehicleMasterList()
-    {   
-        $data['page_name'] = 'Vehicle Master List';
+    {   $data['tab_name'] = 'Vehicle Master';
+        $data['page_name'] = 'Vehicles';
         $data['vehicle_type'] = [
             'two_wheeler' => 'Two Wheeler',
             'four_wheeler' => 'Four Wheeler',
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 8b2a80bb..db8be45b 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -114,6 +114,7 @@ class PolicyTransactionController extends BaseController
     // Policy Transaction Inception
     public function viewInception()
     {
+        $data['tab_name'] = 'Policy';
         $data['page_name'] = 'Policy';
 
         // Static arrays for dropdowns
@@ -1075,6 +1076,7 @@ class PolicyTransactionController extends BaseController
         // echo '<pre>';
         // !dd($this->getEndorsementDataForEdit(17));
 
+        $data['tab_name'] = 'Endorsement';
         $data['page_name'] = 'Endorsement';
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
         $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
@@ -1241,7 +1243,8 @@ class PolicyTransactionController extends BaseController
         $issue_type = $this->policyTransactionModel
             ->where('action_type', 'inception')
             ->where('client_id', $this->request->getPost('client_id'))
-            ->where('client_policy_id', $this->request->getPost('client_policy_id'))
+            // ->where('client_policy_id', $this->request->getPost('client_policy_id'))
+            ->where('id', $this->request->getPost('client_policy_id'))
             ->where('policy_transaction.is_active', 1)
             ->first();
 
@@ -1770,7 +1773,7 @@ class PolicyTransactionController extends BaseController
     //get BDS Reports data old function
     public function reportBDSOld()
     {
-
+        $data['tab_name'] = 'BDS Report';
         $data['page_name'] = 'BDS Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1832,6 +1835,7 @@ class PolicyTransactionController extends BaseController
     public function reportBDS()
     {
 
+        $data['tab_name'] = 'BDS Report';
         $data['page_name'] = 'BDS Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1925,6 +1929,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportVarience()
     {
+        $data['tab_name'] = 'Variance Report';
         $data['page_name'] = 'Variance Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1974,6 +1979,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportBusinessList()
     {
+        $data['tab_name'] = 'Business Report';
         $data['page_name'] = 'Business Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2014,6 +2020,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportFinanceList()
     {
+        $data['tab_name'] = 'Finance Report';
         $data['page_name'] = 'Finance Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2054,6 +2061,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportOutstanding()
     {
+        $data['tab_name'] = 'Outstanding Report';
         $data['page_name'] = 'Outstanding Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2132,6 +2140,7 @@ class PolicyTransactionController extends BaseController
             ->findAll();
 
         // dd( $this->insurerStatements->getLastQuery());
+        $data['tab_name'] = 'Statement Upload';
         $data['page_name'] = 'Statement Upload';
 
         $this->loadLayout('insurer_statement_list',  $data);
@@ -2709,8 +2718,8 @@ class PolicyTransactionController extends BaseController
             $data['files'] = array_merge($pt_files, $kyc_files, $batch_files, $files);
             //  dd($data['files']);
         }
-
-        $data['page_name'] = 'Documents Search';
+        $data['tab_name'] = 'Documents Search';
+        $data['page_name'] = 'Documents';
 
         $data['customers'] = $this->clientModel->select('id,client_name,short_name as display_value')->where('is_active', 1)->get()->getResultarray();
         $data['policies'] = $this->clientPolicyModel->select("client_policy.id,client_policy.policy_no,policy_type.policy_type,concat(policy_type.policy_type,' - ',client_policy.policy_no) as display_value")
@@ -3054,9 +3063,28 @@ class PolicyTransactionController extends BaseController
 
         $clientIds = array_column($clients, 'id');
 
-        $policies = $this->clientPolicyModel
+        // $policies = $this->clientPolicyModel
+        //     ->select("
+        //             client_policy.*, 
+        //             policy_type.policy_type,
+        //             policy_type.ebp,
+        //             policy_type.etp,
+        //             policy_type.iep,
+        //             policy_type.itp,
+        //             policy_type.bap,
+        //             policy_type.allocg,
+        //             DATE_FORMAT(client_policy.policy_start_date, '%d/%m/%Y') as policy_start_date,
+        //             DATE_FORMAT(client_policy.policy_end_date, '%d/%m/%Y') as policy_end_date
+        //         ")
+        //     ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
+        //     ->join('policy_transaction pt', 'pt.client_policy_id = client_policy.id and pt.action_type = "inception" and pt.is_active = 1 and pt.client_policy_id is not null')
+        //     ->whereIn('client_policy.client_id', $clientIds)
+        //     ->where('client_policy.is_active', 1)
+        //     ->findAll();
+
+        $policies = $this->policyTransactionModel
             ->select("
-                    client_policy.*, 
+                    policy_transaction.*, 
                     policy_type.policy_type,
                     policy_type.ebp,
                     policy_type.etp,
@@ -3064,14 +3092,14 @@ class PolicyTransactionController extends BaseController
                     policy_type.itp,
                     policy_type.bap,
                     policy_type.allocg,
-                    DATE_FORMAT(client_policy.policy_start_date, '%d/%m/%Y') as policy_start_date,
-                    DATE_FORMAT(client_policy.policy_end_date, '%d/%m/%Y') as policy_end_date
+                    DATE_FORMAT(policy_transaction.policy_start_date, '%d/%m/%Y') as policy_start_date,
+                    DATE_FORMAT(policy_transaction.policy_end_date, '%d/%m/%Y') as policy_end_date
                 ")
-            ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
-            ->join('policy_transaction pt', 'pt.client_policy_id = client_policy.id and pt.action_type = "inception" and pt.is_active = 1 and pt.client_policy_id is not null')
-            ->whereIn('client_policy.client_id', $clientIds)
-            ->where('client_policy.is_active', 1)
-            ->findAll();
+            ->join('policy_type', 'policy_type.id = policy_transaction.policy_type_id')
+            ->whereIn('policy_transaction.client_id', $clientIds)
+            ->where('policy_transaction.is_active', 1)
+            ->where('policy_transaction.action_type', "inception")
+        ->findAll();
 
         foreach ($policies as $policy) {
             $policyList[$policy['client_branch_id']][] = $policy;
diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index b2567d9c..24f22283 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -79,10 +79,6 @@ class RestAuthenticationController extends AdminController
 
 
 
-
-
-
-
     public function verifyEmployeeWithMobileNumber()
     {   
         log_message('error', '  ');
@@ -93,6 +89,7 @@ class RestAuthenticationController extends AdminController
 
         try {
             $mobile_number = $this->request->getJSON()->mobile_number;
+            $otp = $this->request->getJSON()->otp;
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Received mobile_number = " . $mobile_number);
           
 
@@ -112,12 +109,49 @@ class RestAuthenticationController extends AdminController
         
             if (isset($employeeData['employee_id'])) 
             {
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Employee found: employee_id = " . $employeeData['employee_id']);
+                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Employee verified with ID = " . $employeeData['employee_id']);
                 log_message('error', '  ');
-                log_message('error', ' ************************************* POST END **************************************** ');
-                log_message('error', '  ');
-                $result = ['user_verification' => true ,'message' => "Verified Successfully"];
-                return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                log_message('error', '************************ POST END ********************************');
+
+               
+                $sql = "
+                    UPDATE employees
+                    INNER JOIN employee_polices ON employee_polices.employee_id = employees.id
+                    SET employees.otp = ?
+                    WHERE employees.id = ?
+                    AND employees.relationship = 'self'
+                    AND employees.is_active = 1
+                    AND employee_polices.is_active = 1
+                    AND employee_polices.status IN ('active')
+                ";
+
+                $db = db_connect();
+                $update = $db->query($sql, [$otp, $employeeData['employee_id']]);
+
+                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: OTP update query executed. SQL = " . $db->getLastQuery());
+
+                if($update)
+                {
+                    //send sms 
+                    $SMSResult = sendOtpSms($mobile_number, $otp);
+                    if ($SMSResult['status'] == 'success') 
+                    {
+                        $result = ['user_verification' => true ,'message' => "Verified Successfully" ];
+                        return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                    }else{
+                        $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                        return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                    }
+
+                }else{
+
+                    $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: OTP update query Failed. SQL = " . $db->getLastQuery());
+
+                    $result = ['user_verification' => false, 'message' => "Try again. , try again"];
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+
+                }
+
             } else {
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: No matching employee found");
                 log_message('error', '  ');
@@ -148,6 +182,7 @@ class RestAuthenticationController extends AdminController
         try {
 
             $email = $this->request->getJSON()->email;
+            $otp = $this->request->getJSON()->otp;
             $client_id = $this->request->getJSON()->client_id ?? null;
 
 
@@ -181,11 +216,6 @@ class RestAuthenticationController extends AdminController
 
             if (isset($employeeData['employee_id'])) {
 
-                $otp = random_int(100000, 999999);
-
-                // $update  = $this->employeeModel->where('email_corporate', $email)->where('relationship', 'Self')
-                //     ->where('is_active', 1)->set(array('otp' => $otp))
-                //     ->update();
 
                 $builder = $this->employeeModel
                     ->where('email_corporate', $email)
@@ -265,24 +295,23 @@ class RestAuthenticationController extends AdminController
         $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateEmpOTP: Received payload = " . json_encode($this->request->getJSON() ?? []));
 
         
-        $email = $this->request->getJSON()->email;
+        $email = $this->request->getJSON()->email ?? null;
+        $mobile_number = $this->request->getJSON()->mobile_number ?? null;
         $otp = $this->request->getJSON()->otp;
         $client_id = $this->request->getJSON()->client_id ?? null;
         $employee_id = $this->request->getJSON()->employee_id ?? null;
 
         $builder = $this->employeeModel
-            ->where('email_corporate', $email)
             ->where('relationship', 'Self')
             ->where('is_active', 1);
 
-        // $builder = $this->employeeModel
-        //     ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner')
-        //     ->where('employees.email_corporate', $email)
-        //     ->where('employees.relationship', 'Self')
-        //     ->where('employees.is_active', 1)
-        //     ->whereIn('employees.emp_status', ['active', 'expired'])
-        //     ->where('EP.is_active', 1)
-        //     ->whereIn('EP.status', ['active', 'expired']);
+        if (!empty($email)) {
+            $builder->where('email_corporate', $email);
+        }
+
+        if (!empty($mobile_number)) {
+            $builder->where('mobile', $mobile_number);
+        }
 
 
         if (!empty($client_id)) {
@@ -306,58 +335,7 @@ class RestAuthenticationController extends AdminController
 
     }
 
-    // public function updateEmpMPIN()
-    // {
-    //     $requestData = $this->request->getJSON();
-    //     print_r($requestData); die;
-    //     $mobile_number = $requestData->mobile_number ?? null;
-    //     $email_id = $requestData->email_id ?? null;
-    //     $new_mpin = $requestData->new_mpin ?? $requestData->mpin ?? null;
-    //     $old_mpin = $requestData->old_mpin ?? null;
-    //     $is_mpin_skipped = $requestData->is_mpin_skipped ?? null;
-    //     $is_biometric_enabled = $requestData->is_biometric_enabled ?? null;
-
-    //     if (!$new_mpin) {
-    //         return $this->response->setJSON(['status' => false, 'message' => 'MPIN is required.']);
-    //     }
-
-    //     $query = $this->employeeModel->where('relationship', 'self');
-
-    //     if ($mobile_number) {
-    //         $query->where('mobile', $mobile_number);
-    //     } elseif ($email_id) {
-    //         $query->where('email_corporate', $email_id);
-    //     } else {
-    //         return $this->response->setJSON(['status' => false, 'message' => 'Mobile number or Email ID is required.']);
-    //     }
-
-    //     if (!empty($old_mpin)) {
-    //         $query->where('mpin', $old_mpin);
-    //     }
-
-    //     // Fetch employee data
-    //     $employeeData = $query->first();
-
-    //     if (!$employeeData) {
-    //         return $this->response->setJSON(['status' => false, 'message' => 'Employee not found or invalid MPIN.']);
-    //     }
-
-    //     if(!empty($is_mpin_skipped) && !empty($is_biometric_enabled)){
-    //         $mpin_data_to_updata = [
-    //             'mpin' => $new_mpin,
-    //             'is_mpin_skipped' => $is_mpin_skipped,
-    //             'is_biometric_enabled' => $is_biometric_enabled
-    //         ];
-    //     }else{
-    //         $mpin_data_to_updata = ['mpin' => $new_mpin];
-    //     }
-
-    //     // Update MPIN
-    //     $updated = $this->employeeModel->update($employeeData['id'], $mpin_data_to_updata);
-
-    //     return true;
-    // }
-
+ 
     public function updateEmpMPIN()
     {
         try {
@@ -415,17 +393,11 @@ class RestAuthenticationController extends AdminController
 
         try {
            
-            $otp_verification = isset($this->request->getJSON()->otp_verification) ? $this->request->getJSON()->otp_verification : null;
             $mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null;
-
-            $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
             $email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
+            $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
             $client_id = $this->request->getJSON()->client_id ?? null;
 
-            if (isset($this->request->getJSON()->login_by_hr)) 
-            {
-                $employeeData = $this->employeeModel->where('id', $this->request->getJSON()->employee_id)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
-            }else{
                 if (isset($mobile_number)) 
                 {
                     // $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
@@ -437,7 +409,8 @@ class RestAuthenticationController extends AdminController
                         ->where('employee_polices.is_active', 1)
                         ->whereIn('employee_polices.status', ['active', 'expired'])
                         ->where('employees.is_active', 1)
-                        ->whereIn('employees.emp_status', ['active', 'expired']);
+                        ->whereIn('employees.emp_status', ['active', 'expired'])
+                        ->where('otp', $otp);
 
                     if (!empty($client_id)) {
                         $builder->where('employees.client_id', $client_id);
@@ -464,14 +437,15 @@ class RestAuthenticationController extends AdminController
 
                     $employeeData = $builder->orderBy('employees.id', 'desc')->first();
                 }   
-            }
+            
 
             $lastQuery = $this->employeeModel->db->getLastQuery();
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Last Executed Query: " . $lastQuery);        
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: employeeData: " . json_encode($employeeData ?? []));        
 
             
-            if ($employeeData && $otp_verification == true || $employeeData && isset($this->request->getJSON()->login_by_hr) || $employeeData && isset($this->request->getJSON()->otp) ) {
+            if ($employeeData && isset($this->request->getJSON()->otp) ) 
+            {
                 $auth =  HttpRequestHelper::getRequestInfo();
                 if ($auth) {
                     $data = [
@@ -503,14 +477,14 @@ class RestAuthenticationController extends AdminController
                 log_message('error', '  '); 
                 log_message('error', '************************ POST END ********************************');
                 log_message('error', '  '); 
-                return $this->respond(['status' => 'failed','code' => 404,'data' => []],200);
+                return $this->respond(['status' => 'failed','code' => 404,'data' => "", 'message' => 'Invalid OTP'],200);
             }
         } catch (\Exception $e) {
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Exception: " . $e->getMessage() . " --- Line: " . $e->getLine() .  " --- Trace: " . $e->getTraceAsString());
             log_message('error', '  ');
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
-            return $this->respond(['status' => 'failed','code' => 500,'data' =>[], 'error' => $e->getMessage()],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => "Invalid OTP", 'error' =>  $e->getMessage()],500);
         }
     }
 
@@ -524,17 +498,43 @@ class RestAuthenticationController extends AdminController
     public function verifyHrWithMobileNumber()
     {
         try {
-            $mobile_number = $this->request->getJSON()->mobile_number;
-           
+            $data = $this->request->getJSON();
+
+            $mobile_number = $data->mobile_number;
+            $otp = $data->otp;
+
             $HrData = $this->hrModel->where('mobile', $mobile_number)
                                     ->where('contact_type', 'client')
                                     ->where('is_active', 1)
                                     ->first();
-            
+
+
             if ($HrData) {
                 
-                $result = ['user_verification' => true ,'message' => "Verified Successfully"];
-                return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                    $sql = "UPDATE level_contacts SET otp = ? WHERE mobile = ? AND contact_type = 'client' AND is_active = 1";
+
+                    $db = db_connect();
+                    $update = $db->query($sql, [$otp, $mobile_number]);
+
+                    if($update)
+                    {
+                        
+                        //send sms 
+                        $SMSResult = sendOtpSms($mobile_number, $otp);
+                        if ($SMSResult['status'] == 'success') 
+                        {
+                            $result = ['user_verification' => true, 'message' => "Verified Successfully"];
+                            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
+                        } else {
+                            $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                            return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                        }
+
+                    }else {
+                        $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                        return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                    }
+
             } else {
                 $result = ['user_verification' => false , 'message' => "User not found"];
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
@@ -552,6 +552,7 @@ class RestAuthenticationController extends AdminController
             $data = $this->request->getJSON();
 
             $email = $data->email;
+            $otp = $data->otp;
            
             $HrData = $this->hrModel->where('email', $email)
                                     ->where('contact_type', 'client')
@@ -559,8 +560,6 @@ class RestAuthenticationController extends AdminController
                                     ->first();
           
             if ($HrData) {
-                
-                $otp = random_int(100000, 999999);
 
                 $sql = "
                         UPDATE level_contacts
@@ -575,7 +574,7 @@ class RestAuthenticationController extends AdminController
 
                 if($update)
                 {
-                    $data->otp = $otp; 
+                   
                    
                     $common = [
                         'login_type' => 'HR login',
@@ -608,39 +607,53 @@ class RestAuthenticationController extends AdminController
             return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
         }
     }
-    
+
     public function updateHROTP()
     {
-        
-        $email = $this->request->getJSON()->email;
-        $otp = $this->request->getJSON()->otp;
-        
-        $this->hrModel->where('email', $email) ->where('contact_type', 'client')
-        ->where('is_active', 1)->set(array('otp' => $otp))
-        ->update();
+       
+        $email = $this->request->getJSON()->email ?? null;
+        $mobile_number = $this->request->getJSON()->mobile_number ?? null;
+        $otp = $this->request->getJSON()->otp ?? null;
 
-        return true;
+       
 
+        $builder = $this->hrModel
+            ->where('contact_type', 'client')
+            ->where('is_active', 1);
+
+        if (!empty($email)) {
+            $builder->where('email', $email);
+        } elseif (!empty($mobile_number)) {
+            $builder->where('mobile', $mobile_number);
+        }
+
+        $builder->set(['otp' => $otp])->update();
+
+        if ($this->hrModel->db->affectedRows() > 0) {
+            return true;
+        }
+
+      
     }
 
+    
+
     public function getVerifiedHrData()
     {
         try {
-            // mobile number 
-            $otp_verification = isset($this->request->getJSON()->otp_verification) ? $this->request->getJSON()->otp_verification : null;
-            $mobile_number = isset($this->request->getJSON()->mobile_no) ? $this->request->getJSON()->mobile_no : null;
-            // email id
+
             $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
             $email = isset($this->request->getJSON()->email) ? $this->request->getJSON()->email : null;
+            $mobile_number = isset($this->request->getJSON()->mobile_no) ? $this->request->getJSON()->mobile_no : null;
 
             if (isset($mobile_number)) 
             {
-                $hrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->first();
+                $hrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->where('otp', $otp)->first();
             }else{
                 $hrData = $this->hrModel->where('email', $email)->where('contact_type', 'client')->where('otp', $otp)->first();
             }
 
-            if ($hrData && $otp_verification == true || $hrData && isset($this->request->getJSON()->otp) ) 
+            if ($hrData) 
             {
 
                 $auth =  HttpRequestHelper::getRequestInfo();
@@ -656,41 +669,73 @@ class RestAuthenticationController extends AdminController
                     $this->authHistoryModel->insert($data);
                                         
                 }
-              
+
 
                 if(isset($this->request->getJSON()->mobile_no)){ 
 
-                    $hrData = $this->hrModel ->select('level_contacts.* , client_branch.client_id as client_id')
+                    $getAllhrData = $this->hrModel->select('level_contacts.id ,level_contacts.mobile , level_contacts.email , clients.id as client_id, clients.client_name, clients.short_name , client_branch.id as client_branch_id,client_branch.branch_name , client_branch.pre_branch_id')
                                             ->join('client_branch', 'level_contacts.ref_id = client_branch.id', 'left')
+                                            ->join('clients', 'client_branch.client_id = clients.id', 'left')
                                             ->where('level_contacts.mobile', $mobile_number )
                                             ->where('level_contacts.contact_type', 'client')
-                                            ->find();
+                                            ->findAll();
+                    //set otp value null
+                    $this->hrModel->where('mobile', $mobile_number)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update();
 
-                }else if(isset($this->request->getJSON()->otp)){ 
+                }else if(isset($this->request->getJSON()->email)){ 
 
+                    $getAllhrData = $this->hrModel->select('level_contacts.id ,level_contacts.mobile , level_contacts.email , clients.id as client_id, clients.client_name, clients.short_name , client_branch.id as client_branch_id,client_branch.branch_name , client_branch.pre_branch_id')
+                                            ->join('client_branch', 'level_contacts.ref_id = client_branch.id', 'left')
+                                            ->join('clients', 'client_branch.client_id = clients.id', 'left')
+                                            ->where('level_contacts.email', $email )
+                                            ->where('level_contacts.contact_type', 'client')
+                                            ->findAll();
+                    //set otp value null
                     $this->hrModel->where('email', $email)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update();
-
-                    $hrData = $this->hrModel ->select('level_contacts.* , client_branch.client_id as client_id')
-                                        ->join('client_branch', 'level_contacts.ref_id = client_branch.id', 'left')
-                                        ->where('level_contacts.email', $email )
-                                        ->where('level_contacts.contact_type', 'client')
-                                        ->find();
                 }
 
-                $HRAccessData = $this->getHRAccessData( $hrData['0']['id'] , 'post_enrollment');
+                if(count($getAllhrData))
+                {
+                    
+                    foreach ($getAllhrData as $key => $value) {
 
-                if(isset($HRAccessData['allowed_modules'])){ $hrData['0']['allowed_modules'] =  json_decode($HRAccessData['allowed_modules'],true)['post']; }else{ $hrData['0']['allowed_modules'] = []; }
+                        $HRAccessData = $this->hrAccessControlModel
+                                ->where('post_client_id',$value['client_id'])
+                                ->where('post_branch_id', $value['client_branch_id'])
+                                ->where('post_hr_id', $value['id'])
+                                ->get()->getRowArray();
+
+                       
+                        if (!empty($HRAccessData) && isset($HRAccessData['allowed_modules'])) {
+
+                            $decoded = json_decode($HRAccessData['allowed_modules'], true);
+                            $getAllhrData[$key]['allowed_modules'] = $decoded;
+
+                            $token = JWTToken::encode($HRAccessData);
+                            $getAllhrData[$key]['token'] = $token;
+                            
+                        } else {
+                            $getAllhrData[$key]['allowed_modules'] = [];
+                            $getAllhrData[$key]['token'] = "";
+                        }
+                       
+                    }
+
+                    return $this->respond(['status' => 'success','code' => 200,'data' => $getAllhrData ],200);
+
+                }else {
+
+                    return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'User not found' ],200);
+                }
 
-                $hrData['0']['token_type'] = 'post';
-                $result = JWTToken::encode($hrData['0']);
                
-                
-                return $this->respond(['status' => 'success','code' => 200,'data' => $result ],200);
+
+              
 
 
             } else {
 
-                return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP" ],200);
+                return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'User not found' ],200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);
@@ -829,7 +874,7 @@ class RestAuthenticationController extends AdminController
             log_message('error', '  ');
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => $th],500);
         }
     }
 
@@ -933,7 +978,7 @@ class RestAuthenticationController extends AdminController
             log_message('error', '  ');
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => $th],500);
         }
     }
 
@@ -991,7 +1036,7 @@ class RestAuthenticationController extends AdminController
     //             // $result = $employeeData;
     //             return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
     //         } else {
-    //             return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);
+    //             return $this->respond(['status' => 'failed','code' => 404,'data' => ""],200);
     //         }
     //     } catch (\Exception $e) {
     //         return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);
@@ -1016,7 +1061,7 @@ class RestAuthenticationController extends AdminController
             // print_r($mpin);
 
             if (!$mpin) {
-                return $this->respond(['status' => 'failed', 'code' => 400, 'data' => 'MPIN is required'], 400);
+                return $this->respond(['status' => 'failed', 'code' => 400, 'data'   => "", 'message' => 'MPIN is required'], 400);
             }
 
             if ($mobile_number) {
@@ -1057,7 +1102,7 @@ class RestAuthenticationController extends AdminController
                 $employeeData = $builder->orderBy('employees.id', 'desc')->first();
 
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 400, 'data' => 'Mobile number or Email ID is required'], 400);
+                return $this->respond(['status' => 'failed', 'code' => 400, 'data'   => "", 'message' => 'Mobile number or Email ID is required'], 400);
             }
 
             $lastQuery = $this->employeeModel->db->getLastQuery();
@@ -1095,14 +1140,14 @@ class RestAuthenticationController extends AdminController
                 log_message('error', ' ************************************* POST END **************************************** ');
                 log_message('error', '  ');
 
-                return $this->respond(['status' => 'failed','code'   => 404,'data'   => 'Invalid MPIN'], 200);
+                return $this->respond(['status' => 'failed','code'   => 404, 'data'   => "", 'message'   => 'Invalid MPIN'], 200);
             }
         } catch (\Exception $e) {
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyMpin: Exception: " . $e->getMessage() . " --- Line: " . $e->getLine() .  " --- Trace: " . $e->getTraceAsString());
             log_message('error', '  ');
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
-            return $this->respond(['status' => 'failed','code'   => 500, 'data'   => $e->getMessage()], 500);
+            return $this->respond(['status' => 'failed','code'   => 500, 'data'   => "", 'message'  => $e->getMessage()], 500);
         }
     }
 
@@ -1167,13 +1212,13 @@ class RestAuthenticationController extends AdminController
                 log_message('error', '  ');
                 log_message('error', ' ************************************* POST END **************************************** ');
                 log_message('error', '  ');
-                return $this->respond(['status' => 'success','code' => 200,'data' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'], 'is_biometric_enabled' => $employeeData['is_biometric_enabled']],200);
+                return $this->respond(['status' => 'success','code' => 200,'data' => "", 'message' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'], 'is_biometric_enabled' => $employeeData['is_biometric_enabled']],200);
             } else {
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - checkMpin: Mpin - not found");
                 log_message('error', '  ');
                 log_message('error', ' ************************************* POST END **************************************** ');
                 log_message('error', '  ');
-                return $this->respond(['status' => 'failed','code' => 404,'data' => "Mpin - not found", 'Mpin' =>null],200);
+                return $this->respond(['status' => 'failed','code' => 404,'data' => "", 'message' => "Mpin - not found", 'Mpin' =>null],200);
             }
 
         } catch (\Exception $e) {
@@ -1182,7 +1227,7 @@ class RestAuthenticationController extends AdminController
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
 
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => $e->getMessage()],500);
         }
     }
 
@@ -1361,6 +1406,10 @@ class RestAuthenticationController extends AdminController
                 ->where('employees.mobile', $mobile_number)
                 ->where('EP.is_active', 1)
                 ->whereIn('EP.status', ['active', 'expired']);
+
+            if (!empty($otp)) {
+                $builder->where('employees.otp', $otp);
+            }
                 
             if (!empty($old_mpin)) {
                 $builder->where('employees.mpin', $old_mpin);
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index cb432d24..e6f377c7 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -5,11 +5,18 @@ namespace App\Controllers;
 use App\Controllers\BaseController;
 use App\Models\EmployeePolicyModel;
 use App\Models\InsurerBranchModel;
+use App\Models\RFQModel;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\API\ResponseTrait;
 use Dompdf\Dompdf;
 use Dompdf\Options;
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+
 class TestingController extends BaseController
 {
     use ResponseTrait;
@@ -19,7 +26,7 @@ class TestingController extends BaseController
     {
         $this->myLogger = \Config\Services::mylogger();
     }
-    
+
     public function saveForm()
     {
         // Get JSON input
@@ -34,7 +41,7 @@ class TestingController extends BaseController
     }
 
     public function testcli()
-    {   
+    {
         echo "hi";
         $this->myLogger->logme('error', "test log");
         echo "hi 2";
@@ -78,19 +85,19 @@ class TestingController extends BaseController
         $options->set('debugLayoutBlocks', false);
         $options->set('debugLayoutInline', false);
         $options->set('debugLayoutPaddingBox', false);
-        
+
         // Initialize DomPDF
         $dompdf = new Dompdf($options);
-        
+
         // Load HTML content
         $dompdf->loadHtml($html);
-        
+
         // Set paper size and orientation
         $dompdf->setPaper('A4', 'landscape'); // or 'portrait'
-        
+
         // Render PDF
         $dompdf->render();
-        
+
         // Output PDF to browser
         $filename = 'ecard_' . date('Y-m-d_H-i-s') . '.pdf';
         $dompdf->stream($filename, ['Attachment' => true]); // Set to false for inline view
@@ -110,7 +117,7 @@ class TestingController extends BaseController
             'POLICY_DATE' => '31/12/2024',
             'INSURER_NAME' => 'ZURICH KOTAK GTNERAL INSURANCE COIIPANY lNDlA LIMITED',
             'TPA_NAME' => 'HealthIndia Insurance TPA Services Pvt. Ltd.',
-            'FRONT_CARD' => base_url() .('public/uploads/template_bg/Nhance_Ecard_working_1_front_3.png'),
+            'FRONT_CARD' => base_url() . ('public/uploads/template_bg/Nhance_Ecard_working_1_front_3.png'),
             'BACK_CARD' => base_url() . ('public/uploads/template_bg/Nhance_Ecard_working_1_Back_3.png'),
             'LEVELS' => 'Level 1: 1800-XXX-XXXX<br>Level 2: support@company.com'
         ];
@@ -126,7 +133,7 @@ class TestingController extends BaseController
             'POLICY_DATE' => '31/12/2024',
             'INSURER_NAME' => 'ABC Insurance Co.',
             'TPA_NAME' => 'XYZ TPA Ltd.',
-            'FRONT_CARD' => base_url() .('public/uploads/template_bg/Nhance_Ecard_working_1_front_3.png'),
+            'FRONT_CARD' => base_url() . ('public/uploads/template_bg/Nhance_Ecard_working_1_front_3.png'),
             'BACK_CARD' => base_url() . ('public/uploads/template_bg/Nhance_Ecard_working_1_Back_3.png'),
             'LEVELS' => 'Level 1: 1800-XXX-XXXX<br>Level 2: support@company.com'
         ];
@@ -156,12 +163,12 @@ class TestingController extends BaseController
     {
         // Load your HTML template
         $template = file_get_contents(WRITEPATH . 'e_card_template/common.html');
-        
+
         // Replace placeholders with actual data
         foreach ($data as $key => $value) {
             $template = str_replace('{' . $key . '}', $value, $template);
         }
-        
+
         return $template;
     }
 
@@ -224,21 +231,21 @@ class TestingController extends BaseController
         $employeePolicy = new EmployeePolicyModel();
 
         $data = $employeePolicy
-                ->select('client_policy.policy_type_id')
-                ->join('employees', 'employee_polices.employee_id = employees.id')
-                ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id')
-                ->where('employees.is_active', 1)
-                ->where('employees.emp_status', ['active', 'expired'])
-                ->where('employee_polices.is_active', 1)
-                ->where('employee_polices.status', ['active', 'expired'])
-                ->where('employees.client_id', $client_id)
-                ->where('employees.emp_code', $emp_code)
-                ->groupBy('employee_polices.client_policy_id')
-                ->findAll();
-
+            ->select('client_policy.policy_type_id')
+            ->join('employees', 'employee_polices.employee_id = employees.id')
+            ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id')
+            ->where('employees.is_active', 1)
+            ->where('employees.emp_status', ['active', 'expired'])
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.status', ['active', 'expired'])
+            ->where('employees.client_id', $client_id)
+            ->where('employees.emp_code', $emp_code)
+            ->groupBy('employee_polices.client_policy_id')
+            ->findAll();
     }
 
-    public function ptedfitdata($id){
+    public function ptedfitdata($id)
+    {
         $policy_transaction = new PolicyTransactionController();
         $data = $policy_transaction->getInceptionDataForEdit($id);
         // dd($data);
@@ -248,7 +255,7 @@ class TestingController extends BaseController
         $dataArray = $data['pt_co_share_details']; // Example
         $cd_ac_pk = 'CD12345';
         $role_id = 1;
-        $team_id = ['6']; 
+        $team_id = ['6'];
         $insurer_branch = $insurer_branch;
 
         return view('pt_calc_table', [
@@ -313,4 +320,357 @@ class TestingController extends BaseController
         return $html;
     }
 
+    public function viewRFQNonEb()
+    {
+        $insurerBranchModel = new InsurerBranchModel();
+        $data['page_name'] = "RFQ NON EB";
+        $data['insurer'] = $insurerBranchModel->getInsurerBranchesWithInsurerNames();
+        // dd($data);
+        return $this->loadLayout('view_rfq_non_eb_new', $data);
+    }
+
+    public function saverfq()
+    {
+        $json = $this->request->getPost('json');
+        $json = json_encode($json);
+        print_r($json);
+
+        // $data['lead_id'] = 10000;
+        // $data['json'] = $json;
+        // $rfq = new RFQModel();
+
+        // $rfq->insert($data);
+    }
+
+    public function exportExcel()
+    {
+        $rfq = new RFQModel();
+        $policy_data = $rfq->where('lead_id', 10000)->first();
+        // print_rr($policy_data['json']); die;
+        $policy_data = json_decode($policy_data['json'], true);
+        $policy_data = array_slice($policy_data, 0, -2);
+        print_rr($policy_data);
+        die;
+        dd($policy_data);
+    }
+
+
+    public function mapping_client_id_and_branch_id()
+    {
+
+        $post_clients_list = $this->getNonDuplicatePostClients();
+
+        $pre_clients_list  = $this->getNonDuplicatePreClients();
+
+        
+
+        if (
+            !empty($pre_clients_list) &&
+            !empty($post_clients_list)
+        ) {
+
+            $postDB = \Config\Database::connect();
+            $preDB = \Config\Database::connect('preDB');
+
+            foreach ($post_clients_list as $post_client) {
+
+                foreach ($pre_clients_list as $pre_client) {
+
+                    if (trim($post_client['short_name']) == trim($pre_client['short_name'])) {
+
+                        $postDB->table('clients')->where('id', $post_client['id'])->update(['pre_client_id' => $pre_client['id']]);
+
+                        $preDB->table('clients')->where('id', $pre_client['id'])->update(['post_client_id' => $post_client['id']]);
+
+                        // upto here we updated client_id in both dbs.
+
+                        $post_branches = $postDB->table('client_branch')
+                            ->where('client_id', $post_client['id'])
+                            ->get()
+                            ->getResultArray() ?? [];
+
+                        $pre_branches  = $preDB->table('client_branch')
+                            ->where('client_id', $pre_client['id'])
+                            ->get()
+                            ->getResultArray() ?? [];
+
+                        if (!empty($post_branches) &&  !empty($pre_branches)) {
+
+
+                            foreach ($post_branches as $post_branch) {
+
+                                $pre_branch = $preDB->table('client_branch')
+                                    ->where('client_id', $pre_client['id'])
+                                    ->where('branch_code', $post_branch['branch_code'])
+                                    ->get()
+                                    ->getRowArray() ?? [];
+
+                                if (!empty($pre_branch)) {
+                                    $postDB->table('client_branch')->where('id', $post_branch['id'])->update(['pre_branch_id' => $pre_branch['id']]);
+                                }
+                            }
+
+                            foreach ($pre_branches as $pre_branch) {
+
+                                $post_branch = $postDB->table('client_branch')
+                                    ->where('client_id', $post_client['id'])
+                                    ->where('branch_code', $pre_branch['branch_code'])
+                                    ->get()
+                                    ->getRowArray() ?? [];
+
+                                if (!empty($post_branch)) {
+                                    $preDB->table('client_branch')->where('id', $pre_branch['id'])->update(['post_branch_id' => $post_branch['id']]);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } 
+    }
+
+
+    private function getNonDuplicatePostClients()
+    {
+
+
+        $postDB = \Config\Database::connect();
+
+        $sql = "SELECT *
+                        FROM clients AS post_clients
+                        WHERE post_clients.client_type = 1
+                        AND   post_clients.is_active = 1
+                        AND (post_clients.short_name NOT IN 
+                                        (    
+                                            SELECT ir_post_clients.short_name
+                                                FROM clients as ir_post_clients
+                                                WHERE ir_post_clients.client_type = 1
+                                                AND ir_post_clients.short_name IS NOT NULL
+                                                AND TRIM(ir_post_clients.short_name) <> ''
+                                                AND ir_post_clients.is_active = 1
+                                                GROUP BY ir_post_clients.short_name
+                                                HAVING COUNT(*) > 1) 
+                                            )
+                        ORDER BY post_clients.short_name";
+
+        $binds = [];
+
+        $query = $postDB->query($sql, $binds);
+
+        $results = $query->getResultArray() ?? [];
+
+        return $results;
+    }
+
+    private function getNonDuplicatePreClients()
+    {
+
+        $preDB = \Config\Database::connect('preDB');
+
+        $sql = "SELECT *
+                        FROM clients AS pre_clients
+                        WHERE pre_clients.client_type = 1
+                        AND   pre_clients.is_active = 1
+                        AND (pre_clients.short_name NOT IN 
+                                          (    
+                                            SELECT ir_pre_clients.short_name
+                                                FROM clients as ir_pre_clients
+                                                WHERE ir_pre_clients.client_type = 1
+                                                AND ir_pre_clients.short_name IS NOT NULL
+                                                AND TRIM(ir_pre_clients.short_name) <> ''
+                                                AND ir_pre_clients.is_active = 1
+                                                GROUP BY ir_pre_clients.short_name
+                                                HAVING COUNT(*) > 1) 
+                                            )
+                        ORDER BY pre_clients.short_name";
+
+        $binds = [];
+
+        $query = $preDB->query($sql, $binds);
+
+        $results = $query->getResultArray() ?? [];
+
+        return $results;
+    }
+    public function membervalidation($lead_id = 329)
+    {   
+        $lead_controll = new LeadsController();
+        // $lead_controll->getMemberDataExcelFileErrors();
+        $res = $lead_controll->memberDataListExcelFileFormatValidation(['lead_id' => $lead_id]);
+        dd($res);
+    }
+
+    private $firstNames = [
+        'Rajesh', 'Priya', 'Amit', 'Sneha', 'Vikram', 'Anjali', 'Rahul', 'Deepika',
+        'Sanjay', 'Kavita', 'Arun', 'Pooja', 'Manoj', 'Nisha', 'Suresh', 'Meera',
+        'Karthik', 'Divya', 'Ravi', 'Lakshmi', 'Anand', 'Swathi', 'Vijay', 'Rekha',
+        'Ashok', 'Sangeetha', 'Prakash', 'Uma', 'Ramesh', 'Vani', 'Kumar', 'Radha',
+        'Dinesh', 'Shanti', 'Ganesh', 'Parvati', 'Mohan', 'Sita', 'Arjun', 'Geetha'
+    ];
+
+    private $lastNames = [
+        'Kumar', 'Sharma', 'Singh', 'Patel', 'Reddy', 'Nair', 'Iyer', 'Krishnan',
+        'Rao', 'Gupta', 'Verma', 'Agarwal', 'Joshi', 'Mehta', 'Desai', 'Pillai',
+        'Menon', 'Bhat', 'Naidu', 'Varma', 'Malhotra', 'Kapoor', 'Chopra', 'Saxena',
+        'Pandey', 'Mishra', 'Tiwari', 'Dubey', 'Sinha', 'Jain', 'Shah', 'Thakur'
+    ];
+
+    private $relationships = ['Self', 'Spouse', 'Son', 'Daughter', 'Father', 'Mother'];
+    private $genders = ['M', 'F'];
+    private $domains = ['gmail.com', 'yahoo.com', 'outlook.com', 'company.com', 'example.com'];
+
+    public function generateExcel()
+    {
+        // Increase execution time and memory for large files
+        ini_set('max_execution_time', 600);
+        ini_set('memory_limit', '1024M');
+
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+
+        // Define headers
+        $headers = [
+            'Sl no',
+            'Emp Code',
+            'Name',
+            'Relationship',
+            'Gender',
+            'DOB',
+            'Age',
+            'Email',
+            'Mobile',
+            'SI',
+            'SI Enhancement',
+            'Proposed Sum Insured 1',
+            'Proposed Sum Insured 2',
+            'Proposed Sum Insured 3',
+            'Proposed Sum Insured 4'
+        ];
+
+        // Set headers in row 1
+        $col = 'A';
+        foreach ($headers as $header) {
+            $sheet->setCellValue($col . '1', $header);
+            $col++;
+        }
+
+        // Style the header row
+        $headerStyle = [
+            'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']],
+            'fill' => ['fillType' => Fill::FILL_SOLID, 'startColor' => ['rgb' => '4472C4']],
+            'alignment' => ['horizontal' => Alignment::HORIZONTAL_CENTER, 'vertical' => Alignment::VERTICAL_CENTER],
+            'borders' => ['allBorders' => ['borderStyle' => Border::BORDER_THIN]]
+        ];
+        $sheet->getStyle('A1:O1')->applyFromArray($headerStyle);
+
+        // Generate 70,000 sample records
+        $totalRecords = 1000;
+        $batchSize = 1000;
+
+        for ($i = 1; $i <= $totalRecords; $i++) {
+            $row = $i + 1; // Start from row 2 (row 1 is header)
+            
+            $record = $this->generateSampleRecord($i);
+            
+            $sheet->setCellValue('A' . $row, $record['sl_no']);
+            $sheet->setCellValue('B' . $row, $record['emp_code']);
+            $sheet->setCellValue('C' . $row, $record['name']);
+            $sheet->setCellValue('D' . $row, $record['relationship']);
+            $sheet->setCellValue('E' . $row, $record['gender']);
+            $sheet->setCellValue('F' . $row, $record['dob']);
+            $sheet->setCellValue('G' . $row, $record['age']);
+            $sheet->setCellValue('H' . $row, $record['email']);
+            $sheet->setCellValue('I' . $row, $record['mobile']);
+            $sheet->setCellValue('J' . $row, $record['si']);
+            $sheet->setCellValue('K' . $row, $record['si_enhancement']);
+            $sheet->setCellValue('L' . $row, $record['proposed_si_1']);
+            $sheet->setCellValue('M' . $row, $record['proposed_si_2']);
+            $sheet->setCellValue('N' . $row, $record['proposed_si_3']);
+            $sheet->setCellValue('O' . $row, $record['proposed_si_4']);
+
+            // Clear memory every batch
+            if ($i % $batchSize == 0) {
+                $sheet->garbageCollect();
+            }
+        }
+
+        // Auto-size columns
+        foreach (range('A', 'O') as $col) {
+            $sheet->getColumnDimension($col)->setAutoSize(true);
+        }
+
+        // Generate filename
+        $filename = 'employee_data_70k_' . date('Y-m-d_His') . '.xlsx';
+
+        // Set headers for download
+        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        header('Content-Disposition: attachment;filename="' . $filename . '"');
+        header('Cache-Control: max-age=0');
+
+        // Write file to output
+        $writer = new Xlsx($spreadsheet);
+        $writer->save('php://output');
+
+        // Clean up
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+        exit;
+    }
+
+    private function generateSampleRecord($index)
+    {
+        $firstName = $this->firstNames[array_rand($this->firstNames)];
+        $lastName = $this->lastNames[array_rand($this->lastNames)];
+        $name = $firstName . ' ' . $lastName;
+        
+        $relationship = $this->relationships[array_rand($this->relationships)];
+        $gender = $this->genders[array_rand($this->genders)];
+        
+        // Generate random age between 18 and 65
+        $age = rand(18, 65);
+        
+        // Calculate DOB based on age
+        $year = date('Y') - $age;
+        $month = str_pad(rand(1, 12), 2, '0', STR_PAD_LEFT);
+        $day = str_pad(rand(1, 28), 2, '0', STR_PAD_LEFT);
+        $dob = "{$day}-{$month}-{$year}";
+        
+        // Generate employee code
+        $empCode = 'EMP' . str_pad($index, 6, '0', STR_PAD_LEFT);
+        
+        // Generate email
+        $email = strtolower($firstName . '.' . $lastName . $index) . '@' . $this->domains[array_rand($this->domains)];
+        
+        // Generate mobile number (Indian format)
+        $mobile = '+91' . rand(7000000000, 9999999999);
+        
+        // Generate insurance amounts
+        $siOptions = [100000, 200000, 300000, 500000, 1000000];
+        $si = $siOptions[array_rand($siOptions)];
+        $si_enhancement = rand(0, 1) ? rand(50000, 200000) : 0;
+        
+        $proposed_si_1 = $si + rand(100000, 500000);
+        $proposed_si_2 = $proposed_si_1 + rand(100000, 500000);
+        $proposed_si_3 = $proposed_si_2 + rand(100000, 500000);
+        $proposed_si_4 = $proposed_si_3 + rand(100000, 500000);
+
+        return [
+            'sl_no' => $index,
+            'emp_code' => $empCode,
+            'name' => $name,
+            'relationship' => $relationship,
+            'gender' => $gender,
+            'dob' => $dob,
+            'age' => $age,
+            'email' => $email,
+            'mobile' => $mobile,
+            'si' => $si,
+            'si_enhancement' => $si_enhancement,
+            'proposed_si_1' => $proposed_si_1,
+            'proposed_si_2' => $proposed_si_2,
+            'proposed_si_3' => $proposed_si_3,
+            'proposed_si_4' => $proposed_si_4
+        ];
+    }
+
 }
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index c1896be4..b0c893da 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -1,654 +1,654 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Controllers\BaseController;
-use App\Helpers\MailHelper;
-use CodeIgniter\HTTP\ResponseInterface;
-
-use App\Models\ThzMasterModel;
-use App\Models\ThzMasterNotesModel;
-use App\Models\ThzTypeModel;
-use App\Models\ThzHistoryModel;
-use App\ControllerCleaners\ThzControllerCleaner;
-use App\Models\UserModel;
-use App\Models\ClientPolicyModel;
-use App\Models\ClientModel;
-use App\Models\TicketMailTemplateModel;
-use App\Models\ClientRMModel;
-
-
-class ThzController extends BaseController
-{
-
-    protected $thzMasterModel;
-    protected $thzMasterNotesModel;
-    protected $thzTypeModel;
-    protected $thzHistoryModel;
-    protected $thzControllerCleaner;
-
-    protected $userModel;
-    protected $clientPolicyModel;
-    protected $clientModel;
-
-    protected $ticketMailTemplateModel;
-
-    protected $cientRmModel;
-    protected $myLogger;
-
-    public function __construct()
-    {
-        set_session_context('THZ-CONTROLLER');
-        $this->thzMasterModel           = new ThzMasterModel();
-        $this->thzMasterNotesModel      = new ThzMasterNotesModel();
-        $this->thzTypeModel             = new thzTypeModel();
-        $this->thzHistoryModel          = new ThzHistoryModel();
-        $this->thzControllerCleaner     = new ThzControllerCleaner();
-        $this->userModel                = new UserModel();
-        $this->clientPolicyModel        = new ClientPolicyModel();
-        $this->clientModel              = new ClientModel();
-        $this->cientRmModel             = new ClientRMModel();
-        $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
-        $this->myLogger                 = \Config\Services::mylogger();
-    }
-
-    public function index()
-    {
-        //
-    }
-
-    public function ticketSave()
-    {
-        try {
-            $data = $this->request->getPost();
-            $references   = "";
-            if (!empty($data['thz_id'])) {
-
-                $text   = "update";
-                // here insert history Status. 
-                $old = $this->thzMasterModel->where('thz_id', $data['thz_id'])->get()->getRowArray();
-                $result = $this->updateTicket($data);
-
-                $references = ($old && isset($data['status'])) ? $this->handleTicketHistory($old, $data) : "No Details" ;
-
-                $updateID = $data['thz_id'];
-            } else {
-
-                $text   = "create";
-                $insertID = $this->insertTicket($data);
-                $result = true;
-                $references   = "";
-            }
-
-            $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID;
-
-            $emailNotificationResult = $this->ticketSaveNotification($data, $insertOrUpdate = $text, $id);
-
-            $this->myLogger->logme('error', 'emailNotificationResult: ' . json_encode($emailNotificationResult));
-
-            return $this->response->setJSON([
-                'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket {$text}d successfully " : "Unable to {$text} ticket. Please try again.",
-                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!',
-                'ref' => $references
-            ])->setStatusCode($result ? 200 : 400);
-
-
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketList()
-    {
-
-        $data['tab_name'] = "Tickets";
-        $data['page_name'] = "Tickets";
-        try {
-            $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
-
-
-            $data = $this->request->getGet();
-
-            if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
-                $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
-            }
-
-
-            $tickets = $this->fetchTicketsBasedOnrole($data);
-
-
-            if ($returnType === 'api') {
-                if (empty($tickets)) {
-                    $this->myLogger->logme('error', 'empty tickets in ticket list: ' . json_encode($tickets));
-                    return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found'])->setStatusCode(404);
-                }
-            } else {
-                $data['ticket_data'] = $tickets;
-                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
-                // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu  , 2-"manager l2 " - ivangalum  assign pannalam
-                // 3,4 remain person varannum. 
-                $data['client_list'] = $this->clientModel->getCreatedByUserName();
-                $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
-
-                return $this->loadLayout('thz_list', $data);
-            }
-
-
-            return $this->response->setJSON([
-                'status' => 'success',
-                'data'   => $tickets,
-            ])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketConversationSave()
-    {
-
-        try {
-            $data = $this->request->getPost();
-
-            $data['notes_type'] = $data['notes_type'] ?? 'External';
-
-            $result = $this->thzMasterNotesModel->insert($data);
-
-            if (empty($result)) {
-                $this->myLogger->logme('error', 'Ticket conversation insert failed..!!: ' . json_encode($result));
-                throw new \RuntimeException('No tickets found', 404);
-            }
-
-            $emailNotificationResult = ($data['notes_type'] === "External") 
-                ? $this->ticketConversationSaveNotification($data) 
-                : false;
-
-            return $this->response->setJSON([
-                'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again.",
-                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed Or No Need..!!'
-            ])->setStatusCode($result ? 200 : 400);
-
-
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketAutoFetchDetails()
-    {
-        try {
-            $data = $this->request->getPost();
-
-            $client_id = $data['client_id'] ?? null;
-            $mobile    = $data['mobile'] ?? null;
-
-            if ($client_id && $mobile) {
-                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id, $mobile);
-
-                if (empty($details)) {
-                    $this->myLogger->logme('error', 'empty AutoFetchDetails for client_id : ' . json_encode($client_id));
-                    throw new \RuntimeException('No Data found', 400);
-                }
-
-                $policyIds    = array_filter(array_column($details, 'policy_id'));
-                $clientPolicy = !empty($policyIds)
-                    ? $this->clientPolicyModel->whereIn('id', $policyIds)->where('is_active', 1)->get()->getResultArray()
-                    : [];
-
-                $result['client_details'] = $details;
-                $result['policy_details'] = $clientPolicy ?? [];
-            } else {
-                throw new \RuntimeException('Client and Mobile Not found', 400);
-            }
-
-            return $this->response->setJSON(['status' => 'success', 'data' => $result])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketConversationList()
-    {
-        $data       = $this->request->getGet();
-
-        $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
-
-        $thz_id     = $data['thz_id'] ?? null;
-
-        $ticketType = $data['notes_type'] ?? 'External';
-
-        if ($thz_id) {
-            $result['master'] = $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.thz_id', $thz_id)
-                ->findAll();
-
-            if (!empty($result['master'])) {
-                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
-                $result['notes'] = !empty($notes) ? $notes : [];
-            } else {
-                $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));
-                throw new \RuntimeException('No tickets found', 400);
-            }
-        } else {
-            // return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
-            throw new \RuntimeException('No tickets found', 404);
-        }
-
-        if ($returnType === 'api') {
-            try {
-                return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
-            } catch (\Throwable $e) {
-                return handle_exception($e, $this->myLogger, $this->response);
-            }
-        } else {
-
-            $assign_to = $result['master'][0]['assign_to'];
-            $mobile    = $result['master'][0]['mobile'];
-
-            $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null')
-                ? $result['master'][0]['policy_id']
-                : '';
-
-            $result['related_tickets'] = $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.assign_to', $assign_to)
-                ->where('thz_master.mobile', $mobile)
-                ->where('thz_master.thz_id !=', $thz_id)
-                ->where('thz_master.status !=', 'Closed')
-                ->where('thz_master.status !=', 'Resolved')
-                ->findAll();
-
-            $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
-            // 2,3,4 remain person varannum. 
-            $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
-
-            $result['ticket_type']  = $this->thzTypeModel->where('is_active', 1)->findAll();
-
-            return $this->loadLayout('thz_notes', $result);
-        }
-    }
-
-    public function ticketType()
-    {
-        $method = $this->request->getMethod(); // get, post
-        try {
-            if ($method === 'get') {
-                $types = $this->thzTypeModel->select('id,name,is_active')->where('is_active', 1)->findAll();
-                if (empty($types)) {
-                    $this->myLogger->logme('error', 'No ticket types found ');
-                    return $this->response->setJSON(['status'  => 'error', 'message' => 'No ticket types found'])->setStatusCode(404);
-                }
-                return $this->response->setJSON(['status' => 'success', 'data'   => $types])->setStatusCode(200);
-            }
-
-            if ($method === 'post') {
-
-                $data = $this->request->getPost();
-                if (!empty($data['id'])) {
-                    $text   = "update";
-                    $result = $this->thzTypeModel->update($data['id'], $data);
-                    $updateID = $data['id'];
-                } else {
-                    $text   = "create";
-                    $insertID  = $this->thzTypeModel->insert($data);
-                    $result = true;
-                }
-
-                $id = isset($insertID) && !empty($insertID) ? $insertID : ($updateID ?? null);
-
-                return $this->response->setJSON([
-                    'status'  => $id ? 'success' : 'error',
-                    'message' => $id ? "Ticket Type {$text}d successfully" : "Unable to {$text} ticket type. Please try again.",
-                    'id'      => $id
-                ])->setStatusCode($id ? 200 : 400);
-            }
-            return $this->response->setJSON(['status'  => 'error', 'message' => 'Invalid request method'])->setStatusCode(405);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketHistoryList()
-    {
-        try {
-            $data = $this->request->getGet();
-            $thz_id = $data['thz_id'];
-            // $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray();
-            $details = $this->thzHistoryModel->select('thz_history.*, user_profiles.first_name  as created_name')
-                ->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left')
-                ->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)
-                ->orderBy('thz_history.created_at', 'desc')
-                ->get()->getResultArray();
-
-
-
-            if (empty($details)) {
-                $this->myLogger->logme('error', 'No history details found for ticket id  ' . json_encode($thz_id));
-                throw new \RuntimeException('No History found', 404);
-            }
-
-
-            return $this->response->setJSON(['status' => 'success', 'data'   => $details])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-
-    /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
-
-
-    private function fetchTicketsBasedOnrole(array $data): array
-    {
-        // $id        = $data['thz_id']    ?? null;
-        $assign_to = $data['assign_to'] ?? null;
-        $mobile    = $data['mobile']    ?? null;
-
-        if (!empty($assign_to)) {
-            // Tickets assigned to a staff
-            return $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.assign_to', $assign_to)
-                ->orderBy('thz_master.created_at', 'desc')
-                ->findAll();
-        }
-
-        // if (!empty($id) && !empty($mobile)) {
-        if (!empty($mobile)) {
-            // Specific ticket by ID and mobile
-            return $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                // ->where('thz_id', $id)
-                ->where('thz_master.mobile', $mobile)
-                ->orderBy('thz_master.created_at', 'desc')
-                ->findAll();
-        }
-
-        // All tickets (e.g., for managers)
-        return $this->thzMasterModel
-            ->select('thz_master.*, user_profiles.first_name as assignee_name')
-            ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-            ->orderBy('thz_master.created_at', 'desc')
-            ->findAll();
-    }
-
-
-
-    private function ticketSaveNotification($data, $insertOrUpdate, $id)
-    {
-
-        $user_email  = $data['email'] ?? null;
-
-        $assignee_id = $data['assign_to'] ?? null;
-
-        $assignee_email = $this->findAssigneeEmail($assignee_id);
-
-        $client_id     = $data['client_id'] ?? null;
-
-        $emailToNotified = [
-            'user_email' => $user_email,
-            'assignee_email' => $assignee_email
-        ];
-
-        $ticketId = $id;
-
-        $result = $this->ticketSaveEmailNotificationBasedOnRole($emailToNotified, $insertOrUpdate, $ticketId, $data, $client_id);
-
-        return $result;
-    }
-
-    private function ticketConversationSaveNotification($data)
-    {
-
-        $thz_id = $data['thz_id']; // thz is alias of ticket
-
-        $data['subject'] = $this->findSubject($data['thz_id']);
-
-        $assignee_id    = $this->findAssigneeId($data['thz_id']);
-
-        $user_email     =  $this->findUserEmail($data['thz_id']);
-
-        $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
-
-        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email;
-        $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email;
-
-        $templateName   = "ticket_conversation_save_notification";
-
-        $to_email       = $receiver_mail;
-
-        $ticketId       = $thz_id;
-
-        //        $message        = $data['notes'] ?? '';
-
-        $this->sendEmail($templateName, $data, $to_email, $ticketId);
-
-        return true;
-    }
-
-
-    private function findAssigneeEmail($assignee_id)
-    {
-
-        $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
-        $assigneeEmail = $row ? $row->email : null;
-        return $assigneeEmail ? $assigneeEmail : "";
-    }
-
-    private function findAssigneeId($ticketId)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
-        $assigneeId = $row ? $row->assign_to : null;
-        return $assigneeId ? $assigneeId : 0;
-    }
-
-    private function findUserEmail($ticket_id)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticket_id)->get()->getRow();
-        $email = $row ? $row->email : null;
-        return $email ? $email : " ";
-    }
-
-    private function findSubject($ticketId)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
-        $subject = $row ? $row->subject : null;
-        return $subject ? $subject : " ";
-    }
-
-    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified,  $insertOrUpdate, $ticketId, $data, $client_id)
-    {
-
-        $user_email     = $emailToNotified['user_email'] ?? null;
-        $assignee_email = $emailToNotified['assignee_email'] ?? null;
-
-
-        if (!empty($assignee_email)) {
-
-            switch ($insertOrUpdate) {
-
-                case 'update':
-
-                    $this->sendEmail('ticket_save_update_assignee', $data, $assignee_email, $ticketId);
-
-                    break;
-
-                case 'create':
-
-                    $this->sendEmail('ticket_save_create_assignee', $data, $assignee_email, $ticketId);
-
-                    break;
-
-                default:
-                    # code...
-                    break;
-            }
-        }
-
-        if (!empty($user_email)) {
-
-            switch ($insertOrUpdate) {
-
-                case 'update':
-
-                    $data['assigneeAndStatus'] = empty($assignee_email)
-                        ? "Not Yet Assigned"
-                        : "Assigned With {$assignee_email}";
-
-                    $this->sendEmail('ticket_save_update_user', $data, $user_email, $ticketId);
-
-
-                    break;
-
-                case 'create':
-
-                    $account_manager_email = $this->cientRmModel->findAccountManagerEmail($client_id);
-
-                    $cc = getenv('G_ticketing_system_cc');
-
-                    $this->myLogger->logme('error',  "env for cc G_ticketing_system_cc " . $cc);
-
-                    $template = empty($assignee_email)
-                        ? 'ticket_save_create_user_unassigned'
-                        : 'ticket_save_create_user_assigned';
-
-                    if (!empty($assignee_email)) {
-                        $data['assignee_email'] = $assignee_email;
-                    }
-
-                    $this->sendEmail($template, $data, $user_email, $ticketId);
-
-                    // send to account manager and if it is more than one email also no problem we send to all account managers
-                    if (!empty($account_manager_email)) {
-                        $this->myLogger->logme('error',  "mail sent for account manager " . json_encode($account_manager_email));
-                        $this->sendEmail($template, $data, $account_manager_email, $ticketId, $cc);
-                    } else {
-                        $this->myLogger->logme('error',  "mail not  sent for account manager ");
-                    }
-
-                    break;
-
-                default:
-                    # code...
-                    break;
-            }
-        }
-
-        return true;
-    }
-
-    private function updateTicket($data)
-    {
-
-        $data['updated_by'] = get_session_userid();
-        $ticket_id = $data['thz_id'];
-        $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
-
-        return $result;
-    }
-
-    private function insertTicket($data)
-    {
-        $data['created_by'] = get_session_userid();
-        $this->thzMasterModel->insert($data);
-
-        return $this->thzMasterModel->insertID(); // returns the inserted row's ID
-    }
-
-
-    private function sendEmail($templateName, $data, $to_email, $ticketId, $cc = "", $bcc = "")
-    {
-
-        $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
-
-        if (empty($mailTemplate)) {
-            $this->myLogger->logme('error', 'No Mail Template Found To send email in ticketing system');
-            return;
-        }
-
-        if (empty($cc)) {
-            $this->myLogger->logme('error', 'empty cc attached for  template name : ' . json_encode($templateName));
-        } else {
-            $this->myLogger->logme('error',  "cc attached for  template name : " . json_encode($templateName));
-        }
-
-        $mailTemplate['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['subject']);
-
-        $mailTemplate['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%', $data['assigneeAndStatus'] ?? '', $mailTemplate['mail_content']);
-
-        $from_mail      =  "";
-        $to_mail        =  $to_email;
-        $cc_string      =  $cc;
-        $subject        =  $mailTemplate['subject'];
-        $message        =  $mailTemplate['mail_content'];
-        $attachments    =  "";
-        $reply_to       =  "";
-        $bcc_string     =  $bcc;
-
-        $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail, 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
-
-        $this->myLogger->logme('error', 'Mail Response : ' . json_encode($res));
-    }
-
-
-    public function getPolicyTerms($client_policy_id)
-    {
-        $policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $client_policy_id)->first();
-
-        $policy_terms = [];
-        if (isset($policy_data['policy_terms']) && !empty($policy_data['policy_terms'])) {
-
-            $raw_terms = json_decode($policy_data['policy_terms'] ?? [], true) ?? [];
-
-            $ticketController = new TicketController();
-            $policy_terms = $ticketController->convertTermsToDisplay($raw_terms);
-        }
-
-        $data['policy_terms'] = $policy_terms;
-        return view('view_policy_terms', $data);
-    }
-
-
-    private function handleTicketHistory(array $old, array $data): string
-    {
-        if ($old['status'] != $data['status']) {
-            $history = [
-                'thz_id'       => $data['thz_id'],
-                'field_name'   => 'status',
-                'display_name' => 'Status',
-                'old_value'    => $old['status'],
-                'new_value'    => $data['status'],
-                'is_active'    => 1
-            ];
-
-            if (!empty(get_session_userid())) {
-                $history['created_by'] = get_session_userid();
-            }
-
-            $hist_id = $this->thzHistoryModel->insert($history);
-
-            return $old['status'] . " - " . $data['status'] . " - " . $hist_id;
-        }
-
-        return $old['status'] . " - " . $data['status'];
-    }
-
-
-
-
-
-}
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use App\Helpers\MailHelper;
+use CodeIgniter\HTTP\ResponseInterface;
+
+use App\Models\ThzMasterModel;
+use App\Models\ThzMasterNotesModel;
+use App\Models\ThzTypeModel;
+use App\Models\ThzHistoryModel;
+use App\ControllerCleaners\ThzControllerCleaner;
+use App\Models\UserModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientModel;
+use App\Models\TicketMailTemplateModel;
+use App\Models\ClientRMModel;
+
+
+class ThzController extends BaseController
+{
+
+    protected $thzMasterModel;
+    protected $thzMasterNotesModel;
+    protected $thzTypeModel;
+    protected $thzHistoryModel;
+    protected $thzControllerCleaner;
+
+    protected $userModel;
+    protected $clientPolicyModel;
+    protected $clientModel;
+
+    protected $ticketMailTemplateModel;
+
+    protected $cientRmModel;
+    protected $myLogger;
+
+    public function __construct()
+    {
+        set_session_context('THZ-CONTROLLER');
+        $this->thzMasterModel           = new ThzMasterModel();
+        $this->thzMasterNotesModel      = new ThzMasterNotesModel();
+        $this->thzTypeModel             = new thzTypeModel();
+        $this->thzHistoryModel          = new ThzHistoryModel();
+        $this->thzControllerCleaner     = new ThzControllerCleaner();
+        $this->userModel                = new UserModel();
+        $this->clientPolicyModel        = new ClientPolicyModel();
+        $this->clientModel              = new ClientModel();
+        $this->cientRmModel             = new ClientRMModel();
+        $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
+        $this->myLogger                 = \Config\Services::mylogger();
+    }
+
+    public function index()
+    {
+        //
+    }
+
+    public function ticketSave()
+    {
+        try {
+            $data = $this->request->getPost();
+            $references   = "";
+            if (!empty($data['thz_id'])) {
+
+                $text   = "update";
+                // here insert history Status. 
+                $old = $this->thzMasterModel->where('thz_id', $data['thz_id'])->get()->getRowArray();
+                $result = $this->updateTicket($data);
+
+                $references = ($old && isset($data['status'])) ? $this->handleTicketHistory($old, $data) : "No Details" ;
+
+                $updateID = $data['thz_id'];
+            } else {
+
+                $text   = "create";
+                $insertID = $this->insertTicket($data);
+                $result = true;
+                $references   = "";
+            }
+
+            $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID;
+
+            $emailNotificationResult = $this->ticketSaveNotification($data, $insertOrUpdate = $text, $id);
+
+            $this->myLogger->logme('error', 'emailNotificationResult: ' . json_encode($emailNotificationResult));
+
+            return $this->response->setJSON([
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket {$text}d successfully " : "Unable to {$text} ticket. Please try again.",
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!',
+                'ref' => $references
+            ])->setStatusCode($result ? 200 : 400);
+
+
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketList()
+    {
+
+        $data['tab_name'] = "Tickets";
+        $data['page_name'] = "Tickets";
+        try {
+            $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
+
+
+            $data = $this->request->getGet();
+
+            if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
+                $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
+            }
+
+
+            $tickets = $this->fetchTicketsBasedOnrole($data);
+
+
+            if ($returnType === 'api') {
+                if (empty($tickets)) {
+                    $this->myLogger->logme('error', 'empty tickets in ticket list: ' . json_encode($tickets));
+                    return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found'])->setStatusCode(404);
+                }
+            } else {
+                $data['ticket_data'] = $tickets;
+                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
+                // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu  , 2-"manager l2 " - ivangalum  assign pannalam
+                // 3,4 remain person varannum. 
+                $data['client_list'] = $this->clientModel->getCreatedByUserName();
+                $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
+
+                return $this->loadLayout('thz_list', $data);
+            }
+
+
+            return $this->response->setJSON([
+                'status' => 'success',
+                'data'   => $tickets,
+            ])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketConversationSave()
+    {
+
+        try {
+            $data = $this->request->getPost();
+
+            $data['notes_type'] = $data['notes_type'] ?? 'External';
+
+            $result = $this->thzMasterNotesModel->insert($data);
+
+            if (empty($result)) {
+                $this->myLogger->logme('error', 'Ticket conversation insert failed..!!: ' . json_encode($result));
+                throw new \RuntimeException('No tickets found', 404);
+            }
+
+            $emailNotificationResult = ($data['notes_type'] === "External") 
+                ? $this->ticketConversationSaveNotification($data) 
+                : false;
+
+            return $this->response->setJSON([
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again.",
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed Or No Need..!!'
+            ])->setStatusCode($result ? 200 : 400);
+
+
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketAutoFetchDetails()
+    {
+        try {
+            $data = $this->request->getPost();
+
+            $client_id = $data['client_id'] ?? null;
+            $mobile    = $data['mobile'] ?? null;
+
+            if ($client_id && $mobile) {
+                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id, $mobile);
+
+                if (empty($details)) {
+                    $this->myLogger->logme('error', 'empty AutoFetchDetails for client_id : ' . json_encode($client_id));
+                    throw new \RuntimeException('No Data found', 400);
+                }
+
+                $policyIds    = array_filter(array_column($details, 'policy_id'));
+                $clientPolicy = !empty($policyIds)
+                    ? $this->clientPolicyModel->whereIn('id', $policyIds)->where('is_active', 1)->get()->getResultArray()
+                    : [];
+
+                $result['client_details'] = $details;
+                $result['policy_details'] = $clientPolicy ?? [];
+            } else {
+                throw new \RuntimeException('Client and Mobile Not found', 400);
+            }
+
+            return $this->response->setJSON(['status' => 'success', 'data' => $result])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketConversationList()
+    {
+        $data       = $this->request->getGet();
+
+        $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
+
+        $thz_id     = $data['thz_id'] ?? null;
+
+        $ticketType = $data['notes_type'] ?? 'External';
+
+        if ($thz_id) {
+            $result['master'] = $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.thz_id', $thz_id)
+                ->findAll();
+
+            if (!empty($result['master'])) {
+                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
+                $result['notes'] = !empty($notes) ? $notes : [];
+            } else {
+                $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));
+                throw new \RuntimeException('No tickets found', 400);
+            }
+        } else {
+            // return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
+            throw new \RuntimeException('No tickets found', 404);
+        }
+
+        if ($returnType === 'api') {
+            try {
+                return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
+            } catch (\Throwable $e) {
+                return handle_exception($e, $this->myLogger, $this->response);
+            }
+        } else {
+
+            $assign_to = $result['master'][0]['assign_to'];
+            $mobile    = $result['master'][0]['mobile'];
+
+            $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null')
+                ? $result['master'][0]['policy_id']
+                : '';
+
+            $result['related_tickets'] = $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.assign_to', $assign_to)
+                ->where('thz_master.mobile', $mobile)
+                ->where('thz_master.thz_id !=', $thz_id)
+                ->where('thz_master.status !=', 'Closed')
+                ->where('thz_master.status !=', 'Resolved')
+                ->findAll();
+
+            $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
+            // 2,3,4 remain person varannum. 
+            $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
+
+            $result['ticket_type']  = $this->thzTypeModel->where('is_active', 1)->findAll();
+
+            return $this->loadLayout('thz_notes', $result);
+        }
+    }
+
+    public function ticketType()
+    {
+        $method = $this->request->getMethod(); // get, post
+        try {
+            if ($method === 'get') {
+                $types = $this->thzTypeModel->select('id,name,is_active')->where('is_active', 1)->findAll();
+                if (empty($types)) {
+                    $this->myLogger->logme('error', 'No ticket types found ');
+                    return $this->response->setJSON(['status'  => 'error', 'message' => 'No ticket types found'])->setStatusCode(404);
+                }
+                return $this->response->setJSON(['status' => 'success', 'data'   => $types])->setStatusCode(200);
+            }
+
+            if ($method === 'post') {
+
+                $data = $this->request->getPost();
+                if (!empty($data['id'])) {
+                    $text   = "update";
+                    $result = $this->thzTypeModel->update($data['id'], $data);
+                    $updateID = $data['id'];
+                } else {
+                    $text   = "create";
+                    $insertID  = $this->thzTypeModel->insert($data);
+                    $result = true;
+                }
+
+                $id = isset($insertID) && !empty($insertID) ? $insertID : ($updateID ?? null);
+
+                return $this->response->setJSON([
+                    'status'  => $id ? 'success' : 'error',
+                    'message' => $id ? "Ticket Type {$text}d successfully" : "Unable to {$text} ticket type. Please try again.",
+                    'id'      => $id
+                ])->setStatusCode($id ? 200 : 400);
+            }
+            return $this->response->setJSON(['status'  => 'error', 'message' => 'Invalid request method'])->setStatusCode(405);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketHistoryList()
+    {
+        try {
+            $data = $this->request->getGet();
+            $thz_id = $data['thz_id'];
+            // $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray();
+            $details = $this->thzHistoryModel->select('thz_history.*, user_profiles.first_name  as created_name')
+                ->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left')
+                ->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)
+                ->orderBy('thz_history.created_at', 'desc')
+                ->get()->getResultArray();
+
+
+
+            if (empty($details)) {
+                $this->myLogger->logme('error', 'No history details found for ticket id  ' . json_encode($thz_id));
+                throw new \RuntimeException('No History found', 404);
+            }
+
+
+            return $this->response->setJSON(['status' => 'success', 'data'   => $details])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+
+    /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
+
+
+    private function fetchTicketsBasedOnrole(array $data): array
+    {
+        // $id        = $data['thz_id']    ?? null;
+        $assign_to = $data['assign_to'] ?? null;
+        $mobile    = $data['mobile']    ?? null;
+
+        if (!empty($assign_to)) {
+            // Tickets assigned to a staff
+            return $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.assign_to', $assign_to)
+                ->orderBy('thz_master.created_at', 'desc')
+                ->findAll();
+        }
+
+        // if (!empty($id) && !empty($mobile)) {
+        if (!empty($mobile)) {
+            // Specific ticket by ID and mobile
+            return $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                // ->where('thz_id', $id)
+                ->where('thz_master.mobile', $mobile)
+                ->orderBy('thz_master.created_at', 'desc')
+                ->findAll();
+        }
+
+        // All tickets (e.g., for managers)
+        return $this->thzMasterModel
+            ->select('thz_master.*, user_profiles.first_name as assignee_name')
+            ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+            ->orderBy('thz_master.created_at', 'desc')
+            ->findAll();
+    }
+
+
+
+    private function ticketSaveNotification($data, $insertOrUpdate, $id)
+    {
+
+        $user_email  = $data['email'] ?? null;
+
+        $assignee_id = $data['assign_to'] ?? null;
+
+        $assignee_email = $this->findAssigneeEmail($assignee_id);
+
+        $client_id     = $data['client_id'] ?? null;
+
+        $emailToNotified = [
+            'user_email' => $user_email,
+            'assignee_email' => $assignee_email
+        ];
+
+        $ticketId = $id;
+
+        $result = $this->ticketSaveEmailNotificationBasedOnRole($emailToNotified, $insertOrUpdate, $ticketId, $data, $client_id);
+
+        return $result;
+    }
+
+    private function ticketConversationSaveNotification($data)
+    {
+
+        $thz_id = $data['thz_id']; // thz is alias of ticket
+
+        $data['subject'] = $this->findSubject($data['thz_id']);
+
+        $assignee_id    = $this->findAssigneeId($data['thz_id']);
+
+        $user_email     =  $this->findUserEmail($data['thz_id']);
+
+        $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
+
+        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email;
+        $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email;
+
+        $templateName   = "ticket_conversation_save_notification";
+
+        $to_email       = $receiver_mail;
+
+        $ticketId       = $thz_id;
+
+        //        $message        = $data['notes'] ?? '';
+
+        $this->sendEmail($templateName, $data, $to_email, $ticketId);
+
+        return true;
+    }
+
+
+    private function findAssigneeEmail($assignee_id)
+    {
+
+        $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
+        $assigneeEmail = $row ? $row->email : null;
+        return $assigneeEmail ? $assigneeEmail : "";
+    }
+
+    private function findAssigneeId($ticketId)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
+        $assigneeId = $row ? $row->assign_to : null;
+        return $assigneeId ? $assigneeId : 0;
+    }
+
+    private function findUserEmail($ticket_id)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticket_id)->get()->getRow();
+        $email = $row ? $row->email : null;
+        return $email ? $email : " ";
+    }
+
+    private function findSubject($ticketId)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
+        $subject = $row ? $row->subject : null;
+        return $subject ? $subject : " ";
+    }
+
+    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified,  $insertOrUpdate, $ticketId, $data, $client_id)
+    {
+
+        $user_email     = $emailToNotified['user_email'] ?? null;
+        $assignee_email = $emailToNotified['assignee_email'] ?? null;
+
+
+        if (!empty($assignee_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $this->sendEmail('ticket_save_update_assignee', $data, $assignee_email, $ticketId);
+
+                    break;
+
+                case 'create':
+
+                    $this->sendEmail('ticket_save_create_assignee', $data, $assignee_email, $ticketId);
+
+                    break;
+
+                default:
+                    # code...
+                    break;
+            }
+        }
+
+        if (!empty($user_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $data['assigneeAndStatus'] = empty($assignee_email)
+                        ? "Not Yet Assigned"
+                        : "Assigned With {$assignee_email}";
+
+                    $this->sendEmail('ticket_save_update_user', $data, $user_email, $ticketId);
+
+
+                    break;
+
+                case 'create':
+
+                    $account_manager_email = $this->cientRmModel->findAccountManagerEmail($client_id);
+
+                    $cc = getenv('G_ticketing_system_cc');
+
+                    $this->myLogger->logme('error',  "env for cc G_ticketing_system_cc " . $cc);
+
+                    $template = empty($assignee_email)
+                        ? 'ticket_save_create_user_unassigned'
+                        : 'ticket_save_create_user_assigned';
+
+                    if (!empty($assignee_email)) {
+                        $data['assignee_email'] = $assignee_email;
+                    }
+
+                    $this->sendEmail($template, $data, $user_email, $ticketId);
+
+                    // send to account manager and if it is more than one email also no problem we send to all account managers
+                    if (!empty($account_manager_email)) {
+                        $this->myLogger->logme('error',  "mail sent for account manager " . json_encode($account_manager_email));
+                        $this->sendEmail($template, $data, $account_manager_email, $ticketId, $cc);
+                    } else {
+                        $this->myLogger->logme('error',  "mail not  sent for account manager ");
+                    }
+
+                    break;
+
+                default:
+                    # code...
+                    break;
+            }
+        }
+
+        return true;
+    }
+
+    private function updateTicket($data)
+    {
+
+        $data['updated_by'] = get_session_userid();
+        $ticket_id = $data['thz_id'];
+        $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
+
+        return $result;
+    }
+
+    private function insertTicket($data)
+    {
+        $data['created_by'] = get_session_userid();
+        $this->thzMasterModel->insert($data);
+
+        return $this->thzMasterModel->insertID(); // returns the inserted row's ID
+    }
+
+
+    private function sendEmail($templateName, $data, $to_email, $ticketId, $cc = "", $bcc = "")
+    {
+
+        $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
+
+        if (empty($mailTemplate)) {
+            $this->myLogger->logme('error', 'No Mail Template Found To send email in ticketing system');
+            return;
+        }
+
+        if (empty($cc)) {
+            $this->myLogger->logme('error', 'empty cc attached for  template name : ' . json_encode($templateName));
+        } else {
+            $this->myLogger->logme('error',  "cc attached for  template name : " . json_encode($templateName));
+        }
+
+        $mailTemplate['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['subject']);
+
+        $mailTemplate['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%', $data['assigneeAndStatus'] ?? '', $mailTemplate['mail_content']);
+
+        $from_mail      =  "";
+        $to_mail        =  $to_email;
+        $cc_string      =  $cc;
+        $subject        =  $mailTemplate['subject'];
+        $message        =  $mailTemplate['mail_content'];
+        $attachments    =  "";
+        $reply_to       =  "";
+        $bcc_string     =  $bcc;
+
+        $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail, 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+        $this->myLogger->logme('error', 'Mail Response : ' . json_encode($res));
+    }
+
+
+    public function getPolicyTerms($client_policy_id)
+    {
+        $policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $client_policy_id)->first();
+
+        $policy_terms = [];
+        if (isset($policy_data['policy_terms']) && !empty($policy_data['policy_terms'])) {
+
+            $raw_terms = json_decode($policy_data['policy_terms'] ?? [], true) ?? [];
+
+            $ticketController = new TicketController();
+            $policy_terms = $ticketController->convertTermsToDisplay($raw_terms);
+        }
+
+        $data['policy_terms'] = $policy_terms;
+        return view('view_policy_terms', $data);
+    }
+
+
+    private function handleTicketHistory(array $old, array $data): string
+    {
+        if ($old['status'] != $data['status']) {
+            $history = [
+                'thz_id'       => $data['thz_id'],
+                'field_name'   => 'status',
+                'display_name' => 'Status',
+                'old_value'    => $old['status'],
+                'new_value'    => $data['status'],
+                'is_active'    => 1
+            ];
+
+            if (!empty(get_session_userid())) {
+                $history['created_by'] = get_session_userid();
+            }
+
+            $hist_id = $this->thzHistoryModel->insert($history);
+
+            return $old['status'] . " - " . $data['status'] . " - " . $hist_id;
+        }
+
+        return $old['status'] . " - " . $data['status'];
+    }
+
+
+
+
+
+}
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 5d930c71..eb7e894b 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -362,6 +362,7 @@ class TicketController extends BaseController
         $data['modeOFIntimate'] = $this->modeOFIntimate;
         $data['priorityType'] = $this->priorityType;
         $data['claimType'] = $this->claimType;
+        $data['tab_name'] = "Claims";
         if ($this->request->is('get')) {
             $data['page_name'] = "Claims";
             $data['claim_status'] = $this->claimStatus->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
@@ -1123,6 +1124,9 @@ class TicketController extends BaseController
         // dd($data['ticket_data']);
         $data['ticket_type']  = $this->ticketType;
         $data['trigger_type'] = $this->triggerType;
+
+        $data['page_name'] = "Claims";
+
         return $this->loadLayout('ticket_mail_template', $data);
     }
 
@@ -1744,6 +1748,8 @@ class TicketController extends BaseController
                 'tat_band_wise'          => 'TAT Wise Status Report'
             ];
             //
+            $data['tab_name'] = "Claim Reports";
+            $data['page_name'] = "Claims";
             $this->loadLayout('ticket_reports', $data);
         } else {
             $received_data = $this->request->getPost();
@@ -2187,6 +2193,8 @@ class TicketController extends BaseController
 
 
             $data['viewer'] = !empty($empView) ? $empView : 0; 
+
+           
             // dd($data);
             return view('ticket_feedback_form', $data);    
         }else{
@@ -2217,7 +2225,7 @@ class TicketController extends BaseController
     public function feedbackList(){
 
         $data['feedback_data'] = $this->ticketMasterModel->select("ticket_master.*,clients.client_name")->join("clients","clients.id = ticket_master.client_id")->where("ticket_master.is_active",1)->where("ticket_master.feedback_json IS NOT NULL", null, false)->where("ticket_master.feedback_json !=", "")->findAll();
-
+        $data['page_name'] = "Claims";
         // dd($data);
         $this->loadLayout("ticket_feedback_list",$data);
     }
@@ -2610,7 +2618,8 @@ class TicketController extends BaseController
 
     public function claimDumpUpload()
     {   
-        $data['page_name'] = "Claim Dupm Upload";
+        $data['tab_name'] = "Claim Dupm Upload";
+        $data['page_name'] = "Claims";
 
         if($this->request->is('get')){
 
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 255b6507..b4d391dc 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -55,7 +55,8 @@ class UserController extends AdminController
 
     public function list()
     {   
-        $data['page_name'] = 'User';
+        $data['tab_name'] = 'Users';
+        $data['page_name'] = 'Users';
         $this->myLogger->logme('error','User list function called');
         $data['UserList'] = $this->userModel->getUserList();
         // echo '<pre>';
@@ -588,6 +589,7 @@ class UserController extends AdminController
                 $data = $this->request->getPost();
                 if (!empty($data['id'])) {
                     $text   = "update";            
+                    $data['updated_by'] =  get_session_userid();
                     $result = $this->partnerStaffModel->update($data['id'], $data);
                     $updateID = $data['id'];
                 } else {
@@ -595,6 +597,11 @@ class UserController extends AdminController
                     $data['role_id'] = 1;
                     $data['created_by'] =  get_session_userid();
                     $insertID  = $this->partnerStaffModel->insert($data);
+                    if($insertID){
+                        $details['manager_id'] = $insertID;
+                        $details['updated_by'] =  get_session_userid();
+                        $this->partnerStaffModel->update($insertID, $details);
+                    }
                     $result = true;
                 }
 
@@ -620,17 +627,24 @@ class UserController extends AdminController
                     if (!$staff) {
                         return $this->response->setJSON(['status'  => 'error','message' => 'Staff not found'])->setStatusCode(404);
                     }
+                    $role = $staff['role_id'];
+                    $text = $role == 1 ? "Manager" : "Staff";
 
                     if ($staff['is_active'] == 1) {
+                      if($role == 1){  // manager 
+                        $result = $this->partnerStaffModel->updateByKey($id);
+                        $message = $result;
+                      }else{ // staff
                         $result = $this->partnerStaffModel->update($id, ['is_active' => 0]);
-                        $message = "Staff deleted successfully";
+                        $message = $text." deleted successfully";
+                      }
                     } else {
-                        return $this->response->setJSON(['status'  => 'error','message' => 'Staff already deleted'])->setStatusCode(400);
+                        return $this->response->setJSON(['status'  => 'error','message' => $text.' already deleted'])->setStatusCode(400);
                     }
 
                     return $this->response->setJSON([
                         'status'  => $result ? 'success' : 'error',
-                        'message' => $result ? $message : "Unable to delete staff. Please try again.",
+                        'message' => $result ? $message : "Unable to delete ".$text.". Please try again.",
                         'id'      => $id
                     ])->setStatusCode($result ? 200 : 400);
             }
diff --git a/app/Helpers/ChatbotHelper.php b/app/Helpers/ChatbotHelper.php
index db0e2e3e..72632251 100644
--- a/app/Helpers/ChatbotHelper.php
+++ b/app/Helpers/ChatbotHelper.php
@@ -32,7 +32,7 @@ class ChatbotHelper
         $client_branch_id =  $chat_session_info['client_branch_id'];
         $relationship ='Self';
         $EmployeeModel = new EmployeeModel();
-        return $EmployeeModel->getEmpFamilybyEmpCode(emp_code: $emp_code,client_id: $client_id,emp_status: ['active'],policy_status:['active'],client_branch_id:[ $client_branch_id ],relationship:[$relationship]);//,relationship:[$relationship];
+        return $EmployeeModel->getEmpFamilybyEmpCode(emp_code: $emp_code,client_id: $client_id,emp_status: ['active'],policy_status:['active'],client_branch_id:[ $client_branch_id ],relationship:[$relationship],policy_type_id:[2,3,4,5]);//,relationship:[$relationship];
     }
 
     public static function getHospitalLink($emp_policy_id){
diff --git a/app/Helpers/excel_import_export_helper.php b/app/Helpers/excel_import_export_helper.php
index 9c72c973..c7ba2982 100755
--- a/app/Helpers/excel_import_export_helper.php
+++ b/app/Helpers/excel_import_export_helper.php
@@ -666,12 +666,12 @@ if(!function_exists('generate_insurer_based_excel')){
             foreach ($excel_header_array as $header) {
 
                 $fieldName = $header['db_column_name'];
-                $defaultValue = isset($header['default_value']) ? $header['default_value'] : null;
+                $defaultValue = isset($header['default_value']) ? $header['default_value'] : "";
 
                 if ($fieldName === 'index') {
                     $value = $serialNumber;
                 } else {
-                    if(empty($fieldName) && !empty($defaultValue)){
+                    if(empty($fieldName) && $defaultValue != ""){
                         $value = $defaultValue;
                     }else{
                         $value = $row->$fieldName ?? '';
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 932e53c8..e608b013 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -1993,7 +1993,6 @@ if (!function_exists('group_slab_rates_basedon_name')) {
     }
 }
 
-
 //this key generating mandantory for display employee info in enrolment app w/o error
 if (!function_exists('generate_family_floater_key')) {
     function generate_family_floater_key($relationship)
@@ -2002,7 +2001,7 @@ if (!function_exists('generate_family_floater_key')) {
             $relation = 'parent';
         } else if (strtolower(trim($relationship)) === 'son' || strtolower(trim($relationship)) === 'daughter') {
             $relation = 'child';
-        } else if ((strtolower(trim($relationship)) === 'father in Law' || strtolower(trim($relationship)) === 'mother in Law') || (strtolower(trim($relationship)) === 'father-in-Law' || strtolower(trim($relationship)) === 'mother-in-Law')) {
+        } else if ((strtolower(trim($relationship)) === 'father in law' || strtolower(trim($relationship)) === 'mother in law') || (strtolower(trim($relationship)) === 'father-in-law' || strtolower(trim($relationship)) === 'mother-in-law')) {
             $relation = 'parent_in_law';
         } else if (strtolower(trim($relationship)) === 'spouse') {
             $relation = 'spouse';
@@ -2041,3 +2040,331 @@ if (!function_exists('formatIndianCurrency')) {
         return $formatted . $decimal;
     }
 }
+
+// ------------- FUNCTION FOR LEAD MEMBER DATA LIST VALIDATIONS --------------------------------------
+
+if (!function_exists('check_columns_name_exist')) {
+    function check_columns_name_exist($definedColumns, $excelColumns)
+    {
+        $mismatchedColumns = [];
+
+        foreach ($definedColumns as $colKey => $definedCol) {
+            $definedColName = strtolower(trim($definedCol['col_name']));
+
+            // Normalize excel columns to lowercase for comparison
+            $excelColsLower = array_map('strtolower', array_map('trim', $excelColumns));
+
+            if (!in_array($definedColName, $excelColsLower)) {
+                $mismatchedColumns[] = "Missing column: <strong>" . $definedCol['col_name'] . "</strong> in Excel file.<br/>";
+            }
+        }
+
+        return $mismatchedColumns;
+    }
+}
+
+if (!function_exists('update_excel_column_indexes')) {
+    function update_excel_column_indexes($definedColumns, $excelColumns)
+    {
+        // $excelColumns is the first row of the Excel file (header row)
+        // Example: ['Emp Code', 'Name', 'Gender', 'DOB', 'SI']
+
+        foreach ($definedColumns as $key => &$definedCol) {
+            $definedColName = strtolower(trim($definedCol['col_name']));
+            $excelColsLower = array_map('strtolower', array_map('trim', $excelColumns));
+
+            // Find column index in Excel
+            $colIndex = array_search($definedColName, $excelColsLower);
+
+            if ($colIndex !== false) {
+                $definedCol['col_idx'] = $colIndex;
+                $definedCol['col_cell_name'] = chr(65 + $colIndex); // A=65, B=66...
+            } else {
+                // If column missing in Excel
+                $definedCol['col_idx'] = null;
+                $definedCol['col_cell_name'] = null;
+            }
+        }
+
+        return $definedColumns;
+    }
+}
+
+if (!function_exists('check_duplicate_rows_and_contacts')) {
+    function check_duplicate_rows_and_contacts($excel_data, $columns_to_check, $err_data)
+    {
+        $exl_col = $columns_to_check;
+        $keys = array_keys($columns_to_check);
+        unset($columns_to_check['sno'], $columns_to_check['si'], $columns_to_check['email'], $columns_to_check['mobile'], $columns_to_check['age']);
+
+        $seenRows   = [];
+        $emailSeen  = [];
+        $mobileSeen = [];
+        $duplicateRows = [];
+
+        foreach ($excel_data as $rowIndex => $row) {
+
+            // Build unique key from selected columns
+            $values = [];
+            foreach ($columns_to_check as $colIdx) {
+                $values[] = isset($row[$colIdx['col_idx']]) ? trim($row[$colIdx['col_idx']]) : '';
+            }
+            $rowKey = json_encode($values);
+
+            // =============== STEP 1: Main duplicate check ===============
+            if (!isset($seenRows[$rowKey])) {
+                $seenRows[$rowKey] = [$rowIndex];
+            } else {
+                // First duplicate occurrence — mark all related rows
+                $seenRows[$rowKey][] = $rowIndex;
+                $indexes = $seenRows[$rowKey];
+
+                $rows_str = implode(', ', array_map(fn($i) => $i + 1, $indexes));
+                $error_message = "Duplicate found in selected columns: Rows {$rows_str} are identical";
+
+                foreach ($indexes as $i) {
+                    // Avoid re-adding duplicate errors
+                    if (!in_array($i, $duplicateRows)) {
+                        array_push($err_data['error_summary'], 1);
+                        $err_data['error_data'][$i][$keys[0]]['col_name'] = 'Sl no';
+                        $err_data['error_data'][$i][$keys[0]]['col_idx']  = 0;
+                        $err_data['error_data'][$i][$keys[0]]['error'][]  = $error_message;
+                        $duplicateRows[] = $i;
+                    }
+                }
+
+                // Skip email/mobile check for this duplicate row
+                continue;
+            }
+
+            // =============== STEP 2: Email & Mobile check (only if not duplicate) ===============
+            $email  = isset($row[$exl_col['email']['col_idx']]) ? trim($row[$exl_col['email']['col_idx']]) : '';
+            $mobile = isset($row[$exl_col['mobile']['col_idx']]) ? trim($row[$exl_col['mobile']['col_idx']]) : '';
+
+            // Check email duplicates
+            if ($email !== '') {
+                if (isset($emailSeen[$email])) {
+                    $firstIndex = $emailSeen[$email] + 1;
+                    $currentRow = $rowIndex + 1;
+                    $error_message = "Duplicate email found: Row {$currentRow} and Row {$firstIndex} have the same email '$email'";
+                    array_push($err_data['error_summary'], 1);
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['email']['col_idx']]]['col_name'] = $exl_col['email']['col_name'];
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['email']['col_idx']]]['col_idx']  = $exl_col['email']['col_idx'];
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['email']['col_idx']]]['error'][]  = $error_message;
+                } else {
+                    $emailSeen[$email] = $rowIndex;
+                }
+            }
+
+            // Check mobile duplicates
+            if ($mobile !== '') {
+                if (isset($mobileSeen[$mobile])) {
+                    $firstIndex = $mobileSeen[$mobile] + 1;
+                    $currentRow = $rowIndex + 1;
+                    $error_message = "Duplicate mobile number found: Row {$currentRow} and Row {$firstIndex} have the same mobile '$mobile'";
+                    array_push($err_data['error_summary'], 1);
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['mobile']['col_idx']]]['col_name'] = $exl_col['mobile']['col_name'];
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['mobile']['col_idx']]]['col_idx']  = $exl_col['mobile']['col_idx'];
+                    $err_data['error_data'][$rowIndex][$keys[$exl_col['mobile']['col_idx']]]['error'][]  = $error_message;
+                } else {
+                    $mobileSeen[$mobile] = $rowIndex;
+                }
+            }
+        }
+
+        return $err_data;
+    }
+}
+
+if (!function_exists('check_relationship_for_member_data')) {
+    function check_relationship_for_member_data($row, $relationship, $columns_to_check)
+    {
+        $relation_col_idx = $columns_to_check['relationship']['col_idx'] ?? null;
+        $gender_col_idx = $columns_to_check['gender']['col_idx'] ?? null;
+
+        if ($relation_col_idx !== null && $gender_col_idx !== null && !empty($row[$relation_col_idx]) && !empty($row[$gender_col_idx])) { //$row[5]  = relationship $row[4] = Gender
+            
+            $slug = \Config\Services::slug();
+            $col = $slug->slugify($row[$relation_col_idx]);
+
+            if ($col != 'self' && $col != 'spouse') {
+                if (!isset($relationship[$col])) {
+                    return array('status' => false, 'error' => 'Rule Conflict: Unknown Relationship');
+                }
+
+                if (isset($relationship[$col]) && $relationship[$col]['gender'] != $row[$gender_col_idx]) {
+                    $error = "Gender relationship conflict: Expected " . $relationship[$col]['gender'] . ", received $row[$gender_col_idx]";
+                    return array('status' => false, 'error' => $error);
+                }
+            }
+
+            return array('status' => true);
+        } else {
+            return array('status' => false, 'error' => 'Rule Conflict: Both Relationship and Gender required for check relationship conflict');
+        }
+    }
+}
+
+if (!function_exists('member_data_group_by_family')) {
+    function member_data_group_by_family($member_data, $columns_to_check)
+    {
+        $result = [];
+        // Kint::dump($member_data);
+        foreach ($member_data as $rowIndex => $row) {
+            if (!check_row_is_empty_or_null($row)) {
+
+                $row['row_index'] = $rowIndex;
+
+                $relation_idx = $columns_to_check['relationship']['col_idx'];
+                $emp_code_idx = $columns_to_check['emp_code']['col_idx'];
+
+                if (isset($row[$relation_idx]) && strtolower($row[$relation_idx]) == 'self' && isset($result[$row[$emp_code_idx]])) {
+                    array_unshift($result[$row[$emp_code_idx]], $row);
+                } else {
+                    $result[$row[$emp_code_idx]][] = $row;
+                }
+            }
+        }
+        return $result;
+    }
+}
+
+if (!function_exists('validateFamily')) {
+    function validateFamily($familyData, $columns_to_check, $errors) {
+        
+        $keys = array_keys($columns_to_check);
+        foreach ($familyData as $familyId => $members) {
+
+            $selfMember = null;
+            $spouseMember = null;
+            $selfCount = 0;
+            $row_index = null;
+            
+            // Find Self and Spouse members
+            foreach ($members as $member) {
+                $relation = trim($member[3]); // Relationship field
+                
+                if (strtolower($relation) == 'self') {
+                    $selfCount++;
+                    $selfMember = $member;
+                }
+                
+                if (strtolower($relation) == 'spouse') {
+                    $spouseMember = $member;
+                }
+
+                if($row_index == null){
+                    if(strtolower($relation) == 'self'){
+                        $row_index = $member['row_index'];
+                    }else if(strtolower($relation) == 'spouse'){
+                        $row_index = $member['row_index'];
+                    }else{
+                        $row_index = $member['row_index'];
+                    }
+                }
+
+            }
+            
+            // Validation 1: Check if Self exists
+            if ($selfCount === 0) {
+
+                $message = "Emp ID - {$familyId}: Missing 'Self' member";
+                array_push($errors['error_summary'], 4); 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_name'] = $columns_to_check['emp_code']['col_name']; 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_idx'] = $columns_to_check['emp_code']['col_idx']; 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['error'][] = $message; 
+
+                continue;
+            }
+            
+            // Validation 2: Check if there's exactly one Self
+            if ($selfCount > 1) {
+                $message = "Emp ID - {$familyId}: Multiple 'Self' members found. Only one 'Self' is allowed per family";
+                array_push($errors['error_summary'], 5); 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_name'] = $columns_to_check['emp_code']['col_name']; 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_idx'] = $columns_to_check['emp_code']['col_idx']; 
+                $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['error'][] = $message; 
+
+                continue;
+            }
+            
+            // Validation 3: Validate spouse gender if spouse exists
+            if ($spouseMember !== null) {
+
+                $selfGender = strtoupper(trim($selfMember[4])); // Gender field
+                $spouseGender = strtoupper(trim($spouseMember[4]));
+                $selfName = $selfMember[2]; // Name field
+                $spouseName = $spouseMember[2];
+                
+                // Check gender compatibility
+                $message = '';
+                if ($selfGender === 'M' && $spouseGender !== 'F') {
+                    $message = "Emp ID - {$familyId}: Self ('{$selfName}') is Male (M); spouse must be Female (F). Found spouse ('{$spouseName}') with gender '({$spouseGender})'.";
+                } elseif ($selfGender === 'F' && $spouseGender !== 'M') {
+                    $message = "Emp ID - {$familyId}: Self ('{$selfName}') is Female (F); spouse must be Male (M). Found spouse ('{$spouseName}') with gender '({$spouseGender})'.";
+                } elseif (!in_array($selfGender, ['M', 'F'])) {
+                    $message = "Emp ID - {$familyId}: Invalid gender for Self member ('{$selfName}'). Expected 'M' or 'F', found '({$selfGender})'.";
+                }
+
+                if(isset($message) && !empty($message)){
+                    array_push($errors['error_summary'], 6); 
+                    $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_name'] = $columns_to_check['emp_code']['col_name']; 
+                    $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['col_idx'] = $columns_to_check['emp_code']['col_idx']; 
+                    $errors['error_data'][$row_index][$keys[$columns_to_check['emp_code']['col_idx']]]['error'][] = $message; 
+                }
+            }
+        }
+        
+        return $errors;
+    }
+}
+
+if (!function_exists('check_age_validation')) {
+    function check_age_validation($row, $family_composition)
+    {
+        if ($row[5] != null) {
+
+            $dateString = convert_string_to_date($row[5]);
+            if ($dateString === false) {
+                return array('status' => false, 'error' => 'Not a valid Date');
+            }
+
+            $relationships = $family_composition['age_ratio'];
+
+            $dob = $dateString;
+            $currentDateTime = new DateTime();
+
+            $passedDateTime = new DateTime($dob);
+            $interval = $currentDateTime->diff($passedDateTime);
+
+            $slug = \Config\Services::slug();
+            $relationship = $slug->slugify($row[3]);
+            if($relationship == 'son' || $relationship == 'daughter'){
+                $relationship = 'child';
+            }
+            if($relationship == 'father' || $relationship == 'mother' || $relationship == 'mother-in-law'|| $relationship == 'father-in-law' ){
+                $relationship = 'elders';
+            }
+
+            $age_min = isset($relationships[$relationship]['min']) ? $relationships[$relationship]['min'] : NULL;
+            $age_max = isset($relationships[$relationship]['max']) ? $relationships[$relationship]['max'] : NULL;
+            
+            // Kint::dump($dob,$currentDateTime,$passedDateTime, $interval->y, $age_min, $age_max, $relationship, $relationships);
+
+            if ($age_min !== null && $age_min > $interval->y) {
+                return array('status' => false, 'error' => "Age conflict : minimum $age_min yrs allowed, received $interval->y");
+            }
+            if ($age_max !== null && $age_max < $interval->y) {
+                return array('status' => false, 'error' => "Age conflict : maximum $age_max yrs allowed, received $interval->y");
+            }
+            return array('status' => true);
+
+        } else {
+            return array('status' => false, 'error' => 'Rule Conflict: Both DOB and Relationship required for age check');
+        }
+    }
+}
+
+// ------------- END OF LEAD MEMBER DATA LIST VALIDATIONS --------------------------------------
+
+
diff --git a/app/Helpers/sms_helper.php b/app/Helpers/sms_helper.php
new file mode 100644
index 00000000..0045a61c
--- /dev/null
+++ b/app/Helpers/sms_helper.php
@@ -0,0 +1,44 @@
+<?php
+
+use CodeIgniter\Database\BaseConnection;
+
+if (!function_exists('sendOtpSms')) {
+
+   
+    function sendOtpSms(string $mobile, string $otp)
+    {
+        $apiKey = env('SMS_API_KEY');
+        $senderId = env('SMS_SENDER_ID');
+        $templateId = env('SMS_TEMPLATE_ID');
+        $serviceName = env('SMS_SERVICE_NAME');
+        $appName = env('SMS_APP_NAME');
+
+        // Replace variables {#var#}
+        $message = "Hi, Your One Time Code for logging into Nhance {$appName} App is {$otp}. Valid for 3 minutes. Please do not share this with anyone. -NHANCE";
+
+        log_message('info' , 'SMS - Message '.$message);
+        
+        // Build the API URL
+        $url = "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?" . http_build_query([
+            'APIKEY'        => $apiKey,
+            'MobileNo'      => $mobile,
+            'SenderID'      => $senderId,
+            'Message'       => $message,
+            'ServiceName'   => $serviceName,
+            'DLTTemplateID' => $templateId,
+        ]);
+
+        // Send request
+        $response = @file_get_contents($url);
+
+        log_message('info' , 'SMS - Response '.$response);
+
+        // If response failed
+        if ($response === FALSE) {
+            return ['status' => 'failed', 'message' => 'Failed to send SMS.'];
+        }
+
+
+        return ['status' => 'success', 'message' => 'OTP sent successfully', 'api_response' => $response];
+    }
+}
diff --git a/app/Models/ClientBranchModel.php b/app/Models/ClientBranchModel.php
index 100f503d..a813221a 100755
--- a/app/Models/ClientBranchModel.php
+++ b/app/Models/ClientBranchModel.php
@@ -25,6 +25,7 @@ class ClientBranchModel extends Model
         "gst",
         "sez",
         "units",
+        "pre_branch_id"
     ];
 
     public function getBranchAndContactByBranchId($branch_id){
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index e1407c2c..b84bfae1 100755
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -108,7 +108,7 @@ class ClientModel extends Model
     }
             
 
-    public function getCreatedByUserName(){
+    public function getCreatedByUserName($client_type = null){
 
         $role_id = get_role_id();
         $user_id = get_session_userid();
@@ -118,6 +118,10 @@ class ClientModel extends Model
         ->join('client_rm', 'client_rm.client_id = clients.id','left')
         ->where('clients.is_active', 1);
 
+        if (!empty($client_type)) {
+            $query->where('clients.client_type', $client_type);
+        }
+
         if (in_array($role_id, [2, 3])) {
             
             // If the user is a Account Manager or Manager, filter by user_id
@@ -222,5 +226,18 @@ class ClientModel extends Model
         return $result;
     }
 
+    public function isDuplicateByClientBranch($value, $field, $clientId, $branchId)
+    {
+        $builder = $this->db->table('level_contacts lc')
+            ->select('lc.id')
+            ->join('client_branch cb', 'lc.ref_id = cb.id', 'left')
+            ->where('lc.'.$field, $value)
+            ->where('lc.contact_type', 'client')
+            ->where('cb.client_id', $clientId)
+            ->where('lc.ref_id', $branchId)
+            ->get();
+
+        return $builder->getNumRows() > 0 ? true : false;
+    }
 }
 
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index 1bc55f06..1416c082 100755
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -106,9 +106,9 @@ class EmployeeModel extends Model
     }
 
 
-    public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [],array $client_branch_id = [])
+    public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [],array $client_branch_id = [],array $policy_type_id = [])
     {
-        $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string','employee_polices.claim_status'])
+        $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.policy_type_id','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string','employee_polices.claim_status'])
                         ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                         ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
                         ->join('policy_type', 'policy_type.id = client_policy.policy_type_id','left')
@@ -135,6 +135,9 @@ class EmployeeModel extends Model
                         })
                         ->when(count($policy_status), function($query) use ($policy_status){
                             return $query->whereIn('employee_polices.status', $policy_status);
+                        })
+                         ->when(count($policy_type_id), function($query) use ($policy_type_id){
+                            return $query->whereIn('client_policy.policy_type_id', $policy_type_id);
                         })
                         ->when($client_id, function($query) use ($client_id){
                             return $query->where('employees.client_id',$client_id);
diff --git a/app/Models/HRAccessControlModel.php b/app/Models/HRAccessControlModel.php
index a9a4e2c7..a754536d 100644
--- a/app/Models/HRAccessControlModel.php
+++ b/app/Models/HRAccessControlModel.php
@@ -13,6 +13,9 @@ class HRAccessControlModel extends Model
         'pre_hr_id',
         'post_hr_id',
         'post_client_id',
+        'pre_client_id',
+        'pre_branch_id',
+        'post_branch_id',
         'allowed_modules',
         'allowed_pre_policies',
         'allowed_active_policies',
diff --git a/app/Models/LeadFilesModel.php b/app/Models/LeadFilesModel.php
index 37db8e16..f3532d1f 100644
--- a/app/Models/LeadFilesModel.php
+++ b/app/Models/LeadFilesModel.php
@@ -17,7 +17,10 @@ class LeadFilesModel extends Model
         'updated_by',
         'created_at',
         'updated_at',
-        'is_active'
+        'is_active',
+        'error_data',
+        'status',
+        'type',
     ];
    
     // Callbacks
diff --git a/app/Models/LeadsModel.php b/app/Models/LeadsModel.php
index 67a354b1..7cc56602 100644
--- a/app/Models/LeadsModel.php
+++ b/app/Models/LeadsModel.php
@@ -105,6 +105,7 @@ class LeadsModel extends Model
         'next_reminder_date',
         'is_insurer_auto_mail',
         'quote_received_insurer',
+        'acm_id',
     ];
 
 
@@ -146,6 +147,7 @@ class LeadsModel extends Model
 
         $data = $this->select('
                         leads.*,
+                        lead_files.status as demography_file_status,
                         kyc_entity_type.name as entity_type,
                         policy_type.policy_type,
                         user_profiles.first_name as salse_person_name,
@@ -168,6 +170,7 @@ class LeadsModel extends Model
             ->join('kyc_entity_type', 'leads.entity_type_id = kyc_entity_type.id', 'left')
             ->join('user_profiles', 'leads.salse_person_id = user_profiles.id', 'left')
             ->join('policy_type', 'leads.policy_type_id = policy_type.id', 'left')
+            ->join('lead_files', 'leads.id = lead_files.lead_id AND lead_files.type = 2 AND lead_files.is_active = 1', 'left')
             ->where('leads.is_active', 1);
 
         if (!empty($where)) {
diff --git a/app/Models/PartnerStaffModel.php b/app/Models/PartnerStaffModel.php
index 474f14d1..340a0ec5 100755
--- a/app/Models/PartnerStaffModel.php
+++ b/app/Models/PartnerStaffModel.php
@@ -47,4 +47,55 @@ class PartnerStaffModel extends Model
     // ];
 
     // protected $skipValidation = false;
+public function updateByKey($key)
+{
+    $db = \Config\Database::connect();
+    $message = "";
+
+    // Start transaction
+    $db->transStart();
+
+    try {
+        // 1. Update manager
+        $db->table('partner_staff')
+           ->where('id', $key)
+           ->set('is_active', 0)
+           ->update();
+        $managerRows = $db->affectedRows();
+        $message = "{$managerRows} manager(s), ";
+
+        // 2. Update agents under manager
+        $db->table('partner_agent')
+           ->where('manager_id', $key)
+           ->set('is_active', 0)
+           ->update();
+        $agentRows = $db->affectedRows();
+        $message .= "{$agentRows} agent(s), ";
+
+        // 3. Update staff under manager
+        $db->table('partner_staff')
+           ->where('manager_id', $key)
+           ->set('is_active', 0)
+           ->update();
+        $staffRows = $db->affectedRows();
+        $message .= "{$staffRows} staff(s)";
+
+        // Complete transaction
+        $db->transComplete();
+
+        // Check transaction status
+        if ($db->transStatus() === false) {
+            return "Transaction failed. No updates were applied.";
+        }
+
+        return $message . " are deleted successfully";
+
+    } catch (\Exception $e) {
+        // Rollback in case of exception
+        $db->transRollback();
+        return "Error: " . $e->getMessage();
+    }
+}
+
+
 }
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index 6acad55b..ba72d495 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -182,21 +182,20 @@
 
 </style>
 
-<p style="color:black;font-size:x-large;margin-left:20px !important;margin-bottom:20px;"><b>Dashboard</b></p>  
 
 <?php if(in_array(get_role_id(), [1,2,3,4,5]) || (in_array(ENROLLMENT_TEAM_ID, user_team()) || in_array(CLAIMS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
-<div class="row" id="client_add" style="margin-top: -32px;">
+<div class="row" id="client_add" >
     <div class="col-12">
         <!-- <div class="card"> -->
             <div class="card-body">
-                <ul class="nav nav-pills navtab-bg">
+                <ul class="nav nav-pills navtab-bg nav-dash" >
                     
                     <?php if(in_array(get_role_id(), [1,2,3,5])) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center"> 
                             <a  href="#pending-actions-dash-tab" data-toggle="tab" aria-expanded="false"
-                                class="nav-link px-3 py-1 dash-anchor" id="pending_actions_tab">
+                                class="nav-link px-3 py-1 dash-anchor nav-dash" id="pending_actions_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_pending_actions.png" alt="Logo" height="14" class="inactive_pending" >
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_pending_actions.png" alt="Logo" height="14" 
                                 class="active_pending" style="display:none;">
@@ -210,7 +209,7 @@
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center">
-                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor" id="bds_tab">
+                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash" id="bds_tab">
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_bds.png" alt="Logo" height="14" class="inactive_bds">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_bds.png" alt="Logo" height="14" 
                                 class="active_bds " style="display:none;">
@@ -226,7 +225,7 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="claims_tab">
+                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash"  id="claims_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_claims.png" alt="Logo" height="14" class="inactive_claims">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_claims.png" alt="Logo" height="14" 
                                  class="active_claims " style="display:none;">
@@ -241,7 +240,7 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center ">
-                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="leads_tab" >
+                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash"  id="leads_tab" >
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_leads_and_bds_renewal.png" alt="Logo" height="14" class="inactive_leads">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_leads_and_bds_renewal.png" alt="Logo" height="14" 
                                 class="active_leads " style="display:none;">
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 001fa6a7..2936af69 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -37,10 +37,10 @@ table.dataTable tbody td {
 </style> -->
 
 <style>
-    body {
+    /* body {
         font-family: Arial, sans-serif;
         padding: 20px;
-    }
+    } */
 
     #mobile::placeholder,
     #mobile_no::placeholder {
@@ -348,12 +348,12 @@ table.dataTable tbody td {
         <div class="col-12">
             <div class="card">
                 <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+                    <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Users</h4>
                         </div>
-                    </div>
-                    <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="1" id="user-table">
+                    </div> -->
+                    <table data-custom-table-css="table" class="table table-sm m-0 table-centered dt-responsive nowrap w-100" cellspacing="a" id="user-table">
                         <thead class="bg-light">
                         <tr>
                             <th class="font-weight-medium">Name</th>
@@ -391,15 +391,15 @@ table.dataTable tbody td {
                     
                     </table>
                     <!-- <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                    <thead class="app-table-head">
+                    <thead class="bg-light">
                         <tr>
                             <th>Ticket ID</th>
-                            <th class="app-text-left">Name</th>
+                            <th class="text-left">Name</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
                             <th>Subject</th>
                             <th>Status</th>
-                            <th class="app-text-left">Assign To</th>
+                            <th class="text-left">Assign To</th>
                             <th>Created At</th>
                             <th>Updated At</th>
                         </tr>
@@ -409,18 +409,18 @@ table.dataTable tbody td {
                             <?php foreach($ticket_data as $index => $row){ ?>
 
                                     <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
-                                    <td class="app-text-right"><?php echo $row['thz_id']; ?></td>
-                                    <td class="app-text-left">
+                                    <td class="text-right"><?php echo $row['thz_id']; ?></td>
+                                    <td class="text-left">
                                         <?php echo $row['name']; ?> 
                                         <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
                                         <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
                                     </td>
-                                    <td class="app-text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                                    <td class="text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
                                               ? $row['policy_no'] 
                                               : 'N/A'; ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
-                                    <td class="app-text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
+                                    <td class="text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
+                                    <td class="text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
                                       <?php 
                                           $subject = $row['subject'] ? $row['subject'] : 'N/A';
                                           echo (strlen($subject) > 50) 
@@ -428,9 +428,9 @@ table.dataTable tbody td {
                                               : htmlspecialchars($subject);
                                       ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
-                                    <td class="app-text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
-                                    <td class="app-text-left">
+                                    <td class="text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
+                                    <td class="text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
+                                    <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j F Y", strtotime($row['created_at']));
                                         $ct =  date("h:i a", strtotime($row['created_at']));
@@ -438,7 +438,7 @@ table.dataTable tbody td {
                                         endif;
                                     ?>
                                     </td>
-                                    <td class="app-text-left">
+                                    <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j F Y", strtotime($row['updated_at']));
                                         $ut =  date("h:i a", strtotime($row['updated_at']));
@@ -873,22 +873,32 @@ table.dataTable tbody td {
                         {
                             extend: 'csv',
                             text: '<i class="mdi mdi-file-delimited"></i><span class="btn-custom"> CSV </span>',
-                            className: 'app-btn-primary'
+                            className: 'app-btn-primary',
+                            exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
                         },
                         {
                             extend: 'excel',
                             text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
                             exportOptions: { orthogonal: 'sort' },
-                            className: 'app-btn-primary'
+                            className: 'app-btn-primary',
+                            exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
                         }
                     ]
                 }
             ],
             paging: true,
-            pageLength: 25,  
+            pageLength: 10,  
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                    searchPlaceholder: "Search"
             },
             initComplete: function () {
                 $(".dt-buttons").prepend(`
@@ -1022,9 +1032,17 @@ table.dataTable tbody td {
             });
 
             $('body').on('click', '.btnPartnerDelete', function () {
+                 var partner_role = $(this).attr('data-role');
+                 var alertText = "You need to remove this user";
+                    if (partner_role == 2) {
+                        alertText = "You need to remove this Staff";
+                    } else if (partner_role == 1) {
+                        alertText = "You need to remove this Manager and related agent and staff are also delete";
+                    }
+
                 Swal.fire({
                     title: "Are you sure?",
-                    text: "You need to remove this user",
+                    text: alertText,
                     icon: "info",
                     showCancelButton: true,
                     confirmButtonColor: "#3085d6",
@@ -1160,6 +1178,9 @@ table.dataTable tbody td {
                 complete: function() {
                     btn.disabled = false;
                     btn.innerText = "Submit"; 
+                    $('#nhance-partner-modal').removeClass('show').hide();
+                    $('.modal-backdrop').remove();
+                    loadPartner();
                 }
             });
     }
@@ -1258,7 +1279,7 @@ table.dataTable tbody td {
                         row.name,
                         row.email,
                         row.mobile,
-                        'Staff',
+                        row.role_id == 1 ? "Manager" : "Staff",
                         `<span class="badge ${statusClass}">${statusText}</span>`,
                         `<div class="btn-group dropdown">
                             <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown">
@@ -1268,8 +1289,8 @@ table.dataTable tbody td {
                                 <a data-toggle="modal" data-target="#nhance-partner-modal" class="dropdown-item btnPartnerEdit" data-obj='${JSON.stringify(row)}'>
                                     <i data-obj='${JSON.stringify(row)}' class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle btnPartnerEdit"></i>Edit
                                 </a>
-                                <a class="dropdown-item btnPartnerDelete" data-id="${row.id}">
-                                    <i data-id="${row.id}" class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle btnPartnerDelete"></i>Delete
+                                <a class="dropdown-item btnPartnerDelete" data-id="${row.id}" data-role="${row.role_id}">
+                                    <i data-id="${row.id}" data-role="${row.role_id}" class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle btnPartnerDelete"></i>Delete
                                 </a>
                                 <a class="dropdown-item btnPartnerPerformance" data-id="${row.id}">
                                     <i data-id="${row.id}" class="mdi mdi-speedometer mr-2 text-muted font-18 vertical-middle btnPartnerPerformance"></i>View Performance
@@ -1439,7 +1460,7 @@ table.dataTable tbody td {
                             hour12: false
                         };
                         let uploaded = date.toLocaleString('en-GB', options).replace(',', '');
-                        let color = file.incentive_file_name ? "app-text-success" : "app-text-black";
+                        let color = file.incentive_file_name ? "app-text-success" : "font-color-black";
                         let download_url = "<?= base_url('user/download-incentive-file/') ?>" + encodeURIComponent(file.id);
                         let im = file.incentive_month;
                         
@@ -1450,10 +1471,10 @@ table.dataTable tbody td {
                                         <div class="d-flex align-items-center justify-content-between border rounded p-2 bg-white">
                                             <div class="d-flex align-items-center">
                                                 <div class="file-icon-box d-flex align-items-center justify-content-center">
-                                                    <i class="mdi mdi-file-document-outline app-text-black" style="font-size: 24px;"></i>
+                                                    <i class="mdi mdi-file-document-outline font-color-black" style="font-size: 24px;"></i>
                                                 </div>
                                                 <div class="ml-2">
-                                                    <div class="font-weight-bold app-text-black small text-truncate" 
+                                                    <div class="font-weight-bold font-color-black small text-truncate" 
                                                                 title="${file.incentive_file_name}" 
                                                                 style="max-width: 265px;">
                                                                 ${file.incentive_file_name}
@@ -1694,10 +1715,11 @@ table.dataTable tbody td {
     });
     $(document).on('click', '#btnNhancePartnerAdd', function(){
         $('#partner_name').val('');
-        $('#email').val('');
+        $('#email_addr').val('');
         $('#partner_id').val('');
         $('#mobile_no').val('');
-        $('#locn').val('');        
+        $('#locn').val('');     
+        $('.modal-title').html('Add Nhance Partner');   
         $('#PartnerForm').attr('action', '<?php echo base_url('/user/partner');?>');    
         let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal'));
         myModal.show();  // open modal
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index 05aad57a..3ab9080e 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -24,7 +24,7 @@ table.dataTable thead th {
             <div class="card-body">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">Advertisement Image List</h4>
+                            <h4 style="position: relative;">Advertisement Images</h4>
                         </div>
                         <div class="col-6" style="text-align: right; position: relative;top: 5px;">
                             <a data-toggle="modal" data-target="#bike_make_login-modal" href="#" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
@@ -75,20 +75,25 @@ table.dataTable thead th {
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-body">
-                <div class="text-center mt-2 mb-4">
+                <div class="mt-2 mb-4">
                     <h4 id="advertise_add_edit">Add Advertise Image </h4>
                 </div>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <form id="model_form_data" class="px-4">
 
                     <input type="text" name="add_image_id" id="add_image_id" value="0" hidden>
 
                     <div class="row">
-                        <div class="col-md-8">
+                        <div class="col-md-12">
                             <div class="form-group">
-                                <label for="branchname">Image</label>
-                                <input class="form-control" name="advertise_image" id="advertise_image" type="file" accept="image/*" onchange="PreviewImage();" required="">
+                                <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>
-                            <div class="form-group col-md-6 float-left" style="position: relative;top: 0px;">
+                             <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>
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index d5897722..cbbc1731 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -28,20 +28,20 @@
                 <table data-custom-table-css="table" id="datatable-buttons" class="table table-hover m-0 table-centered dt-responsive w-100">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">SNO</th>
-                            <th class="font-weight-medium">Batch Code</th>
-                            <th class="font-weight-medium">File Name</th>
-                            <th class="font-weight-medium">Client</th>
-                            <th class="font-weight-medium">Client Branch</th>
-                            <th class="font-weight-medium">Client Policy</th>
-                            <th class="font-weight-medium">Event Type</th>
-                            <th class="font-weight-medium">Insurer/ TPA</th>
-                            <th class="font-weight-medium">Action</th>
-                            <th class="font-weight-medium">Count</th>
-                            <th class="font-weight-medium">(₹)Amount</th>
-                            <th class="font-weight-medium">User/Time</th>
-                            <th class="font-weight-medium">Status</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Batch Code&nbsp;</th>
+                            <th class="font-weight-medium">File Name&nbsp;</th>
+                            <th class="font-weight-medium">Client&nbsp;</th>
+                            <th class="font-weight-medium">Client Branch&nbsp;</th>
+                            <th class="font-weight-medium">Client Policy&nbsp;</th>
+                            <th class="font-weight-medium">Event Type&nbsp;</th>
+                            <th class="font-weight-medium">Insurer/ TPA&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
+                            <th class="font-weight-medium">Count&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Amount&nbsp;</th>
+                            <th class="font-weight-medium">User/Time&nbsp;</th>
+                            <th class="font-weight-medium">Status&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
@@ -52,7 +52,7 @@
                         ?>
 
                         <tr>
-                            <td><b><?php echo ($key + 1) ?></b></td>
+                            <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                             <td><?php echo $file['batch_code'] ?></td>
                             <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                                 <?php echo $file['file_name']?>
@@ -215,24 +215,42 @@
     $(document).ready(function() {
 
         $('#datatable-buttons').DataTable({
-            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+            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'<'col-sm-5'i><'col-sm-7'p>>",
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Batch List',
+            //     className: 'my_class',
+            // }],
+            // initComplete: function(settings, json) {
+            //     $('.my_class').css({
+            //         position: "relative",
+            //         left: "50px"
+            //     });
+            // },
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Batch List',
-                className: 'my_class',
-            }],
-            initComplete: function(settings, json) {
-                $('.my_class').css({
-                    position: "relative",
-                    left: "50px"
-                });
-            },
+                        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: 'Batch List',
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true
         });
diff --git a/app/Views/bds_dash.php b/app/Views/bds_dash.php
index c91b2b6e..725c61b2 100644
--- a/app/Views/bds_dash.php
+++ b/app/Views/bds_dash.php
@@ -162,7 +162,7 @@
 
     <div class="row d-flex  align-items-center">
         <div class="StatusTileHide" style="padding-left: 25px;">
-            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="StatusTileHide" style="display: none;padding-left: 15px;">
             <a href="#" id="mainMenuTiles">Current Tile : </a>
diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php
index ce37847e..fac8a2e0 100644
--- a/app/Views/bds_multi_report.php
+++ b/app/Views/bds_multi_report.php
@@ -22,7 +22,6 @@
 </style>
 
 
-<div class="row">
     <div class="col-12" id="second_page">
         <div class="card">
             <div class="card-body">
@@ -82,7 +81,6 @@
             </div> <!-- end card-body -->
         </div> <!-- end card -->
     </div> <!-- end col-12 -->
-</div> <!-- end row -->
 
 <script>
     $(document).ready(function() {
@@ -94,22 +92,32 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                buttons: [
+                {
+                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: 'CSV',
+                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                         title: 'BDS TAT BAND WISE DATA',
                     },
                     {
                         extend: 'excel',
-                        text: 'Excel',
+                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
                         title: 'BDS TAT BAND WISE DATA',
                     },
-                    
+                    ]
+                 }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true,
                 pageLength: 10,
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index 8079164a..e9cbb1c6 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -9,8 +9,7 @@ table.dataTable tbody td {
 }
 </style>
 
-<div class="row" id="inception_list">
-    <div class="col-12">
+<div class="col-12" id="inception_list">    
         <div class="card">
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
@@ -24,7 +23,7 @@ table.dataTable tbody td {
                             <thead class="bg-light">
                                 <tr>
                                     <th>
-                                        <div class="column-header">S.No.</div>
+                                        <div class="column-header">S.No&nbsp;</div>
                                     </th>
                                     <th>
                                         <div class="column-header">Renewal Month</div>
@@ -100,7 +99,6 @@ table.dataTable tbody td {
                 </div>
             </div>
         </div>
-    </div><!-- end col -->
 </div>
 
 <script>
@@ -115,24 +113,34 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [
+            {
+            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: 'CSV',
+                    text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                     title: 'Renewal-List',
                 },
                 {
                     extend: 'excel',
-                    text: 'Excel',
+                    text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
                     title: 'Renewal-List',
                     exportOptions: {
                         orthogonal: 'sort'
                     },
                 }
-
+            ]
+            }
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
@@ -142,4 +150,39 @@ $(document).ready(function() {
         console.error("Table atet found.");
     }
 });
+
+// Global DataTables defaults
+$.extend(true, $.fn.dataTable.defaults, {
+    language: {
+        search: "", // remove "Search:" label
+        searchPlaceholder: "Search"
+    },
+    paging: true,
+    pageLength: 10,
+    ordering: false
+});
+
+// Global init hook
+$(document).on('init.dt', function (e, settings) {
+    let $filter = $(settings.nTableWrapper).find('.dataTables_filter');
+    let $input = $filter.find('input');
+
+    if (!$filter.hasClass('custom-search')) {
+        // Wrap in Bootstrap input-group
+        $input
+            .addClass('form-control')
+            .wrap('<div class="input-group"></div>');
+
+        // Append icon
+        $input.after(`
+            <span class="input-group-text bg-white border-0">
+                <i class="mdi mdi-magnify"></i>
+            </span>
+        `);
+
+        // Align to right
+        $filter.addClass('text-right custom-search');
+    }
+});
+
 </script>
\ No newline at end of file
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index 79159730..cbc717a2 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -75,22 +75,35 @@ table.dataTable tbody td {
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Insurer-Wise-Report-List',
-                    },
-                    {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'Insurer-Wise-Report-List',
-                        exportOptions: {
-                            orthogonal: 'sort'
-                        },
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Insurer-Wise-Report-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'Insurer-Wise-Report-List',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index c0a69a8b..12c6e8a2 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -75,22 +75,35 @@ table.dataTable tbody td {
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Bap-Wise-Report-List',
-                    },
-                    {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'Bap-Wise-Report-List',
-                        exportOptions: {
-                            orthogonal: 'sort'
-                        },
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Bap-Wise-Report-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                        title: 'Bap-Wise-Report-List',
+                                    }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index 721cd07c..8173ee3c 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -94,22 +94,54 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                // buttons: [
+                //     {
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'BDS TAT BAND WISE DATA',
+                //     },
+                //     {
+                //         extend: 'excel',
+                //         text: 'Excel',
+                //         title: 'BDS TAT BAND WISE DATA',
+                //     },
+                    
+                // ],
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'BDS TAT BAND WISE DATA',
+                        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) { 
+                            openTicket();
+                        }
                     },
                     {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'BDS TAT BAND WISE DATA',
-                    },
-                    
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'BDS TAT BAND WISE DATA',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'BDS TAT BAND WISE DATA',
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true,
                 pageLength: 10,
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index c6baa89e..481268cb 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -1,59 +1,62 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 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);
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 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:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
+
+<div class="col-12">
+    <div class="card-body">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h5 class="m-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>
-                </h5>
+                </h4>
                 <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -64,11 +67,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="client_id" name="client_id">
                                         <option value="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -79,9 +82,9 @@ table.dataTable tbody td {
                                     <select class="form-control" id="insurer_id" name="insurer_id">
                                         <option value="0" selected>Select Insurer</option>
                                         <?php if (isset($insurer) && count($insurer)) { ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
                                         <?php } ?>
                                     </select>
                                 </div>
@@ -91,11 +94,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="policy_type_id" 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>";
-                                                }
+                                        if (isset($policy_types) && count($policy_types)) {
+                                            foreach ($policy_types as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -105,11 +108,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="issuer" 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>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -124,36 +127,36 @@ table.dataTable tbody td {
                                         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>";
-                                                }
+                                        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 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">
                                     <input type="hidden" id="endDate">
                                 </div>
-
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
-                                        class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
-                                        class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-
                             </div>
 
+                            <div class="form-group text-right m-b-0">
+                                <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
+                                    class="btn btn-secondary" id="clear-filters">Clear</a>
+                                <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
+                                    class="btn btn-primary" id="get-emp-list"
+                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                            </div>
+
+
+
                             <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
                                 <a href="<?= base_url("/policy_tranction/report/list"); ?>"
@@ -167,8 +170,10 @@ table.dataTable tbody td {
 
         </div>
     </div>
+
 </div>
 
+
 <div class="col-12" id="second_page">
     <div class="card">
         <div class="card-body">
@@ -182,13 +187,13 @@ table.dataTable tbody td {
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client Name</th>
-                            <th>Insurer</th>
-                            <th>Policy</th>
-                            <th>Policy No</th>
-                            <th>Endorsement No</th>
-                            <th>Event Type</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client Name&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Policy No&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Event Type&nbsp;</th>
                             <th>Action</th>
                         </tr>
                     </thead>
@@ -196,7 +201,7 @@ table.dataTable tbody td {
                         <?php if (isset($business_list)) { ?>
                         <?php foreach($business_list as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['client_name']; ?></td>
                             <td><?php echo $row['insurer_name']; ?></td>
                             <td><?php echo $row['policy_type']; ?></td>
@@ -217,13 +222,13 @@ table.dataTable tbody td {
                                                         echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['policy_trns_id']; 
                                                     }
                                                 ?>" id="get-policy-list" class="dropdown-item btnEdit">
-                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <?php } ?>
+                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
                     </tbody>
                 </table>
@@ -236,159 +241,167 @@ table.dataTable tbody td {
 </div>
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("scroll-horizontal-datatable");
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("scroll-horizontal-datatable");
 
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
-    }
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            // Get the original dropdown items
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-    let activeDropdown = null;
+            // Create new dropdown with proper background and spacing
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        // Append the custom dropdown to the body
-        document.body.appendChild(customDropdown);
+            // Copy inner content while maintaining icon alignment
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+            return customDropdown;
+        }
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+        let activeDropdown = null;
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
+            // Append the custom dropdown to the body
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the action column
+                if (event.target.closest('td:last-child')) {
+                    return;
                 }
 
-                // Close the dropdown after handling the click
+                // Hide any active dropdown
                 if (activeDropdown) {
                     activeDropdown.style.display = 'none';
-                    activeDropdown = null;
                 }
-                
-                e.stopPropagation();
+
+                // Get click position
+                const rect = event.target.getBoundingClientRect();
+
+                // Position the dropdown with some offset
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+                // Set as active dropdown
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    const onclickAttr = this.getAttribute('onclick');
+                    if (onclickAttr) {
+                        eval(onclickAttr);
+                    }
+
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') {
+                        window.location.href = href;
+                    }
+
+                    // Close the dropdown after handling the click
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
 </script>
 
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
-
+    // Datatable document ready
+ $(document).ready(function() {
     var ticketsTable = $('#scroll-horizontal-datatable');
 
     if (ticketsTable.length) {
         ticketsTable.DataTable({
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
+                 "<'row'<'col-sm-12'tr>>" +
+                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [
                 {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                    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-BDS-List'
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                                .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Sum values in column AB (28th column)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this).text());
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get last row index and append total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) + 2;
+
+                                var totalRow =
+                                    '<row r="' + rowIndex + '">' +
+                                        '<c t="inlineStr" r="AA' + rowIndex + '"><is><t>Total</t></is></c>' +
+                                        '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) + '</v></c>' +
+                                    '</row>';
+
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                            2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
+                        }
+                    ]
                 }
-
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                searchPlaceholder: "Search"
             },
-            paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
-            ordering: false, 
+            paging: true,
+            pageLength: 10,
+            ordering: false
         });
     } else {
         console.error("Table not found.");
     }
 });
 
+
 $(document).ready(function() {
     getURLParams()
     $('#client_id').select2();
@@ -487,7 +500,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').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'));
     }
@@ -495,6 +508,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -505,53 +519,174 @@ $(function() {
                 .endOf('month')
             ]
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').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
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').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,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
-}
 
-function sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
 
-    console.log(pt_id);
+        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
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        hideDateField(date_type)
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        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)
+
+        // 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').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 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').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').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').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 sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index b556f4e3..f9ebba28 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -56,41 +56,42 @@ table.dataTable thead th {
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                <div class="row" style="margin-bottom:1rem;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">CD Master</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                        <!-- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
+                        <!- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
                             data-toggle="modal" data-target="#con-close-modal" data-placement="top" title="Add"
-                            data-trigger="hover">ADD</button> -->
+                            data-trigger="hover">ADD</button> ->
                     </div>
-                </div>
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap" >
+                </div> -->
+                
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No.</th>
-                            <th class="font-weight-medium">Client Name</th>
-                            <th class="font-weight-medium">Insurer Name</th>
-                            <th class="font-weight-medium">Insurer Branch Name</th>
-                            <th class="font-weight-medium">Opening Date</th>
-                            <th class="font-weight-medium">CD Account No</th>
-                            <th class="font-weight-medium">Opening Amount</th>
-                            <th class="font-weight-medium">Date/User</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Client Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Branch Name&nbsp;</th>
+                            <th class="font-weight-medium">Opening Date&nbsp;</th>
+                            <th class="font-weight-medium">CD Account No&nbsp;</th>
+                            <th class="font-weight-medium">Opening Amount&nbsp;</th>
+                            <th class="font-weight-medium">Date/User&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
-                    <tbody>
+                    <tbody class="app-table-body">
                         <?php foreach($CD_Master_Data as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1; ?></td>
+                            <td class="text-center"><?= $index + 1; ?></td>
                             <td><?php echo $row['client_name']; ?>( <?= $row['short_name'] ?> )</td>
                             <td><?php echo $row['insurer_name']; ?></td>
                             <td><?php echo $row['insurer_branch_name']; ?></td>
                             <td><?php echo date('d-m-Y', strtotime($row['opening_date'])); ?></td>
                             <td><?php echo $row['cd_ac_no']; ?></td>
                             <td><?php echo $row['opening_bal']; ?></td>
-                            <td><?php echo date('d-M-Y h:i A', strtotime($row['created_at'])) ?> by <?php echo $row['user_name']; ?></td>
+                            <td><?php echo date('d-M-Y h:i A', strtotime($row['created_at'])) ?> <br>by <?php echo $row['user_name']; ?></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>
@@ -213,35 +214,82 @@ table.dataTable thead th {
     $(document).ready(function() {
 
         $('#scroll-horizontal-datatable').DataTable({
-            scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-            buttons: [
-                {
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'CD-Master-List',
-                    className: 'my_class',
-                    exportOptions: {
-                        columns: ':not(:last-child)'
-                    },
-                }, 
-                {
-                    text: 'Add',
-                    className: 'buttons-html5 ',
-                    action: function (e, dt, node, config) {
+          scrollX: true,
+          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
+            "<'row'<'col-sm-12'tr>>" + 
+            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+            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) {
                         showCdMasterAddModal();
-                    }
-                }
-            ],
-            language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
-            paging: true,
+                  }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                title: 'CD-Master-List',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary my_class',
+                                exportOptions: {
+                                    columns: ':not(:last-child)'
+                                },
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
+          language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+          },
+          paging: true,
+          pageLength: 10,
+          order: [[0, 'desc']]
+        //     scrollX: true,
+        //     dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
+        //         "<'row'<'col-sm-12'tr>>" +
+        //         "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+        //     buttons: [
+        //         {
+        //             extend: 'csv',
+        //             text: 'CSV',
+        //             title: 'CD-Master-List',
+        //             className: 'my_class',
+        //             exportOptions: {
+        //                 columns: ':not(:last-child)'
+        //             },
+        //         }, 
+        //         {
+        //             text: 'Add',
+        //             className: 'buttons-html5 ',
+        //             action: function (e, dt, node, config) {
+        //                 showCdMasterAddModal();
+        //             }
+        //         }
+        //     ],
+        //     language: {
+        //         search: "_INPUT_",
+        //         searchPlaceholder: "Search..."
+        //     },
+        //     paging: true,
          });
-
     })
 
     $(document).ready(function(){
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 0c1d6906..7a52530b 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -64,14 +64,14 @@
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Files</h4>
+                    <h4 style="position: relative;">Claim Dump Upload</h4>
                 </div>
 
             </div>
             <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
                         <th class="font-weight-medium">File name</th>
                         <th class="font-weight-medium">User/Time</th>
                         <th class="font-weight-medium">Status</th>
@@ -86,21 +86,25 @@
                     ?>
 
                             <tr>
-                                <td><b><?php echo ($key + 1) ?></b></td>
+                                <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                                 <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                                     <?php echo $file['file_name'] ?>
                                 </td>
                                 <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
                                 <td>
                                     <?php if ($file['status'] == "failed") { ?>
-                                        <?= $file['status'] ?> <span class='col-xl-3 col-lg-4 col-sm-6'> 
+                                        <span style="color : #BD0707 ;"> <?= $file['status'] ?> </span> 
+                                        <span class='col-xl-3 col-lg-4 col-sm-6'> 
                                             <!-- <a href="<?= base_url('util/claim_dump_excel_error/') . $file['file_id'] ?>" target="_blank" class='fe-alert-circle' data-err="<?= $file['file_id'] ?>"></a> -->
                                             <a href="#" class='fe-alert-circle' onclick="fetchFileError(<?= $file['file_id'] ?>)"></a>
                                         </span>
                                     <?php } else if ($file['status'] == "inprogress") { ?>
-                                        <a data-id="<?= $file['status'] ?>" class="reload" href="#"><?= $file['status'] ?></a>
+                                        <a data-id="<?= $file['status'] ?>" class="reload" href="#"
+                                            style="color : #938e04ff ;">
+                                            <?= $file['status'] ?>
+                                        </a>
                                     <?php } else { ?>
-                                        <?= $file['status'] ?>
+                                       <span style="color : #34A853 ;"> <?= $file['status'] ?> </span> 
                                     <?php } ?>
                                 </td>
                                 <td>
@@ -156,7 +160,7 @@
                                 <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
                                 <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
                             </div>
-                            <div class="form-group col-md-3" style="margin-top: 18px;">
+                            <div class="form-group col-md-3" style="margin-top: 40px;">
                                 <button id="claim_form_submit_button" type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
                             </div>
                         </div>
@@ -293,8 +297,12 @@
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 15, // Set default number of rows per page (optional)
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 5652432c..0b5eab77 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -19,7 +19,15 @@
 
                                 <div class="form-group">
 
-                                    <div id="dynamic-form-container"></div>
+                                    <div id="dynamic-form-container">
+                                        <div  align="right">
+                                            <a class="btn btn-primary waves-effect waves-light mr-1"           
+                                                onclick="addHTMLInput(this)">
+                                                + Add
+                                            </a>
+                                        </div>
+                        
+                                    </div>
 
                                     <div class="form-group text-right m-b-0">
                                         <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
@@ -48,10 +56,10 @@
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="table_bd">
@@ -191,8 +199,9 @@ function addHTMLInput()
             >
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
-            <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
-            <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInput(this)">+</a>
+            <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)" style="background-color: #BD0707;">
+               <i class="mdi mdi-delete" ></i> 
+            </a>
         </div>
     `;
     container.appendChild(newRow);
@@ -265,7 +274,7 @@ function create_url_list(data) {
         data.forEach((item, index) => {
             html += `
                 <tr>
-                    <td>${index + 1}</td>
+                    <td class="text-center">${index + 1}</td>
                     <td>${item.doc_name}</td>
                     <td><a href="${item.url}" target="_blank">${item.url}</a></td>
                     <td>
diff --git a/app/Views/claims_dash.php b/app/Views/claims_dash.php
index f37a2ed7..804b2621 100644
--- a/app/Views/claims_dash.php
+++ b/app/Views/claims_dash.php
@@ -202,7 +202,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
 
     <div class="row d-flex  align-items-center">
         <div class="goBack" style="padding-left: 25px;">
-            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="goBack" style="display: none;padding-left: 15px;">
             <a href="#" id="current_tile">Current Tile : </a>
diff --git a/app/Views/claims_report_acc_manager_wise.php b/app/Views/claims_report_acc_manager_wise.php
index 659646b8..105f552a 100644
--- a/app/Views/claims_report_acc_manager_wise.php
+++ b/app/Views/claims_report_acc_manager_wise.php
@@ -7,10 +7,6 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-        max-width: 98% !important;
-    }
-
     .dataTables_filter {
         position: absolute;
     }
@@ -92,10 +88,24 @@
                      "<'row'<'col-sm-12'tr>>" +
                      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 buttons: [
-                    { extend: 'csv', text: 'CSV', title: 'Insurer-Wise-Report-List' },
-                    { extend: 'excel', text: 'Excel', title: 'Insurer-Wise-Report-List', exportOptions: { orthogonal: 'sort' } }
+                    {
+                        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: 'Insurer-Wise-Report-List',  className: 'app-btn-primary ' },
+                                { extend: 'excel', text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>', title: 'Insurer-Wise-Report-List',  className: 'app-btn-primary ', exportOptions: { orthogonal: 'sort' } }
+                        ],
+                    }
                 ],
-                language: { search: "_INPUT_", searchPlaceholder: "Search..." },
+                language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
                 paging: true,
                 pageLength: 10,
                 ordering: false
diff --git a/app/Views/claims_report_tpa_wise.php b/app/Views/claims_report_tpa_wise.php
index 36b3412c..ec66572a 100644
--- a/app/Views/claims_report_tpa_wise.php
+++ b/app/Views/claims_report_tpa_wise.php
@@ -7,9 +7,6 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-        max-width: 98% !important;
-    }
 
     .dataTables_filter {
         position: absolute;
@@ -33,7 +30,8 @@
                     <thead class="bg-light">
                         <tr>
                             <th style="text-align: center;" colspan="8">OPEN</th>
-                            <th style="text-align: center;" colspan="5" >CLEARED</th>
+                            &nbsp;
+                            <th style="text-align: center;" colspan="7" >CLEARED</th>
                         </tr>
                         <tr>
                             <?php foreach ($column_order as $col_name): ?>
@@ -88,10 +86,24 @@
                      "<'row'<'col-sm-12'tr>>" +
                      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 buttons: [
-                    { extend: 'csv', text: 'CSV', title: 'Insurer-Wise-Report-List' },
-                    { extend: 'excel', text: 'Excel', title: 'Insurer-Wise-Report-List', exportOptions: { orthogonal: 'sort' } }
+                    {
+                        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: 'Insurer-Wise-Report-List',className: 'app-btn-primary ' },
+                            { extend: 'excel', text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>', title: 'Insurer-Wise-Report-List',className: 'app-btn-primary ', exportOptions: { orthogonal: 'sort' } }
+                        ]
+                    }
                 ],
-                language: { search: "_INPUT_", searchPlaceholder: "Search..." },
+                language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
                 paging: true,
                 pageLength: 10,
                 ordering: false
diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php
index f43c65ee..0af82f51 100755
--- a/app/Views/client_basic_info.php
+++ b/app/Views/client_basic_info.php
@@ -110,13 +110,14 @@ input:checked + .slider:before {
                             <div class="form-group col-md-4">
                                 <label for="client_name">Client Name<span
                                         class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="client_name"
+                                <input type="text" class="form-control" id="client_name"  data-old-name="<?= isset($client['client_name']) ? $client['client_name'] : '' ?>"
                                     placeholder="Enter Client Name" value="<?= isset($client['client_name']) ? $client['client_name'] : '' ?>" name="client_name" required>
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="short_name">Client Short Name<span
                                         class="text-danger">*</span></label>
                                 <input type="text" class="form-control" id="short_name"
+                                    data-old-short="<?= isset($client['short_name']) ? $client['short_name'] : '' ?>"
                                     placeholder="Enter Short Name" value="<?= isset($client['short_name']) ? $client['short_name'] : '' ?>" name="short_name" onkeyup="validateInput(this, 'clients', 'short_name', 'clientBtnSubmit')" required>
                             </div>
                         </div>
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index 33314cc9..31e08346 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -70,6 +70,13 @@
     <div class="row" id="add_branch">
         <div class="col-12">
             <div class="card-body">
+
+
+                <div class="row float-left" style="position: relative; bottom: 20px; left: 13px;">
+                    <button type="button" id="btnAutoBranchFetch"
+                        class="btn btn-primary waves-effect waves-light btn-sm ">Fetch Client Branch (Pre-Enrolment)</button>
+                </div>
+
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
                     <button type="button" id="btnBranchBack"
                         class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted"
@@ -79,10 +86,20 @@
                 <hr>
 
                 <form role="form" class="parsley-examples" method="post" id="branch_form" enctype="multipart/form-data">
+
+
                     <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+
+
+                    <!-- post_client_id as client_id -->
                     <input type="hidden" name="client_id" id="client_id_branch"
                         value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
+                    <!-- pre_branch_id  -->
+                    <input type="hidden" name="pre_branch_id" id="pre_branch_id" 
+                        value="<?= isset($pre_branch_id) ? $pre_branch_id : '' ?>" />
+                    <!-- post_branch_id as branch_id_primarykey -->
                     <input type="hidden" name="branch_id_primarykey" id="branch_id_primarykey" />
+
                     <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-6">
@@ -181,12 +198,13 @@
                             <div class="form-group col-md-6">
                                 <label for="last_name">Email<span class="text-danger">*</span></label>
                                 <input value="" type="text" class="form-control" placeholder="Enter Contact Email"
-                                    name="email[]" id="email" data-parsley-trigger="change" data-parsley-type="email" onkeyup="validateInput(this, 'level_contacts', 'email', 'branchBtnSubmit')" required>
+                                    name="email[]" id="email" data-parsley-trigger="change" data-parsley-type="email"  onchange="validateDuplicateByClientBranch(this, 'email','branchBtnSubmit')" required>
                             </div>
                             <div class="form-group col-md-6">
                                 <label for="mobile">Mobile<span class="text-danger">*</span></label>
                                 <input value="" type="text" class="form-control" placeholder="Enter Contact Mobile"
-                                    name="mobile[]" id="mobile" onkeyup="validateInput(this, 'level_contacts', 'mobile', 'branchBtnSubmit')"
+                                    name="mobile[]" id="mobile" 
+                                    onchange="validateDuplicateByClientBranch(this, 'mobile','branchBtnSubmit')"
                                     onkeypress="return onlyNumbers(event)" maxlength="10" minlength="10"
                                     data-parsley-type-message="Please enter a valid 10-digit mobile number."
                                     data-parsley-required-message="Please enter a valid 10-digit mobile number."
@@ -285,6 +303,10 @@ $('#btnBranchAdd').click(function() {
     $('#district').val('');
     $('#branch_city').val('');
     $('#branch_form')[0].reset();
+    $('#branch_form').parsley().reset();
+    $('#pre_branch_id').val('');
+    $('#branch_id_primarykey').val('');
+
     $('.ac').css('display', 'block');
     contactCount = 1
 
@@ -351,13 +373,14 @@ $("#branch_form").submit(function(event) {
 
     var selectedValues = $("#selected").val();
     console.log(selectedValues, selectedValues);
+    console.log("branch_id_primarykey", $('#branch_id_primarykey').val());
+
 
     let level_contect_data = getContactsData();
     console.log('level_contect_data', level_contect_data);
 
     event.preventDefault();
     branch_PrimaryKey = $('#client_id_branch').val();
-
     console.log('branch_PrimaryKey', branch_PrimaryKey)
 
     if (branch_PrimaryKey === '') {
@@ -377,6 +400,7 @@ $("#branch_form").submit(function(event) {
 
         var formData = new FormData($('#branch_form')[0]);
 
+
         const jsonString = JSON.stringify(selectedValues);
         const level_contect_data_json_string = JSON.stringify(level_contect_data);
         console.log('jsonString', jsonString);
@@ -467,6 +491,9 @@ $("#branch_form").submit(function(event) {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     console.log('Something Wrong!', 'warning');
+                    if(xhr.status === 409){
+                        alert('The Current Branch is Already Existing..!!');
+                    }
                 }, 300);
             },
             complete: function() {
@@ -534,6 +561,7 @@ $('body').on('click', '.btnBranchEdit', function() {
             $('#district').val(res.data.district);
             $('#branch_city').val(res.data.city);
             $('#branch_PrimaryKey').val(res.data.id);
+            $('#pre_branch_id').val(res.data.pre_branch_id??'')
 
             if(res.data.sez == 1){
                 $('#sez').prop('checked', true);
@@ -625,11 +653,11 @@ function appendContactHtml(contact = false, reset = false) {
                 <div class="form-row">
                     <div class="form-group col-md-6">
                         <label for="${uniqueId}_last_name">Email<span class="text-danger">*</span></label>
-                        <input value="${contact !== undefined && contact !== false ? contact.email : ''}" type="text" class="form-control" placeholder="Enter Contact Email" name="email[]" id="${uniqueId}_email" data-parsley-trigger="change" data-parsley-type="email" onkeyup="validateInput(this, 'level_contacts', 'email', 'branchBtnSubmit')" required>
+                        <input value="${contact !== undefined && contact !== false ? contact.email : ''}" type="text" class="form-control" placeholder="Enter Contact Email" name="email[]" id="${uniqueId}_email" data-parsley-trigger="change" data-parsley-type="email" onchange="validateDuplicateByClientBranch(this, 'email', 'branchBtnSubmit')" required>
                     </div>
                     <div class="form-group col-md-6">
                         <label for="${uniqueId}_mobile">Mobile<span class="text-danger">*</span></label>
-                        <input value="${contact !== undefined && contact !== false ? contact.mobile : ''}" type="text" class="form-control" placeholder="Enter Contact Mobile" name="mobile[]" id="${uniqueId}_mobile" onkeyup="validateInput(this, 'level_contacts', 'mobile', 'branchBtnSubmit')" onkeypress = "return onlyNumbers(event)" maxlength="10" min="10" data-parsley-type-message="Please enter a valid 10-digit mobile number." data-parsley-required-message="Please enter a valid 10-digit mobile number." required>
+                        <input value="${contact !== undefined && contact !== false ? contact.mobile : ''}" type="text" class="form-control" placeholder="Enter Contact Mobile" name="mobile[]" id="${uniqueId}_mobile" onchange="validateDuplicateByClientBranch(this, 'mobile', 'branchBtnSubmit')" onkeypress = "return onlyNumbers(event)" maxlength="10" min="10" data-parsley-type-message="Please enter a valid 10-digit mobile number." data-parsley-required-message="Please enter a valid 10-digit mobile number." required>
                     </div>
                 </div>
                 <div class="form-group" style="display: flex;">
@@ -849,6 +877,83 @@ function checkMobileNumber(input) {
 
 }
 
+// function generateShortName() {
+//     let clientName = $("#client_name").val().trim();
+//     if (clientName.length > 0) {
+//         let shortName = clientName.substring(0, 10).replace(/\s+/g, '').toUpperCase(); // Take first 10 chars , space removed, converted caps
+//         $("#short_name").val(shortName);
+//         makeUniqueShortName(shortName);
+//     }else{
+//         $("#short_name").val('');
+//     }
+// }
+
+let shortNameTimer;
+
+$("#client_name").on("input change keyup", function() {
+    clearTimeout(shortNameTimer); // cancel previous call
+    shortNameTimer = setTimeout(() => {
+        generateShortName();      // only runs after 200ms pause
+    }, 200); // adjust debounce delay as needed
+});
+
+function generateShortName() {
+    let clientInput = $("#client_name");
+    let shortInput = $("#short_name");
+
+    let oldClientName = clientInput.data("old-name");   // from DB
+    let oldShortName = shortInput.data("old-short");    // from DB
+    let newClientName = clientInput.val().trim();
+    console.log(`LN 882 : NEW - ${newClientName} | OLD - ${oldClientName} | OLD SN - ${oldShortName}`);
+
+    if (newClientName.toUpperCase() === (oldClientName || '').toUpperCase()) {
+        shortInput.val(oldShortName);
+        return;
+    }
+
+    if (newClientName.length == 0) {
+        shortInput.val('');
+        return;
+    }
+
+    if (newClientName.length > 0) {
+        let shortName = newClientName.substring(0, 10).replace(/\s+/g, '').toUpperCase();
+        shortInput.val(shortName);
+        makeUniqueShortName(shortName);
+    }
+}
+
+
+
+function makeUniqueShortName(baseName) {
+    let input = $("#short_name")[0]; // input element
+    checkDuplicateTableFieldValue("clients", "short_name", baseName, function(isDuplicate) {
+        if (isDuplicate) {
+            // Append sequence until unique
+            let counter = 1;
+            function tryNext() {
+                let padded = String(counter).padStart(3, '0'); // 001, 002, 003
+                let newName = baseName + padded;
+
+                checkDuplicateTableFieldValue("clients", "short_name", newName, function(exists) {
+                    if (exists) {
+                        counter++;
+                        tryNext(); // keep checking
+                    } else {
+                        $("#short_name").val(newName);
+                        validateInput(input, "clients", "short_name", "clientBtnSubmit");
+                    }
+                });
+            }
+            tryNext();
+        } else {
+            $("#short_name").val(baseName);
+            validateInput(input, "clients", "short_name", "clientBtnSubmit");
+        }
+    });
+}
+
+
 function validateInput(input, table, field, submitButId){
 
     let value = $(input).val();
@@ -871,6 +976,68 @@ function validateInput(input, table, field, submitButId){
 
 }
 
+
+
+function validateDuplicateByClientBranch(input, field, submitButId) {
+    let value = $(input).val().trim();
+    let clientId = $('#client_id_branch').val();
+    let branchId = $('#branch_id_primarykey').val();
+    let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
+    let message = label ? label + " is duplicate!" : "Value is duplicate!";
+
+    console.log(`cId: ${clientId} | bId: ${branchId}`);
+    
+    // Don't forgot be careful
+    // 1 Local duplication check (User entered)
+    let isLocalDuplicate = false;
+    $('input[name="' + field + '[]"]').each(function(index) {
+        console.log(`Entered value: ${value} | Contact ${index+1} value: ${$(this).val()}`);
+        if (this !== input && $(this).val().trim() === value) {
+            isLocalDuplicate = true;
+            return false; // break loop
+        }
+    });
+
+    if (isLocalDuplicate) {
+        console.log(`r u n Local`);
+        console.log(`btn Dis - true`);
+        toastr.warning(message, 'WARNING');
+        $('#' + submitButId).prop('disabled', true);
+        return; // don’t call server if duplicate in UI
+    }
+    
+    // Don't forgot be careful
+    // 2 Server-side duplicate check (DB)
+    if (!isLocalDuplicate && value !== '') {
+        
+        $.ajax({
+            url: '<?= base_url("client/others/check-duplicate") ?>',
+            type: 'POST',
+            data: { 
+                client_id: clientId,
+                branch_id: branchId,
+                value: value,
+                field: field
+            },
+            dataType: 'json',
+            success: function(response) {
+                if (response.isDuplicate) {
+                    console.log(`r u n Server`);
+                    console.log(`btn Dis - true`);
+                    toastr.warning(message, 'WARNING');
+                    $('#' + submitButId).prop('disabled', true);
+                } else {
+                    console.log(`btn Dis - false`);
+                    $('#' + submitButId).prop('disabled', false);
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('AJAX Error:', error);
+            }
+        });
+    }
+}
+
 function getContactsData() {
     const contacts = [];
 
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index 7fcfff6b..81c80750 100755
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -16,14 +16,13 @@
                             <a href="<?= base_url("client/client_deposit"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
                         </div> -->
                 </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
+                <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">Insurer Name</th>
-                            <th class="font-weight-medium">Insurer Branch Name</th>
-                            <th class="font-weight-medium">CD Account Number</th>
-                            <th class="font-weight-medium">Current Balance</th>
+                            <th class="font-weight-medium">Insurer Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Branch Name&nbsp;</th>
+                            <th class="font-weight-medium">CD Account Number&nbsp;</th>
+                            <th class="font-weight-medium">Current Balance&nbsp;</th>
                             <th class="font-weight-medium">Action</th>
                         </tr>
                     </thead>
@@ -70,31 +69,43 @@
 $(document).ready(function() {
 
     $('#tickets-table').DataTable({
-        dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>",
-        buttons: [{
-            extend: 'csv',
-            text: 'CSV',
-            title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
-            className: 'my_class',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-        },
-        {
-            extend: 'pdf',
-            text: 'PDF',
-            title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-        }
-    ],
-
-
+        // dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>",
+        dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>",
+        buttons: [
+                    {
+                        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: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    },
+                                    {
+                                        extend: 'pdf',
+                                        text: '<i class="mdi mdi-file-pdf " ></i><span class="  btn-custom">  PDF </span>',
+                                        title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
 
     });
 
diff --git a/app/Views/client_info.php b/app/Views/client_info.php
index 0b43ecb5..aeb052cf 100755
--- a/app/Views/client_info.php
+++ b/app/Views/client_info.php
@@ -21,8 +21,18 @@
 
                     <div class="row" style="padding-top: 20px;margin-bottom: 18px;">
                         <div class="col-6">
-                            <h4 style="position: relative;left: 18px;top: 2px;">Client Basic Info - <strong> <?= $client['client_name'] ?> (
-                                <?= $client['short_name'] ?> ) </strong></h4>
+                            
+                        <h4 style="position: relative; left: 18px; top: 2px;">
+                        <span class="client_info_close fs-6" id="close_btn"> 
+                            <i class="mdi mdi-chevron-left" style="font-size: 28px;cursor:pointer;"></i> 
+                        </span> 
+                        <span>
+                            Client Basic Info - 
+                            <strong> <?= $client['client_name'] ?> ( <?= $client['short_name'] ?> ) </strong>
+                        </span>
+
+                        </h4>
+
                         </div>
 
                         <div class="col-6">
@@ -30,8 +40,6 @@
                             <div class="row">
 
                                 <div class="col-6" style="position: relative;left: 455px;">
-                                    <button id="close_btn"
-                                        class="btn btn-primary waves-effect waves-light client_info_close">Close</button>
                                 </div>
                                 <div class="col-1 float-right" style="position: relative;left: 255px;">
                                     <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse"
@@ -125,28 +133,36 @@
                                                 <?php if($value['open_for_enrollment'] == 'Open' ) { ?>
 
                                                 <span
-                                                    class="badge badge-success"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #F9F8CD; color: #000 !important; border-radius:10px !important; "
+                                                    ><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else if($value['open_for_enrollment'] == 'Closed') { ?>
 
                                                 <span
-                                                    class="badge badge-warning"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #C2C2C2; color: #000 !important; border-radius:10px !important;"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else { ?>
 
                                                 <span
-                                                    class="badge badge-secondary"><?= $value['open_for_enrollment']  ?></span>
+                                                    style="background-color: #E26728; color: #000 !important; border-radius:10px !important;"
+                                                    class="px-2 py-1"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } ?>
                                             </td>
                                             <td>
                                                 <?php if($value['policy_status'] == 'Active' ) { ?>
 
-                                                <span class="badge badge-success"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #D1F8E7; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1"><?= $value['policy_status']  ?></span>
 
                                                 <?php } else { ?>
 
-                                                <span class="badge badge-danger"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #BD0707; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1 "><?= $value['policy_status']  ?></span>
 
                                                 <?php } ?>
                                             </td>
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index b7f543d8..e68543e2 100755
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -1,49 +1,15 @@
-<style>
-    #kyc_table #tbody td,
-    #other_docs_table tbody td
-    {
-        background-color: white !important;
-    }
-
-    #kyc_table #tbody tr ,
-    #other_docs_table tbody tr
-    {
-        box-shadow: 0px 2px 4px 0px #00000024;
-        background-color: white;
-        border-radius: 10px;
-    }
-
-    #kyc_table #tbody tr:hover td  ,
-    #other_docs_table tr:hover td
-    {
-        background-color: #e0e0e0 !important;
-    }
-
-    #KYC-DOC-tab .card-body ,
-    #other_docs_table .card-body
-    {
-        background-color: #F5FFFF !important;
-        border-radius: 10px;
-        box-shadow: 0px 4px 4px 0px #00000040;
-    }
-
-    #KYC-DOC-tab thead{
-         padding: 15px !important;
-    }
-
-</style>
-
+<style> .card-body{ margin-top: 0px !important; } </style>
 
 <div class="tab-pane fade" id="KYC-DOC-tab">
 
     <div class="col-lg-12">
-        <div class="card">
+        <div class="card" id="collapseOne">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table data-custom-table-css="table" id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="second-table" id="kyc_table" class="table table-sm mb-0">
                         <thead>
                             <tr>
-                                <th>S.no</th>
+                                <th>S. No</th>
                                 <th>Document Name</th>
                                 <th>Status</th>
                                 <th>Action</th>
@@ -63,7 +29,7 @@
    
     <div class="row" id="others">
         <div class="col-12">
-            <div class="card" style="margin-left: 12px;margin-right: -12px;">
+            <div class="card" id="collapseOne" style="margin-left: 12px;margin-right: -12px;">
                 <div class="card-body">
                     <h3>Additional Documents</h3>
                     <form role="form" class="parsley-examples" method="post" id="kyc_form" 
@@ -101,10 +67,10 @@
     </div> <!-- end row -->
 
     <div class="col-lg-12" id="other_docs_table">
-        <div class="card">
+        <div class="card" id="collapseOne">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table data-custom-table-css="table" id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="second-table" id="kyc_table" class="table table-sm mb-0">
                         <thead>
                             <tr>
                                 <th>Document Name</th>
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index b46846e3..237c2752 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -1,6 +1,6 @@
 
 <style>
-.table th,
+/* .table th,
 .table td {
     padding: 8px;
 }
@@ -11,7 +11,7 @@ table.dataTable tbody td {
 
 table.dataTable thead th {
     padding: 4px 4px !important;
-}
+} */
 
 .col-12{
 
@@ -74,32 +74,31 @@ table.dataTable thead th {
     <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;">Client List</h4>
-                        </div>
+                    <!-- <div class="row" style="margin-bottom:1rem;">-->
+                        <!-- <div class="col-6" style="align-self: center;">
+                            <h4 style="position: relative;">Client</h4>
+                        </div> -->
                         <!-- <div class="col-2" style="text-align: right; position: relative;top: 56px; left: 303px;">
                             <a class="btn btn-primary waves-effect waves-light" onclick="showModal()">Add From Lead</a>                
                         </div>
                         <div class="col-1" style="text-align: right; position: relative;top: 56px; left: 294px;">
                             <a href="<?= base_url("client/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">Add</a>                
                         </div> -->
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
+                    <!-- </div>-->
+                <table data-custom-table-css="table" class="table mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No</th>
-                            <th class="font-weight-medium">Client Name</th>
-                            <th class="font-weight-medium">Account Manager</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Client Name&nbsp;</th>
+                            <th class="font-weight-medium">Account Manager&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
                     <tbody>
                      <?php foreach($clientList as $index => $row){ ?>
                         <tr >
-                            <td><?=$index+1?></td>
+                            <td class="text-center"><?=$index+1?></td>
                             <td class="client_info" data-id="<?php echo $row->id; ?>"><?php echo $row->client_name; ?> ( <?php echo $row->short_name; ?> ) </td>
                             <td>
                                 <?php $account_managers = ''; ?>
@@ -108,7 +107,9 @@ table.dataTable thead th {
                                         <?php $account_managers .= $client->account_manager . ', '; ?>
                                     <?php endif; ?>
                                 <?php endforeach; ?>
-                                <?php echo rtrim($account_managers, ', '); ?> 
+                                <?php 
+                                 $account_managers = rtrim($account_managers, ', ');
+                                 echo $account_managers !== '' ? $account_managers : 'N/A'; ?> 
                             </td>
                             <td>
                                 <div class="btn-group dropdown">
@@ -166,7 +167,8 @@ table.dataTable thead th {
             </div>
         </div><!-- /.modal-content -->
     </div>
-</div><!-- /.modal -->
+</div>
+<!-- /.modal -->
 
 <script>
    document.addEventListener("DOMContentLoaded", function () {
@@ -292,15 +294,15 @@ table.dataTable thead th {
  $(document).ready(function(){
     $('#lead_id').select2();
  })   
-
+var table;
 $(document).ready(function()
 {
-    $('#tickets-table').DataTable({
-        dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
-            "<'row'<'col-sm-12'tr>>" + 
-            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+    table = $('#tickets-table').DataTable({
+        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'<'col-sm-5'i><'col-sm-7'p>>",
+
         buttons: [
- 
             {
                 text: 'Add From Lead',
                 className: 'btn-filter add-from-lead', // custom class
@@ -309,37 +311,138 @@ $(document).ready(function()
                 }
             },
             {
-                text: '+ create New Client',
-                className: 'btn-filter buttons-html5', // custom class
+                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) {
                     addClient();
                 }
             },
-            {
-                extend: 'csv',
-                text: 'CSV',
-                title: 'ClientList',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                },
-            }
-        ],
-
-        initComplete: function() {
-            $('.btn-filter')
-                .removeClass('btn-secondary') 
-                .addClass('btn btn-primary');  
-        },
+                    {
+                        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: 'Client-List',
+                                        // title: function() {
+                                        //         return $('#toggleButtons').is(':checked') 
+                                        //             ? 'GC-Client-List' 
+                                        //             : 'RC-Client-List';
+                                        // },
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+            search: `
+            <div class="datatable-search-wrapper">
+                _INPUT_
+                <i class="mdi mdi-magnify datatable-search-icon"></i>
+            </div>`,
+            searchPlaceholder: "Search",
+            emptyTable: '<div class="text-center text-muted">No Data found</div>'
         },
         paging: true ,
         // pagingType: 'full_numbers'
     });
+
+    // $(".datatable-buttons").prepend(`
+    //     <label class="switch">
+    //         <input type="checkbox" id="toggleButtons">
+    //         <span">Group</span>
+    //     </label>
+    // `);
+
+    $(".datatable-buttons").prepend(`
+        <span id="statusSwitchWrapper" class="dt-switch-wrapper">
+            <span class="custom-switch" style="text-align: left;">
+                <input type="checkbox" class="custom-control-input" id="toggleButtons" checked>
+                <label class="custom-control-label" for="toggleButtons" style="vertical-align: middle !important;">Group Client</label>
+            </span>
+        </span>
+    `);
+                $('#toggleButtons').on('change', function() {
+                    let type = $(this).is(':checked') ? 1 : 2;
+                    // $('div.col-6 h4').text(
+                    //     $(this).is(':checked') 
+                    //         ? "GC Client List" 
+                    //         : "RC Client List"
+                    // );
+                    let url = '<?= base_url('client/typeList/') ?>' + type;
+
+                    $.ajax({
+                        url: url,        
+                        method: 'GET',
+                        success: function(response) {
+                            if (response.status === "success" && Array.isArray(response.data)) {
+                                renderRows(response.data);
+                            } else {
+                                renderRows([]);
+                            }
+                        },
+                        error: function(xhr, status, error) {
+                            console.error("Error loading:", error);
+                            renderRows([]);
+                        }
+                    });
+            });
+    
 }) 
 
+    function renderRows(data) {
+        table.clear();
+        if (Array.isArray(data) && data.length) {
+            data.forEach((row, index) => {
+                let clientrm = <?= json_encode($client_rm) ?>;
+                let account_managers = "";
+
+                clientrm.forEach(client => {
+                    if (client.client_id == row.id) {
+                        account_managers += client.account_manager + ", ";
+                    }
+                });
+                account_managers = account_managers.replace(/,\s*$/, "");
+                if (account_managers === "") account_managers = "N/A";
+
+                let rowData = [
+                    index + 1,
+                    `<span class="client_info" data-id="${row.id}">${row.client_name} (${row.short_name})</span>`,
+                    account_managers,                
+                    `<div class="btn-group dropdown">
+                        <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown">
+                            <i class="mdi mdi-dots-horizontal"></i>
+                        </a>
+                        <div class="dropdown-menu dropdown-menu-right">
+                            <a class="dropdown-item" href="<?= base_url("client/list/") ?>${row.id}">
+                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                            </a>
+                            <a class="dropdown-item" href="<?= base_url("client/deposit/") ?>${row.id}">
+                                <i class="mdi mdi-cash mr-2 text-muted font-18 vertical-middle"></i>CD Transactions
+                            </a>
+                            <?php if(in_array(get_role_id(), [1, 5])) { ?>
+                                <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>
+                            <?php } ?>
+                        </div>
+                    </div>`
+                ];
+
+                let newRow = table.row.add(rowData);
+                $(newRow.node()).find('td:eq(0)').addClass('text-center');
+                $(newRow.node()).find('td:eq(1)').addClass('client_info').attr('data-id', row.id);
+                    
+                });
+        } 
+        table.draw();
+    }
+
 //DO NOT REMOVE THIS FUNCTION >>> THI FUNCTION FOR CLIENT SOFT DELETE
 // function removeClient(element) 
 // {
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 5366d1a8..3dc798d6 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -1,44 +1,39 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
-.navtab-bg .nav-link {
-    margin: 0 5px 10px!important;
-}
-
-.readonly-select {
-    pointer-events: none;
-    /* background-color: #f0f0f0;  */
-    background-color: #e0e0e0;
-    color: #666; 
-}
 
+    .readonly-select {
+        pointer-events: none;
+        /* background-color: #f0f0f0;  */
+        background-color: #e0e0e0;
+        color: #666;
+    }
 </style>
 
 <style>
@@ -47,10 +42,6 @@ body {
         font-size: 14px;
     }
 
-    .container-fluid {
-        padding: 12px;
-    }
-
     .user-card {
         background: white;
         border-radius: 8px;
@@ -90,7 +81,7 @@ body {
         font-size: 0.85em;
         opacity: 0.9;
         margin: 0;
-        color:rgb(56, 55, 55);
+        color: rgb(56, 55, 55);
     }
 
     .accordion-icon {
@@ -259,48 +250,19 @@ body {
         border: 1px solid #dee2e6;
     }
 
-    #client_add .nav-pills ,
-    #client_add .nav-link    
-    {
-        background-color: #F5FFFF !important;
-        color : #00999E !important;
-        border-radius:10px;
-        
-    }
 
-    #client_add .nav-pills 
-    {
-        background-color: #F5FFFF !important;
-        color : #00999E !important;
-        box-shadow: 0px 2px 4px 0px #00000040;
-        padding-top: 5px ;
-    }
-
-
-    #client_add .nav-link.active-tab {
-        color: white !important;
-        background-color: #00999E !important;
-        font-size: small !important;
-        padding:8px 16px;
-        border-radius: 10px !important; 
-        box-shadow: 0px 2px 4px 0px #00000040;
-    
-    }
-
-    #hr_activity_history_append_area{
-        padding-top:0; 
-        margin-top:0; 
+    #hr_activity_history_append_area {
+        padding-top: 0;
+        margin-top: 0;
         background-color: #F5FFFF !important;
         border: 2px solid #F5FFFF;
         border-radius: 10px;
         box-shadow: 0px 4px 4px 0px #00000040;
     }
 
-    #hr_activity_history_append_area tbody tr{
+    #hr_activity_history_append_area tbody tr {
         background-color: white !important;
     }
-
-
 </style>
 
 
@@ -311,78 +273,95 @@ body {
             <div class="card-body">
                 <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
-                        <h4  style="position: relative;">Client Onboarding  <?php if(isset($client)) {echo ' - ' . $client['client_name']; } ?></h4>
+                        <h4 style="position: relative;">Client Onboarding <?php if (isset($client)) {
+                                                                                echo ' - ' . $client['client_name'];
+                                                                            } ?></h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("client/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>
                     </div>
                 </div>
-                
+
                 <br>
 
-                <ul class="nav nav-pills navtab-bg" >
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active" id="general_tab">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                            <span class="d-none d-sm-inline-block">KYC Docs</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#RM-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="RM_tab">
-                            <span class="mr-1"><i class="mdi mdi-account-switch"></i></span>
-                            <span class="d-none d-sm-inline-block"> Relationship Manager</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="branch_tab">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#notification-tab"  data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="notification_tab">
-                            <span class="mr-1"><i class="mdi mdi-bell"></i></span>
-                            <span class="d-none d-sm-inline-block">Notifications</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#police-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_tab">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">Policies</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Access Control</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#hr-activity-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_activity_tab" onclick="appendHrActivityHistoryHtml(this)">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Activity</span>
-                        </a>
-                    </li>
-                    <!-- <li class="nav-item">
-                        <a href="#api-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="api_tab">
-                            <span class="mdi mdi-api"></span>
-                            <span class="d-none d-sm-inline-block">API</span>
-                        </a>
-                    </li> -->
-                    <!-- <li class="nav-item">
-                        <a href="#others-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="others_tab">
-                            <span class="mr-1"><i class="mdi mdi-tag-text-outline"></i></span>
-                            <span class="d-none d-sm-inline-block">Others</span>
-                        </a>
-                    </li> -->
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <!-- Left Arrow -->
+
+
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item ">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active" id="general_tab">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                                <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                                <span class="d-none d-sm-inline-block">KYC Docs</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#RM-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="RM_tab">
+                                <span class="mr-1"><i class="mdi mdi-account-switch"></i></span>
+                                <span class="d-none d-sm-inline-block"> Relationship Manager</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="branch_tab">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#notification-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="notification_tab">
+                                <span class="mr-1"><i class="mdi mdi-bell"></i></span>
+                                <span class="d-none d-sm-inline-block">Notifications</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#police-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_tab">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">Policies</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">Client Access Control</span>
+                                <!-- Name Changed "HR Access Controll" into "Client Access Control" -->
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#hr-activity-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_activity_tab" onclick="appendHrActivityHistoryHtml(this)">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">HR Activity</span>
+                            </a>
+                        </li>
+                        <!-- <li class="nav-item">
+                                <a href="#api-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="api_tab">
+                                    <span class="mdi mdi-api"></span>
+                                    <span class="d-none d-sm-inline-block">API</span>
+                                </a>
+                            </li> -->
+                        <!-- <li class="nav-item">
+                                <a href="#others-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="others_tab">
+                                    <span class="mr-1"><i class="mdi mdi-tag-text-outline"></i></span>
+                                    <span class="d-none d-sm-inline-block">Others</span>
+                                </a>
+                            </li> -->
+                        <li class="nav-item">
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+
+
+                </div>
+
                 <div class="tab-content">
 
                     <div class="tab-pane fade" id="hr-access-tab">
@@ -408,7 +387,8 @@ body {
                     </div>
 
                     <?php include("client_api.php"); ?>
-                    <?php // include('client_others_tab.php'); ?>
+                    <?php // include('client_others_tab.php'); 
+                    ?>
                     <?php include('notification.php'); ?>
                     <?php include('client_basic_info.php'); ?>
                     <?php include('client_kyc.php'); ?>
@@ -422,81 +402,141 @@ body {
 </div>
 
 
-<script>
+<div class="modal fade" id="autoFetchBranchModal" tabindex="-1" role="dialog" aria-labelledby="autoFetchBranchModalLabel" accesskey=""
+    aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" style="margin-left: 400px !important;">
+        <div class="modal-content modal-lg">
+            <div class="modal-header">
+                <h5 class="modal-title" id="autoFetchBranchModalLabel">Fetch Client Branch (Pre-Enrolment)</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" style="min-height:auto !important;">
 
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="form-group col-md-12">
+                            <label for="auto_fetch_client">Client List<span class="text-danger">*</span></label>
+                            <select class="form-control select2" id="auto_fetch_client" name="auto_fetch_client" required>
+                                <option value="">Select Client</option>
+                                <?php if (!empty($auto_fetch_client_list)): ?>
+                                    <?php foreach ($auto_fetch_client_list as $client_list): ?>
+                                        <option value="<?= esc($client_list['id']) ?>">
+                                            <?= esc($client_list['client_name']) ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                <?php endif; ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="col-md-6">
+                        <div class="form-group col-md-12">
+                            <label for="auto_fetch_branch">Branch List<span class="text-danger">*</span></label>
+                            <select class="form-control select2" id="auto_fetch_branch" name="auto_fetch_branch" required>
+                                <option value="">Select Branch</option>
+
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn cancel-btn" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary submit-btn" id="submitAutoFetch">Submit</button>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
     let hrAccessControlHtmlAppended = false;
     let hrActivityHistoryHtmlAppended = false;
 
     function client_kyc_docs() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     function client_relationship_manager() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#relation_form').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             $('#relation_form').show();
         }
-        
+
     }
 
     function client_policies() {
         var check_client_id = $('#general_PrimaryKey').val();
-        
-        if(check_client_id == '' || check_client_id == null || check_client_id == 0){
+
+        if (check_client_id == '' || check_client_id == null || check_client_id == 0) {
             $('#BtnAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnPolicyBack')[0].style.display == 'none') {
                 $('#BtnAdd').show();
             }
         }
-        
+
     }
 
     function client_branch_contact() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     function client_notification() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#notification-tab').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#notification-tab')[0].style.display == 'none') {
                 $('#notification-tab').show();
             }
         }
-        
+
     }
 
     document.getElementById("kyc_tab").addEventListener("click", function(event) {
@@ -513,7 +553,7 @@ body {
         event.preventDefault();
         client_policies();
     });
-    
+
     document.getElementById("branch_tab").addEventListener("click", function(event) {
         event.preventDefault();
         client_branch_contact();
@@ -524,16 +564,18 @@ body {
         client_notification();
     });
 
-    //HR Access Controll
-    function appendHrAccessControllHtml(input){
+    //HR Access Controll also know as "Client Access Control"
+    function appendHrAccessControllHtml(input) {
         console.log(input.id);
         let client_id = $('#general_PrimaryKey').val();
         console.log('client_id ', client_id);
 
         let url = '<?= base_url('util/viewHrAccessData') ?>';
-        let requestData = {client_id : client_id};
+        let requestData = {
+            client_id: client_id
+        };
 
-        if(hrAccessControlHtmlAppended == false){
+        if (hrAccessControlHtmlAppended == false) {
             sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
                 console.log('Data fetched successfully:', response);
 
@@ -550,13 +592,13 @@ body {
                 console.error(xhr.responseText);
                 hrAccessControlHtmlAppended = false;
             });
-        }else{
+        } else {
             console.log('Already HTML appended');
         }
     }
 
     //HR Activity History
-    function appendHrActivityHistoryHtml(input, submit = false){
+    function appendHrActivityHistoryHtml(input, submit = false) {
         console.log(input.id);
         let client_id = $('#general_PrimaryKey').val();
         let startDate = $('#startDate').val();
@@ -565,14 +607,18 @@ body {
         console.log('startDate ', startDate);
         console.log('endDate ', endDate);
 
-        if(submit){
-             hrActivityHistoryHtmlAppended = false;
+        if (submit) {
+            hrActivityHistoryHtmlAppended = false;
         }
 
         let url = '<?= base_url('user/getUserActivityHistory') ?>';
-        let requestData = {client_id : client_id, startDate : startDate, endDate : endDate};
+        let requestData = {
+            client_id: client_id,
+            startDate: startDate,
+            endDate: endDate
+        };
 
-        if(hrActivityHistoryHtmlAppended == false){
+        if (hrActivityHistoryHtmlAppended == false) {
             sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
                 console.log('Data fetched successfully:', response);
 
@@ -589,20 +635,18 @@ body {
                 console.error(xhr.responseText);
                 hrActivityHistoryHtmlAppended = false;
             });
-        }else{
+        } else {
             console.log('Already HTML appended');
         }
     }
-
 </script>
 
 <script>
-
     function toggleAccordion(header) {
-        if (event.target.classList.contains('fa-info-circle') || 
-        event.target.parentElement.classList.contains('fa-info-circle')) {
+        if (event.target.classList.contains('fa-info-circle') ||
+            event.target.parentElement.classList.contains('fa-info-circle')) {
             getHrActivityHistory();
-        return; // Do nothing if click was on the info icon
+            return; // Do nothing if click was on the info icon
         }
         const card = header.parentElement;
         const content = card.querySelector('.card-content');
@@ -650,9 +694,8 @@ body {
         return Array.from(checkboxes).map(cb => parseInt(cb.value));
     }
 
-    function getHrActivityHistory()
-    {
-        console.log(event.target.dataset.id);//return;
+    function getHrActivityHistory() {
+        console.log(event.target.dataset.id); //return;
         let ids = event.target.dataset.id.split('-');
         console.log('ids', ids)
         let client_id = $('#general_PrimaryKey').val();
@@ -661,7 +704,12 @@ body {
         console.log(url);
         let user_type = "hr";
 
-        let requestData = {user_id : ids[1], pre_hr_id : ids[0], user_type : user_type, client_id : client_id};
+        let requestData = {
+            user_id: ids[1],
+            pre_hr_id: ids[0],
+            user_type: user_type,
+            client_id: client_id
+        };
         console.log('requestData', requestData);
 
         sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
@@ -703,7 +751,10 @@ body {
                 allowed_pre_policies: getCheckedValues(`${userId}_pre_policies`),
                 allowed_active_policies: getCheckedValues(`${userId}_active_policies`),
                 allowed_cd: getCheckedValues(`${userId}_cd`),
-                allowed_claims: getCheckedValues(`${userId}_claims`)
+                allowed_claims: getCheckedValues(`${userId}_claims`),
+                pre_branch_id: formData.get(`${userId}_pre_branch_id`),
+                post_branch_id: formData.get(`${userId}_post_branch_id`),
+                pre_client_id: formData.get(`${userId}_pre_client_id`)
             };
 
             users.push(user);
@@ -721,7 +772,10 @@ body {
                 allowed_pre_policies: user.allowed_pre_policies.length ? `[${user.allowed_pre_policies.join(',')}]` : '[]',
                 allowed_active_policies: user.allowed_active_policies.length ? `[${user.allowed_active_policies.join(',')}]` : '[]',
                 allowed_cd: user.allowed_cd.length ? `[${user.allowed_cd.join(',')}]` : '[]',
-                allowed_claims: user.allowed_claims.length ? `[${user.allowed_claims.join(',')}]` : '[]'
+                allowed_claims: user.allowed_claims.length ? `[${user.allowed_claims.join(',')}]` : '[]',
+                pre_client_id: user.pre_client_id || "",
+                pre_branch_id: user.pre_branch_id || "",
+                post_branch_id: user.post_branch_id || ""
             };
         });
 
@@ -745,7 +799,10 @@ body {
         console.log(output);
 
         let url = '<?= base_url('util/saveHrAccessData') ?>';
-        let requestData = {json : output, client_id : client_id};
+        let requestData = {
+            json: output,
+            client_id: client_id
+        };
 
         sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
             console.log('Data fetched successfully:', response);
@@ -771,15 +828,15 @@ body {
         return Array.from(checkboxes).map(cb => cb.value);
     }
 
-    $(document).on('change', '.select-all', function () {
+    $(document).on('change', '.select-all', function() {
         let $this = $(this);
         let type = $this.data('type');
         let user = $this.data('user');
         let group = $this.data('group');
 
         console.log('--- SELECT-ALL CHANGED ---');
-        console.log('Type:', type);   // all / active / inactive
-        console.log('User:', user);   // user index
+        console.log('Type:', type); // all / active / inactive
+        console.log('User:', user); // user index
         console.log('Group:', group); // pre / post
 
         // Step 1: Uncheck other "select-all" checkboxes in the same user/group
@@ -972,19 +1029,148 @@ body {
 
     //     console.log('--- END ---');
     // });
+</script>
+
+
+<script>
+    $('#btnAutoBranchFetch').click(function() {
+
+        var myModal = new bootstrap.Modal(document.getElementById('autoFetchBranchModal'));
+        myModal.show();
+
+
+    })
+</script>
+
+<script>
+    $(document).ready(function() {
+
+        $('#auto_fetch_client').select2();
+        $('#auto_fetch_branch').select2();
+        
+        $('#auto_fetch_client').change(function() {
+
+            $('#auto_fetch_branch').html(`<option value="">Select Branch</option>`);
+
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+
+            $.ajax({
+                url: "<?php echo base_url('client/branch/auto_fetch_branch'); ?>",
+                type: "POST",
+                data: {
+                    client_id: $('#auto_fetch_client').val()
+                },
+                dataType: "json",
+                success: function(response, textStatus, xhr) {
+                    if (xhr.status === 200) {
+                        let options = `<option value="">Select Branch</option>`;
+
+                        response.data.forEach((data) => {
+                            options += `<option value="${data.id}">${data.branch_name}</option>`;
+                        });
+
+                        $('#auto_fetch_branch').html(options);
+                    } else {
+                        $('#auto_fetch_branch').html('<option value="">No Branch Found</option>');
+                    }
+                },
+                error: function(xhr, status, error) {
+                    console.error("Error occurred:", status, error);
+                },
+                complete: function() {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    console.log("auto_fetch_client call is completed..!!");
+                }
+            });
+        });
+
+    });
+
 
 </script>
 
 <script>
-    $(document).ready(function(){
-    $('#client_add .nav-link').click(function(){
+    $('#submitAutoFetch').click(function() {
 
-    // change bg color of tab
-        $('#client_add .nav-link').removeClass('active-tab');
-        $(this).addClass('active-tab');
-    
+        let client_id = $('#auto_fetch_client').val();
+        let branch_id = $('#auto_fetch_branch').val();
+
+        if (client_id == "" || branch_id == "") {
+            Swal.fire({
+                icon: 'warning',
+                title: 'Missing Data',
+                text: 'Please select both Client and its Branch!',
+                confirmButtonText: 'OK'
+            });
+            return;
+        }
+
+        $.ajax({
+            url: "<?php echo base_url('client/branch/auto_fetch_branch_details'); ?>",
+            type: "POST",
+            data: {
+                client_id,
+                branch_id
+            },
+            dataType: "json",
+            success: function(response, textStatus, xhr) {
+                if (xhr.status === 200) {
+
+                    let result = response.data[0]??[];
+
+                    if(response.data[0] == []){
+                        console.log("Empty array ..!!!");
+                        return;
+                    }
+
+                    let units = JSON.parse(result['units']);
+
+                    let $select = $('#selected');
+                    $select.empty();
+
+                    units.forEach(unit => {
+                        // If you want to mark them as selected, set 'selected' attribute
+                        $select.append(`<option value="${unit}" selected>${unit}</option>`);
+                    });
 
 
-    });
-});
-</script>
+
+                    $('#pre_branch_id').val(branch_id);
+                    $('#branch_name').val(result['branch_name']??'');
+                    $('#branch_code').val(result['branch_code']??'');
+                    $('#address1').val(result['address1']??'');
+                    $('#address2').val(result['address2']??'');
+                    $('#state').val(result['state']??'');
+                    $('#district').val(result['district']??'');
+                    $('#branch_city').val(result['city']??'');
+                    $('#pincode').val(result['pincode']??'');
+                    $('#gst').val(result['gst']??'');
+                    $('#sez').val(result['sez']??'');
+
+                } else {
+                    console.log("User Error thrown");
+                    console.log("status" + xhr.status);                
+                }
+
+                closeModalById('autoFetchBranchModal');
+
+            },
+            error: function(xhr, status, error) {
+                console.error("Error occurred:", status, error);
+            },
+            complete: function() {
+                console.log("auto_fetch_branch_details call is completed..!!");
+            }
+
+        })
+
+
+
+
+    })
+
+
+
+</script>
\ No newline at end of file
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 541a6a98..987bccf8 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -200,7 +200,8 @@
                                     <span class="slider round" style="height: 27px;"></span>
                                 </label>
 
-                                <label for="policy_visibility" style="position: relative;bottom: 5px;left: 85px;">Policy Visibilty in Enrollment App</label>
+                                <!-- <label for="policy_visibility" style="position: relative;bottom: 5px;left: 85px;">Policy Visibilty in Enrollment App</label> -->
+                                 <label for="policy_visibility" style="position: relative;bottom: 5px;left: 85px;">Policy Visibilty in Employee App</label>
                             </div>
                             
                             <div class="form-group col-md-4 EB">
diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php
index 58fd2da3..6bdd968a 100644
--- a/app/Views/dms_search.php
+++ b/app/Views/dms_search.php
@@ -1,90 +1,101 @@
 <style>
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
-
-.autocomplete-suggestions {
-      border: 1px solid #d4d4d4;
-      max-height: 150px;
-      overflow-y: auto;
-      position: absolute;
-      background-color: white;
-      width: inherit;
-      z-index: 1;
+        max-width: 98% !important;
     }
+
+    .autocomplete-suggestions {
+        border: 1px solid #d4d4d4;
+        max-height: 150px;
+        overflow-y: auto;
+        position: absolute;
+        background-color: white;
+        width: inherit;
+        z-index: 1;
+    }
+
     .autocomplete-suggestion {
-      padding: 8px;
-      cursor: pointer;
-    }
-    .autocomplete-suggestion:hover {
-      background-color: #e9e9e9;
+        padding: 8px;
+        cursor: pointer;
     }
 
+    .autocomplete-suggestion:hover {
+        background-color: #e9e9e9;
+    }
 </style>
 
 <div class="row">
     <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <form method="post" action="<?= base_url("/dmsSearch");?>" id='dms_search_form'>
-                            <div class="form-row">
+        <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" style="margin-top: 0px;">
+                            <div class="form-group">
+                                <form method="post" action="<?= base_url("/dmsSearch"); ?>" id='dms_search_form'>
+                                    <div class="form-row">
 
-                                <div class="form-group col-md-2">
-                                    <label for="customer">Customer</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" class="form-control" id="customer" placeholder="Enter customer name">
-                                        <input type="hidden" name="customer_id" class="form-control" id="customer_id" placeholder="Enter customer name">
-                                        <div id="customer_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Customer</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" class="form-control" id="customer" placeholder="Enter customer name">
+                                            <input type="hidden" name="customer_id" class="form-control" id="customer_id" placeholder="Enter customer name">
+                                            <div id="customer_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
+                                            <!-- </div> -->
+                                        </div>
 
-                                 <div class="form-group col-md-2">
-                                    <label for="customer">Customer document name</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" name="cus_doc_name" class="form-control" id="cus_doc_name" placeholder="Enter customer doc name ">
-                                    <!-- </div> -->
-                                </div>
-                                <div class="form-group col-md-1" style="text-align: center;">
-                                    OR
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label for="customer">Policy</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" class="form-control" id="policy" placeholder="Enter policy no">
-                                        <input type="hidden" name="policy_id" class="form-control" id="policy_id" placeholder="Enter policy no">
-                                        <div id="policy_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Customer document name</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" name="cus_doc_name" class="form-control" id="cus_doc_name" placeholder="Enter customer doc name ">
+                                            <!-- </div> -->
+                                        </div>
+                                        <div class="form-group col-md-4"></div>
 
-                                 <div class="form-group col-md-3">
-                                    <label for="customer">Policy document name</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" name="policy_doc_name" class="form-control" id="policy_doc_name" placeholder="Enter policy doc name ">
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-8" style="text-align: center; font-size: small;">
+                                            OR
+                                        </div>
+                                        <div class="form-group col-md-4"></div>
+
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Policy</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" class="form-control" id="policy" placeholder="Enter policy no">
+                                            <input type="hidden" name="policy_id" class="form-control" id="policy_id" placeholder="Enter policy no">
+                                            <div id="policy_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
+                                            <!-- </div> -->
+                                        </div>
+
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Policy document name</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" name="policy_doc_name" class="form-control" id="policy_doc_name" placeholder="Enter policy doc name ">
+                                            <!-- </div> -->
+                                        </div>
+
+                                        <div class="form-group col-md-4 d-flex justify-content-end align-items-end">
+                                            <button type="button" class="btn app-btn-outline-secondary  mr-2" id="clear-filters">Clear</button>
+                                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="get-emp-list" onclick="fetchFileList(event);">Submit</button>
+                                            <!-- <input type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="get-emp-list" onclick="fetchFileList(event);" value="submit">                             -->
+                                        </div>
+
+                                    </div>
+                                </form>
                             </div>
-
-                            <div class="form-group text-right m-b-0">
-                                <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
-                                <input type="submit" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchFileList(event);" value="submit">                            
-                            </div>
-                        </form>
                         </div>
                     </div>
                 </div>
-            </div>
 
+            </div>
         </div>
+
     </div>
 </div>
 
@@ -94,7 +105,8 @@
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">File search result</h4>
+                    <h4 style="position: relative;">Files</h4>
+                    <!-- <h4 style="position: relative;">File search result</h4> -->
                 </div>
 
             </div>
@@ -102,17 +114,17 @@
             <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100">
                 <thead class="bg-light">
                     <tr>
-                        <th>S.No</th>
-                        <th>Doc name</th>
-                        <th>File name</th>
-                        <th>Action</th>
+                        <th>S.No&nbsp;</th>
+                        <th>Doc name&nbsp;</th>
+                        <th>File name&nbsp;</th>
+                        <th>Action&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php if (isset($files)) { ?>
                         <?php foreach($files as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['doc_name']; ?></td>
                             <td><?php echo $row['file_name']; ?></td>
                             <td>
@@ -125,11 +137,13 @@
                                 </a>
                             </td>
 
-                        </tr>
+  
+
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
-                    <?php } ?>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
 
                 <div>
                 </div>
@@ -140,106 +154,124 @@
 
 
 <script>
- 
-$(document).ready(function() {
-    // $('#client_id').select2();
-    // $('#insurer_id').select2();
-    // $('#policy_type_id').select2();
-     const customer_suggestions = <?php echo json_encode($customers); ?>;
-     const policy_suggestions = <?php echo json_encode($policies); ?>;
-     showSuggestions('customer','customer_suggestions','customer_id',customer_suggestions);
-     showSuggestions('policy','policy_suggestions','policy_id',policy_suggestions);
+    $(document).ready(function() {
+        // $('#client_id').select2();
+        // $('#insurer_id').select2();
+        // $('#policy_type_id').select2();
+        const customer_suggestions = <?php echo json_encode($customers); ?>;
+        const policy_suggestions = <?php echo json_encode($policies); ?>;
+        showSuggestions('customer', 'customer_suggestions', 'customer_id', customer_suggestions);
+        showSuggestions('policy', 'policy_suggestions', 'policy_id', policy_suggestions);
 
-})
+    })
 
-// Datatable document ready
-$(document).ready(function() {
+    // Datatable document ready
+    $(document).ready(function() {
 
-var ticketsTable = $('#scroll-horizontal-datatable');
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-if (ticketsTable.length) {
-    ticketsTable.DataTable({
-        scrollX: true,
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true, // Enable pagination
-        pageLength: 25, // Set default number of rows per page (optional)
-    });
-} else {
-    console.error("Table not found.");
-}
-});
-
-function showSuggestions(inputID, suggestionBoxID,hiddenInputID,suggestions) {
-   
-    // console.log('showSuggestions');
-    // console.log(suggestions);return;
-    const input = document.getElementById(inputID);
-    const suggestionBox = document.getElementById(suggestionBoxID);
-    const hiddenInput = document.getElementById(hiddenInputID);
-
-    input.addEventListener('input', function() {
-        const value = this.value.toLowerCase();
-        suggestionBox.innerHTML = ''; // Clear previous suggestions
-
-        if (value) {
-            const filteredSuggestions = suggestions.filter(item =>
-                item.display_value.toLowerCase().includes(value)
-            );
-            // console.log(filteredSuggestions);
-            filteredSuggestions.forEach(suggestion => {
-                const suggestionItem = document.createElement('div');
-                suggestionItem.textContent = suggestion.display_value;
-                suggestionItem.classList.add('autocomplete-suggestion');
-
-                suggestionItem.addEventListener('click', function() {
-                    input.value = suggestion.display_value;  // Display value in input
-                    hiddenInput.value = suggestion.id;        // Store id in hidden input
-                    suggestionBox.innerHTML = '';             // Clear suggestions after selecting
-                    suggestionBox.style.display = 'none';
-                });
-
-                suggestionBox.appendChild(suggestionItem);
-                suggestionBox.style.display = 'block';
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" +
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                buttons: [{
+                    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>',
+                            className: 'app-btn-primary ',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            exportOptions: {
+                                orthogonal: 'sort'
+                            },
+                            className: 'app-btn-primary ',
+                        }
+                    ]
+                }],
+                paging: true,
+                pageLength: 10,
+                order: [
+                    [0, 'desc']
+                ]
             });
+        } else {
+            console.error("Table not found.");
         }
     });
-}
 
+    function showSuggestions(inputID, suggestionBoxID, hiddenInputID, suggestions) {
 
-function fetchFileList(event)
-{
-    event.preventDefault();
+        // console.log('showSuggestions');
+        // console.log(suggestions);return;
+        const input = document.getElementById(inputID);
+        const suggestionBox = document.getElementById(suggestionBoxID);
+        const hiddenInput = document.getElementById(hiddenInputID);
 
-    var customer = document.getElementById('customer').value;
-    var customer_id = document.getElementById('customer_id').value;
-    var policy = document.getElementById('policy').value;
-    var policy_id = document.getElementById('policy_id').value;
-    var cus_doc_name = document.getElementById('cus_doc_name').value;
-    var policy_doc_name = document.getElementById('policy_doc_name').value;
+        input.addEventListener('input', function() {
+            const value = this.value.toLowerCase();
+            suggestionBox.innerHTML = ''; // Clear previous suggestions
 
-    if(customer == '' && cus_doc_name != '')
-    {
-        alert('choose customer');return false;
+            if (value) {
+                const filteredSuggestions = suggestions.filter(item =>
+                    item.display_value.toLowerCase().includes(value)
+                );
+                // console.log(filteredSuggestions);
+                filteredSuggestions.forEach(suggestion => {
+                    const suggestionItem = document.createElement('div');
+                    suggestionItem.textContent = suggestion.display_value;
+                    suggestionItem.classList.add('autocomplete-suggestion');
+
+                    suggestionItem.addEventListener('click', function() {
+                        input.value = suggestion.display_value; // Display value in input
+                        hiddenInput.value = suggestion.id; // Store id in hidden input
+                        suggestionBox.innerHTML = ''; // Clear suggestions after selecting
+                        suggestionBox.style.display = 'none';
+                    });
+
+                    suggestionBox.appendChild(suggestionItem);
+                    suggestionBox.style.display = 'block';
+                });
+            }
+        });
     }
 
-    if(policy == '' && policy_doc_name != '')
-    {
-        alert('choose policy');return false;
+
+    function fetchFileList(event) {
+        event.preventDefault();
+
+        var customer = document.getElementById('customer').value;
+        var customer_id = document.getElementById('customer_id').value;
+        var policy = document.getElementById('policy').value;
+        var policy_id = document.getElementById('policy_id').value;
+        var cus_doc_name = document.getElementById('cus_doc_name').value;
+        var policy_doc_name = document.getElementById('policy_doc_name').value;
+
+        if (policy == '' && customer == '') {
+            alert('choose customer or policy');
+            return false;
+        }
+
+        if (customer == '' && cus_doc_name != '') {
+            alert('choose customer');
+            return false;
+        }
+
+        if (policy == '' && policy_doc_name != '') {
+            alert('choose policy');
+            return false;
+        }
+
+
+        console.log('called');
+        let customEvent = new CustomEvent('fetchFileListCustomEvent');
+        $('#dms_search_form').submit();
+
     }
-
-    if(policy == '' && customer == '')
-    {
-        alert('choose customer or policy');return false;
-    }
-    console.log('called');
-    let customEvent = new CustomEvent('fetchFileListCustomEvent');
-    $('#dms_search_form').submit();
-
-}
-
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index 275b5c6f..db20f6d4 100644
--- a/app/Views/drive_file_upload.php
+++ b/app/Views/drive_file_upload.php
@@ -36,7 +36,8 @@
         </div>
     </div>
 
-    <div id="file_table" class="card">
+    <div id="collapseOne">
+     <div id="file_table" class="card">
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
@@ -45,13 +46,13 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="table_bd">
@@ -62,6 +63,7 @@
             </div>
         </div><!-- end col -->
     </div>
+    </div>
 </div>
 
 
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index d4507c26..a3948cce 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -92,33 +92,33 @@
                 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">SNO</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
 
                             <?php if (isset($getData)) { 
                                 if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
-                                    <th class="font-weight-medium">Client/Branch</th>
+                                    <th class="font-weight-medium">Client/Branch&nbsp;</th>
                             <?php } 
                                 if ($getData['client_id'] != '0' && $getData['branch_id'] == '0') { ?>
-                                    <th class="font-weight-medium">Branch</th>
+                                    <th class="font-weight-medium">Branch&nbsp;</th>
                             <?php } } ?>
 
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">EMP Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Gender</th>
-                            <th class="font-weight-medium">Email</th>
-                            <th class="font-weight-medium">Mobile</th>
-                            <th class="font-weight-medium">Date of Birth</th>
-                            <th class="font-weight-medium">Policy name</th>
-                            <th class="font-weight-medium">Insurer name</th>
-                            <th class="font-weight-medium">TPA ID</th>
-                            <th class="font-weight-medium">Risk ID</th>
-                            <th class="font-weight-medium">Policy status</th>
-                            <th class="font-weight-medium">(₹)Sum Insured</th>
-                            <th class="font-weight-medium">(₹)Premium</th>
-                            <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">(₹)Pro Rata <br> Premium</th>
-                            <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST</th>
-                            <th class="font-weight-medium" > Action </th>
+                            <th class="font-weight-medium">Name&nbsp;</th>
+                            <th class="font-weight-medium">EMP Code&nbsp;</th>
+                            <th class="font-weight-medium">Relationship&nbsp;</th>
+                            <th class="font-weight-medium">Gender&nbsp;</th>
+                            <th class="font-weight-medium">Email&nbsp;</th>
+                            <th class="font-weight-medium">Mobile&nbsp;</th>
+                            <th class="font-weight-medium">Date of Birth&nbsp;</th>
+                            <th class="font-weight-medium">Policy name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer name&nbsp;</th>
+                            <th class="font-weight-medium">TPA ID&nbsp;</th>
+                            <th class="font-weight-medium">Risk ID&nbsp;</th>
+                            <th class="font-weight-medium">Policy status&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Sum Insured&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Premium&nbsp;</th>
+                            <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">(₹)Pro Rata <br> Premium&nbsp;</th>
+                            <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST&nbsp;</th>
+                            <th class="font-weight-medium" > Action &nbsp;</th>
                         </tr>
                     </thead>
 
@@ -129,7 +129,7 @@
                             $gst_total = 0;
                             foreach ($employees as $key => $employee) { ?>
                                 <tr>
-                                    <td><b><?php echo ($key + 1); ?></b></td>
+                                    <td class="text-center"><b><?php echo ($key + 1); ?></b></td>
 
                                     <?php if (isset($getData)) { 
                                         if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
@@ -343,18 +343,34 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Member-List',
-                },{
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Member-List',
-                }],
+                buttons: [
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Member-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Member-List',
+                                    }
+                        ]
+                    }
+                ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 25 // Set default number of rows per page (optional)
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php
index af1cde66..45ad39a0 100755
--- a/app/Views/employee_list.php
+++ b/app/Views/employee_list.php
@@ -1,530 +1,501 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.select2-selection__choice {
-    background-color: #0a8794 !important; 
-    color: white !important;             
-    font-weight: bold;                   
-}
+    .select2-selection__choice {
+        background-color: #0a8794 !important;
+        color: white !important;
+        font-weight: bold;
+    }
 
-.select2-selection__choice__remove {
-    color: white !important;        
-    margin-right: 5px;
-}
+    .select2-selection__choice__remove {
+        color: white !important;
+        margin-right: 5px;
+    }
 
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 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 {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 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;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
-
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
-
- .row{
-    margin-right:20px !important;
-    margin-left:30px  !important;
- }
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
 
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
 <div class="row">
     <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h3 class="m-1">
-                    <span>Members</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>
-                </h3>
-                <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-4">
-                                <label>Client</label> <br />
-                                <select class="form-control" id="clients">
-                                    <option value="0">Select</option>
-                                </select>
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <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-4">
+                                    <label>Client</label> <br />
+                                    <select class="form-control" id="clients">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Branch</label> <br />
+                                    <select name="branch_id" class="form-control" id="branch_id">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Policy</label> <br />
+                                    <select class="form-control" id="policies">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Status</label> <br />
+                                    <select class="form-control" name="status2[]" id="status2" multiple>
+                                        <option value="0">Select</option>
+                                        <?php foreach ($status as $key => $value) { ?>
+                                            <option value="<?= $key ?>"
+                                                <?php
+                                                if ((!isset($getData) || in_array('active', $getData['status'])) && $key == 'active') {
+                                                    echo 'selected';
+                                                }
+                                                ?>>
+                                                <?= $value ?>
+                                            </option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Employee Code</label> <br />
+                                    <input type="text" class="form-control" id="emp_code" name="emp_code" value="<?= isset($getData['emp_code']) && !empty($getData['emp_code']) ? $getData['emp_code'] : '' ?>">
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Employee Name</label> <br />
+                                    <input type="text" class="form-control" id="emp_name" name="emp_name" value="<?= isset($getData['emp_name']) && !empty($getData['emp_name']) ? $getData['emp_name'] : '' ?>">
+                                </div>
+
                             </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Branch</label> <br />
-                                <select name="branch_id" class="form-control" id="branch_id">
-                                    <option value="0">Select</option>
-                                </select>
+                            <div class="row justify-content-end">
+                                <div class="col-auto">
+                                    <!-- <div id="categoryFilter_12"> -->
+                                    <a href="#" class="btn btn-primary waves-effect waves-light"
+                                        style="background-color: #F5FFFF; color:black; border:1px solid #00999E;"
+                                        onclick="sendManualEcard(this)">Send Ecard</a>
+                                    <!-- </div> -->
+                                </div>
+                                <div class="col-auto">
+                                    <a href="<?= base_url("employee/list"); ?>"
+                                        class="btn btn-primary waves-effect waves-light" id="get-emp-list"
+                                        onclick="fetchEmpolyeeList(event);">Submit</a>
+                                </div>
                             </div>
-
-                            
-                            <div class="form-group col-md-4">
-                                <label>Policy</label> <br />
-                                <select class="form-control" id="policies">
-                                    <option value="0">Select</option>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label>Status</label> <br />
-                                <select class="form-control" name="status2[]" id="status2" multiple>
-                                    <option value="0">Select</option>
-                                    <?php foreach($status as $key => $value) { ?>
-                                    <option value="<?= $key ?>"
-                                        <?php  
-                                           if ((!isset($getData) || in_array('active', $getData['status'])) && $key == 'active') {
-                                                echo 'selected';
-                                            }
-                                        ?>>
-                                        <?= $value ?>
-                                    </option>
-                                    <?php } ?>
-                                </select>
-                            </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Employee Code</label> <br />
-                                <input type="text" class="form-control" id="emp_code" name="emp_code" value="<?= isset($getData['emp_code']) && !empty($getData['emp_code']) ? $getData['emp_code'] : '' ?>">
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label>Employee Name</label> <br />
-                                <input type="text" class="form-control" id="emp_name" name="emp_name" value="<?= isset($getData['emp_name']) && !empty($getData['emp_name']) ? $getData['emp_name'] : '' ?>">
-                            </div>
-
+                            <!-- </div> -->
                         </div>
-                        <div class="row justify-content-end">
-                             <div class="col-auto">
-                                <!-- <div id="categoryFilter_12"> -->
-                                    <a href="#" class="btn btn-primary waves-effect waves-light" 
-                                    style="background-color: #F5FFFF; color:black; border:1px solid #00999E;"
-                                    onclick="sendManualEcard(this)">Send Ecard</a>
-                                <!-- </div> -->
-                            </div>
-                            <div class="col-auto">
-                                <a href="<?= base_url("employee/list"); ?>"
-                                    class="btn btn-primary waves-effect waves-light" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
-                            </div>
-                        </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
         </div>
+
     </div>
 </div>
 
 
 
-<?php // include('employee_data_list.php');?>
+<?php // include('employee_data_list.php');
+?>
 
 <div id="employee_table_list"></div>
 
 <!-- end row -->
 <div id="loader" class="loader" style="display:none;">SPINNER</div>
 <script>
-// document.addEventListener("DOMContentLoaded", function () {
-//     const table = document.getElementById("tickets-table");
-    
-//     // Create custom dropdown
-//     function createCustomDropdown(row) {
-//         // Get the original dropdown items
-//         const originalDropdown = row.querySelector('.dropdown-menu');
-//         if (!originalDropdown) return null;
-        
-//         // Create new dropdown with proper background and spacing
-//         const customDropdown = document.createElement('div');
-//         customDropdown.className = 'custom-dropdown-menu';
-        
-//         // Copy inner content while maintaining icon alignment
-//         customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-//         return customDropdown;
-//     }
+    // document.addEventListener("DOMContentLoaded", function () {
+    //     const table = document.getElementById("tickets-table");
 
-//     let activeDropdown = null;
+    //     // Create custom dropdown
+    //     function createCustomDropdown(row) {
+    //         // Get the original dropdown items
+    //         const originalDropdown = row.querySelector('.dropdown-menu');
+    //         if (!originalDropdown) return null;
 
-//     // Add click event listener to rows
-//     table.querySelectorAll("tbody tr").forEach(row => {
-//         const customDropdown = createCustomDropdown(row);
-//         if (!customDropdown) return;
-        
-//         document.body.appendChild(customDropdown);
+    //         // Create new dropdown with proper background and spacing
+    //         const customDropdown = document.createElement('div');
+    //         customDropdown.className = 'custom-dropdown-menu';
 
-//         row.addEventListener("click", function(event) {
-//             // Ignore clicks on the action column
-//             if (event.target.closest('td:last-child')) {
-//                 return;
-//             }
+    //         // Copy inner content while maintaining icon alignment
+    //         customDropdown.innerHTML = originalDropdown.innerHTML;
 
-//             // Hide any active dropdown
-//             if (activeDropdown) {
-//                 activeDropdown.style.display = 'none';
-//             }
+    //         return customDropdown;
+    //     }
 
-//             // Get click position
-//             const rect = event.target.getBoundingClientRect();
-            
-//             // Position the dropdown with some offset
-//             customDropdown.style.display = 'block';
-//             customDropdown.style.position = 'fixed';
-//             customDropdown.style.left = `${rect.left}px`;
-//             customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-//             // Set as active dropdown
-//             activeDropdown = customDropdown;
-            
-//             event.stopPropagation();
-//         });
+    //     let activeDropdown = null;
 
-//         // Preserve click handlers and add auto-close
-//         customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-//             item.addEventListener('click', function(e) {
-//                 const onclickAttr = this.getAttribute('onclick');
-//                 if (onclickAttr) {
-//                     eval(onclickAttr);
-//                 }
-                
-//                 const href = this.getAttribute('href');
-//                 if (href && href !== '#') {
-//                     window.location.href = href;
-//                 }
+    //     // Add click event listener to rows
+    //     table.querySelectorAll("tbody tr").forEach(row => {
+    //         const customDropdown = createCustomDropdown(row);
+    //         if (!customDropdown) return;
 
-//                 // Close the dropdown after handling the click
-//                 if (activeDropdown) {
-//                     activeDropdown.style.display = 'none';
-//                     activeDropdown = null;
-//                 }
-                
-//                 e.stopPropagation();
-//             });
-//         });
-//     });
+    //         document.body.appendChild(customDropdown);
 
-//     // Close dropdown when clicking outside
-//     document.addEventListener("click", function() {
-//         if (activeDropdown) {
-//             activeDropdown.style.display = 'none';
-//             activeDropdown = null;
-//         }
-//     });
-// });
+    //         row.addEventListener("click", function(event) {
+    //             // Ignore clicks on the action column
+    //             if (event.target.closest('td:last-child')) {
+    //                 return;
+    //             }
 
-// document.addEventListener("DOMContentLoaded", init);
+    //             // Hide any active dropdown
+    //             if (activeDropdown) {
+    //                 activeDropdown.style.display = 'none';
+    //             }
 
-function init() {
-    const table = document.getElementById("tickets-table");
-    let activeDropdown = null;
+    //             // Get click position
+    //             const rect = event.target.getBoundingClientRect();
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+    //             // Position the dropdown with some offset
+    //             customDropdown.style.display = 'block';
+    //             customDropdown.style.position = 'fixed';
+    //             customDropdown.style.left = `${rect.left}px`;
+    //             customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
 
-        row.addEventListener("click", function(event) {
-            handleRowClick(event, customDropdown);
-        });
+    //             // Set as active dropdown
+    //             activeDropdown = customDropdown;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                handleItemClick(e, item);
+    //             event.stopPropagation();
+    //         });
+
+    //         // Preserve click handlers and add auto-close
+    //         customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+    //             item.addEventListener('click', function(e) {
+    //                 const onclickAttr = this.getAttribute('onclick');
+    //                 if (onclickAttr) {
+    //                     eval(onclickAttr);
+    //                 }
+
+    //                 const href = this.getAttribute('href');
+    //                 if (href && href !== '#') {
+    //                     window.location.href = href;
+    //                 }
+
+    //                 // Close the dropdown after handling the click
+    //                 if (activeDropdown) {
+    //                     activeDropdown.style.display = 'none';
+    //                     activeDropdown = null;
+    //                 }
+
+    //                 e.stopPropagation();
+    //             });
+    //         });
+    //     });
+
+    //     // Close dropdown when clicking outside
+    //     document.addEventListener("click", function() {
+    //         if (activeDropdown) {
+    //             activeDropdown.style.display = 'none';
+    //             activeDropdown = null;
+    //         }
+    //     });
+    // });
+
+    // document.addEventListener("DOMContentLoaded", init);
+
+    function init() {
+        const table = document.getElementById("tickets-table");
+        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) {
+                handleRowClick(event, customDropdown);
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    handleItemClick(e, item);
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", handleDocumentClick);
+        // Close dropdown when clicking outside
+        document.addEventListener("click", handleDocumentClick);
 
-    function createCustomDropdown(row) {
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Clone original dropdown items while moving onclick handlers to data attributes
-        const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        // Transfer onclick handlers to data attributes
-        customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
-            const originalItem = originalItems[index];
-            const originalOnclick = originalItem.getAttribute('onclick');
-            if (originalOnclick) {
-                item.setAttribute('data-onclick', originalOnclick);
-                item.removeAttribute('onclick');  // Remove original handler
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
+
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+
+            // Clone original dropdown items while moving onclick handlers to data attributes
+            const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
+            customDropdown.innerHTML = originalDropdown.innerHTML;
+
+            // Transfer onclick handlers to data attributes
+            customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
+                const originalItem = originalItems[index];
+                const originalOnclick = originalItem.getAttribute('onclick');
+                if (originalOnclick) {
+                    item.setAttribute('data-onclick', originalOnclick);
+                    item.removeAttribute('onclick'); // Remove original handler
+                }
+            });
+
+            return customDropdown;
+        }
+
+        function handleRowClick(event, customDropdown) {
+            if (event.target.closest('td:last-child')) return;
+
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
             }
-        });
 
-        return customDropdown;
-    }
+            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`;
 
-    function handleRowClick(event, customDropdown) {
-        if (event.target.closest('td:last-child')) return;
-
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
+            activeDropdown = customDropdown;
+            event.stopPropagation();
         }
 
-        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`;
+        function handleItemClick(e, item) {
+            e.preventDefault();
 
-        activeDropdown = customDropdown;
-        event.stopPropagation();
-    }
+            // Execute the stored onclick handler
+            const onclickAttr = item.getAttribute('data-onclick');
+            if (onclickAttr) {
+                eval(onclickAttr);
+            }
 
-    function handleItemClick(e, item) {
-        e.preventDefault(); 
-        
-        // Execute the stored onclick handler
-        const onclickAttr = item.getAttribute('data-onclick');
-        if (onclickAttr) {
-            eval(onclickAttr);
-        }
-        
-        // Handle href navigation
-        const href = item.getAttribute('href');
-        if (href && href !== '#') {
-            window.location.href = href;
+            // Handle href navigation
+            const href = item.getAttribute('href');
+            if (href && href !== '#') {
+                window.location.href = href;
+            }
+
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+
+            e.stopPropagation();
         }
 
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
-        
-        e.stopPropagation();
-    }
-
-    function handleDocumentClick() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
+        function handleDocumentClick() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
         }
     }
-}
-
 </script>
 <script>
+    $(document).ready(function() {
+        // Initialize select2
+        $("#clients").select2();
+        $("#policies").select2();
+        $("#branch_id").select2();
 
-$(document).ready(function() {
-    // Initialize select2
-    $("#clients").select2();
-    $("#policies").select2();
-    $("#branch_id").select2();
+        $("#status2").select2({
+            placeholder: 'Select Status'
+        });
 
-    $("#status2").select2({
-        placeholder : 'Select Status'
+        $("textarea.select2-search__field").attr('rows', '1');
+        $("textarea.select2-search__field").css('resize', 'none');
+
+        // if ($('.select2-selection__arrow').length > 0) {
+        //     $('.select2-selection__arrow').removeClass('select2-selection__arrow').addClass('fa fa-chevron-down');
+        // }
     });
 
-    $("textarea.select2-search__field").attr('rows', '1');
-    $("textarea.select2-search__field").css('resize', 'none');
+    // Declare a global variable to store API response data
+    var clientPolicies = [];
+    var clientPoliciesWithBranch = {
+        policies: []
+    };
+    var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
+    var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
 
-    // if ($('.select2-selection__arrow').length > 0) {
-    //     $('.select2-selection__arrow').removeClass('select2-selection__arrow').addClass('fa fa-chevron-down');
-    // }
-});
+    var statusData = <?= json_encode(isset($getData['status']) ? $getData['status'] : []) ?>;
 
-// Declare a global variable to store API response data
-var clientPolicies = [];
-var clientPoliciesWithBranch = {
-    policies: []
-};
-var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
-var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
+    $(document).ready(function() {
+        // Loop through each item in statusData and set the option as selected.
+        statusData.forEach(function(status) {
+            $('#status2 option[value="' + status + '"]').prop('selected', true);
+        });
 
-var statusData = <?= json_encode(isset($getData['status']) ? $getData['status'] : []) ?>;
-
-$(document).ready(function() {
-    // Loop through each item in statusData and set the option as selected.
-    statusData.forEach(function(status) {
-        $('#status2 option[value="' + status + '"]').prop('selected', true);
+        // Refresh the select element (necessary if you are using a plugin like Select2).
+        $('#status2').trigger('change');
     });
 
-    // Refresh the select element (necessary if you are using a plugin like Select2).
-    $('#status2').trigger('change');
-});
 
+    $(document).ready(function() {
+        console.log("document loaded");
+        //fetchClientPolicies();
+    });
 
-$(document).ready(function() {
-    console.log("document loaded");
-    //fetchClientPolicies();
-});
+    $(window).on("load", function() {
+        console.log("window loaded");
+        fetchClientPolicies();
+    });
 
-$(window).on("load", function() {
-    console.log("window loaded");
-    fetchClientPolicies();
-});
+    function fetchClientPolicies() {
+        $('#loader').show();
+        var apiURL = '<?php echo base_url(); ?>' + 'util/clients-with-policies';
+        console.log('fetchClientPolicies');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                // console.log(response.code);
+                // console.log(response.dataStatus);
+                // console.log(response.data);
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    try {
+                        clientPolicies = (response.data);
 
-function fetchClientPolicies() {
-    $('#loader').show();
-    var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
-    console.log('fetchClientPolicies');
-    // console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "Content-Type": "application/json",
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            // console.log(response.code);
-            // console.log(response.dataStatus);
-            // console.log(response.data);
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    clientPolicies = (response.data);
-
-                    response.data.forEach(policy => {
-                        // console.log('policies', policy.policies);
-                        policy.policies.forEach(p => {
-                            clientPoliciesWithBranch.policies.push(p);
+                        response.data.forEach(policy => {
+                            // console.log('policies', policy.policies);
+                            policy.policies.forEach(p => {
+                                clientPoliciesWithBranch.policies.push(p);
+                            });
                         });
-                    });
 
-                    // console.log('1',clientPolicies);
-                    appendClients(clientPolicies);
-                    
-                    //this function for reselect the policy
-                    setTimeout(function() {
-                        if (client_id != 0 ) {
-                            var foundPolicies = clientPolicies.find(function(item) {
-                                // console.log(typeof item.id)
-                                return item.id == client_id;
-                            });
-                            appendBranch(foundPolicies.branchs);
-                        }
-                    }, 500); 
-                    
-                    setTimeout(function() {
-                        if (client_branch_id != 0 ) {
+                        // console.log('1',clientPolicies);
+                        appendClients(clientPolicies);
 
-                            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-                                // console.log('item', item);
-                                return item.branch_id === client_branch_id;
-                            });
-
-                            if (foundPolicies) {
-                                // console.log('foundPolicies', foundPolicies);
-                                appendPolicies(foundPolicies);
-                            } else {
-                                console.log('No policies found for the selected client');
+                        //this function for reselect the policy
+                        setTimeout(function() {
+                            if (client_id != 0) {
+                                var foundPolicies = clientPolicies.find(function(item) {
+                                    // console.log(typeof item.id)
+                                    return item.id == client_id;
+                                });
+                                appendBranch(foundPolicies.branchs);
                             }
-                        }
-                    }, 500);
-                    //end
+                        }, 500);
 
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                        setTimeout(function() {
+                            if (client_branch_id != 0) {
+
+                                var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                                    // console.log('item', item);
+                                    return item.branch_id === client_branch_id;
+                                });
+
+                                if (foundPolicies) {
+                                    // console.log('foundPolicies', foundPolicies);
+                                    appendPolicies(foundPolicies);
+                                } else {
+                                    console.log('No policies found for the selected client');
+                                }
+                            }
+                        }, 500);
+                        //end
+
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
+                    }
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
-
-    $('#loader').hide();
-}
-
-function appendClients(data) {
-    var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name
         });
-        if (clientID == item.id) {
-            option.attr('selected', true);
-        }
-        $('#clients').append(option);
-    });
-}
 
-function appendBranch(data) {
+        $('#loader').hide();
+    }
 
-    $('#branch_id').empty();
-    $('#branch_id').append($('<option>', {
-        value: '0',
-        text: 'Select'
-    }));
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
+    function appendClients(data) {
+        var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name
+            });
+            if (clientID == item.id) {
+                option.attr('selected', true);
+            }
+            $('#clients').append(option);
         });
-        if (client_branch_id == item.id) {
-            option.attr('selected', true);
-        }
-        $('#branch_id').append(option);
-    });
-}
+    }
 
-function appendPolicies(data) {
+    function appendBranch(data) {
 
-    $('#policies').empty();
-    $('#policies').append($('<option>', {
-        value: '0',
-        text: 'Select'
-    }));
-
-    var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0'?>;
-    // console.log(PolicyID)
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.client_policy_id,
-            // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
-            text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`        
+        $('#branch_id').empty();
+        $('#branch_id').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            if (client_branch_id == item.id) {
+                option.attr('selected', true);
+            }
+            $('#branch_id').append(option);
         });
-        if (PolicyID == item.client_policy_id) {
-            option.attr('selected', true);
-        }
-        $('#policies').append(option);
-    });
-}
+    }
 
-$(document).ready(function() {
-    
-    $('#clients').on('change', function() {
+    function appendPolicies(data) {
 
         $('#policies').empty();
         $('#policies').append($('<option>', {
@@ -532,191 +503,213 @@ $(document).ready(function() {
             text: 'Select'
         }));
 
-        var selectedClient = $(this).val();
-        // console.log('selectedClient', selectedClient);
-        // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
-
-        // Check if the selected option exists in apiData
-        var foundPolicies = clientPolicies.find(function(item) {
-            return item.id === selectedClient;
+        var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0' ?>;
+        // console.log(PolicyID)
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.client_policy_id,
+                // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
+                text: `${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
+            });
+            if (PolicyID == item.client_policy_id) {
+                option.attr('selected', true);
+            }
+            $('#policies').append(option);
         });
-        // console.log(foundPolicies.branchs);
-        appendBranch(foundPolicies.branchs);
-    });
-});
-
-$(document).ready(function() {
-
-    $('#branch_id').on('change', function() {
-        
-        var selectedClient = $(this).val();
-
-        // console.log('selectedBranch', selectedClient);
-        // console.log('clientPolicies', clientPoliciesWithBranch);
-
-        var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-            // console.log('item', item);
-            return item.branch_id === selectedClient;
-        });
-
-
-        if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
-
-            appendPolicies(foundPolicies);
-            toastr.warning('No policies found for the selected client branch.');
-
-        } else {
-
-            // console.log('foundPolicies', foundPolicies);
-            appendPolicies(foundPolicies);
-        }
-    });
-
-});
-
-// Function to convert object to query parameters
-function objectToQueryString(obj) {
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function fetchEmpolyeeList(event = null) {
-
-    if(event){
-        event.preventDefault(); // Prevent default action
     }
 
-    var client_id = $('#clients').val();
-    var policy_id = $('#policies').val();
-    var status = $('#status2').val();
-    var branch_id = $('#branch_id').val();
-    var emp_code = $('#emp_code').val();
-    var emp_name = $('#emp_name').val();
+    $(document).ready(function() {
 
-    var statusArray = [];
-    $('#status2 option:selected').each(function() {
-        statusArray.push($(this).val());
+        $('#clients').on('change', function() {
+
+            $('#policies').empty();
+            $('#policies').append($('<option>', {
+                value: '0',
+                text: 'Select'
+            }));
+
+            var selectedClient = $(this).val();
+            // console.log('selectedClient', selectedClient);
+            // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
+
+            // Check if the selected option exists in apiData
+            var foundPolicies = clientPolicies.find(function(item) {
+                return item.id === selectedClient;
+            });
+            // console.log(foundPolicies.branchs);
+            appendBranch(foundPolicies.branchs);
+        });
     });
 
-    // console.log(client_id + '-' + policy_id);
-    // if (client_id == '0' || policy_id == '0') {
-    //     alert('Please select values in both dropdowns.');
-    //     return;
-    // }
+    $(document).ready(function() {
 
-    var queryParams = {
+        $('#branch_id').on('change', function() {
 
-        client_id: client_id,
-        policy_id: policy_id,
-        branch_id: branch_id,
-        emp_code : emp_code,
-        emp_name : emp_name,
-        status   : statusArray,
-    };
+            var selectedClient = $(this).val();
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    // console.log(apiURL);
-    // window.location.href = apiURL;
+            // console.log('selectedBranch', selectedClient);
+            // console.log('clientPolicies', clientPoliciesWithBranch);
 
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                // console.log('item', item);
+                return item.branch_id === selectedClient;
+            });
 
 
-    // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value
-    console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        data: queryParams,
-        success: function(response) {
-            if(response.status == true){
-                $('#employee_table_list').html(response.html);
+            if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
+
+                appendPolicies(foundPolicies);
+                toastr.warning('No policies found for the selected client branch.');
+
+            } else {
+
+                // console.log('foundPolicies', foundPolicies);
+                appendPolicies(foundPolicies);
+            }
+        });
+
+    });
+
+    // Function to convert object to query parameters
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function fetchEmpolyeeList(event = null) {
+
+        if (event) {
+            event.preventDefault(); // Prevent default action
+        }
+
+        var client_id = $('#clients').val();
+        var policy_id = $('#policies').val();
+        var status = $('#status2').val();
+        var branch_id = $('#branch_id').val();
+        var emp_code = $('#emp_code').val();
+        var emp_name = $('#emp_name').val();
+
+        var statusArray = [];
+        $('#status2 option:selected').each(function() {
+            statusArray.push($(this).val());
+        });
+
+        // console.log(client_id + '-' + policy_id);
+        // if (client_id == '0' || policy_id == '0') {
+        //     alert('Please select values in both dropdowns.');
+        //     return;
+        // }
+
+        var queryParams = {
+
+            client_id: client_id,
+            policy_id: policy_id,
+            branch_id: branch_id,
+            emp_code: emp_code,
+            emp_name: emp_name,
+            status: statusArray,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        // console.log(apiURL);
+        // window.location.href = apiURL;
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+
+        // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value
+        console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            data: queryParams,
+            success: function(response) {
+                if (response.status == true) {
+                    $('#employee_table_list').html(response.html);
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    setTimeout(function() {
+                        init()
+                    }, 1000)
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('Error:', error);
+                toastr.error('Failed to fetch Data', 'Error');
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                setTimeout(function(){
-                    init()
-                }, 1000)
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error:', error);
-            toastr.error('Failed to fetch Data','Error');
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-}
-
-
-document.getElementById('toggleIcon').addEventListener('click', function() {
-    var icon = document.getElementById('icon');
-    icon.classList.toggle('mdi-chevron-down');
-    icon.classList.toggle('mdi-chevron-up');
-});
-
-
-function sendManualEcard(input)
-{
-    console.log('sendManualEcard function called');
-
-    var client_id = $('#clients').val()
-    var client_branch_id = $('#branch_id').val()
-    var policy_id = $('#policies').val()
-
-    console.log('input', input);
-    console.log('client_id', client_id);
-    console.log('client_branch_id', client_branch_id);
-
-    if(client_id == 0 || client_branch_id == 0 || policy_id == 0)
-    {   
-        Swal.fire({
-            title: "warning!",
-            text: 'Please select the Client, Client Branch and Policy.',
-            icon: "warning"
         });
-
-        return false
     }
 
-    Swal.fire({
-      title: "Do you want to send Ecard Mail?",
-      showDenyButton: true,
-      showCancelButton: false,
-      confirmButtonText: "Yes,Send",
-      denyButtonText: "Don't Send"
-    }).then((result) => {
 
-      if (result.isConfirmed) {
-
-             $.ajax({
-                url: '<?= base_url("util/send_manual_ecard/") ?>' + client_id + '/' + client_branch_id+'/'+policy_id,
-                type: "GET",
-                dataType: 'json',
-                success: function(res) {
-
-                    console.log('send_manual_ecard', res)
-
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-
-                    if(res.status == false){
-                        toastr.info(res.message, 'INFO');
-                    }else{
-                        toastr.success(res.message, 'SUCCESS');
-                    }
-
-                },
-                error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                }
-            });
-            // Swal.fire("Saved!", "", "success");
-      }
+    document.getElementById('toggleIcon').addEventListener('click', function() {
+        var icon = document.getElementById('icon');
+        icon.classList.toggle('mdi-chevron-down');
+        icon.classList.toggle('mdi-chevron-up');
     });
 
-}
 
-</script>
+    function sendManualEcard(input) {
+        console.log('sendManualEcard function called');
+
+        var client_id = $('#clients').val()
+        var client_branch_id = $('#branch_id').val()
+        var policy_id = $('#policies').val()
+
+        console.log('input', input);
+        console.log('client_id', client_id);
+        console.log('client_branch_id', client_branch_id);
+
+        if (client_id == 0 || client_branch_id == 0 || policy_id == 0) {
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Client, Client Branch and Policy.',
+                icon: "warning"
+            });
+
+            return false
+        }
+
+        Swal.fire({
+            title: "Do you want to send Ecard Mail?",
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: "Yes,Send",
+            denyButtonText: "Don't Send"
+        }).then((result) => {
+
+            if (result.isConfirmed) {
+
+                $.ajax({
+                    url: '<?= base_url("util/send_manual_ecard/") ?>' + client_id + '/' + client_branch_id + '/' + policy_id,
+                    type: "GET",
+                    dataType: 'json',
+                    success: function(res) {
+
+                        console.log('send_manual_ecard', res)
+
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+
+                        if (res.status == false) {
+                            toastr.info(res.message, 'INFO');
+                        } else {
+                            toastr.success(res.message, 'SUCCESS');
+                        }
+
+                    },
+                    error: function(xhr, status, error) {
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                    }
+                });
+                // Swal.fire("Saved!", "", "success");
+            }
+        });
+
+    }
+</script>
\ No newline at end of file
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 09fb7637..00718a37 100755
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -11,12 +11,23 @@ option:disabled {
         <div class="col-xl-12">
             <div id="accordion1" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</span>
                         <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
                             aria-expanded="true">
                             <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                         </a>
-                    </h5>
+                    </h4>
+
+                    <!-- <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</span>
+                            <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                aria-expanded="true">
+                                <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                    </label> -->
+
                     <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion1">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -86,7 +97,7 @@ option:disabled {
                                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  
 
                                                 <button id="emp_form_submit_button" type="submit"
-                                                        class=" nav-link-btn px-3 py-1 btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
+                                                        class=" nav-link-btn px-3 py-2 btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
 
                                                 &nbsp;&nbsp;
 
@@ -94,7 +105,7 @@ option:disabled {
 
                                                 &nbsp;&nbsp;
 
-                                                <a class=" nav-link-btn px-3 py-1  btn btn-primary waves-effect waves-light justify-content-end"
+                                                <a class=" nav-link-btn px-3 py-2  btn btn-primary waves-effect waves-light justify-content-end"
                                                 id="fetch_enrolled_data" data-toggle="modal"
                                                 data-target="#full-width-modal" title="Download Sample Excel">Fetch
                                                 Enrolled Data</a>
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index 3a4b4f93..cacfab96 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -14,66 +14,70 @@
     }
 </style>
 
-<div class="container-fluid">
-    <h2>Endorsement</h2>
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-xl-12">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h5 class="m-1">
-                        <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>
-                    </h5>
-                    <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-4">
-                                    <label>Client</label> <br />
-                                    <select class="form-control" id="clients">
-                                        <option value="0">Select</option>
-                                    </select>
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <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-4">
+                                        <label>Client</label> <br />
+                                        <select class="form-control" id="clients">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Branch</label> <br />
+                                        <select name="branch_id" class="form-control" id="branch_id">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label>Policy</label> <br />
+                                        <select class="form-control" id="policies">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label>Status</label> <br />
+                                        <select class="form-control" id="status1">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($status as $key => $value) { ?>
+                                                <option value="<?= $key ?>" <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
+                                                    <?= $value ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+
                                 </div>
-
-
-                                <div class="form-group col-md-4">
-                                    <label>Branch</label> <br />
-                                    <select name="branch_id" class="form-control" id="branch_id">
-                                        <option value="0">Select</option>
-                                    </select>
+                                <div class="row">
+                                    <div class="col-12" style="text-align: right;">
+                                        <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
                                 </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Policy</label> <br />
-                                    <select class="form-control" id="policies">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Status</label> <br />
-                                    <select class="form-control" id="status1">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($status as $key => $value) { ?>
-                                            <option value="<?= $key ?>" <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
-                                                <?= $value ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-
+                                <!-- </div> -->
                             </div>
-                            <div class="row">
-                                <div class="col-12" style="text-align: right;">
-                                    <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-                            </div>
-                            <!-- </div> -->
                         </div>
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
 
@@ -90,7 +94,7 @@
                     <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
                             <tr>
-                                <th class="font-weight-medium">SNO</th>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
                                 <th class="font-weight-medium">Name/code</th>
                                 <th class="font-weight-medium">Policy name</th>
                                 <th class="font-weight-medium">Endorsement ID</th>
@@ -108,7 +112,7 @@
                                 foreach ($employees as $key => $employee) { ?>
 
                                     <tr>
-                                        <td><b><?php echo ($key + 1) ?></b></td>
+                                        <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                                         <td><?php echo $employee['name'] ?>( <?php echo $employee['emp_code'] ?> )</td>
                                         <!-- <td><?php echo isset($employee['policy_name']) ? $employee['policy_name'] : '' ?> - <?php echo isset($employee['policy_no']) ? $employee['policy_no'] : '' ?> - <?php echo isset($employee['policy_type']) ? $employee['policy_type'] : '' ?></td> -->
                                         <td><?php echo isset($employee['policy_type']) ?  $employee['policy_type'] : '' ?> - <?php echo isset($employee['policy_no']) ? $employee['policy_no'] : '' ?></td>
@@ -332,7 +336,7 @@
             var option = $('<option>', {
                 value: item.client_policy_id,
                 // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
-                text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
+                text: `${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
             });
             if (PolicyID == item.client_policy_id) {
                 option.attr('selected', true);
@@ -386,7 +390,7 @@
                 toastr.warning('No policies found for the selected client branch.');
 
             } else {
-                
+
                 // console.log('foundPolicies', foundPolicies);
                 appendPolicies(foundPolicies);
             }
@@ -590,27 +594,54 @@
     $(document).ready(function() {
 
         $('#tickets-table').DataTable({
-            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+            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'<'col-sm-5'i><'col-sm-7'p>>",
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Endorsement-List',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)',
-                    format: {
-                        body: function (data, row, column, node) {
-                            // Convert data to string to avoid scientific notation in CSV
-                            if (!isNaN(data) && parseFloat(data) > 1e20) {
-                                return `'${data}`;
-                            }
-                            return data.toString();// Ensures all data is treated as strings
-                        }
+                    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) {
+                        openTicket();
                     }
+                },
+                {
+                    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>',
+                            className: 'app-btn-primary ',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            exportOptions: {
+                                orthogonal: 'sort'
+                            },
+                            className: 'app-btn-primary ',
+                        }
+                    ]
                 }
-            }],
+            ],
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Endorsement-List',
+            //     className: 'my_class',
+            //     exportOptions: {
+            //         columns: ':not(:last-child)',
+            //         format: {
+            //             body: function (data, row, column, node) {
+            //                 // Convert data to string to avoid scientific notation in CSV
+            //                 if (!isNaN(data) && parseFloat(data) > 1e20) {
+            //                     return `'${data}`;
+            //                 }
+            //                 return data.toString();// Ensures all data is treated as strings
+            //             }
+            //         }
+            //     }
+            // }],
             initComplete: function(settings, json) {
                 $('.my_class').css({
                     "position": "relative",
@@ -618,13 +649,19 @@
                 });
             },
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
             // pagingType: 'full_numbers'
-            columnDefs: [
-                { type: 'scientific', targets: 0 } // Apply custom sorting type to the first column
+            columnDefs: [{
+                    type: 'scientific',
+                    targets: 0
+                } // Apply custom sorting type to the first column
             ],
         });
 
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index b0839a80..bc968cd6 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -21,7 +21,7 @@
     }
 
     #tickets-table_filter {
-    float: right;
+        float: right;
     }
 
     .click_hover {
@@ -31,212 +31,215 @@
         box-shadow: 6px 5px 8px 0 #00000036;
         cursor: pointer;
     }
-    .click_hover .text-muted{
+
+    .click_hover .text-muted {
         color: #fff !important;
     }
-    .click_hover span{
+
+    .click_hover span {
         color: #fff !important;
     }
+
     .card {
         border-radius: 10px;
     }
 
-    .row.visa_status_count_view .card-header{
-            background-color: #F5FFFF;
-            padding: 25px;
-            border: 2px solid #fff;
-            border-radius: 10px;
-            /* box-shadow: 2px 2px 2px; */
-            box-shadow: 0px 1px 1px 0px #00000040;
+    .row.visa_status_count_view .card-header {
+        background-color: #F5FFFF;
+        padding: 25px;
+        border: 2px solid #fff;
+        border-radius: 10px;
+        /* box-shadow: 2px 2px 2px; */
+        box-shadow: 0px 1px 1px 0px #00000040;
     }
 
-    .row.visa_status_count_view .card-header #categoryFilter_11 a{
+    .row.visa_status_count_view .card-header #categoryFilter_11 a {
         background-color: #D4F5F6 !important;
-        font-weight:800;
-        color:#000 !important;
-        border : 1px solid #D4F5F6 !important;
+        font-weight: 800;
+        color: #000 !important;
+        border: 1px solid #D4F5F6 !important;
         border-radius: 15px;
-        padding : 5px 10px;
+        padding: 5px 10px;
     }
 
-        #categoryFilter_12 a ,
-        #categoryFilter_13 a ,
-        #categoryFilter_14 a 
-        {
-            background-color: #00999E;
-            box-shadow: 0px 2px 4px 0px #00000040;
+    #categoryFilter_12 a,
+    #categoryFilter_13 a,
+    #categoryFilter_14 a {
+        background-color: #00999E;
+        box-shadow: 0px 2px 4px 0px #00000040;
 
-        }
+    }
 
-        #statusContent{
-            background-color: #F5FFFF;
-            border-radius: 10px;
-            box-shadow: 0px 1px 1px 0px #00000040;
-        }
+    #statusContent {
+        background-color: #F5FFFF;
+        border-radius: 10px;
+        box-shadow: 0px 1px 1px 0px #00000040;
+    }
 
-        #statusContent .statusContent-flex{
-            display:flex;
-            flex-flow: row wrap;
-        }
+    #statusContent .statusContent-flex {
+        display: flex;
+        flex-flow: row wrap;
+    }
 
-        .statusContent-flex .my-2{
-            color:black !important;
-        }
-
-        #statusContent .custom-card{
-            min-width:300px;
-            min-height: 50px;
-            padding:15px;
-            background-color: white;
-            color:black;
-            margin-right:15px;
-            margin-top :10px;
-            border-radius: 10px;
-            box-shadow: 0px 2px 4px 0px #00000024 !important;
-        }
+    .statusContent-flex .my-2 {
+        color: black !important;
+    }
 
+    #statusContent .custom-card {
+        min-width: 300px;
+        min-height: 50px;
+        padding: 15px;
+        background-color: white;
+        color: black;
+        margin-right: 15px;
+        margin-top: 10px;
+        border-radius: 10px;
+        box-shadow: 0px 2px 4px 0px #00000024 !important;
+    }
 </style>
 
 
-<div class="container-fluid">
-<h2>Enrollment</h2>
-<div class="row visa_status_count_view">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-header">
-                <div class="row" >
-                    <div class="col-3">
-                        <div id="categoryFilter" >
-                            <label for="">Client</label>
-                            <select class="form-control" id="clients" onchange="populateBranches()">
-                                <option value="0">Select Client</option>
-                                <?php foreach ($client_list as $client) { ?>
-                                    <option value="<?= $client['id'] ?>"><?= $client['client_name'] ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_11">
-                            <label for="">Branch</label>
-                            <select name="branch_id" class="form-control" id="branch_id" onchange="populatePolicies()">
-                                <option value="0">Select Branch</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_14">
-                            <label for="">Policy</label>
-                            <select name="client_policy_id" class="form-control" id="client_policy_id">
-                                <option value="0">Select Policy</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_11" >
-                            <a class="btn btn-primary waves-effect waves-light" 
-                            style="margin-top:30px !important"
-                            onclick="fetchEmpolyeeList(event);" 
-                            data-toggle="tooltip" data-placement="top" title="Search" 
-                            id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
-                        </div>
-                    </div>
-                    <div class="col-6" style="margin-right: 15px; margin-top:30px; ">
-                        <span id="categoryFilter_12" style="margin-right: 15px;">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><span >Send Remainder</span></a>
-                        </span>
-  
-                        <span id="categoryFilter_13" style="margin-right: 15px;">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><span >File Upload</span></a>
-                        </span>
-
-                        <button id="categoryFilter_14" type="button" class="btn btn-link visa_status_button" onclick="toggleContent()"  data-toggle="tooltip" data-placement="top" >
-                              <a class="btn btn-primary waves-effect waves-light"  data-toggle="tooltip" data-placement="top" title="View Status"><span >View Status</span></a>
-                        </button>
-                    </div>
-                </div>
-
-            </div>
-            <div class="card-body status-option" id="statusContent" >
-                <h4>Status</h4>
-                <div class="text-center">
-
-                    <div  style="margin-left: 60px; margin-top: 0px;">
-                        <div class="statusContent-flex">
-                            <div class="custom-card d-flex justify-content-between" id="emp_count_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Emp Count">Emp Count</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_count_view" >0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_enrolled_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Enrolled">Enroled</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_enrolled_view" >0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_not_enrolled_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Enrolled">Not Enroled</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_not_enrolled_view">0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_logged_in_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Logged-In">Logged-In</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_logged_in_view">0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_not_logged_in_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Logged-In">Not Logged-In</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_not_logged_in_view">0</span>
-                                    </div>
-                            </div>
-                        </div><!-- end col -->
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="row" id="client_list">
-    <div class="col-12">
-        <div class="card">
+<div class="container-fluid-min">
+    <div class="row visa_status_count_view">
+        <div class="col-12">
             <div class="card-body">
-                <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">SNO</th>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Emp Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Enroled</th>
-                            <th class="font-weight-medium">Logged-In</th>
-                        </tr>
-                    </thead>
-                    <tbody class="font-12">
-                        <!-- Table body -->
-                    </tbody>
-                </table>
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-3">
+                                <div id="categoryFilter">
+                                    <label for="">Client</label>
+                                    <select class="form-control" id="clients" onchange="populateBranches()">
+                                        <option value="0">Select Client</option>
+                                        <?php foreach ($client_list as $client) { ?>
+                                            <option value="<?= $client['id'] ?>"><?= $client['client_name'] ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_11">
+                                    <label for="">Branch</label>
+                                    <select name="branch_id" class="form-control" id="branch_id" onchange="populatePolicies()">
+                                        <option value="0">Select Branch</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_14">
+                                    <label for="">Policy</label>
+                                    <select name="client_policy_id" class="form-control" id="client_policy_id">
+                                        <option value="0">Select Policy</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_11">
+                                    <a class="btn btn-primary waves-effect waves-light"
+                                        style="margin-top:30px !important"
+                                        onclick="fetchEmpolyeeList(event);"
+                                        data-toggle="tooltip" data-placement="top" title="Search"
+                                        id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
+                                </div>
+                            </div>
+                            <div class="col-6" style="margin-right: 15px; margin-top:30px; ">
+                                <span id="categoryFilter_12" style="margin-right: 15px;">
+                                    <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><span>Send Remainder</span></a>
+                                </span>
+
+                                <span id="categoryFilter_13" style="margin-right: 15px;">
+                                    <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><span>File Upload</span></a>
+                                </span>
+
+                                <button id="categoryFilter_14" type="button" class="btn btn-link visa_status_button" onclick="toggleContent()" data-toggle="tooltip" data-placement="top">
+                                    <a class="btn btn-primary waves-effect waves-light" data-toggle="tooltip" data-placement="top" title="View Status"><span>View Status</span></a>
+                                </button>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="card-body status-option" id="statusContent">
+                        <h4>Status</h4>
+                        <div class="text-center">
+
+                            <div style="margin-left: 60px; margin-top: 0px;">
+                                <div class="statusContent-flex">
+                                    <div class="custom-card d-flex justify-content-between" id="emp_count_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Emp Count">Emp Count</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_count_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_enrolled_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Enrolled">Enroled</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_enrolled_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_not_enrolled_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Enrolled">Not Enroled</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_not_enrolled_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_logged_in_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Logged-In">Logged-In</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_logged_in_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_not_logged_in_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Logged-In">Not Logged-In</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_not_logged_in_view">0</span>
+                                        </div>
+                                    </div>
+                                </div><!-- end col -->
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="row" id="client_list">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
+                        <thead class="bg-light">
+                            <tr>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
+                                <th class="font-weight-medium">Name</th>
+                                <th class="font-weight-medium">Emp Code</th>
+                                <th class="font-weight-medium">Relationship</th>
+                                <th class="font-weight-medium">Enroled</th>
+                                <th class="font-weight-medium">Logged-In</th>
+                            </tr>
+                        </thead>
+                        <tbody class="font-12">
+                            <!-- Table body -->
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
     </div>
 </div>
-</div>
 
 <!-- Center modal content -->
 <div class="modal fade" id="upload_enrollment_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="false">
@@ -247,7 +250,7 @@
                 <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
-                <form class="parsley-examples" method="post" id="uploadForm" action="<?php echo base_url().'employee/upload'?>" enctype="multipart/form-data">
+                <form class="parsley-examples" method="post" id="uploadForm" action="<?php echo base_url() . 'employee/upload' ?>" enctype="multipart/form-data">
                     <input type="hidden" id="file_client_id" name="client_id">
                     <input type="hidden" id="file_branch_id" name="branch_id">
                     <input type="hidden" id="file_upload_actions" name="upload-action-type" value="enrollment">
@@ -256,7 +259,7 @@
                             <div class="form-group col-md-12">
                                 <label for="policy_id">Client Policy<span class="text-danger">*</span></label>
                                 <select class="form-control" id="policy_id" name="policy_id" required>
-                                    <option selected >Select Client Policy</option>
+                                    <option selected>Select Client Policy</option>
                                 </select>
                             </div>
                         </div>
@@ -278,9 +281,7 @@
 </div><!-- /.modal -->
 
 <script>
-
-    function populateBranches() 
-    {
+    function populateBranches() {
         var clientId = document.getElementById('clients').value;
         var branchDropdown = document.getElementById('branch_id');
 
@@ -302,8 +303,7 @@
         });
     }
 
-    function populatePolicies() 
-    {
+    function populatePolicies() {
         console.log('populatePolicies function called');
 
         var clientId = document.getElementById('clients').value;
@@ -334,19 +334,17 @@
         });
     }
 
-    function filterTable(columnIndex, filterValue) 
-    {
+    function filterTable(columnIndex, filterValue) {
         var table = $('#tickets-table').DataTable();
-        
+
         // Reset the search filter for all columns
         table.columns().search('').draw();
-        
+
         // Apply the filter to the specified column
         table.column(columnIndex).search(filterValue).draw();
     }
 
-    function fetchEmpolyeeList(event) 
-    {
+    function fetchEmpolyeeList(event) {
         event.preventDefault();
 
         var client_id = $('#clients').val();
@@ -372,7 +370,7 @@
                 $('.loader-mask').fadeIn();
             },
             success: function(response) {
-                
+
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -396,17 +394,17 @@
                 var loggedIn_count = 0;
                 data.forEach(function(employee, index) {
 
-                    if(employee.emp_status !== 'draft'){
+                    if (employee.emp_status !== 'draft') {
                         var enrolled = 'Yes';
                         enrolled_count++;
-                    }else{  
+                    } else {
                         var enrolled = 'No';
                     }
 
-                    if(employee.user_type === 'employee'){
+                    if (employee.user_type === 'employee') {
                         var loggedIn = 'Yes';
                         loggedIn_count++;
-                    }else{  
+                    } else {
                         var loggedIn = 'No';
                     }
 
@@ -433,7 +431,7 @@
                     var params = new URLSearchParams(window.location.search);
                     return params.get(name);
                 }
-           
+
             },
             error: function(xhr, status, error) {
                 console.error(xhr.responseText);
@@ -444,8 +442,7 @@
         });
     }
 
-    $(document).ready(function() 
-    {
+    $(document).ready(function() {
 
         function getUrlParameter(name) {
             var params = new URLSearchParams(window.location.search);
@@ -464,22 +461,24 @@
         if (branch_id) {
             setTimeout(function() { // Ensure branches are populated before setting branch ID
                 $('#branch_id').val(branch_id).trigger('change');
-                if($('#branch_id').val() != 0){
+                if ($('#branch_id').val() != 0) {
                     $('#get-emp-list').click().trigger();
                 }
             }, 500);
-            
+
         }
         if (history.pushState) {
             var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
-            window.history.pushState({path: newUrl}, '', newUrl);
+            window.history.pushState({
+                path: newUrl
+            }, '', newUrl);
         }
-        
+
         setTimeout(() => {
             // var type = getUrlParameter('type');
-                console.log("------------------------");
-                console.log(type);
-                $('#' + type).click().trigger();
+            console.log("------------------------");
+            console.log(type);
+            $('#' + type).click().trigger();
         }, 1000);
 
         $('#clients').select2();
@@ -488,39 +487,73 @@
         $('#client_policy_id').select2();
         var table = $('#tickets-table').DataTable({
             dom: 'fBrtip',
-            buttons: [
-                {
-                    extend: 'copy',
-                    text: '<i class="mdi mdi-content-copy"></i>',
-                    titleAttr: 'Copy',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'print',
-                    text: '<i class="mdi mdi-printer"></i>',
-                    titleAttr: 'Print',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'pdf',
-                    text: '<i class="mdi mdi-file-pdf"></i>',
-                    titleAttr: 'PDF',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'csv',
-                    text: '<i class="mdi mdi-file-document"></i>',
-                    titleAttr: 'CSV',
-                    filename: 'Enrolment List'
-                }
-            ],
+            // buttons: [
+            //     {
+            //         extend: 'copy',
+            //         text: '<i class="mdi mdi-content-copy"></i>',
+            //         titleAttr: 'Copy',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'print',
+            //         text: '<i class="mdi mdi-printer"></i>',
+            //         titleAttr: 'Print',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'pdf',
+            //         text: '<i class="mdi mdi-file-pdf"></i>',
+            //         titleAttr: 'PDF',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'csv',
+            //         text: '<i class="mdi mdi-file-document"></i>',
+            //         titleAttr: 'CSV',
+            //         filename: 'Enrolment List'
+            //     }
+            // ],
+            buttons: [{
+                extend: 'collection',
+                text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                className: 'btn app-btn-secondary ',
+                buttons: [{
+                        extend: 'copy',
+                        text: '<i class="mdi mdi-content-copy"></i>',
+                        titleAttr: 'Copy',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'csv',
+                        text: '<i class="mdi mdi-file-document"></i>',
+                        titleAttr: 'CSV',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'print',
+                        text: '<i class="mdi mdi-printer"></i>',
+                        titleAttr: 'Print',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'pdf',
+                        text: '<i class="mdi mdi-file-pdf"></i>',
+                        titleAttr: 'PDF',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    }
+                ]
+            }],
             initComplete: function() {
                 // Add custom class to the print button
                 $('.buttons-print').addClass('buttons-html5');
             }
         });
 
-        
+
         $('#emp_enrolled_view_click').on('click', function() {
             if ($(this).hasClass('click_hover')) {
                 // $(this).removeClass('click_hover');
@@ -528,7 +561,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -544,7 +577,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -560,7 +593,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -576,7 +609,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -592,7 +625,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -604,8 +637,7 @@
         toggleContent();
     });
 
-    function toggleContent() 
-    {
+    function toggleContent() {
         var content = document.getElementById("statusContent");
         var toggleIcon = document.getElementById("toggleIcon");
         if (content.style.display === "none") {
@@ -622,8 +654,7 @@
     //----------------------------------------------------------------------------------------------------
 
 
-    function uploadEnrollmentFile(input)
-    {  
+    function uploadEnrollmentFile(input) {
         console.log('uploadEnrollmentFile called');
 
         var client_id = $('#clients').val()
@@ -633,8 +664,8 @@
         console.log('client_id', client_id);
         console.log('client_branch_id', client_branch_id);
 
-        if(client_id == 0 && client_branch_id == 0){   
-            
+        if (client_id == 0 && client_branch_id == 0) {
+
             Swal.fire({
                 title: "warning!",
                 text: 'Please select the Client and Client Branch.',
@@ -679,8 +710,7 @@
 
     }
 
-    function appendpolicy(data)
-    {
+    function appendpolicy(data) {
 
         $('#policy_id').empty();
         $('#policy_id').append($('<option>', {
@@ -692,7 +722,7 @@
         $.each(data, function(index, item) {
             var option = $('<option>', {
                 value: item.id,
-                text:`${item.policy_name ?? ''} - ${item.policy_no ?? ''}`
+                text: `${item.policy_name ?? ''} - ${item.policy_no ?? ''}`
             });
             $('#policy_id').append(option);
         });
@@ -712,7 +742,7 @@
                 return;
             }
 
-            if(client_id == 0 && client_branch_id == 0){   
+            if (client_id == 0 && client_branch_id == 0) {
                 toastr.warning('Select Client and Client Branch');
                 return false;
             }
@@ -776,8 +806,7 @@
     });
 
 
-    function sendManualReminder(input)
-    {
+    function sendManualReminder(input) {
         console.log('sendManualReminder function called');
 
         var client_id = $('#clients').val()
@@ -816,44 +845,44 @@
             return false;
         }
 
-    Swal.fire({
-      title: "Do you want to send reminder mail?",
-      showDenyButton: true,
-      showCancelButton: false,
-      confirmButtonText: "Yes,Send",
-      denyButtonText: "Don't Send"
-    }).then((result) => {
+        Swal.fire({
+            title: "Do you want to send reminder mail?",
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: "Yes,Send",
+            denyButtonText: "Don't Send"
+        }).then((result) => {
 
-      if (result.isConfirmed) {
+            if (result.isConfirmed) {
 
-             $.ajax({
-                url: '<?= base_url("util/send_manual_reminder/") ?>' + client_id + '/' + client_branch_id + '/' + client_policy_id,
-                type: "GET",
-                dataType: 'json',
-                success: function(res) {
+                $.ajax({
+                    url: '<?= base_url("util/send_manual_reminder/") ?>' + client_id + '/' + client_branch_id + '/' + client_policy_id,
+                    type: "GET",
+                    dataType: 'json',
+                    success: function(res) {
 
-                    console.log('send_manual_reminder', res)
+                        console.log('send_manual_reminder', res)
 
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
 
-                    if(res.status == false){
-                        toastr.info(res.message, 'INFO');
-                    }else{
-                        toastr.success(res.message, 'SUCCESS');
+                        if (res.status == false) {
+                            toastr.info(res.message, 'INFO');
+                        } else {
+                            toastr.success(res.message, 'SUCCESS');
+                        }
+
+                    },
+                    error: function(xhr, status, error) {
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
                     }
-
-                },
-                error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                }
-            });
-            // Swal.fire("Saved!", "", "success");
-          }
-    });
+                });
+                // Swal.fire("Saved!", "", "success");
+            }
+        });
 
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/excel_errors.php b/app/Views/excel_errors.php
index 04db844d..7e9141e4 100755
--- a/app/Views/excel_errors.php
+++ b/app/Views/excel_errors.php
@@ -110,7 +110,18 @@ table.dataTable tbody td {
 <!-- Include DataTables Buttons HTML5 export extension -->
 <script src="https://cdn.datatables.net/buttons/2.3.0/js/buttons.html5.min.js"></script>
 
+<?php 
+    if (isset($lead_id)) {
+        $url = base_url("util/downloadFullMemberDataExcelErrorFile/") . $lead_id;
+    } else {
+        $url = base_url("util/full-excel-error-file/") . $file_id;
+    }
+?>
+
 <script>
+
+ let url = "<?= $url ?>";
+
 $(document).ready(function() {
     $('#tickets-table').DataTable({
         dom: 'Bfrtip',
@@ -123,7 +134,7 @@ $(document).ready(function() {
             {
                 text: 'Excel Error', // Set the text for the custom button
                 action: function (e, dt, node, config) {
-                    window.location.href = '<?= base_url("util/full-excel-error-file/") . $file_id ?>';
+                    window.location.href = url;
                 }
             }
         ],
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index bceb3554..0b401026 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -19,19 +19,18 @@
                 </div>
 
             </div>
-            <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
-                id="tickets-table">
+            <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
-                        <th class="font-weight-medium">File name</th>
-                        <th class="font-weight-medium">Client</th>
-                        <th class="font-weight-medium">Client Branch</th>
-                        <th class="font-weight-medium">Policy</th>
-                        <th class="font-weight-medium">Event</th>
-                        <th class="font-weight-medium">User/Time</th>
-                        <th class="font-weight-medium">Status</th>
-                        <th class="font-weight-medium">Action</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
+                        <th class="font-weight-medium">File name&nbsp;</th>
+                        <th class="font-weight-medium">Client&nbsp;</th>
+                        <th class="font-weight-medium">Client Branch&nbsp;</th>
+                        <th class="font-weight-medium">Policy&nbsp;</th>
+                        <th class="font-weight-medium">Event&nbsp;</th>
+                        <th class="font-weight-medium">User/Time&nbsp;</th>
+                        <th class="font-weight-medium">Status&nbsp;</th>
+                        <th class="font-weight-medium">Action&nbsp;</th>
                     </tr>
                 </thead>
 
@@ -45,7 +44,7 @@
                     ?>
 
                     <tr>
-                        <td><b><?php echo ($key + 1) ?></b></td>
+                        <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                         <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                             <?php echo $file['file_name']?>
                         </td>
@@ -461,28 +460,57 @@ $('body').on('click', '.reload', function() {
 $(document).ready(function() {
 
     $('#tickets-table').DataTable({
-        dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+
+        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'<'col-sm-5'i><'col-sm-7'p>>",
-        "buttons": [{
-            "extend": 'csv',
-            "text": 'CSV',
-            "title": 'Employee-Upload-List',
-            "className": 'my_class',
-            "exportOptions": {
-                "columns": ':not(:last-child)'
+        buttons: [{
+                        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: 'Employee-Upload-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
+            language: {
+                search: `
+                <div class="datatable-search-wrapper">
+                    _INPUT_
+                    <i class="mdi mdi-magnify datatable-search-icon"></i>
+                </div>`,
+                searchPlaceholder: "Search"
             },
-        }],
-        "initComplete": function(settings, json) {
-            $('.my_class').css({
-                "position": "relative",
-                "left": "79px"
-            });
-        },
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+        // "buttons": [{
+        //     "extend": 'csv',
+        //     "text": 'CSV',
+        //     "title": 'Employee-Upload-List',
+        //     "className": 'my_class',
+        //     "exportOptions": {
+        //         "columns": ':not(:last-child)'
+        //     },
+        // }],
+        // "initComplete": function(settings, json) {
+        //     $('.my_class').css({
+        //         "position": "relative",
+        //         "left": "79px"
+        //     });
+        // },
+        // language: {
+        //     search: "_INPUT_",
+        //     searchPlaceholder: "Search..."
+        // },
         paging: true,
     });
 
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index ffb991ea..0ec2aed9 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -1,59 +1,62 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 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);
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 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:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
-<div class="row" id="finance_filter">
-    <div class="col-12" style="margin-top: -12px;">
+
+<div class="col-12" id="finance_filter">
+    <div class="card-body">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h5 class="m-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>
-                </h5>
+                </h4>
                 <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -64,11 +67,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="client_id" name="client_id">
                                         <option value="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -79,9 +82,9 @@ table.dataTable tbody td {
                                     <select class="form-control" id="insurer_id" name="insurer_id">
                                         <option value="0" selected>Select Insurer</option>
                                         <?php if (isset($insurer) && count($insurer)) { ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
                                         <?php } ?>
                                     </select>
                                 </div>
@@ -91,11 +94,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="policy_type_id" 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>";
-                                                }
+                                        if (isset($policy_types) && count($policy_types)) {
+                                            foreach ($policy_types as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -105,11 +108,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="issuer" 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>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -124,35 +127,34 @@ table.dataTable tbody td {
                                         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>";
-                                                }
+                                        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 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">
                                     <input type="hidden" id="endDate">
                                 </div>
-
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
-                                        class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
-                                        class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-
                             </div>
+                            <div class="form-group text-right m-b-0">
+                                <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
+                                    class="btn btn-secondary" id="clear-filters">Clear</a>
+                                <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
+                                    class="btn btn-primary" id="get-emp-list"
+                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                            </div>
+
+
 
                             <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
@@ -182,48 +184,48 @@ table.dataTable tbody td {
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client Name</th>
-                            <th>Insurer</th>
-                            <th>Policy</th>
-                            <th>Policy No</th>
-                            <th>Endorsement No</th>
-                            <th>Event Type</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client Name&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Policy No&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Event Type&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php if (isset($finance_list)) { ?>
-                        <?php foreach($finance_list as $index => $row){ ?>
-                        <tr>
-                            <td><?= $index + 1 ?></td>
-                            <td><?php echo $row['client_name']; ?></td>
-                            <td><?php echo $row['insurer_name']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $row['policy_no']; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo $row['action_type_full']; ?></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 href="
-                                                <?php 
-                                                    if ($row['action_type'] == 'I') {
-                                                        echo base_url("/policy_tranction/inception/list") . '?pt_id=' . $row['id']; 
-                                                    } else {
-                                                        echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['id']; 
-                                                    }
+                            <?php foreach ($finance_list as $index => $row) { ?>
+                                <tr>
+                                    <td><?= $index + 1 ?></td>
+                                    <td><?php echo $row['client_name']; ?></td>
+                                    <td><?php echo $row['insurer_name']; ?></td>
+                                    <td><?php echo $row['policy_type']; ?></td>
+                                    <td><?php echo $row['policy_no']; ?></td>
+                                    <td><?php echo $row['endorsement_no']; ?></td>
+                                    <td><?php echo $row['action_type_full']; ?></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 href="
+                                                <?php
+                                                if ($row['action_type'] == 'I') {
+                                                    echo base_url("/policy_tranction/inception/list") . '?pt_id=' . $row['id'];
+                                                } else {
+                                                    echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['id'];
+                                                }
                                                 ?>" id="get-policy-list" class="dropdown-item btnEdit">
-                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <?php } ?>
+                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
                     </tbody>
                 </table>
@@ -236,160 +238,170 @@ table.dataTable tbody td {
 </div>
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("scroll-horizontal-datatable");
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("scroll-horizontal-datatable");
 
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
-    }
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            // Get the original dropdown items
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-    let activeDropdown = null;
+            // Create new dropdown with proper background and spacing
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        // Append the custom dropdown to the body
-        document.body.appendChild(customDropdown);
+            // Copy inner content while maintaining icon alignment
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+            return customDropdown;
+        }
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+        let activeDropdown = null;
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
+            // Append the custom dropdown to the body
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the action column
+                if (event.target.closest('td:last-child')) {
+                    return;
                 }
 
-                // Close the dropdown after handling the click
+                // Hide any active dropdown
                 if (activeDropdown) {
                     activeDropdown.style.display = 'none';
-                    activeDropdown = null;
                 }
-                
-                e.stopPropagation();
+
+                // Get click position
+                const rect = event.target.getBoundingClientRect();
+
+                // Position the dropdown with some offset
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+                // Set as active dropdown
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    const onclickAttr = this.getAttribute('onclick');
+                    if (onclickAttr) {
+                        eval(onclickAttr);
+                    }
+
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') {
+                        window.location.href = href;
+                    }
+
+                    // Close the dropdown after handling the click
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
 </script>
 
 
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
-
+    // Datatable document ready
+$(document).ready(function () {
     var ticketsTable = $('#scroll-horizontal-datatable');
 
     if (ticketsTable.length) {
         ticketsTable.DataTable({
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+            dom:
+                "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
+            buttons: [
                 {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                    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-BDS-List'
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function (xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                                .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function () {
+                                    var value = parseFloat($('v', this).text());
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) + 2;
+
+                                var totalRow =
+                                    '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex + '"><is><t>Total</t></is></c>' +
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) + '</v></c>' +
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                            2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
+                        }
+                    ]
                 }
-
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                searchPlaceholder: "Search"
             },
-            paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
-            ordering: false, 
+            paging: true,
+            pageLength: 10,
+            ordering: false
         });
     } else {
         console.error("Table not found.");
     }
 });
 
+
 $(document).ready(function() {
     getURLParams()
     $('#client_id').select2();
@@ -488,7 +500,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').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'));
     }
@@ -496,6 +508,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -506,53 +519,174 @@ $(function() {
                 .endOf('month')
             ]
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').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
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').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,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
-}
 
-function sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
 
-    console.log(pt_id);
+        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
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        hideDateField(date_type)
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        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)
+
+        // 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').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 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').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').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').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 sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 8baf6872..cbd2838e 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -61,11 +61,14 @@
 </style>
 
 
-<div class="container-fluid">
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-12">
 
-            <?php if (isset($hr_access_data) && !empty($hr_access_data)) { ?>
+            <?php if (isset($hr_access_data) && !empty($hr_access_data)) {
+                $listed_pre  = [];
+                $listed_post = [];
+            ?>
                 <form id="insuranceForm" onsubmit="submitForm(event)">
 
                     <?php foreach ($hr_access_data as $key => $value) {
@@ -79,13 +82,17 @@
                             <input type="hidden" name="<?= 'user' . $key ?>_pre_hr_id" value="<?= $value['pre_hr_id'] ?>">
                             <input type="hidden" name="<?= 'user' . $key ?>_post_hr_id" value="<?= $value['post_hr_id'] ?>">
                             <input type="hidden" name="<?= 'user' . $key ?>_post_client_id" value="<?= $value['post_client_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_pre_branch_id" value="<?= $value['pre_branch_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_post_branch_id" value="<?= $value['post_branch_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_pre_client_id" value="<?= $value['pre_client_id'] ?>">
 
                             <div class="card-header" onclick="toggleAccordion(this)" style="background-color: #F5FFFF;">
                                 <div class="user-info">
-                                    <h5 class="mb-0"><?= $value['hr_name'] ?>
+                                    <h5 class="mb-0"> Name -<?= $value['hr_name'] ?>
                                         <!-- <i class="mdi mdi-information-outline" aria-hidden="true" data-id="<?= (!empty($value['pre_hr_id']) ? $value['pre_hr_id'] : 0) . '-' . (!empty($value['post_hr_id']) ? $value['post_hr_id'] : 0) ?>"></i> -->
                                     </h5>
-                                    <p class="user-email"><?= $value['hr_mail'] ?></p>
+                                    <p style="color: black;"> <b>branch - <?= $value['post_branch_name']?></b></p>
+                                    <p class="user-email"> Mail - <?= $value['hr_mail'] ?></p>
                                 </div>
                                 <div class="accordion-icon">
                                     <i class="mdi mdi-chevron-down"></i>
@@ -128,6 +135,15 @@
                                                     <?php foreach ($pre_policy_data as $key1 => $policies) {
                                                         $statusText = $policies['policy_status'] == 1 ? 'Active' : 'In-Active';
                                                         $statusClass = $policies['policy_status'] == 1 ? 'active' : 'inactive';
+                                                        if (
+                                                            in_array($policies['branch_id'].'-'.$policies['policy_no'], $listed_pre)
+                                                            &&
+                                                            $value['pre_branch_id'] != $policies['branch_id']                                                          
+                                                            ) {
+                                                            continue;
+                                                        } else {
+                                                            $listed_pre[] = $policies['branch_id'].'-'.$policies['policy_no'];
+                                                        }
                                                     ?>
                                                         <div class="checkbox-item">
                                                             <input type="checkbox" class="policy-checkbox <?= $statusClass ?>" name="<?= 'user' . $key ?>_pre_policies" data-user="<?= $key ?>" data-group="pre" value="<?= $policies['client_policy_id'] ?>"
@@ -180,12 +196,26 @@
                                                     <?php foreach ($post_policy_data as $key2 => $policies) {
                                                         $statusText = $policies['policy_status'] == 1 ? 'Active' : 'In-Active';
                                                         $statusClass = $policies['policy_status'] == 1 ? 'active' : 'inactive';
+                                                        if(
+                                                            in_array($policies['branch_id'].'-'.$policies['policy_no'] , $listed_post) 
+                                                            &&
+                                                            $value['post_branch_id'] != $policies['branch_id'] 
+                                                        ) 
+                                                        {
+                                                            continue;
+                                                        } 
+                                                        else 
+                                                        {
+                                                            $listed_post[] = $policies['branch_id'].'-'.$policies['policy_no'];
+                                                        }
+
                                                     ?>
                                                         <div class="checkbox-item">
                                                             <input type="checkbox" class="policy-checkbox <?= $statusClass ?>" id="<?= 'user' . $key ?>-gmc2" name="<?= 'user' . $key ?>_active_policies" data-user="<?= $key ?>" data-group="post"
                                                                 value="<?= $policies['client_policy_id'] ?>" <?php if (in_array($policies['client_policy_id'], $value['allowed_active_policies'])) {
                                                                                                                     echo 'checked';
                                                                                                                 } ?>>
+                                                            &nbsp;&nbsp;
                                                             <label for="<?= 'user' . $key ?>-gmc2" style="<?php if ($policies['policy_status'] == 0) {
                                                                                                                 echo 'color:#ff5757';
                                                                                                             } ?>">
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index e868cf8b..8f52d592 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -44,6 +44,10 @@ table.dataTable tbody td {
     box-shadow: 0px 2px 4px 0px #00000024 !important;  
  }
 
+#hr_activity_history_append_area tbody tr {
+  background-color: transparent !important;
+}
+
 </style>
 
 <!-- <div class="row" style="position: relative;left: 250px;top: 55px;">
@@ -60,7 +64,7 @@ table.dataTable tbody td {
     </div>
 </div> -->
 
-<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap flex-grow">
+<table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap flex-grow">
     <thead class="bg-light">
         <tr>
             <th>S. No</th>
@@ -93,15 +97,16 @@ $(document).ready(function () {
     if (ticketsTable.length) {
         var table = ticketsTable.DataTable({
             scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // search left, buttons right
-                 "<'row'<'col-sm-12'tr>>" +
-                 "<'row'<'col-sm-3'i><'col-sm-2'l><'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'<'col-sm-5'i><'col-sm-7'p>>",
             language: {
                 search: "_INPUT_",
                 searchPlaceholder: "Search..."
             },
             paging: true,
-            pageLength: 25,
+            pageLength: 10,
             ordering: false,
             buttons: [
                 {
@@ -120,6 +125,17 @@ $(document).ready(function () {
             ]
         });
 
+        // run after DataTable is ready
+$('.dataTables_filter input').css({
+    'background': '#F0F0F0',
+    'border': 'none',
+    'border-radius': '8px',
+    'padding-right': '35px'
+}).wrap('<div style="position:relative; display:inline-block;"></div>')
+  .after('<i class="mdi mdi-magnify" ' +
+         'style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>');
+
+
         // Attach submit handler separately so it works
         $(document).on("click", "#submitBtn", function () {
             appendHrActivityHistoryHtml(this, true);
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 936d603f..dd0c7b33 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -10,11 +10,26 @@
         <div class="col-xl-12">
             <div id="accordion" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</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>
-                    </h5>
+                    </h4>
+
+                    <!-- <h5 class="m-1">
+                        <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>
+                    </h5> 
+                    <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</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>
+                    </label> -->
+
                     <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -103,15 +118,15 @@
                 id="hr_tickets_table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
-                        <th class="font-weight-medium">File name</th>
-                        <th class="font-weight-medium">Client</th>
-                        <th class="font-weight-medium">Client Branch</th>
-                        <th class="font-weight-medium">Policy</th>
-                        <th class="font-weight-medium">Event</th>
-                        <th class="font-weight-medium">User/Time</th>
-                        <th class="font-weight-medium">Status</th>
-                        <th class="font-weight-medium">Action</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
+                        <th class="font-weight-medium">File name&nbsp;</th>
+                        <th class="font-weight-medium">Client&nbsp;</th>
+                        <th class="font-weight-medium">Client Branch&nbsp;</th>
+                        <th class="font-weight-medium">Policy&nbsp;</th>
+                        <th class="font-weight-medium">Event&nbsp;</th>
+                        <th class="font-weight-medium">User/Time&nbsp;</th>
+                        <th class="font-weight-medium">Status&nbsp;</th>
+                        <th class="font-weight-medium">Action&nbsp;</th>
                     </tr>
                 </thead>
 
@@ -341,27 +356,33 @@
     // for datatable 
     $(document).ready(function() {
         $('#hr_tickets_table').DataTable({
-            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+            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'<'col-sm-5'i><'col-sm-7'p>>",
-            "buttons": [{
-                "extend": 'csv',
-                "text": 'CSV',
-                "title": 'Employee-Upload-List',
-                "className": 'my_class',
-                "exportOptions": {
-                    "columns": ':not(:last-child)'
-                },
-            }],
-            "initComplete": function(settings, json) {
-                $('.my_class').css({
-                    "position": "relative",
-                    "left": "79px"
-                });
-            },
+            buttons: [{
+                        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: 'Employee-Upload-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                <div class="datatable-search-wrapper">
+                    _INPUT_
+                    <i class="mdi mdi-magnify datatable-search-icon"></i>
+                </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
         });
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index da473af6..276b51fd 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -10,19 +10,17 @@
 </style>
 
 <script>
-
     var client_list = ''; // local variable for storing the client branch list
     var branch_list = ''; // local variable for storing the client branch list
     var policy_list = ''; // local variable for storing the client policy list
     var branch_policy = '';
 
-    $(document).ready(function(){
+    $(document).ready(function() {
         getClientAndBranchAndPolicy();
     })
 
     //featch client and branch and policy
-    function getClientAndBranchAndPolicy()
-    {   
+    function getClientAndBranchAndPolicy() {
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
@@ -30,7 +28,7 @@
             success: function(res) {
 
                 console.log('getClientAndBranchAndPolicy', res);
-                if(res.status == true){
+                if (res.status == true) {
 
                     client_list = res.client_data;
                     branch_list = res.branch_data;
@@ -39,8 +37,8 @@
                     appendClients(res.client_data);
                     appendClients2(res.client_data);
                     appendClients3(res.client_data);
-                    
-                }else{
+
+                } else {
                     console.log('No data found');
                 }
 
@@ -51,35 +49,42 @@
             }
         });
     }
-
 </script>
 
 <div class="row" id="client_add" style="position: relative; bottom: 25px;">
 
     <div class="col-12">
         <div class="card-body">
-                <h3>Inception</h3>
-                <br>
-            <ul class="nav nav-pills navtab-bg">
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#general-q-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-1 active-tab" id="general_tab">
-                        <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">Data From Client</span>
-                    </a>
-                </li>
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="kyc_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">Insurer or TPA Data</span>
-                    </a>
-                </li>
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="hr_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">HR Uploaded Files</span>
-                    </a>
-                </li>
-            </ul>
+            <div class="tab-wrapper position-relative">
+                <ul class="nav nav-pills navtab-bg " id="myTab">
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active-tab " id="general_tab">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block ">Data From Client</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block ">Insurer or TPA Data</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="hr_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block ">HR Uploaded Files</span>
+                        </a>
+                    </li>
+                     <li class="nav-item d-flex justify-content-center align-items-center">
+                        <!-- Right Arrow -->
+                        <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                    </li>
+                </ul>
+            </div>
+
             <div class="tab-content">
                 <?php include('employee_upload.php'); ?>
                 <?php include('insurer_or_tpa_data.php'); ?>
@@ -107,7 +112,7 @@
     function formatTextToCamelCase(str) {
         return str
             .replace(/_/g, ' ') // replace underscores with spaces
-            .toLowerCase()      // convert everything to lowercase
+            .toLowerCase() // convert everything to lowercase
             .replace(/\b\w/g, char => char.toUpperCase()); // capitalize each word
     }
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index 800d4e70..a92543a4 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -80,19 +80,19 @@
             <thead class="">
 
                 <tr>
-                    <th>S.NO</th>
-                    <th>Policy Type</th>
-                    <th>Event Type</th>
-                    <th>Upload/Download</th>
-                    <th>Template</th>
-                    <th>Action</th>
+                    <th>S.NO&nbsp;</th>
+                    <th>Policy Type&nbsp;</th>
+                    <th>Event Type&nbsp;</th>
+                    <th>Upload/Download&nbsp;</th>
+                    <th>Template&nbsp;</th>
+                    <th>Action&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
                 <?php if(isset($insurer_templete_list)){  ?>
                     <?php foreach($insurer_templete_list as $key => $value ){ ?>
                         <tr>
-                            <td><?= $key+1; ?></td>
+                            <td class="text-center"><?= $key+1; ?></td>
                             <td><?= $value['policy_type']; ?></td>
                             <td><?= $events[$value['event_name']]; ?></td>
                             <td><?= $value['type_name'] == 'import' ? 'Upload' : 'Download'; ?></td>
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 9b52aa41..59727f76 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -1,6 +1,5 @@
 <style>
-
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: absolute;
     background-color: #ffffff !important;
@@ -10,311 +9,323 @@
     min-width: 10rem;
     z-index: 9999;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
     color: #212529 !important;
     text-decoration: none !important;
     background-color: transparent !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   
+  }
 
-.btn-color{
-  background-color: rgba(52, 174, 178, 1);
-  color: white;
-  border:1px solid rgba(52, 174, 178, 1);
-}
+  .btn-color {
+    background-color: rgba(52, 174, 178, 1);
+    color: white;
+    border: 1px solid rgba(52, 174, 178, 1);
+  }
 
-.btn-color:hover{
+  .btn-color:hover {
     background-color: rgba(41, 139, 142, 1);
     color: white;
-    border:1px solid  rgba(41, 139, 142, 1);
-}
-
+    border: 1px solid rgba(41, 139, 142, 1);
+  }
 </style>
-<div class="row" id="insurer_list">
+
+<div class="container-fluid-min">
+  <div class="row" id="insurer_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Insurers</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Type</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Name</th>
+                <th class="font-weight-medium">Type</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
-                    <tbody>
-                    <?php if(is_array($insurerList)) {foreach($insurerList as $row){ ?>
-                      <tr>
-                        <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
-                        <td><?php echo $row['type']; ?></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" href="<?= base_url("master/insurer/list/"); ?><?= $row['id'];?>"><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="removeInsurer(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                    <?php }}?>
+            <tbody>
+              <?php if (is_array($insurerList)) {
+                foreach ($insurerList as $row) { ?>
+                  <tr>
+                    <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
+                    <td><?php echo $row['type']; ?></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" href="<?= base_url("master/insurer/list/"); ?><?= $row['id']; ?>"><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="removeInsurer(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+              <?php }
+              } ?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 
 <script>
-
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      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);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              event.preventDefault(e);
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-
-                // Close the dropdown after handling the click
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
-            });
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
+
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
+
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers and add auto-close
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          event.preventDefault(e);
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          // Close the dropdown after handling the click
+          if (activeDropdown) {
+            activeDropdown.style.display = 'none';
+            activeDropdown = null;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
-
+  });
 </script>
 
 <script>
-
- $(document).ready(function(){
+  $(document).ready(function() {
 
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'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'<'col-sm-5'i><'col-sm-7'p>>",
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'InsurerList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
-                    window.location.href = "<?= base_url("master/insurer/create"); ?>";
-                }
-            }
-        ],
-
-
+                    {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function() { 
+                            window.location.href = "<?= base_url("master/insurer/create"); ?>";
+                        }
+                    },
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'InsurerList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
-        paging: true ,
+        paging: true,
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "UserList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "UserList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
-  }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
-}
 
 
   function removeInsurer(element) {
 
     Swal.fire({
-            title: "Are you sure?",
-            text: "You need to remove this insurer.",
-            icon: "info",
-            showCancelButton: true,
-            confirmButtonColor: "#3085d6",
-            confirmButtonText: "Yes",
+      title: "Are you sure?",
+      text: "You need to remove this insurer.",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
     }).then((result) => {
 
-            if (result.isConfirmed) {
-              var id = element.getAttribute('data-id');
-              var form_action = '<?= base_url("master/insurer/remove/") ?>' + id; 
-              $.ajax({
-                  url: form_action,
-                  type: "GET",
-                  dataType: 'json',
-                  processData: false,
-                  contentType: false,
-                  success: function(res) {
-                    // console.log(res.status == true);
-                      if(res){
-                        if (res.status == true) {
-                          toastr.success('Insurer removed successfully', 'success');
-                          location.reload();
-                        } else {
-                          toastr.warning('Failed to remove insurer', 'warning');
-                        }
-                      }
-                  },
-                  error: function (xhr, status, error) {
-                      console.error(xhr.responseText);
-                      console.error(status, error);
-                      $('.loader').fadeOut();
-                      $('.loader-mask').delay(350).fadeOut('slow');
-                      toastr.warning('Failed to remove insurer', 'warning');
-                  }
-              });
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/insurer/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('Insurer removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove insurer', 'warning');
+              }
             }
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove insurer', 'warning');
+          }
+        });
+      }
 
     });
 
   }
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 2c290d15..2889ba13 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -20,34 +20,44 @@
                         <span class="title-text ">Insurer</span>
                     </h4>
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_branch_contacts_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-
-                    <?php if(isset($insurer['id'])){ ?>
 
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
                         <li class="nav-item">
-                            <a href="#template-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_export_templete">
-                                <span class="mr-1"><i class="mdi mdi-file-export font-16"></i></span>
-                                <span class="d-none d-sm-inline-block">Insurer Download Templete</span>
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_branch_contacts_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
                             </a>
                         </li>
 
-                    <?php } ?>
+                        <?php if (isset($insurer['id'])) { ?>
 
+                            <li class="nav-item">
+                                <a href="#template-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_export_templete">
+                                    <span class="mr-1"><i class="mdi mdi-file-export font-16"></i></span>
+                                    <span class="d-none d-sm-inline-block">Insurer Download Templete</span>
+                                </a>
+                            </li>
+
+                        <?php } ?>
+
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
 
-                </ul>
                 <div class="tab-content">
                     <?php include('insurer_basic_info.php'); ?>
                     <?php include('insurer_branch.php'); ?>
@@ -60,17 +70,18 @@
 
 
 <script>
-
     function insurer_branch_contact() {
         var check_insurer_id = $('#insurer_General_PrimaryKey');
 
-        if(check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0){
+        if (check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Insurer!', 'warning',{timeOut: 2000});
-        }else{
-         // if ($('#btnBranchBack')[0].style.display == 'none') {
-                $('#btnBranchAdd').show();
-         // }
+            toastr.warning('First Add the Insurer!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
+            // if ($('#btnBranchBack')[0].style.display == 'none') {
+            $('#btnBranchAdd').show();
+            // }
         }
     }
 
@@ -79,6 +90,4 @@
 
         insurer_branch_contact();
     });
-</script>
-
-
+</script>
\ No newline at end of file
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index fc822a52..b4c615b3 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -10,11 +10,21 @@
         <div class="col-xl-12">
             <div id="accordion" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</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>
-                    </h5>
+                    </h4>
+
+                    <!-- <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</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>
+                    </label> -->
+
                     <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -48,7 +58,7 @@
 
                                     <div class="form-row">
 
-                                        <div class="form-group col-md-4">
+                                        <div class="form- group col-md-4">
                                             <label>Insurer/TPA Data<span class="text-danger">*</span></label> <br />
                                             <select name="insurer_or_tpa" class="form-control" id="insurer_or_tpa" required>
                                                 <option value="">Select</option>
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index 6689488a..6c5d67bb 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -1,107 +1,105 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-/* table.dataTable thead th {
+    /* table.dataTable thead th {
     padding: 4px 4px !important;
 } */
 
-.col-12 {
+    
 
-    max-width: 98% !important;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
+    .highlight {
+        border: 2px solid red;
+        background-color: #ffe6e6;
+    }
 
-.highlight {
-    border: 2px solid red; 
-    background-color: #ffe6e6; 
-}
+    .column-header {
+        margin-right: 10px;
+        /* Adjust this value as needed */
+    }
 
-.column-header {
-    margin-right: 10px; /* Adjust this value as needed */
-}
+    .form-section {
+        border: 1px solid #ccc;
+        padding: 15px;
+        margin-bottom: 20px;
+    }
 
-.form-section {
-    border: 1px solid #ccc;
-    padding: 15px;
-    margin-bottom: 20px;
-}
-
-.row-box {
-    border: 1px solid #ccc;
-    padding: 10px;
-    margin-bottom: 10px;
-}
+    .row-box {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 10px;
+    }
 </style>
 
 <style>
     .switch {
-    position: relative;
-    display: inline-block;
-    width: 54px;
-    height: 34px;
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
     }
 
-    .switch input { 
-    opacity: 0;
-    width: 0;
-    height: 0;
+    .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;
+        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;
+        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:checked+.slider {
+        background-color: #2196F3;
     }
 
-    input:focus + .slider {
-    box-shadow: 0 0 1px #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);
+    input:checked+.slider:before {
+        -webkit-transform: translateX(26px);
+        -ms-transform: translateX(26px);
+        transform: translateX(26px);
     }
 
     /* Rounded sliders */
     .slider.round {
-    border-radius: 34px;
+        border-radius: 34px;
     }
 
     .slider.round:before {
-    border-radius: 50%;
+        border-radius: 50%;
     }
 
     .disabled-option {
@@ -109,144 +107,196 @@ table.dataTable tbody td {
     }
 
     .custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 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);
-}
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 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;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
 
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
+<style>
+    .payment-card {
+        width: 100%;
+        background: #F7F7F7;
+        box-shadow: 0px 2px 2px 0px #00000040;
+        border-radius: 6px;
+        padding: 15px;
+        margin-bottom: 15px;
+    }
 
-<div class="row" id="inception_list">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
-                    <div class="col-9" style="align-self: center;">
-                        <h4 style="position: relative;">Insurer Statement List</h4>
-                        <!-- <div id="statusSwitchWrapper" class="dt-switch-wrapper">
+    .payment-card .row {
+        align-items: flex-end;
+    }
+
+    .payment-card label {
+        font-size: 13px;
+        font-weight: 500;
+        margin-bottom: 4px;
+        display: block;
+    }
+
+    .payment-card .form-control {
+        border-radius: 6px;
+        height: 35px;
+        font-size: 14px;
+    }
+
+    .payment-card .btn {
+        margin-left: 5px;
+        border-radius: 6px;
+    }
+</style>
+<div class="container-fluid-min">
+    <div class="row" id="inception_list">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <div class="row" style="margin-bottom:1rem;">
+                        <div class="col-8" style="align-self: center;">
+                            <h4 style="position: relative;">Insurer Statements</h4>
+                            <!-- <div id="statusSwitchWrapper" class="dt-switch-wrapper">
                                 <div class="custom-control custom-switch">
                                     <input type="checkbox" class="custom-control-input" id="statusSwitch">
                                     <label class="custom-control-label" for="statusSwitch">Failed Status</label>
                                 </div>
                         </div> -->
-                    </div>
-                    <!-- <div class="col-4">
+                        </div>
+                        <!-- <div class="col-4">
                         <div class="custom-control custom-switch">
                             <input type="checkbox" class="custom-control-input" id="failedSwitch">
                             <label class="custom-control-label" for="failedSwitch">Failed</label>
                         </div>
                     </div> -->
-                    
-                    <div class="col-3" style="text-align: right;">
-                        <div class="row align-items-center">
-                            <div class="col-8">
-                                <div id="statusSwitchWrapper" class="dt-switch-wrapper">
-                                    <div class="custom-control custom-switch" style="text-align: left;">
-                                        <input type="checkbox" class="custom-control-input" id="statusSwitch">
-                                        <label class="custom-control-label" for="statusSwitch">Failed Status</label>
+
+                        <div class="col-4" style="text-align: right;">
+                            <div class="row align-items-center">
+                                <div class="offset-3 col-5">
+                                    <div id="statusSwitchWrapper" class="dt-switch-wrapper">
+                                        <div class="custom-control custom-switch" style="text-align: left;">
+                                            <input type="checkbox" class="custom-control-input" id="statusSwitch">
+                                            <label class="custom-control-label" for="statusSwitch">Failed Status</label>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-4">
-                                <button type="button" id="btnAdd" onclick="showFileUploadModal()" class="btn btn-primary waves-effect waves-light">Upload</button>
+                                <div class="col-4">
+                                    <button type="button" id="btnAdd" onclick="showFileUploadModal()" class="btn btn-primary waves-effect waves-light">Upload <i class="mdi mdi-upload"></i></button>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div><div class="dataTables_length d-flex align-items-center">
-                </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></th>
-                                <th><div class="column-header">Insurer</div></th>
-                                <th><div class="column-header">Month</div></th>
-                                <th><div class="column-header">Statement<br>sno</div></th>
-                                <th><div class="column-header">Filename</div></th>
-                                <th><div class="column-header">Line<br>items</div></th>
-                                <th><div class="column-header">File<br>status</div></th>
-                                <th><div class="column-header">Invoice<br>status</div></th>
-                                <th><div class="column-header">User/Time</div></th>
-                                <th><div class="column-header">Action</div></th>
-                            </tr>
-                        </thead>
+                    <div class="dataTables_length d-flex align-items-center">
+                    </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></th>
+                                    <th>
+                                        <div class="column-header">Insurer</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Month</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Statement<br>sno</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Filename</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Line<br>items</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">File<br>status</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Invoice<br>status</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">User/Time</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Action</div>
+                                    </th>
+                                </tr>
+                            </thead>
 
-                        <tbody>
-                            <?php foreach($insurer_statement_list as $row){ ?>
-                            <tr>
-                                <td><input type="hidden" class="row-select" data-id="<?= $row['id']; ?>"></td>
-                                <td><?php echo $row['short_name'].'-'.$row['branch_code']; ?></td>
-                                <td><?php echo change_date_format($row['month'],'Y-m-d','M-Y'); ?></td>
-                                <td><?php echo $row['stmt_sno'] ?> </td>
-                                <td><?php echo $row['file_name'] ?> </td>
-                                <td><?php echo $row['line_items'] ?></td>
-                                <td><?php echo $row['file_status']; 
-                                      if($row['file_status'] == 'failed') 
-                                        {
-                                            echo " <span class='col-xl-3 col-lg-4 col-sm-6'> <i class='fe-alert-circle' data-toggle='modal' data-target='#file-err-modal' data-err=" . $row['id'] . "></i></span>";
-                                        }
-                                    ?>
-                                </td>
+                            <tbody>
+                                <?php foreach ($insurer_statement_list as $row) { ?>
+                                    <tr>
+                                        <td><input type="hidden" class="row-select" data-id="<?= $row['id']; ?>"></td>
+                                        <td><?php echo $row['short_name'] . '-' . $row['branch_code']; ?></td>
+                                        <td><?php echo change_date_format($row['month'], 'Y-m-d', 'M-Y'); ?></td>
+                                        <td><?php echo $row['stmt_sno'] ?> </td>
+                                        <td><?php echo $row['file_name'] ?> </td>
+                                        <td><?php echo $row['line_items'] ?></td>
+                                        <td><?php echo $row['file_status'];
+                                            if ($row['file_status'] == 'failed') {
+                                                echo " <span class='col-xl-3 col-lg-4 col-sm-6'> <i class='fe-alert-circle' data-toggle='modal' data-target='#file-err-modal' data-err=" . $row['id'] . "></i></span>";
+                                            }
+                                            ?>
+                                        </td>
 
-                                <td><?php echo (isset($invoice_status_array[ $row['invoice_status'] ]) ? $invoice_status_array[ $row['invoice_status'] ] : ' - ') ?>
-                                <span class="col-xl-3 col-lg-4 col-sm-6">
-                                    <?php if($row['file_status'] == 'success' ) { ?>
-                                    <i class="fe-alert-circle" 
-                                       data-toggle="tooltip" 
-                                       data-placement="right" 
-                                       title="<?php  echo 'Invoice Amt: ' . (isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00' ) . '  Received Amt: ' . (isset($row['received_inv_amt']) ? $row['received_inv_amt'] : '0.00') ;  ?>" 
-                                       data-original-title="Tooltip on right">
-                                    </i>
+                                        <td><?php echo (isset($invoice_status_array[$row['invoice_status']]) ? $invoice_status_array[$row['invoice_status']] : ' - ') ?>
+                                            <span class="col-xl-3 col-lg-4 col-sm-6">
+                                                <?php if ($row['file_status'] == 'success') { ?>
+                                                    <i class="fe-alert-circle"
+                                                        data-toggle="tooltip"
+                                                        data-placement="right"
+                                                        title="<?php echo 'Invoice Amt: ' . (isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00') . '  Received Amt: ' . (isset($row['received_inv_amt']) ? $row['received_inv_amt'] : '0.00');  ?>"
+                                                        data-original-title="Tooltip on right">
+                                                    </i>
+                                                <?php } ?>
+                                            </span>
+
+                                        </td>
+                                        <td><?php echo change_date_format($row['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' <br> by ' . $row['first_name'] ?></td>
+                                        <td>
+                                            <?php if ($row['file_status'] != 'failed') { ?>
+                                                <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']; ?>" data-exp-amt="<?= $row['exp_inv_amt']; ?>" data-received-amt="<?= $row['received_inv_amt']; ?>" onclick="showInvoiceStatusModal(event)">
+                                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status
+                                                        </a>
+                                                        <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="deleteStatement(<?= $row['id']; ?>)">
+                                                            <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            <?php } ?>
+                                        </td>
+
+                                    </tr>
                                 <?php } ?>
-                                </span>
-
-                               </td>
-                                <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s','d M Y h:i a').' by <br>'.$row['first_name'] ?></td>
-                                <td>
-                                    <?php if($row['file_status'] != 'failed'){?>
-                                    <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'];?>" data-exp-amt="<?= $row['exp_inv_amt'];?>" data-received-amt="<?= $row['received_inv_amt'];?>" onclick="showInvoiceStatusModal(event)">
-                                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status
-                                            </a>
-                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>"onclick="deleteStatement(<?= $row['id'];?>)">
-                                                <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
-                                            </a>
-                                        </div>
-                                    </div>
-                                <?php } ?>
-                                </td>
-                                
-                            </tr>
-                            <?php } ?>
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
-        </div>
-    </div><!-- end col -->
+        </div><!-- end col -->
+    </div>
 </div>
+
 <!-- end table row -->
 
 <div class="modal fade" id="file_upload" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -261,52 +311,61 @@ table.dataTable tbody td {
                 <div class="">
 
                     <form role="form" class="parsley-examples" method="post" id="insurer_statement_upload_form" enctype="multipart/form-data" action="upload">
-                        
+
                         <div class="form-group">
-
-                            <div class="form-group col-md-10">
-                                <label for="insurer"> Insurer <spanclass="text-danger">*</spanclass=></label>
-                                <select class="form-control" id="insurer" name="insurer" required>
-                                    <option value="" selected>Select Insurer</option>
-                                        <?php
-                                            if (isset($insurers) && count($insurers)) {
-                                                foreach ($insurers as $key => $value) {
-                                                    echo "<option value=" . $value['insurer_id'].'-'.$value['id'] . ">" . $value['insurer_name'] .'-'. $value['branch_code'] . "</option>";
-                                                }
-                                            }
-                                        ?>
-                                </select>
-                            </div>   
-                             <div class="form-group col-md-10">
-                                <label for="statement_month">Statement month</label>
-                                <input type="text" class="form-control" id="statement_month" name="statement_month" placeholder="" required readonly onchange="getStatementNo()">
+                            <div class="row">
+                                <div class="form-group float-right-end offset-8 col-4">
+                                    <span><a href="downloadSampleInsurerStatement" id="download_sample_file" style="font-size: small; color:red !important;">Download sample file</a></span>
+                                </div>
                             </div>
-
-                             <div class="form-group col-md-10">
-                                <label for="statement_no">Statement no</label>
-                                <select class="form-control" id="statement_no" name="statement_no" required >
-                                    <option value="" selected>Select statement no</option>
+                            <div class="row">
+                                <div class="form-group col-md-6">
+                                    <label for="insurer"> Insurer <spanclass="text-danger">*</spanclass=></label>
+                                    <select class="form-control" id="insurer" name="insurer" required>
+                                        <option value="" selected>Select Insurer</option>
                                         <?php
-                                        $stmt_no = [1,2,3,4,5,6,7];
-                                            if (isset($stmt_no) && count($stmt_no)) {
-                                                foreach ($stmt_no as $key => $value) {
-                                                    echo "<option value=" . $value . ">" . $value . "</option>";
-                                                }
+                                        if (isset($insurers) && count($insurers)) {
+                                            foreach ($insurers as $key => $value) {
+                                                echo "<option value=" . $value['insurer_id'] . '-' . $value['id'] . ">" . $value['insurer_name'] . '-' . $value['branch_code'] . "</option>";
                                             }
+                                        }
                                         ?>
-                                </select>
+                                    </select>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label for="statement_month">Statement month</label>
+                                    <input type="text" class="form-control" id="statement_month" name="statement_month" placeholder="" required readonly onchange="getStatementNo()">
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-10" >
-                                <label for="statment">Statement </label> <span><a href="downloadSampleInsurerStatement" id="download_sample_file" style="font-size: small;">Download sample file</a></span>
-                                <input type="file" class="form-control" name="statement" required  accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                            <div class="row">
+                                <div class="form-group col-md-6">
+                                    <label for="statement_no">Statement no</label>
+                                    <select class="form-control" id="statement_no" name="statement_no" required>
+                                        <option value="" selected>Select statement no</option>
+                                        <?php
+                                        $stmt_no = [1, 2, 3, 4, 5, 6, 7];
+                                        if (isset($stmt_no) && count($stmt_no)) {
+                                            foreach ($stmt_no as $key => $value) {
+                                                echo "<option value=" . $value . ">" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label for="statment">Statement </label>
+                                    <div class="input-icon">
+                                        <input type="file" class="form-control" name="statement" required accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                                        <i class="mdi mdi-upload additional-icon"></i>
+                                    </div>
+                                </div>
                             </div>
 
                         </div>
 
                         <div class="form-group text-right m-b-0">
-                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                                id="btnSubmit">Submit</button>
+                            <button type="button" class="btn app-btn-outline-secondary mr-2" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
                         </div>
                     </form>
                 </div>
@@ -341,8 +400,8 @@ table.dataTable tbody td {
 
             <div class="modal-body p-4">
                 <div class="">
-                    <form role="form" class="parsley-examples" method="post" id="invoiceForm" enctype="multipart/form-data" action="<?php echo base_url().'policy_tranction/statement/saveInvoicePaymentDetails'?>">
-                        
+                    <form role="form" class="parsley-examples" method="post" id="invoiceForm" enctype="multipart/form-data" action="<?php echo base_url() . 'policy_tranction/statement/saveInvoicePaymentDetails' ?>">
+
                         <div class="form-group">
                             <div class="row">
                                 <div class="form-group col-md-4">
@@ -350,82 +409,80 @@ table.dataTable tbody td {
                                     <select class="form-control" id="invoice_status" name="invoice_status" required>
                                         <option value="" selected>Select Invoice Status</option>
                                         <?php
-                                            if (isset($invoice_status_array) && count($invoice_status_array)) {
-                                                foreach ($invoice_status_array as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
-                                                }
+                                        if (isset($invoice_status_array) && count($invoice_status_array)) {
+                                            foreach ($invoice_status_array as $key => $value) {
+                                                echo "<option value='" . $key . "'>" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                     <input type="hidden" id="hidden_statement_id" name="hidden_statement_id">
                                 </div>
-                               <!--  <div class="form-group col-md-4">
+                                <!--  <div class="form-group col-md-4">
                                     <label for="addon_policy">Exp Amount</label>
                                         <input type="text" class="form-control" id="modal_exp_amt" placeholder="" disabled>
                                 </div> -->
-                                
+
                             </div>
+                            <hr>
 
                             <!-- Invoice Number and Invoice Date in same row -->
                             <!-- <div id="invoice_no_div_modal" style="display: none;"> -->
-                                <div class="row" id="invoice_no_div_modal" style="display: none;">
-                                    <div class="form-group col-md-4">
-                                          <label for="invoice_no">Invoice Number<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="text" class="form-control" id="invoice_no_modal" name="invoice_no" placeholder="Enter Invoice Number" required>
-                                    </div>
-                                    
-                                    <div class="form-group col-md-4">
-                                         <label for="invoice_date">Invoice Date</label>
-                                        <input type="text" class="form-control" id="invoice_date_modal" name="invoice_date" value="<?php echo date('Y-m-d'); ?>"  readonly required>
-                                    </div>
-
-                                     <div class="form-group col-md-4">
-                                          <label for="invoice_value_modal">Invoice value<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="invoice_value_modal" name="invoice_value" placeholder="Enter Invoice Value" readonly step="0.01">
-                                    </div>
-
-                                        
-                                     
+                            <div class="row" id="invoice_no_div_modal" style="display: none;">
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_no">Invoice Number<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="invoice_no_modal" name="invoice_no" placeholder="Enter Invoice Number" required>
                                 </div>
-                                <div class="row" id="invoice_no_div_modal2" style="display: none;">
 
-                                    <div class="form-group col-md-4">
-                                          <label for="gst_value_modal">GST %<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="gst_per_modal" name="invoice_gst_per" placeholder="Enter GST %" required onchange="calcGSTValue()">
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_date">Invoice Date</label>
+                                    <input type="text" class="form-control" id="invoice_date_modal" name="invoice_date" value="<?php echo date('Y-m-d'); ?>" readonly required>
+                                </div>
 
-                                     <div class="form-group col-md-4">
-                                          <label for="gst_value_modal">GST Value<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="gst_value_modal" name="invoice_gst" placeholder="Enter Invoice Value" required readonly step="0.01">
-                                    </div>
-                                     <div class="form-group col-md-4">
-                                          <label for="invoice_no">Invoice Amount<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="invoice_amount_no_modal" name="invoice_amount" placeholder="Enter Invoice Amt" required readonly step="0.01">
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_value_modal">Invoice value<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="invoice_value_modal" name="invoice_value" placeholder="Enter Invoice Value" readonly step="0.01">
+                                </div>
 
-                                     <!-- <div class="form-group col-md-3" id="modal_received_amt_div">
+
+
+                            </div>
+                            <div class="row" id="invoice_no_div_modal2" style="display: none;">
+
+                                <div class="form-group col-md-4">
+                                    <label for="gst_value_modal">GST %<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="gst_per_modal" name="invoice_gst_per" placeholder="Enter GST %" required onchange="calcGSTValue()">
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="gst_value_modal">GST Value<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="gst_value_modal" name="invoice_gst" placeholder="Enter Invoice Value" required readonly step="0.01">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_no">Invoice Amount<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="invoice_amount_no_modal" name="invoice_amount" placeholder="Enter Invoice Amt" required readonly step="0.01">
+                                </div>
+
+                                <!-- <div class="form-group col-md-3" id="modal_received_amt_div">
                                     <label for="addon_policy">Total Received Amount</label>
                                         <input type="text" class="form-control" id="modal_received_amt" placeholder="" disabled>
                                      </div>  -->
-                                   
-                                </div>
 
-                                 <div class="row" id="modal_received_amt_div">
-                                     <div class="form-group col-md-4" >
-                                        <label for="addon_policy">Total Received Amount</label>
-                                            <input type="number" class="form-control" id="modal_received_amt" placeholder="" disabled step="0.01">
-                                     </div> 
+                            </div>
+
+                            <div class="row" id="modal_received_amt_div">
+                                <div class="form-group col-md-4">
+                                    <label for="addon_policy">Total Received Amount</label>
+                                    <input type="number" class="form-control" id="modal_received_amt" placeholder="" disabled step="0.01">
                                 </div>
+                            </div>
                             <!-- </div> -->
 
                         </div>
 
                         <!-- Payment Received Table -->
                         <div class="form-group col-md-12" style="display: none;" id="payment_table_div_modal" style="max-width: 800px;">
-                            <button type="button" id="add_row_btn" class="btn btn-secondary float-right"><i class="fa fa-plus"></i></button>
-
-
-                            <table data-custom-table-css="table" class="table table-bordered" id="payment_table_modal">
+                            <!-- <table data-custom-table-css="table" class="table table-bordered" id="payment_table_modal">
                                 <thead>
                                     <tr>
                                         <th style="display: none;">pk</th>
@@ -448,14 +505,51 @@ table.dataTable tbody td {
                                         <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
                                     </tr>
                                 </tbody>
-                            </table>
+                            </table> -->
                             <!-- <button type="button" id="add_row_btn" class="btn btn-secondary float-right mt-2"><i class="fa fa-plus"></i></button> -->
 
+                            <div class="payment-card">
+                                <input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount">
+                                <div class="row">
+                                    <div class="col">
+                                        <label>Invoice value</label>
+                                        <input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" required step="0.01" onchange="checkInvAmont(event)">
+                                    </div>
+                                    <div class="col">
+                                        <label>GST</label>
+                                        <input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" required step="0.01" onchange="checkInvAmont(event)">
+                                    </div>
+                                    <div class="col">
+                                        <label>TDS</label>
+                                        <input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required>
+                                    </div>
+                                    <div class="col">
+                                        <label>UTR Number</label>
+                                        <input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required>
+                                    </div>
+                                    <div class="col">
+                                        <label>Date</label>
+                                        <input type="text" class="form-control payment_date" name="payment_date[]" value="<?php echo date('d/m/Y'); ?>" placeholder="dd/mm/yyyy" required readonly>
+                                    </div>
+                                    <div class="col-auto d-flex align-items-end">
+                                        <button type="button" class="btn btn-danger btn-sm remove-row">
+                                            <i class="mdi mdi-delete"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="payment_card_container"></div>
+                            <div class="form-group text-right m-b-0">
+                                <button type="button" id="add_row_btn" class=" ml-2 btn app-btn-primary"><i class="mdi mdi-plus"></i></button>
+                            </div>
+
+
                         </div>
 
                         <div class="form-group text-right m-b-0">
-                             <!-- <button type="button" id="add_row_btn" class="btn btn-primary waves-effect waves-light mr-1">Add payment</button> -->
-                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Save</button>
+                            <!-- <button type="button" id="add_row_btn" class="btn btn-primary waves-effect waves-light mr-1">Add payment</button> -->
+                            <button type="button" class="btn app-btn-outline-secondary mr-2" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                            <button type="submit" class="btn btn-primary waves-effect waves-light" id="btnSubmit">Save</button>
                         </div>
                     </form>
                 </div>
@@ -464,90 +558,88 @@ table.dataTable tbody td {
     </div>
 </div>
 <script>
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("tickets-table");
 
-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;
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-        // 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
-        });
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        return customDropdown;
-    }
+            // 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
+            });
 
-    let activeDropdown = null;
+            return customDropdown;
+        }
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+        let activeDropdown = null;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the first column
-            if (event.target.closest('td:first-child')) return;
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-            if (activeDropdown) activeDropdown.style.display = 'none';
+            document.body.appendChild(customDropdown);
 
-            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);
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the first column
+                if (event.target.closest('td:first-child')) return;
 
-                // Handle href navigation
-                const href = this.getAttribute('href');
-                if (href && href !== '#') window.location.href = href;
+                if (activeDropdown) activeDropdown.style.display = 'none';
 
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
+                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;
-        }
+        // Close dropdown on outside click
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
-
 </script>
 
 <script>
-    document.getElementById('invoice_status').addEventListener('change', function () {
+    document.getElementById('invoice_status').addEventListener('change', function() {
         const invoiceStatus = this.value;
         console.log(invoiceStatus);
         const invoiceNoDiv = document.getElementById('invoice_no_div_modal');
@@ -568,203 +660,276 @@ document.addEventListener("DOMContentLoaded", function () {
             invoiceNoDiv.style.display = 'flex';
             invoiceNoDiv2.style.display = 'flex';
             totalReceivedAmtDiv.style.display = 'none';
-            switchRequired('invoice_no_modal',true);
-            switchRequired('invoice_date_modal',true);
-            switchRequired('invoice_amount_no_modal',true);
+            switchRequired('invoice_no_modal', true);
+            switchRequired('invoice_date_modal', true);
+            switchRequired('invoice_amount_no_modal', true);
 
-             switchRequired('received_amount',false,'name');
-             switchRequired('tds',false,'name');
-             switchRequired('gst_amount',false,'name');
-             switchRequired('utr_no',false,'name');
-             switchRequired('payment_date',false,'name');
-             switchRequired('pk',false,'name');
+            switchRequired('received_amount', false, 'name');
+            switchRequired('tds', false, 'name');
+            switchRequired('gst_amount', false, 'name');
+            switchRequired('utr_no', false, 'name');
+            switchRequired('payment_date', false, 'name');
+            switchRequired('pk', false, 'name');
             // invoiceDateDiv.style.display = 'block';
         } else if (invoiceStatus === 'payment_received') {
             invoiceNoDiv.style.display = 'flex';
             invoiceNoDiv2.style.display = 'flex';
             paymentTableDiv.style.display = 'block';
             totalReceivedAmtDiv.style.display = 'block';
-             switchRequired('invoice_no_modal',true);
-             switchRequired('invoice_date_modal',true);
-             switchRequired('invoice_amount_no_modal',true);
+            switchRequired('invoice_no_modal', true);
+            switchRequired('invoice_date_modal', true);
+            switchRequired('invoice_amount_no_modal', true);
 
 
-             switchRequired('received_amount',true,'name');
-             switchRequired('utr_no',true,'name');
-             switchRequired('tds',true,'name');
-             switchRequired('gst_amount',true,'name');
-             switchRequired('payment_date',true,'name');
-             switchRequired('pk',true,'name');
-        }else if(invoiceStatus === 'pending')
-        {
-             invoiceNoDiv.style.display = 'none';
-             invoiceNoDiv2.style.display = 'none';
-             paymentTableDiv.style.display = 'none';
-             totalReceivedAmtDiv.style.display = 'none';
-             // switchRequired('modal_received_amt_div',false);
-             switchRequired('invoice_no_modal',false);
-             switchRequired('invoice_date_modal',false);
-             switchRequired('invoice_amount_no_modal',false);
+            switchRequired('received_amount', true, 'name');
+            switchRequired('utr_no', true, 'name');
+            switchRequired('tds', true, 'name');
+            switchRequired('gst_amount', true, 'name');
+            switchRequired('payment_date', true, 'name');
+            switchRequired('pk', true, 'name');
+        } else if (invoiceStatus === 'pending') {
+            invoiceNoDiv.style.display = 'none';
+            invoiceNoDiv2.style.display = 'none';
+            paymentTableDiv.style.display = 'none';
+            totalReceivedAmtDiv.style.display = 'none';
+            // switchRequired('modal_received_amt_div',false);
+            switchRequired('invoice_no_modal', false);
+            switchRequired('invoice_date_modal', false);
+            switchRequired('invoice_amount_no_modal', false);
 
-             switchRequired('received_amount',false,'name');
-             switchRequired('utr_no',false,'name');
-             switchRequired('payment_date',false,'name');
-             switchRequired('pk',false,'name');
-             switchRequired('tds',false,'name');
-             switchRequired('gst_amount',false,'name');
+            switchRequired('received_amount', false, 'name');
+            switchRequired('utr_no', false, 'name');
+            switchRequired('payment_date', false, 'name');
+            switchRequired('pk', false, 'name');
+            switchRequired('tds', false, 'name');
+            switchRequired('gst_amount', false, 'name');
 
         }
 
         calcGSTValue();
     });
 
-    
-
-    $(document).ready(function () {
-
-     $('#file-err-modal').on('show.bs.modal', function(event) {
-        // console.log(event.relatedTarget);
-        var myVal = $(event.relatedTarget).data('err');
-        // console.log(myVal);
-        var loader =
-            '<div style="text-align: center;"><img src="<?php echo base_url()?>public/assets/images/simple_loader.gif" height="50px" width="50px" ></div>';
-        $('#file-err-modal').find(".modal-body").html(loader);
-        var model_data = fetchFileError(myVal);
-        // console.log('data received.');
-        // console.log(model_data);
-
-    });
 
 
-    $('#invoiceForm').on('submit', function (e) {
-        e.preventDefault();  // Prevent default form submission
+    $(document).ready(function() {
 
-         var res = checkInvAmont();
-        if(!res)
-        {
-            return false;
-        }
+        $('#file-err-modal').on('show.bs.modal', function(event) {
+            // console.log(event.relatedTarget);
+            var myVal = $(event.relatedTarget).data('err');
+            // console.log(myVal);
+            var loader =
+                '<div style="text-align: center;"><img src="<?php echo base_url() ?>public/assets/images/simple_loader.gif" height="50px" width="50px" ></div>';
+            $('#file-err-modal').find(".modal-body").html(loader);
+            var model_data = fetchFileError(myVal);
+            // console.log('data received.');
+            // console.log(model_data);
 
-        var form = document.getElementById('invoiceForm');
-        // alert(form.checkValidity());
-        // alert($('#invoice_date_modal').val());
-        if((!form.checkValidity()))
-        {
-            console.log('error2');
-            console.log(form.checkValidity());
-            return false;
-        }
+        });
 
-        if($('#invoice_date_modal').val().trim() === '' && $('#invoice_status').val() != 'pending')
-        {
-            // console.log('error1');
-            return false;
-        }
-        // console.log('final');
-        // return false;
-        // Serialize form data to array and then convert to JSON
-        var formData = new FormData(form);
-        var formDataJSON = {};
 
-        // Iterate over FormData entries
-        formData.forEach(function(value, key) {
-            // Check if the key ends with '[]' indicating an array-like input
-            if (key.endsWith('[]')) {
-                // Remove '[]' from the key and store it as an array in formDataJSON
-                var arrayKey = key.slice(0, -2);
-                if (!formDataJSON[arrayKey]) {
-                    formDataJSON[arrayKey] = [];
+        $('#invoiceForm').on('submit', function(e) {
+            e.preventDefault(); // Prevent default form submission
+
+            var res = checkInvAmont();
+            if (!res) {
+                return false;
+            }
+
+            var form = document.getElementById('invoiceForm');
+            // alert(form.checkValidity());
+            // alert($('#invoice_date_modal').val());
+            if ((!form.checkValidity())) {
+                console.log('error2');
+                console.log(form.checkValidity());
+                return false;
+            }
+
+            if ($('#invoice_date_modal').val().trim() === '' && $('#invoice_status').val() != 'pending') {
+                // console.log('error1');
+                return false;
+            }
+            // console.log('final');
+            // return false;
+            // Serialize form data to array and then convert to JSON
+            var formData = new FormData(form);
+            var formDataJSON = {};
+
+            // Iterate over FormData entries
+            formData.forEach(function(value, key) {
+                // Check if the key ends with '[]' indicating an array-like input
+                if (key.endsWith('[]')) {
+                    // Remove '[]' from the key and store it as an array in formDataJSON
+                    var arrayKey = key.slice(0, -2);
+                    if (!formDataJSON[arrayKey]) {
+                        formDataJSON[arrayKey] = [];
+                    }
+                    formDataJSON[arrayKey].push(value); // Push the value into the array
+                } else {
+                    formDataJSON[key] = value; // Standard single-value field
                 }
-                formDataJSON[arrayKey].push(value); // Push the value into the array
-            } else {
-                formDataJSON[key] = value; // Standard single-value field
-            }
-        });
+            });
 
-        // Convert the JSON object to a string
-        var jsonData = JSON.stringify(formDataJSON);
-        console.log(jsonData);
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-        // Send the JSON data to the backend using AJAX
-        $.ajax({
-            url: 'saveInvoicePaymentDetails',  // Replace with your backend URL
-            type: 'POST',
-            contentType: 'application/json',
-            data: jsonData,
-            success: function (response) {
-                console.log(response);
-                // Close the modal
-    
-                 $('.close').click()
-                // Reset the form data
-                // $('#invoiceForm')[0].reset();
-                
-                alert('Invoice updated successfully!');
-                location.reload(); 
-            },
-            error: function (xhr, status, error) {
-                // Handle any errors
-                console.error('Form submission failed:', error);
-                alert('An error occurred while updating the invoice.');
-            }
+            // Convert the JSON object to a string
+            var jsonData = JSON.stringify(formDataJSON);
+            console.log(jsonData);
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+            // Send the JSON data to the backend using AJAX
+            $.ajax({
+                url: 'saveInvoicePaymentDetails', // Replace with your backend URL
+                type: 'POST',
+                contentType: 'application/json',
+                data: jsonData,
+                success: function(response) {
+                    console.log(response);
+                    // Close the modal
+
+                    $('.close').click()
+                    // Reset the form data
+                    // $('#invoiceForm')[0].reset();
+
+                    alert('Invoice updated successfully!');
+                    location.reload();
+                },
+                error: function(xhr, status, error) {
+                    // Handle any errors
+                    console.error('Form submission failed:', error);
+                    alert('An error occurred while updating the invoice.');
+                }
+            });
+            // location.reload(); 
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(10).fadeOut('slow');
         });
-        // location.reload(); 
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(10).fadeOut('slow');
-    });
     });
 
 
     // Add/Delete rows in the payment table
-    document.getElementById('add_row_btn').addEventListener('click', function () {
-        const tableBody = document.querySelector('#payment_table_modal tbody');
-        const newRow = document.createElement('tr');
+    // document.getElementById('add_row_btn').addEventListener('click', function () {
+    //     const tableBody = document.querySelector('#payment_table_modal tbody');
+    //     const newRow = document.createElement('tr');
 
-        newRow.innerHTML = `
-            <td style="display: none;"><input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount"></td>
-            <td><input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01"></td>
-            <td><input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01"></td>
-            <td><input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required></td>
-            <td><input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required></td>
-            <td><input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly></td>
-            <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
-        `;
+    //     newRow.innerHTML = `
+    //         <td style="display: none;"><input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount"></td>
+    //         <td><input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01"></td>
+    //         <td><input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01"></td>
+    //         <td><input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required></td>
+    //         <td><input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required></td>
+    //         <td><input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly></td>
+    //         <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
+    //     `;
 
-        tableBody.appendChild(newRow);
-            $('.payment_date').datepicker({
-                format: 'dd/mm/yyyy',
-                autoclose: true 
-            });
+    //     tableBody.appendChild(newRow);
+    //         $('.payment_date').datepicker({
+    //             format: 'dd/mm/yyyy',
+    //             autoclose: true 
+    //         });
+    // });
+
+    // Remove row
+    // document.getElementById('payment_table_modal').addEventListener('click', function (e) {
+    //     if (e.target && e.target.classList.contains('remove-row')) {
+    //         if (confirm("Do you want to delete this entry?")) {
+    //             var row = e.target.closest('tr');
+    //             var pk = row.querySelector('input[name="pk[]"]').value;
+
+    //             if (pk === "") {
+    //                 // If pk is empty, remove the row
+    //                 row.remove();
+    //             } else {
+    //                 // If pk is non-empty, send AJAX request to remove it from the backend
+    //                 $.ajax({
+    //                     url: 'deletePaymentEntry/'+pk, // Your backend URL here
+    //                     type: 'GET',
+    //                     // data: { pk: pk }, // Send the pk value to delete on server-side
+    //                     success: function (response) {
+    //                         // On success, remove the row
+    //                         console.log(response);
+    //                         if (response.dataStatus) {
+    //                             row.remove();
+    //                             alert('Payment deleted successfully.');
+    //                         } else {
+    //                             alert('Failed to delete the entry.');
+    //                         }
+    //                     },
+    //                     error: function () {
+    //                         alert('Error occurred while deleting the entry.');
+    //                     }
+    //                 });
+    //             }
+    //         }
+    //     }
+    // });
+
+    document.getElementById('add_row_btn').addEventListener('click', function() {
+        const container = document.getElementById('payment_card_container'); // wrapper div for cards
+        const newCard = document.createElement('div');
+        newCard.classList.add('payment-card');
+
+        newCard.innerHTML = `
+        <input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount">
+        <div class="row">
+            <div class="col">
+                <label>Invoice value</label>
+                <input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01">
+            </div>
+            <div class="col">
+                <label>GST</label>
+                <input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01">
+            </div>
+            <div class="col">
+                <label>TDS</label>
+                <input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required>
+            </div>
+            <div class="col">
+                <label>UTR Number</label>
+                <input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required>
+            </div>
+            <div class="col">
+                <label>Date</label>
+                <input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly>
+            </div>
+            <div class="col-auto d-flex align-items-end">
+                <button type="button" class="btn btn-danger btn-sm remove-row" style="text-align: center;">
+                    <i class="mdi mdi-delete"></i>
+                </button>
+            </div>
+        </div>
+    `;
+
+        container.appendChild(newCard);
+
+        // Reinit datepicker
+        $('.payment_date').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true
+        });
     });
 
-   // Remove row
-    document.getElementById('payment_table_modal').addEventListener('click', function (e) {
-        if (e.target && e.target.classList.contains('remove-row')) {
+    // Remove row (card)
+    document.getElementById('payment_card_container').addEventListener('click', function(e) {
+        if (e.target.closest('.remove-row')) {
+            const card = e.target.closest('.payment-card');
             if (confirm("Do you want to delete this entry?")) {
-                var row = e.target.closest('tr');
-                var pk = row.querySelector('input[name="pk[]"]').value;
+                const pk = card.querySelector('input[name="pk[]"]').value;
 
                 if (pk === "") {
-                    // If pk is empty, remove the row
-                    row.remove();
+                    // frontend only remove
+                    card.remove();
                 } else {
-                    // If pk is non-empty, send AJAX request to remove it from the backend
+                    // AJAX delete request
                     $.ajax({
-                        url: 'deletePaymentEntry/'+pk, // Your backend URL here
+                        url: 'deletePaymentEntry/' + pk,
                         type: 'GET',
-                        // data: { pk: pk }, // Send the pk value to delete on server-side
-                        success: function (response) {
-                            // On success, remove the row
-                            console.log(response);
+                        success: function(response) {
                             if (response.dataStatus) {
-                                row.remove();
+                                card.remove();
                                 alert('Payment deleted successfully.');
                             } else {
                                 alert('Failed to delete the entry.');
                             }
                         },
-                        error: function () {
+                        error: function() {
                             alert('Error occurred while deleting the entry.');
                         }
                     });
@@ -772,95 +937,87 @@ document.addEventListener("DOMContentLoaded", function () {
             }
         }
     });
-
-
-    
-
 </script>
 
 <script>
-
-function showFileUploadModal(input)
-{
+    function showFileUploadModal(input) {
         var myModal = new bootstrap.Modal(document.getElementById('file_upload'));
         myModal.show();
         // $(input).val('');
-}
+    }
 
-function formatDate(date) {
-    var day = ("0" + date.getDate()).slice(-2);
-    var month = ("0" + (date.getMonth() + 1)).slice(-2);
-    var year = date.getFullYear();
-    return day + "/" + month + "/" + year;
-}
-function formatDateToDMY(dateStr) {
-    // Split the date string by the hyphen
-    var parts = dateStr.split('-');
-    return parts[2] + '/' + parts[1] + '/' + parts[0]; // Rearrange to DD-MM-YYYY
-}
-function showInvoiceStatusModal(event)
-{
+    function formatDate(date) {
+        var day = ("0" + date.getDate()).slice(-2);
+        var month = ("0" + (date.getMonth() + 1)).slice(-2);
+        var year = date.getFullYear();
+        return day + "/" + month + "/" + year;
+    }
+
+    function formatDateToDMY(dateStr) {
+        // Split the date string by the hyphen
+        var parts = dateStr.split('-');
+        return parts[2] + '/' + parts[1] + '/' + parts[0]; // Rearrange to DD-MM-YYYY
+    }
+
+    function showInvoiceStatusModal(event) {
         console.log('############  showInvoiceStatusModal function called ##################');
-         var modal_received_amt_div = document.getElementById('modal_received_amt_div');
-         modal_received_amt_div.style.display = 'none';
+        var modal_received_amt_div = document.getElementById('modal_received_amt_div');
+        modal_received_amt_div.style.display = 'none';
         // alert();
         // console.log(event.target.data)
         var dataId = event.target.getAttribute('data-id');
         var dataExpAmt = event.target.getAttribute('data-exp-amt');
         var dataReceivedAmt = event.target.getAttribute('data-received-amt');
         // Set the value to a hidden input field in the modal
-        document.getElementById('hidden_statement_id').value = dataId; 
+        document.getElementById('hidden_statement_id').value = dataId;
         // document.getElementById('modal_exp_amt').value = dataExpAmt; 
-        document.getElementById('modal_received_amt').value = dataReceivedAmt; 
+        document.getElementById('modal_received_amt').value = dataReceivedAmt;
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
         // AJAX call to get the invoice details based on data-id
         $.ajax({
-            url: 'getPaymentDetails/'+ dataId, // Replace with your backend URL
+            url: 'getPaymentDetails/' + dataId, // Replace with your backend URL
             method: 'get',
             // data: { id: dataId },
             // dataType: 'json',
             success: function(response) {
                 $('.loader').fadeOut();
-            $('.loader-mask').delay(10).fadeOut('slow');
+                $('.loader-mask').delay(10).fadeOut('slow');
                 console.log(response);
                 // Assuming response contains the necessary data
                 if (response.dataStatus === true && response.code === 200) {
                     // Populate modal fields
-                    if(response.data.invoice_status !== null)
-                    {
+                    if (response.data.invoice_status !== null) {
                         var inv_status_element = document.getElementById('invoice_status');
                         inv_status_element.value = response.data.invoice_status;
                         var event = new Event('change');
                         inv_status_element.dispatchEvent(event);
                     }
-                    
+
                     document.getElementById('invoice_no_modal').value = response.data.invoice_no;
-                    document.getElementById('invoice_date_modal').value = response.data.invoice_date === '' ? <?php echo date('d-m-Y')?> : response.data.invoice_date;
+                    document.getElementById('invoice_date_modal').value = response.data.invoice_date === '' ? <?php echo date('d-m-Y') ?> : response.data.invoice_date;
                     document.getElementById('invoice_amount_no_modal').value = response.data.invoice_amount;
-                    
+
                     document.getElementById('invoice_value_modal').value = response.data.invoice_value;
                     document.getElementById('gst_per_modal').value = response.data.gst_per;
                     document.getElementById('gst_value_modal').value = response.data.gst_value;
                     console.log('response.data.gst_value - ' + response.data.gst_value);
-                    if(response.data.gst_value == 0 || response.data.gst_value == '' || response.data.gst_value == null)
-                    {
+                    if (response.data.gst_value == 0 || response.data.gst_value == '' || response.data.gst_value == null) {
                         calcGSTValue();
                     }
 
                     if (!$('#invoice_date_modal').val()) {
                         // alert('nope');
-                          // Set today's date as the default date
-                          $('#invoice_date_modal').datepicker('setDate', new Date());
+                        // Set today's date as the default date
+                        $('#invoice_date_modal').datepicker('setDate', new Date());
                     }
                     // Clear existing rows in the payment table
                     var paymentTableBody = document.querySelector('#payment_table_modal tbody');
-                    
+
                     console.log('response.data.payments.length', response.data.payments.length)
                     // Populate payment table rows
-                    if(response.data.payments.length)
-                    {
+                    if (response.data.payments.length) {
                         paymentTableBody.innerHTML = '';
                         response.data.payments.forEach(function(payment) {
                             var row = paymentTableBody.insertRow();
@@ -875,7 +1032,10 @@ function showInvoiceStatusModal(event)
                             `;
                         });
                     }
-                     $('.payment_date').datepicker({ format: 'dd/mm/yyyy',autoclose: true});
+                    $('.payment_date').datepicker({
+                        format: 'dd/mm/yyyy',
+                        autoclose: true
+                    });
                     // Show the modal
                     var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
                     myModal.show();
@@ -896,70 +1056,70 @@ function showInvoiceStatusModal(event)
         // var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
         // myModal.show();
         // $(input).val('');
-}
-
-$(document).ready(function(){
-   
-    // var rollover_date = flatpickr("#statement_month", {
-    //     dateFormat: "Y-M",
-    //     allowInput: true
-    // });
-     $('#statement_month').datepicker({
-      format: 'yyyy-M',
-      viewMode: 'months',
-      minViewMode: 'months',
-       autoclose: true
-    });
-
-
-     $('.payment_date').datepicker({
-      format: 'dd/mm/yyyy',
-       autoclose: true
-    });
-
-     // Get today's date
-var today = new Date();
-
-// Calculate the minimum date (60 days before today)
-var minDate = new Date();
-minDate.setDate(today.getDate() - 180);
-
-// Calculate the maximum date (60 days after today)
-var maxDate = new Date();
-maxDate.setDate(today.getDate() + 180);
-     $('#invoice_date_modal').datepicker({
-      format: 'dd/mm/yyyy',
-       autoclose: true,
-       startDate: minDate,
-    endDate: maxDate
-    });
-
-    //  var invoice_date_modal = flatpickr("#invoice_date_modal", {
-    //     dateFormat: "d-m-Y",
-    //     allowInput: true
-    // });
-});
-
-
- $('#insurer_statement_upload_form').submit(function(event) {
-    
-    event.preventDefault();
-    var isValid = $('#insurer_statement_upload_form').parsley().validate();
-    if (!isValid) {
-        console.log('Form is Empty', 'Warning');
-        // alert('choose all fileds');
-        return;
     }
 
-    $('#btnSubmit').prop('disabled', true).text('Submitting...');
-    // Create FormData object
-    var formData = new FormData($(this)[0]);
-    for (var pair of formData.entries()) {
-        console.log(pair[0] + ', ' + pair[1]);
-    }
+    $(document).ready(function() {
 
-         $('.loader').fadeIn();
-         $('.loader-mask').fadeIn();
+        // var rollover_date = flatpickr("#statement_month", {
+        //     dateFormat: "Y-M",
+        //     allowInput: true
+        // });
+        $('#statement_month').datepicker({
+            format: 'yyyy-M',
+            viewMode: 'months',
+            minViewMode: 'months',
+            autoclose: true
+        });
+
+
+        $('.payment_date').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true
+        });
+
+        // Get today's date
+        var today = new Date();
+
+        // Calculate the minimum date (60 days before today)
+        var minDate = new Date();
+        minDate.setDate(today.getDate() - 180);
+
+        // Calculate the maximum date (60 days after today)
+        var maxDate = new Date();
+        maxDate.setDate(today.getDate() + 180);
+        $('#invoice_date_modal').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true,
+            startDate: minDate,
+            endDate: maxDate
+        });
+
+        //  var invoice_date_modal = flatpickr("#invoice_date_modal", {
+        //     dateFormat: "d-m-Y",
+        //     allowInput: true
+        // });
+    });
+
+
+    $('#insurer_statement_upload_form').submit(function(event) {
+
+        event.preventDefault();
+        var isValid = $('#insurer_statement_upload_form').parsley().validate();
+        if (!isValid) {
+            console.log('Form is Empty', 'Warning');
+            // alert('choose all fileds');
+            return;
+        }
+
+        $('#btnSubmit').prop('disabled', true).text('Submitting...');
+        // Create FormData object
+        var formData = new FormData($(this)[0]);
+        for (var pair of formData.entries()) {
+            console.log(pair[0] + ', ' + pair[1]);
+        }
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
         $.ajax({
             url: $(this).attr("action"),
             type: "POST",
@@ -993,7 +1153,7 @@ maxDate.setDate(today.getDate() + 180);
                     toastr.error('Something went wrong! Try later', 'Error');
                     window.location.reload(true);
                 }
-                  $('.close').click()
+                $('.close').click()
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(10).fadeOut('slow');
 
@@ -1005,99 +1165,98 @@ maxDate.setDate(today.getDate() + 180);
                 console.error("Request failed:", status, error);
                 toastr.error('Something went wrong! Try later', 'Error');
                 // $('#uploadForm')[0].reset();
-                  $('.close').click()
+                $('.close').click()
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(10).fadeOut('slow');
                 window.location.reload(true);
             }
         });
-         
+
     });
 
- function fetchFileError(file_id) {
-    $('#loader').show();
-    var apiURL = 'getFileErr/' + file_id;
-    // console.log('fetchFileError');
-    // console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            console.log(response);
-            $(this).find(".modal-body").html("");
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    // console.log((JSON.parse(response.data)));
-                    var file_error_data = (JSON.parse(response.data));
-                    var file_error_html = "";
+    function fetchFileError(file_id) {
+        $('#loader').show();
+        var apiURL = 'getFileErr/' + file_id;
+        // console.log('fetchFileError');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                console.log(response);
+                $(this).find(".modal-body").html("");
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    try {
+                        // console.log((JSON.parse(response.data)));
+                        var file_error_data = (JSON.parse(response.data));
+                        var file_error_html = "";
 
-                    if (file_error_data['error_code'] == 1) {
-                        file_error_html += 'The following row no(s) from excel are <span style="font-weight:bold">not found with policy transactions / duplicates.</span>';
-                        file_error_html += ' : ' + '<span style="font-weight:bolder">' + file_error_data['error_data'].join(',') + '</span>';
+                        if (file_error_data['error_code'] == 1) {
+                            file_error_html += 'The following row no(s) from excel are <span style="font-weight:bold">not found with policy transactions / duplicates.</span>';
+                            file_error_html += ' : ' + '<span style="font-weight:bolder">' + file_error_data['error_data'].join(',') + '</span>';
+                        }
+
+                        // console.log(file_error_html);
+                        $('#file-err-modal').find(".modal-body").html(file_error_html);
+                        return file_error_html;
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
                     }
-
-                    // console.log(file_error_html);
-                    $('#file-err-modal').find(".modal-body").html(file_error_html);
-                    return file_error_html;
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
+        });
 
-    $('#loader').hide();
-}
-
-
-function checkInvAmont(event = null) {
-    var total = 0;
-    var receivedAmounts = document.querySelectorAll('input[name="received_amount[]"]');
-    var receivedGST = document.querySelectorAll('input[name="gst_amount[]"]');
-    var tdsAmounts = document.querySelectorAll('input[name="tds[]"]');
-    // console.log();
-    receivedAmounts.forEach(function(el, index) {
-        // Get the received amount
-        let receivedVal = parseFloat(el.value) || 0;
-        // Get the corresponding tds amount (paired with the received amount)
-        let gstVal = parseFloat(receivedGST[index].value) || 0;
-        let tdsVal = parseFloat(tdsAmounts[index].value) || 0;
-        // Add received amount and tds amount
-        // console.log();
-        total += (receivedVal + tdsVal + gstVal);
-    });
-    // console.log(total);
-    // Get the expected invoice amount
-    var exp_amt = parseFloat(document.getElementById('invoice_amount_no_modal').value) || 0;
-
-    // Check if the total exceeds the expected amount
-    if (exp_amt < total) {
-        alert('Exceeds Invoice amount...Plz adjust numbers');
-        if(event != null)
-        {
-            event.target.value = '';
-            
-        }
-        return false; // Reset the value of the element that triggered the event
+        $('#loader').hide();
     }
 
-    return true;
-}
+
+    function checkInvAmont(event = null) {
+        var total = 0;
+        var receivedAmounts = document.querySelectorAll('input[name="received_amount[]"]');
+        var receivedGST = document.querySelectorAll('input[name="gst_amount[]"]');
+        var tdsAmounts = document.querySelectorAll('input[name="tds[]"]');
+        // console.log();
+        receivedAmounts.forEach(function(el, index) {
+            // Get the received amount
+            let receivedVal = parseFloat(el.value) || 0;
+            // Get the corresponding tds amount (paired with the received amount)
+            let gstVal = parseFloat(receivedGST[index].value) || 0;
+            let tdsVal = parseFloat(tdsAmounts[index].value) || 0;
+            // Add received amount and tds amount
+            // console.log();
+            total += (receivedVal + tdsVal + gstVal);
+        });
+        // console.log(total);
+        // Get the expected invoice amount
+        var exp_amt = parseFloat(document.getElementById('invoice_amount_no_modal').value) || 0;
+
+        // Check if the total exceeds the expected amount
+        if (exp_amt < total) {
+            alert('Exceeds Invoice amount...Plz adjust numbers');
+            if (event != null) {
+                event.target.value = '';
+
+            }
+            return false; // Reset the value of the element that triggered the event
+        }
+
+        return true;
+    }
 
 
-function switchRequired(elementId, isRequired, type = 'id') {
+    function switchRequired(elementId, isRequired, type = 'id') {
         // console.log('switchRequired: ' + elementId+' - '+' - '+ type);
-        if(type == 'id')//id attribute
+        if (type == 'id') //id attribute
         {
             let element = document.getElementById(elementId);
             if (isRequired) {
@@ -1105,42 +1264,39 @@ function switchRequired(elementId, isRequired, type = 'id') {
             } else {
                 element.removeAttribute('required');
             }
-        }
-        else //name attribute
+        } else //name attribute
         {
-            var name_attribute = elementId+'[]';
+            var name_attribute = elementId + '[]';
             // Select all elements with the name 'invoice_amt[]'
             var elements = document.getElementsByName(name_attribute);
 
             // Loop through the elements and set or remove the 'required' attribute
             elements.forEach(function(element) {
                 if (isRequired) {
-                    element.setAttribute('required', 'required');  // Make required
+                    element.setAttribute('required', 'required'); // Make required
                 } else {
-                    element.removeAttribute('required');  // Remove required
+                    element.removeAttribute('required'); // Remove required
                 }
             });
         }
-}
-
-function getStatementNo()
-{
-    var insurer_id = $('#insurer').val();
-    var statement_month = $('#statement_month').val();
-
-    console.log(insurer_id+' / '+statement_month);
-    if(insurer_id == "")
-    {
-        alert('Choose insurer...!');
-        $('#statement_month').val('');
     }
 
+    function getStatementNo() {
+        var insurer_id = $('#insurer').val();
+        var statement_month = $('#statement_month').val();
+
+        console.log(insurer_id + ' / ' + statement_month);
+        if (insurer_id == "") {
+            alert('Choose insurer...!');
+            $('#statement_month').val('');
+        }
 
 
 
-         $('.loader').fadeIn();
-         $('.loader-mask').fadeIn();
-        var apiURL = 'getInsurerStatementMonth?insurer_id=' +insurer_id+'&month='+statement_month ;
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        var apiURL = 'getInsurerStatementMonth?insurer_id=' + insurer_id + '&month=' + statement_month;
         $.ajax({
             url: apiURL,
             type: "GET",
@@ -1155,14 +1311,14 @@ function getStatementNo()
 
                 if (response.code === 200 && response.dataStatus === true && response
                     .data !== "") {
-                   
-                   disableStatementNo(response.data)
+
+                    disableStatementNo(response.data)
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(10).fadeOut('slow');
                 } else if (response.code === 404 && response.dataStatus === false) {
                     console.error('no data found', response);
                     // alert(response.message);
-                   // toastr.error(response.message, 'Failed');
+                    // toastr.error(response.message, 'Failed');
                     // window.location.reload(true);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(10).fadeOut('slow');
@@ -1186,277 +1342,269 @@ function getStatementNo()
                 $('.loader-mask').delay(10).fadeOut('slow');
             }
         });
-         // $('.loader').fadeOut();
-         // $('.loader-mask').delay(10).fadeOut('slow');
+        // $('.loader').fadeOut();
+        // $('.loader-mask').delay(10).fadeOut('slow');
 
 
-}
-
-function calcGSTValue()
-{
-    // alert('calcGSTValue');
-    console.log('calcGSTValue called');
-    var inv_status_element = document.getElementById('invoice_status');
-    
-    if(inv_status_element.value == 'generated' || inv_status_element.value == 'send' || inv_status_element.value == 'payment_received')
-    {
-
-        var gst_per = document.getElementById('gst_per_modal').value;
-        console.log('gst_per - ' + gst_per);
-
-        var invoice_value_dom_obj = document.getElementById('invoice_value_modal');
-        var invoice_value = invoice_value_dom_obj.value;
-        console.log('invoice_value - ' + invoice_value);
-
-        var gst_value_dom_obj = document.getElementById('gst_value_modal');
-        var gst_value = gst_value_dom_obj.value;
-        console.log('gst_value - ' + gst_value);
-
-        var invoice_amount_dom_obj = document.getElementById('invoice_amount_no_modal');
-        // var invoice_amount = invoice_amount_dom_obj.value();
-        
-        gst_value_dom_obj.value = Math.round((parseFloat(gst_per) / 100 ) * invoice_value);
-        // gst_value_dom_obj.value = ((parseFloat(gst_per) / 100 ) * invoice_value);
-        invoice_amount_dom_obj.value = parseFloat(invoice_value_dom_obj.value) + parseFloat(gst_value_dom_obj.value);
-            if(inv_status_element.value == 'payment_received')
-            {
-                checkInvAmont();
-            }
     }
 
+    function calcGSTValue() {
+        // alert('calcGSTValue');
+        console.log('calcGSTValue called');
+        var inv_status_element = document.getElementById('invoice_status');
 
-}
+        if (inv_status_element.value == 'generated' || inv_status_element.value == 'send' || inv_status_element.value == 'payment_received') {
 
-function disableStatementNo(arr)
-{
-    // JavaScript array with values to disable
-    // const disableValues = arr;
-    const disableIds = arr.map(item => item.stmt_sno);
-    console.log(disableIds);
+            var gst_per = document.getElementById('gst_per_modal').value;
+            console.log('gst_per - ' + gst_per);
 
-    // Get the select element
-    const selectElement = document.getElementById("statement_no");
-    // Variable to track if the first enabled option is selected
-    let firstEnabledOptionSelected = false;
-    // Iterate over the options in the select element
-    Array.from(selectElement.options).forEach(option => {
-        // If the option value is in the disableIds array, disable it
-        console.log(option.value);
-         option.disabled = false;
-         option.style.backgroundColor = "";
-        if (disableIds.includes((option.value))) {
-            option.disabled = true;
-            option.style.backgroundColor = "lightgray";
+            var invoice_value_dom_obj = document.getElementById('invoice_value_modal');
+            var invoice_value = invoice_value_dom_obj.value;
+            console.log('invoice_value - ' + invoice_value);
+
+            var gst_value_dom_obj = document.getElementById('gst_value_modal');
+            var gst_value = gst_value_dom_obj.value;
+            console.log('gst_value - ' + gst_value);
+
+            var invoice_amount_dom_obj = document.getElementById('invoice_amount_no_modal');
+            // var invoice_amount = invoice_amount_dom_obj.value();
+
+            gst_value_dom_obj.value = Math.round((parseFloat(gst_per) / 100) * invoice_value);
+            // gst_value_dom_obj.value = ((parseFloat(gst_per) / 100 ) * invoice_value);
+            invoice_amount_dom_obj.value = parseFloat(invoice_value_dom_obj.value) + parseFloat(gst_value_dom_obj.value);
+            if (inv_status_element.value == 'payment_received') {
+                checkInvAmont();
+            }
         }
-        else if (!firstEnabledOptionSelected && option.value !== "") {
-            // Automatically select the first enabled option
-            option.selected = true;
-            firstEnabledOptionSelected = true;
-        }
-    });
-}
 
-function deleteStatement(id)
-{
-    //alert(id);
-    Swal.fire({
-        title: "Do you want to delete statement & it's invoice data if any?",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#ff3333",
-    }).then((result) => {
 
-        console.log(result);
+    }
 
-        if (result.isConfirmed) {
+    function disableStatementNo(arr) {
+        // JavaScript array with values to disable
+        // const disableValues = arr;
+        const disableIds = arr.map(item => item.stmt_sno);
+        console.log(disableIds);
 
-            $('.loader').fadeIn();
-            $('.loader-mask').fadeIn();
-            var apiURL = 'deleteStatement/' + id;
-            // console.log('Truncate API URL : ', apiURL);
+        // Get the select element
+        const selectElement = document.getElementById("statement_no");
+        // Variable to track if the first enabled option is selected
+        let firstEnabledOptionSelected = false;
+        // Iterate over the options in the select element
+        Array.from(selectElement.options).forEach(option => {
+            // If the option value is in the disableIds array, disable it
+            console.log(option.value);
+            option.disabled = false;
+            option.style.backgroundColor = "";
+            if (disableIds.includes((option.value))) {
+                option.disabled = true;
+                option.style.backgroundColor = "lightgray";
+            } else if (!firstEnabledOptionSelected && option.value !== "") {
+                // Automatically select the first enabled option
+                option.selected = true;
+                firstEnabledOptionSelected = true;
+            }
+        });
+    }
 
-            $.ajax({
-                url: apiURL,
-                method: 'GET',
-                headers: {
-                    "X-Requested-With": "XMLHttpRequest"
-                },
-                success: function(response) {
-                            // console.log('Truncate Response', response)
+    function deleteStatement(id) {
+        //alert(id);
+        Swal.fire({
+            title: "Do you want to delete statement & it's invoice data if any?",
+            showCancelButton: true,
+            confirmButtonText: "Delete",
+            confirmButtonColor: "#ff3333",
+        }).then((result) => {
+
+            console.log(result);
+
+            if (result.isConfirmed) {
+
+                $('.loader').fadeIn();
+                $('.loader-mask').fadeIn();
+                var apiURL = 'deleteStatement/' + id;
+                // console.log('Truncate API URL : ', apiURL);
+
+                $.ajax({
+                    url: apiURL,
+                    method: 'GET',
+                    headers: {
+                        "X-Requested-With": "XMLHttpRequest"
+                    },
+                    success: function(response) {
+                        // console.log('Truncate Response', response)
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(10).fadeOut('slow');
-                    if (response.code === 200 && response.dataStatus === true) {
-                        Swal.fire({
-                            title: "Deleted!",
-                            icon: "success"
-                        });
-                       window.location.reload(true);
-                    }  else {
-                        Swal.fire({
-                            title: "Failed!",
-                            text: 'Something went wrong! Try later',
-                            icon: "error"
-                        });
+                        if (response.code === 200 && response.dataStatus === true) {
+                            Swal.fire({
+                                title: "Deleted!",
+                                icon: "success"
+                            });
+                            window.location.reload(true);
+                        } else {
+                            Swal.fire({
+                                title: "Failed!",
+                                text: 'Something went wrong! Try later',
+                                icon: "error"
+                            });
 
+                            window.location.reload(true);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(10).fadeOut('slow');
+                        console.error('Error fetching data from API:', error);
+                        toastr.error('Something went wrong! Try later', 'Error');
                         window.location.reload(true);
                     }
-                },
-                error: function(xhr, status, error) {
+                });
+            }
 
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(10).fadeOut('slow');
-                    console.error('Error fetching data from API:', error);
-                    toastr.error('Something went wrong! Try later', 'Error');
-                    window.location.reload(true);
-                }
-            });
-        }
+        });
 
-    });
+    }
+    // $(document).ready(function() {
+    //     $('#failedSwitch').change(function() {
+    //         if ($(this).prop('checked')) {
+    //             getFailedStatementList();
+    //         } else {
+    //             console.log("Inside Reload Function");
+    //         fetch(window.location.href) // Fetch the current page's content
+    //             .then(response => response.text())
+    //             .then(html => {
+    //             const parser = new DOMParser();
+    //             const doc = parser.parseFromString(html, 'text/html');
+    //             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
+    //             $('.loader').fadeOut();
+    //             $('.loader-mask').delay(100).fadeOut('slow');
+    //             })
+    //             .catch(error => console.error('Error reloading body:', error));
+    //                 }
+    //     });
+    // });
 
-}
-// $(document).ready(function() {
-//     $('#failedSwitch').change(function() {
-//         if ($(this).prop('checked')) {
-//             getFailedStatementList();
-//         } else {
-//             console.log("Inside Reload Function");
-//         fetch(window.location.href) // Fetch the current page's content
-//             .then(response => response.text())
-//             .then(html => {
-//             const parser = new DOMParser();
-//             const doc = parser.parseFromString(html, 'text/html');
-//             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
-//             $('.loader').fadeOut();
-//             $('.loader-mask').delay(100).fadeOut('slow');
-//             })
-//             .catch(error => console.error('Error reloading body:', error));
-//                 }
-//     });
-// });
-
-// function checkSwitchStatus(){
-//     $('#failedSwitch').change(function() {
-//     if ($(this).prop('checked')) {
-//             getFailedStatementList();
-//         } else {
-//             console.log("Inside Reload Function");
-//         fetch(window.location.href) // Fetch the current page's content
-//             .then(response => response.text())
-//             .then(html => {
-//             const parser = new DOMParser();
-//             const doc = parser.parseFromString(html, 'text/html');
-//             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
-//             $('.loader').fadeOut();
-//             $('.loader-mask').delay(250).fadeOut('slow');
-//             })
-//             .catch(error => console.error('Error reloading body:', error));
-//                 }
-//             });
-// }
+    // function checkSwitchStatus(){
+    //     $('#failedSwitch').change(function() {
+    //     if ($(this).prop('checked')) {
+    //             getFailedStatementList();
+    //         } else {
+    //             console.log("Inside Reload Function");
+    //         fetch(window.location.href) // Fetch the current page's content
+    //             .then(response => response.text())
+    //             .then(html => {
+    //             const parser = new DOMParser();
+    //             const doc = parser.parseFromString(html, 'text/html');
+    //             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
+    //             $('.loader').fadeOut();
+    //             $('.loader-mask').delay(250).fadeOut('slow');
+    //             })
+    //             .catch(error => console.error('Error reloading body:', error));
+    //                 }
+    //             });
+    // }
 
 
-// function getFailedStatementList(){
-//     $('.loader').fadeIn();
-//     $('.loader-mask').fadeIn();
-//     $.ajax({
-//         url:'<?= base_url("policy_tranction/statement/failedStatement")?>',
-//         type:'POST',
-//         success:function(response){
-//             console.log(response);
-//             var table = $('#tickets-table').DataTable();
-//             table.clear();
-//             $('#tickets-table').addClass('table-fixed');
-//             var failedList = response.data.insurer_statement_list;
-//             console.log('failed list'+failedList);
-//             failedList.forEach(function(row) {
-//                 var newRow = [
-//                                 '<input type="hidden" class="row-select" data-id="' + row.id + '">',
-//                                 row.short_name + '-' + row.branch_code,
-//                                 formatDate(row.month),
-//                                 row.stmt_sno,
-//                                 row.file_name,
-//                                 row.line_items,
-//                                 row.file_status +
-//                                     (row.file_status == 'failed' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="modal" data-target="#file-err-modal" data-err="' + row.id + '"></i></span>' : ''),
-//                                 (row.invoice_status ? row.invoice_status : ' - ') +
-//                                     (row.file_status == 'success' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="tooltip" title="Invoice Amt: ' + (row.invoice_amount || '0.00') + ' Received Amt: ' + (row.received_inv_amt || '0.00') + '"></i></span>' : ''),
-//                                 formatDate(row.created_at) + ' by <br>' + row.first_name,
-//                                 (row.file_status != 'failed' ?
-//                                     '<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 + '" data-exp-amt="' + row.exp_inv_amt + '" data-received-amt="' + row.received_inv_amt + '" onclick="showInvoiceStatusModal(event)">' +
-//                                                 '<i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status' +
-//                                             '</a>' +
-//                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" onclick="deleteStatement(' + row.id + ')">' +
-//                                                 '<i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete' +
-//                                             '</a>' +
-//                                         '</div>' +
-//                                     '</div>' : '...')
-//                             ];
-
-//                             // Append the new row to the table body
-//                             table.row.add(newRow);
-//                         });
-//                         table.draw();
-//                         table.columns.adjust().draw(); // Ensures correct alignment
-//                         $('.loader').fadeOut();
-//                         $('.loader-mask').delay(250).fadeOut('slow');
-//         },
-//         error: function(xhr, status, error) {
-//                         let message = 'Failed to load Data ';
-//                         toastr.error(response.message, 'Failed');
-//                         $('.loader').fadeOut();
-//             $('.loader-mask').delay(250).fadeOut('slow');
-//         }
-
-//     })
-// }
-// $(document).ready(function() {
-//     var table = $('#tickets-table').DataTable({
-//         // responsive: true, // Ensures table adjusts to smaller screens
-//         stateSave: true, // Saves the table's state
-//     });
-// });
+    // function getFailedStatementList(){
+    //     $('.loader').fadeIn();
+    //     $('.loader-mask').fadeIn();
+    //     $.ajax({
+    //         url:'<?= base_url("policy_tranction/statement/failedStatement") ?>',
+    //         type:'POST',
+    //         success:function(response){
+    //             console.log(response);
+    //             var table = $('#tickets-table').DataTable();
+    //             table.clear();
+    //             $('#tickets-table').addClass('table-fixed');
+    //             var failedList = response.data.insurer_statement_list;
+    //             console.log('failed list'+failedList);
+    //             failedList.forEach(function(row) {
+    //                 var newRow = [
+    //                                 '<input type="hidden" class="row-select" data-id="' + row.id + '">',
+    //                                 row.short_name + '-' + row.branch_code,
+    //                                 formatDate(row.month),
+    //                                 row.stmt_sno,
+    //                                 row.file_name,
+    //                                 row.line_items,
+    //                                 row.file_status +
+    //                                     (row.file_status == 'failed' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="modal" data-target="#file-err-modal" data-err="' + row.id + '"></i></span>' : ''),
+    //                                 (row.invoice_status ? row.invoice_status : ' - ') +
+    //                                     (row.file_status == 'success' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="tooltip" title="Invoice Amt: ' + (row.invoice_amount || '0.00') + ' Received Amt: ' + (row.received_inv_amt || '0.00') + '"></i></span>' : ''),
+    //                                 formatDate(row.created_at) + ' by <br>' + row.first_name,
+    //                                 (row.file_status != 'failed' ?
+    //                                     '<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 + '" data-exp-amt="' + row.exp_inv_amt + '" data-received-amt="' + row.received_inv_amt + '" onclick="showInvoiceStatusModal(event)">' +
+    //                                                 '<i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status' +
+    //                                             '</a>' +
+    //                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" onclick="deleteStatement(' + row.id + ')">' +
+    //                                                 '<i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete' +
+    //                                             '</a>' +
+    //                                         '</div>' +
+    //                                     '</div>' : '...')
+    //                             ];
 
+    //                             // Append the new row to the table body
+    //                             table.row.add(newRow);
+    //                         });
+    //                         table.draw();
+    //                         table.columns.adjust().draw(); // Ensures correct alignment
+    //                         $('.loader').fadeOut();
+    //                         $('.loader-mask').delay(250).fadeOut('slow');
+    //         },
+    //         error: function(xhr, status, error) {
+    //                         let message = 'Failed to load Data ';
+    //                         toastr.error(response.message, 'Failed');
+    //                         $('.loader').fadeOut();
+    //             $('.loader-mask').delay(250).fadeOut('slow');
+    //         }
 
+    //     })
+    // }
+    // $(document).ready(function() {
+    //     var table = $('#tickets-table').DataTable({
+    //         // responsive: true, // Ensures table adjusts to smaller screens
+    //         stateSave: true, // Saves the table's state
+    //     });
+    // });
 </script>
 
 <script>
-$(document).ready(function() {
-    // Add custom filter function to DataTables
-    $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
-        const showFailedStatus = $('#statusSwitch').is(':checked');
-        const status = data[6].toLowerCase().trim(); // Index 6 is the file_status column
-        
-        if (showFailedStatus) {
-            return status.includes('failed');
-        } else {
-            return status.includes('success');
-        }
-    });
+    $(document).ready(function() {
+        // Add custom filter function to DataTables
+        $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
+            const showFailedStatus = $('#statusSwitch').is(':checked');
+            const status = data[6].toLowerCase().trim(); // Index 6 is the file_status column
 
-    // Initialize DataTable
-    const table = $('#tickets-table').DataTable({
-        // Your existing DataTable options here
-        "order": [], // Disable initial sorting if needed
-        "pageLength": 10,
-        // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top
-        "language": {
-            "lengthMenu": "Show _MENU_ entries",
-            "search": "Search:"
-        }
-    });
+            if (showFailedStatus) {
+                return status.includes('failed');
+            } else {
+                return status.includes('success');
+            }
+        });
 
-    // Add event listener for switch changes
-    $('#statusSwitch').on('change', function() {
-        table.draw(); // Redraw the table to apply the filter
-    });
+        // Initialize DataTable
+        const table = $('#tickets-table').DataTable({
+            // Your existing DataTable options here
+            "order": [], // Disable initial sorting if needed
+            "pageLength": 10,
+            // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top
+            "language": {
+                "lengthMenu": "Show _MENU_ entries",
+                "search": "Search:"
+            }
+        });
 
-    // Trigger initial filter to show only success status
-    table.draw();
-});
+        // Add event listener for switch changes
+        $('#statusSwitch').on('change', function() {
+            table.draw(); // Redraw the table to apply the filter
+        });
+
+        // Trigger initial filter to show only success status
+        table.draw();
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index bb4d0427..56f41f07 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -1,68 +1,74 @@
-<div class="row">
-    <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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-4" 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 class="container-fluid-min">
+    <div class="col-xl-12" id="outstanding_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="text-center"> -->
+                            <div class="form-row">
+                                <div class="form-group col-md-4" id="date_div">
+                                    <label>Date<span class="text-danger"></span></label>
+                                    <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>
-                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Category<span class="text-danger"> *</span></label> <br />
+                                    <select name="category" class="form-control" id="category" required>
+                                        <option value="">Select</option>
+                                        <?php foreach ($categories as $category => $key) : ?>
+                                            <option value="<?= $key ?>"><?= $category ?></option>
+                                        <?php endforeach ?>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Report Type<span class="text-danger"> *</span></label> <br />
+                                    <select class="form-control" id="report_type" required>
+                                        <option value="0">Select</option>
+                                        <?php foreach ($report_type as $reports => $key) : ?>
+                                            <option value="<?= $key ?>"><?= $reports ?></option>
+                                        <?php endforeach ?>
+                                    </select>
+                                </div>
+
+
                             </div>
+                            <div class="row justify-content-end">
 
-
-                            <div class="form-group col-md-4">
-                                <label>Category<span class="text-danger"> *</span></label> <br />
-                                <select name="category" class="form-control" id="category" required>
-                                    <option value="">Select</option>
-                                    <?php foreach ($categories as $category => $key) : ?>
-                                        <option value="<?= $key ?>"><?= $category ?></option>
-                                    <?php endforeach ?>
-                                </select>
+                                <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 class="form-group col-md-4">
-                                <label>Report Type<span class="text-danger"> *</span></label> <br />
-                                <select class="form-control" id="report_type" required>
-                                    <option value="0">Select</option>
-                                    <?php foreach ($report_type as $reports => $key) : ?>
-                                        <option value="<?= $key ?>"><?= $reports ?></option>
-                                    <?php endforeach ?>
-                                </select>
-                            </div>
-
-
+                            <!-- </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>
         </div>
-    </div>
-</div>
-<div class="card mb-1">
 
+    </div>
     <div id="report"></div>
 </div>
+
+
+
 <script>
     $(function() {
 
@@ -73,7 +79,7 @@
         var end = moment(end, 'DD/MM/YYYY');
 
         function cb(start, end) {
-            $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#reportrange').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'));
         }
@@ -81,6 +87,9 @@
         $('#reportrange').daterangepicker({
             startDate: start,
             endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
             ranges: {
                 'Today': [moment(), moment()],
                 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -96,16 +105,16 @@
     });
 </script>
 <script>
-    $('#category').on('click', function(){
+    $('#category').on('click', function() {
 
         var choosed_option = $('#category').val();
         $("#report_type").val('0');
-        if (choosed_option == 'life' ){
-            $("#report_type option[value='insurer']").show();  
-            $("#report_type option[value='bap']").hide();  
-            $("#report_type option[value='bapClient']").hide();  
-            $("#report_type option[value='bapInsurer']").hide();  
-            $("#report_type option[value='client']").show();  
+        if (choosed_option == 'life') {
+            $("#report_type option[value='insurer']").show();
+            $("#report_type option[value='bap']").hide();
+            $("#report_type option[value='bapClient']").hide();
+            $("#report_type option[value='bapInsurer']").hide();
+            $("#report_type option[value='client']").show();
 
         } else if (choosed_option == 'nonLife') {
             $("#report_type option[value='insurer']").show();
@@ -138,11 +147,11 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
-            }else{
+            } else {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message,'ERROR');
+                toastr.error(message, 'ERROR');
             }
 
 
diff --git a/app/Views/irda_bap_client_report_list.php b/app/Views/irda_bap_client_report_list.php
index 69414819..20d18f17 100644
--- a/app/Views/irda_bap_client_report_list.php
+++ b/app/Views/irda_bap_client_report_list.php
@@ -205,24 +205,37 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-CLIENT-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-CLIENT-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                }
-
-            ],
+            buttons: [
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php
index 7d9e9773..6d213238 100644
--- a/app/Views/irda_bap_insurer_report_list.php
+++ b/app/Views/irda_bap_insurer_report_list.php
@@ -238,62 +238,128 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-INSURER-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-INSURER-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'IRDA-BAP-INSURER-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'IRDA-BAP-INSURER-List',
+            //         customize: function(xlsx) {
+            //             var sheet = xlsx.xl.worksheets['sheet1.xml'];
+            //             var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
-                            }
-                        });
+            //             // Find cells in column AB (28th column in Excel)
+            //             $('row c[r^="AB"]', sheet).each(function() {
+            //                 var value = parseFloat($('v', this)
+            //             .text()); // Get the value inside the cell
+            //                 if (!isNaN(value)) {
+            //                     total += value;
+            //                 }
+            //             });
 
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
+            //             // Get the last row index and append the total row
+            //             var lastRow = $('row:last', sheet);
+            //             var rowIndex = parseInt(lastRow.attr('r')) +
+            //             2; // Find the next row index
+            //             var totalRow = '<row r="' + rowIndex + '">' +
+            //                 '<c t="inlineStr" r="AA' + rowIndex +
+            //                 '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+            //                 '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+            //                 '</v></c>' + // Insert sum in AB
+            //                 '</row>';
 
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    },
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                    customizeData: function(data) {
-                        for (var i = 0; i < data.body.length; i++) {
-                            for (var j = 0; j < data.body[i].length; j++) {
-                                // Check if the column is the 9th index (10th column)
-                                if (j === 9) {
-                                    data.body[i][j] = '\u200C' + data.body[i][j];
-                                }
-                            }
-                        }
+            //             // Append the new total row to the sheet
+            //             $(sheet).find('sheetData').append(totalRow);
+            //         },
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //         customizeData: function(data) {
+            //             for (var i = 0; i < data.body.length; i++) {
+            //                 for (var j = 0; j < data.body[i].length; j++) {
+            //                     // Check if the column is the 9th index (10th column)
+            //                     if (j === 9) {
+            //                         data.body[i][j] = '\u200C' + data.body[i][j];
+            //                     }
+            //                 }
+            //             }
+            //         }
+
+            //     }
+
+            // ],
+            buttons: [
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                         title: 'IRDA-BAP-INSURER-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                         title: 'IRDA-BAP-INSURER-List',
+                                        customize: function(xlsx) {
+                                            var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                            var total = 0;
+
+                                            // Find cells in column AB (28th column in Excel)
+                                            $('row c[r^="AB"]', sheet).each(function() {
+                                                var value = parseFloat($('v', this)
+                                            .text()); // Get the value inside the cell
+                                                if (!isNaN(value)) {
+                                                    total += value;
+                                                }
+                                            });
+
+                                            // Get the last row index and append the total row
+                                            var lastRow = $('row:last', sheet);
+                                            var rowIndex = parseInt(lastRow.attr('r')) +
+                                            2; // Find the next row index
+                                            var totalRow = '<row r="' + rowIndex + '">' +
+                                                '<c t="inlineStr" r="AA' + rowIndex +
+                                                '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                                '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                                '</v></c>' + // Insert sum in AB
+                                                '</row>';
+
+                                            // Append the new total row to the sheet
+                                            $(sheet).find('sheetData').append(totalRow);
+                                        },
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        customizeData: function(data) {
+                                            for (var i = 0; i < data.body.length; i++) {
+                                                for (var j = 0; j < data.body[i].length; j++) {
+                                                    // Check if the column is the 9th index (10th column)
+                                                    if (j === 9) {
+                                                        data.body[i][j] = '\u200C' + data.body[i][j];
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                    }
+                        ]
                     }
-
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
diff --git a/app/Views/irda_client_report_list.php b/app/Views/irda_client_report_list.php
index e3006e95..d3f7993f 100644
--- a/app/Views/irda_client_report_list.php
+++ b/app/Views/irda_client_report_list.php
@@ -78,62 +78,128 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-CLIENT-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-CLIENT-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'IRDA-BAP-CLIENT-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'IRDA-BAP-CLIENT-List',
+            //         customize: function(xlsx) {
+            //             var sheet = xlsx.xl.worksheets['sheet1.xml'];
+            //             var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
-                            }
-                        });
+            //             // Find cells in column AB (28th column in Excel)
+            //             $('row c[r^="AB"]', sheet).each(function() {
+            //                 var value = parseFloat($('v', this)
+            //             .text()); // Get the value inside the cell
+            //                 if (!isNaN(value)) {
+            //                     total += value;
+            //                 }
+            //             });
 
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
+            //             // Get the last row index and append the total row
+            //             var lastRow = $('row:last', sheet);
+            //             var rowIndex = parseInt(lastRow.attr('r')) +
+            //             2; // Find the next row index
+            //             var totalRow = '<row r="' + rowIndex + '">' +
+            //                 '<c t="inlineStr" r="AA' + rowIndex +
+            //                 '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+            //                 '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+            //                 '</v></c>' + // Insert sum in AB
+            //                 '</row>';
 
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    },
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                    customizeData: function(data) {
-                        for (var i = 0; i < data.body.length; i++) {
-                            for (var j = 0; j < data.body[i].length; j++) {
-                                // Check if the column is the 9th index (10th column)
-                                if (j === 9) {
-                                    data.body[i][j] = '\u200C' + data.body[i][j];
-                                }
-                            }
-                        }
+            //             // Append the new total row to the sheet
+            //             $(sheet).find('sheetData').append(totalRow);
+            //         },
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //         customizeData: function(data) {
+            //             for (var i = 0; i < data.body.length; i++) {
+            //                 for (var j = 0; j < data.body[i].length; j++) {
+            //                     // Check if the column is the 9th index (10th column)
+            //                     if (j === 9) {
+            //                         data.body[i][j] = '\u200C' + data.body[i][j];
+            //                     }
+            //                 }
+            //             }
+            //         }
+
+            //     }
+
+            // ],
+            buttons: [
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                        className: 'app-btn-primary ',
+                                        customize: function(xlsx) {
+                                            var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                            var total = 0;
+
+                                            // Find cells in column AB (28th column in Excel)
+                                            $('row c[r^="AB"]', sheet).each(function() {
+                                                var value = parseFloat($('v', this)
+                                            .text()); // Get the value inside the cell
+                                                if (!isNaN(value)) {
+                                                    total += value;
+                                                }
+                                            });
+
+                                            // Get the last row index and append the total row
+                                            var lastRow = $('row:last', sheet);
+                                            var rowIndex = parseInt(lastRow.attr('r')) +
+                                            2; // Find the next row index
+                                            var totalRow = '<row r="' + rowIndex + '">' +
+                                                '<c t="inlineStr" r="AA' + rowIndex +
+                                                '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                                '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                                '</v></c>' + // Insert sum in AB
+                                                '</row>';
+
+                                            // Append the new total row to the sheet
+                                            $(sheet).find('sheetData').append(totalRow);
+                                        },
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        customizeData: function(data) {
+                                            for (var i = 0; i < data.body.length; i++) {
+                                                for (var j = 0; j < data.body[i].length; j++) {
+                                                    // Check if the column is the 9th index (10th column)
+                                                    if (j === 9) {
+                                                        data.body[i][j] = '\u200C' + data.body[i][j];
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                    }
+                        ]
                     }
-
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index c1b10112..54339201 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -44,11 +44,11 @@
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+                    <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">KYC</h4>
                         </div>
-                    </div>
+                    </div> -->
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
                     <thead class="bg-light">
@@ -175,31 +175,44 @@
  $(document).ready(function(){
 
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
+
+        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'<'col-sm-5'i><'col-sm-7'p>>" ,
+
+        
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'KYCList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
-                    window.location.href = "<?= base_url("master/kyc/create"); ?>";
-                }
-            }
-        ],
-
-
+                    {
+                        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) { 
+                            window.location.href = "<?= base_url("master/kyc/create"); ?>";
+                        }
+                    },
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'KYCList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
         paging: true ,
     });
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index d13612f1..eec84a12 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div class="row" id="insurer_add">
@@ -50,21 +49,31 @@ body {
                         <a href="<?= base_url("master/kyc/list"); ?>" ><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
                 </div> -->
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="kyc_docs_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">KYC Docs</span>
-                        </a>
-                    </li>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="kyc_docs_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">KYC Docs</span>
+                            </a>
+                        </li>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('kyc_entity_type_basic_info.php'); ?>
                     <?php include('kyc_docs.php'); ?>
@@ -79,21 +88,23 @@ body {
 <script>
     function policy_type_branch_contact() {
         var check_policy_type_id = $('#kyc_General_PrimaryKey');
-        
+
         console.log(check_policy_type_id.val());
-        if(check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0){
+        if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the KYC Entity Type!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the KYC Entity Type!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     document.getElementById("kyc_docs_id").addEventListener("click", function(event) {
         event.preventDefault();
         policy_type_branch_contact();
     });
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 3ccd15c4..cf7417e3 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -4,37 +4,35 @@
 
 <?php include(__DIR__ . '/../ticket_type_modal.php'); ?>
 
-
-<!-- Footer Start -->
- <div style="display: block;">
-    <footer class="footer">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-md-6">
-                    <script>
-                        document.write(new Date().getFullYear())
-                    </script> &copy; NHANCE
-                </div>
-                <!-- <div class="col-md-6">
-                    <div class="text-md-right footer-links d-none d-sm-block">
-                        <a href="javascript:void(0);">About Us</a>
-                        <a href="javascript:void(0);">Help</a>
-                        <a href="javascript:void(0);">Contact Us</a>
-                    </div>
-                </div> -->
-            </div>
-        </div>
-    </footer>
- </div>
-
-<!-- end Footer -->
-
 </div>
 
 <!-- ============================================================== -->
 <!-- End Page content -->
 <!-- ============================================================== -->
 
+    <!-- Footer Start -->
+    <div style="background-color: white !important;">
+        <footer class="footer" style="background-color: white !important;">
+            <div class="">
+                <div class="row">
+                    <div class="col-md-6">
+                        <script>
+                            document.write(new Date().getFullYear())
+                        </script> &copy; NHANCE
+                    </div>
+                    <!-- <div class="col-md-6">
+                        <div class="text-md-right footer-links d-none d-sm-block">
+                            <a href="javascript:void(0);">About Us</a>
+                            <a href="javascript:void(0);">Help</a>
+                            <a href="javascript:void(0);">Contact Us</a>
+                        </div>
+                    </div> -->
+                </div>
+            </div>
+        </footer>
+    </div>
+    <!-- end Footer -->
+
 
 </div>
 <!-- END wrapper -->
@@ -157,8 +155,43 @@
         "closeButton": true,
     };
 </script>
+<script>
+    $(document).ready(function() {
 
 
+        var pageName = "<?= esc($page_name ?? '') ?>";
+
+        var titleHtml = (pageName && pageName !== "Dashboard") ?
+            `<h3 style="margin-right:5px !important;">${pageName}</h3>` :
+            " ";
+
+        if (pageName && pageName == "Dashboard") {
+            titleHtml = `<h6 style="margin-right:5px !important;">Welcome <?= esc(get_session_userdata()->first_name ?? 'NOT SET') ?></h6>
+                     <h3>Dashboard</h3>`;
+        }
+
+
+        $(".top-navbar-title").html(titleHtml);
+
+
+        $('#collapseOne').on('show.bs.collapse', function() {
+            // When open
+            $('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');
+            // $('#filterAccordion').removeAttr("style"); // remove bg/border when open
+        });
+
+        $('#collapseOne').on('hide.bs.collapse', function() {
+            // When closed
+            $('#icon').removeClass('mdi-chevron-up').addClass('mdi-chevron-down');
+            // $('#filterAccordion').css({
+            //     "background-color": "#F5FFFF",
+            //     "border": "2px solid #F5FFFF",
+            //     "border-radius": "10px",
+            //     "box-shadow": "0px 4px 4px 0px #00000040"
+            // });
+        });
+    });
+</script>
 <script>
     var pullNotificationCount = 0;
     var pendingActionCount = 0;
@@ -175,7 +208,7 @@
 
                     // console.log('responce', response)
 
-                    if(response.status == false){
+                    if (response.status == false) {
                         $('#notification_count').html('0')
                         console.log('The session is not set correctly. ')
                         return;
@@ -188,7 +221,7 @@
 
                     pullNotificationCount = response.message.length
 
-                    
+
 
                     localStorage.setItem('pullNotificationCount', pullNotificationCount)
 
@@ -332,8 +365,7 @@
                         // console.log(response[key].length)
                         // console.log('type', typeof response[key].length)
                         // console.log('key', response[key])
-                        if(response[key].length != 'undefined' && response[key].length != undefined)
-                        {
+                        if (response[key].length != 'undefined' && response[key].length != undefined) {
                             pendingActionCount = pendingActionCount + response[key].length;
                         }
                     }
@@ -342,7 +374,7 @@
 
                     let messagesList = $('#messages-list-2');
                     messagesList.empty();
-                 
+
 
                     if (response.inception) {
                         $.each(response.inception, function(index, item) {
@@ -405,7 +437,7 @@
                     } else {
                         console.log('response.inception is undefined or null');
                     }
-                    
+
                     if (response.correction) {
                         $.each(response.correction, function(index, item) {
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
@@ -476,7 +508,7 @@
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.correction is undefined or null');
                     }
 
@@ -554,7 +586,7 @@
                             }
 
                         });
-                    }else{
+                    } else {
                         console.log('response.deletion is undefined or null');
 
                     }
@@ -564,46 +596,46 @@
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
 
 
-                                    var queryParams = {
-                                        client_id: item.client_id,
-                                        client_policy_id: item.client_policy_id,
-                                        client_branch_id: item.branch_id,
-                                        event: 'si_enhancement',
-                                        actions: 'export',
-                                        insurer_or_tpa: 'tpa',
-                                    };
+                                var queryParams = {
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'si_enhancement',
+                                    actions: 'export',
+                                    insurer_or_tpa: 'tpa',
+                                };
 
-                                    const queryString = objectToQueryString(queryParams);
+                                const queryString = objectToQueryString(queryParams);
 
-                                    var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                                    ////console.log(url)
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
 
 
-                                    var toast_body_css = 'background : #bfd7eb !important;';
-                                    var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
-                                    var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
-                                    var toast_status_word = 'Info';
-                                    var title = 'SI Enhancement Pending';
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'SI Enhancement Pending';
 
 
-                                    if (!item.branch_name.toLowerCase().includes('branch')) {
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                                        //console.log(item.branch_name)
-                                        item.branch_name += ' branch';
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
 
-                                    }
+                                }
 
-                                    ////console.log(item.branch_name);
+                                ////console.log(item.branch_name);
 
-                                    // if (item.batch_export_count > 0) {
+                                // if (item.batch_export_count > 0) {
 
-                                    //     title = 'SI Enhancement Import Pending';
-                                    // }
+                                //     title = 'SI Enhancement Import Pending';
+                                // }
 
-                                    var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
-                                    ////console.log(toast_body_data);
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
 
-                                    var html = ` <li data-id="" data-url="${url}">
+                                var html = ` <li data-id="" data-url="${url}">
                                                 <div class="p-3">
                                                     <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
                                                         <div class="toast-header " style="${toast_head_css}" >
@@ -625,12 +657,12 @@
                                             </li>`
 
 
-                                    messagesList.append(html);
+                                messagesList.append(html);
 
-                                }
+                            }
 
-                            });
-                    }else{
+                        });
+                    } else {
                         console.log('response.si_enhancement is undefined or null');
 
                     }
@@ -665,7 +697,7 @@
 
                                     //console.log(item.branch_name)
                                     item.branch_name += ' branch';
-                                    
+
                                 }
 
                                 ////console.log(item.branch_name);
@@ -704,7 +736,7 @@
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.tpa is undefined or null');
 
                     }
@@ -713,46 +745,46 @@
                         $.each(response.uhid, function(index, item) {
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
 
-                                    var queryParams = {
+                                var queryParams = {
 
-                                        client_id: item.client_id,
-                                        client_policy_id: item.client_policy_id,
-                                        client_branch_id: item.branch_id,
-                                        event: 'inception',
-                                        insurer_or_tpa: 'insurer',
-                                        actions: 'export',
-                                    };
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'inception',
+                                    insurer_or_tpa: 'insurer',
+                                    actions: 'export',
+                                };
 
-                                    const queryString = objectToQueryString(queryParams);
+                                const queryString = objectToQueryString(queryParams);
 
-                                    var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                                    //console.log(url)
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                //console.log(url)
 
-                                    var toast_body_css = 'background : #bfd7eb !important;';
-                                    var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
-                                    var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
-                                    var toast_status_word = 'Info';
-                                    var title = 'Insurer Pending';
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'Insurer Pending';
 
 
-                                    if (!item.branch_name.toLowerCase().includes('branch')) {
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                                        //console.log(item.branch_name)
-                                        item.branch_name += ' branch';
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
 
-                                    }
+                                }
 
-                                    ////console.log(item.branch_name);
+                                ////console.log(item.branch_name);
 
-                                    // if (item.batch_export_count > 0) {
+                                // if (item.batch_export_count > 0) {
 
-                                    //     title = 'Insurer Import Pending';
-                                    // }
+                                //     title = 'Insurer Import Pending';
+                                // }
 
-                                    var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
-                                    ////console.log(toast_body_data);
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
 
-                                    var html = ` <li data-id="" data-url="${url}">
+                                var html = ` <li data-id="" data-url="${url}">
                                                 <div class="p-3">
                                                     <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
                                                         <div class="toast-header " style="${toast_head_css}" >
@@ -774,11 +806,11 @@
                                             </li>`
 
 
-                                    messagesList.append(html);
+                                messagesList.append(html);
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.uhid is undefined or null');
                     }
                     localStorage.setItem('pendingActionCount', pendingActionCount)
@@ -826,9 +858,7 @@
 
 
 <script>
-
-    function formatDate(dateString) 
-    {
+    function formatDate(dateString) {
         // Parse the input date string
         let date = new Date(dateString);
 
@@ -856,8 +886,7 @@
         return formattedDate;
     }
 
-    function printCurrentTime() 
-    {
+    function printCurrentTime() {
         var now = new Date();
         var hours = now.getHours().toString().padStart(2, '0');
         var minutes = now.getMinutes().toString().padStart(2, '0');
@@ -867,163 +896,256 @@
 
         return currentTime;
     }
-
 </script>
 
 <script>
-
-function checkDuplicateTableFieldValue(tableName, fieldName, value, callback) {
-    $.ajax({
-        url: '<?= base_url('util/checkDuplicateTableFieldValue') ?>', // Adjust this to your endpoint in CodeIgniter
-        type: 'POST',
-        data: {
-            table: tableName,
-            field: fieldName,
-            value: value
-        },
-        dataType: 'json',
-        success: function(response) {
-            if (typeof callback === 'function') {
-                callback(response.isDuplicate); // Pass the result to the callback
-            }
-        },
-        error: function(xhr, status, error) {
-            console.error('AJAX Error:', error);
-        }
-    });
-}
-
-function sendAjaxRequestForGlobal(url, method, data = {}, successCallback = null, errorCallback = null) {
-    $.ajax({
-        url: url,
-        method: method,
-        data: data,
-        dataType: 'json', // Expected response type
-        success: function(response) {
-            // If a success callback is provided, call it with the response
-            if (successCallback) {
-                successCallback(response);
-            }
-        },
-        error: function(xhr, status, error) {
-            // Handle errors if provided error callback
-            if (errorCallback) {
-                errorCallback(xhr, status, error);
-            } else {
+    function checkDuplicateTableFieldValue(tableName, fieldName, value, callback) {
+        $.ajax({
+            url: '<?= base_url('util/checkDuplicateTableFieldValue') ?>', // Adjust this to your endpoint in CodeIgniter
+            type: 'POST',
+            data: {
+                table: tableName,
+                field: fieldName,
+                value: value
+            },
+            dataType: 'json',
+            success: function(response) {
+                if (typeof callback === 'function') {
+                    callback(response.isDuplicate); // Pass the result to the callback
+                }
+            },
+            error: function(xhr, status, error) {
                 console.error('AJAX Error:', error);
             }
-        }
-    });
-}
-
-function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, Proceed!", cancelText = "Cancel", icon = "warning") {
-    return Swal.fire({
-        title: message,
-        icon: icon,
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#d33",
-        confirmButtonText: confirmText,
-        cancelButtonText: cancelText
-    }).then((result) => {
-        return result.isConfirmed; // Returns true if confirmed, false otherwise
-    });
-}
+        });
+    }
 
+    function sendAjaxRequestForGlobal(url, method, data = {}, successCallback = null, errorCallback = null) {
+        $.ajax({
+            url: url,
+            method: method,
+            data: data,
+            dataType: 'json', // Expected response type
+            success: function(response) {
+                // If a success callback is provided, call it with the response
+                if (successCallback) {
+                    successCallback(response);
+                }
+            },
+            error: function(xhr, status, error) {
+                // Handle errors if provided error callback
+                if (errorCallback) {
+                    errorCallback(xhr, status, error);
+                } else {
+                    console.error('AJAX Error:', error);
+                }
+            }
+        });
+    }
 
+    function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, Proceed!", cancelText = "Cancel", icon = "warning") {
+        return Swal.fire({
+            title: message,
+            icon: icon,
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#d33",
+            confirmButtonText: confirmText,
+            cancelButtonText: cancelText
+        }).then((result) => {
+            return result.isConfirmed; // Returns true if confirmed, false otherwise
+        });
+    }
 </script>
 
 <script>
-        function restoreDashboardHistoryIfNeeded() {
+    function restoreDashboardHistoryIfNeeded() {
 
-            const dashboardHistoryString = localStorage.getItem('dashboardHistory');
+        const dashboardHistoryString = localStorage.getItem('dashboardHistory');
 
-            if (!dashboardHistoryString) {
-                console.log("dashboardHistory not found");
-                return;
-            }
-
-            const dashboardHistory = JSON.parse(dashboardHistoryString);
-
-            if (window.location.href === dashboardHistory.dashboard_url) {
-                const tabSelector = dashboardHistory.tab;
-                if (tabSelector) {
-                    const tabElement = document.querySelector(`a[href="${tabSelector}"]`);
-                    if (tabElement) {
-                        tabElement.click();
-                    }
-                }
-
-                const functionName = dashboardHistory.function_name;
-                const params = dashboardHistory.tile_params;
-
-                if (functionName && typeof window[functionName] === 'function') {
-                    if(params.majorType == 0 && params.minorType == 0){
-                        window[functionName]();
-                    }else{
-                        window[functionName](params.majorType, params.minorType);
-                    }
-                    
-                }
-
-                console.log("inside location match");
-            }
+        if (!dashboardHistoryString) {
+            console.log("dashboardHistory not found");
+            return;
         }
 
-        // Run on popstate (back/forward buttons)
-        window.addEventListener('popstate', restoreDashboardHistoryIfNeeded);
+        const dashboardHistory = JSON.parse(dashboardHistoryString);
 
-        // Run on page load (refresh)
-        window.addEventListener('DOMContentLoaded', () => {
-            // slight delay ensures DOM/tab loads completely
-            setTimeout(restoreDashboardHistoryIfNeeded, 100);
-        });
+        if (window.location.href === dashboardHistory.dashboard_url) {
+            const tabSelector = dashboardHistory.tab;
+            if (tabSelector) {
+                const tabElement = document.querySelector(`a[href="${tabSelector}"]`);
+                if (tabElement) {
+                    tabElement.click();
+                }
+            }
 
+            const functionName = dashboardHistory.function_name;
+            const params = dashboardHistory.tile_params;
+
+            if (functionName && typeof window[functionName] === 'function') {
+                if (params.majorType == 0 && params.minorType == 0) {
+                    window[functionName]();
+                } else {
+                    window[functionName](params.majorType, params.minorType);
+                }
+
+            }
+
+            console.log("inside location match");
+        }
+    }
+
+    // Run on popstate (back/forward buttons)
+    window.addEventListener('popstate', restoreDashboardHistoryIfNeeded);
+
+    // Run on page load (refresh)
+    window.addEventListener('DOMContentLoaded', () => {
+        // slight delay ensures DOM/tab loads completely
+        setTimeout(restoreDashboardHistoryIfNeeded, 100);
+    });
 </script>
 
 <script>
     $(document).ready(function() {
-        $('.img-inactive').on('click', function() {
+        const activeItem = localStorage.getItem("activeLi");
+        if (activeItem) {
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+            $('#' + activeItem).children('a').first().removeClass('img-inactive').addClass('img-active');
+        }
+
+        $('.li-seperate').on('click', function() {
+            // reset all anchors
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+
+            // only the immediate <a> inside this <li>
+            $(this).children('a').first().removeClass('img-inactive').addClass('img-active');
+
+            localStorage.setItem("activeLi", $(this).attr("id"));
+        });
+    });
+</script>
+
+
+<script>
+    $(document).ready(function() {
+        $('.nav-link').click(function() {
+
+            // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+
+
+
+        });
+    });
+
+    $(document).ready(function() {
+        // find all nav anchors
+        let $nav = $("ul.nav.nav-pills.navtab-bg");
+
+        // check if no anchor has active classes
+        if ($nav.find("a.active.active-tab").length === 0) {
+            // add classes to the first anchor
+            $nav.find("li:first-child a").addClass("active active-tab");
+
+            // also need to find the tab name and show only active image
+            let tab_name = $nav.find("li:first-child a").attr('href').split('-')[0];
+            tab_name = tab_name.replace('#', '');
+
+
+            switch (tab_name) {
+                case "leads":
+                    $('.active_leads').show();
+                    $('.inactive_leads').hide();
+                    break;
+                case "bds":
+                    $('.active_bds').show();
+                    $('.inactive_bds').hide();
+                    break;
+                case "claims":
+                    $('.active_claims').show();
+                    $('.inactive_claims').hide();
+                    break;
+                case "pending":
+                    $('.active_pending').show();
+                    $('.inactive_pending').hide();
+                    break;
+                default:
+                    break;
+            }
+
+        }
+    });
+
+$(function(){
+    let $nav = $("#myTab");
+
+    $(".left-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() - 150 }, 200);
+    });
+
+    $(".right-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() + 150 }, 200);
+    });
+});
+
+
+    // function openModal(modalId) {
+    //     console.log('openModal called with ID:', modalId);
+    //     var modalEl = document.getElementById(modalId);
+
+    //     if (typeof bootstrap !== "undefined" && bootstrap.Modal && typeof bootstrap.Modal.getOrCreateInstance === "function") {
+    //         // ✅ Bootstrap 5
+    //         var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+    //         modal.show();
+    //     } else if (typeof $ !== "undefined" && typeof $.fn.modal === "function") {
+    //         // ✅ Bootstrap 4
+    //         $('#' + modalId).modal('show');
+    //     } else {
+    //         console.error("No compatible Bootstrap modal found.");
+    //     }
+    // }
+</script>
+
+
+<script>
+        $(document).ready(function(){
+        $('.nav-link').click(function(){
+
+        // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+        
+
 
-            $('.img-c').addClass('img-inactive');
-            $(this).removeClass('.img-inactive');
-            $(this).addClass('.img-active');
         });
     });
 </script>
 
 <script>
-$(document).ready(function(){
-    $('.nav-link').click(function(){
+    function closeModalById(modalId) {
+        // Get the modal element
+        var modal = document.getElementById(modalId);
+        if (!modal) return; // Exit if no modal found
 
-    // change bg color of tab
-        $('.nav-link').removeClass('active-tab');
-        $(this).addClass('active-tab');
-    
+        // Hide it by removing "show" or "in" classes and setting display:none
+        modal.style.display = 'none';
+        modal.classList.remove('in', 'show'); // 'in' for BS3, 'show' for BS4/5
+        modal.setAttribute('aria-hidden', 'true');
+        modal.removeAttribute('aria-modal'); // optional
+        modal.removeAttribute('role'); // optional
 
+        // Remove backdrop if present
+        var backdrop = document.querySelector('.modal-backdrop');
+        if (backdrop) backdrop.remove();
 
-    });
-});
-
-function openModal(modalId) {
-    var modalEl = document.getElementById(modalId);
-
-    if (typeof bootstrap !== "undefined" && bootstrap.Modal) {
-        // Bootstrap 5
-        var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
-        modal.show();
-    } else if (typeof $ !== "undefined" && typeof $.fn.modal === "function") {
-        // Bootstrap 4
-        $('#' + modalId).modal('show');
-    } else {
-        console.error("No compatible Bootstrap modal found.");
+        // Allow page scrolling again
+        document.body.classList.remove('modal-open');
     }
-}
 
 </script>
 
 
 </body>
 
-</html>
-
+</html>
\ No newline at end of file
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 8857a211..cd3f6886 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -4,7 +4,7 @@
 <head>
 
     <meta charset="utf-8" />
-    <title><?= isset($page_name) ? $page_name : 'NHance'; ?></title>
+    <title><?= isset($tab_name) ? $tab_name : 'NHance'; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta content="" name="description" />
     <meta content="NHANCE" name="NHANCE" />
@@ -129,31 +129,51 @@
         }
 
         .container-fluid {
+            padding: 0px 20px 0px 20px !important;
+        }
+
+        .container-fluid-top {
             padding: 0px 40px 0px 40px !important;
         }
 
-        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages)
-        {
-                min-height: 100vh !important;
-        }   
+        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages) {
+            min-height: 100vh !important;
+        }
 
+        body .content-page {
+            margin-top: 90px !important;
+        }
     </style>
 
     <!-- navbar -->
     <style>
+        .nav-bar {
+            position: fixed !important;
+            z-index: 2;
+            width: 90%;
+            margin-left: 120px !important;
+            background: #fff;
+        }
+
+        .top-navbar-div {
+            display: flex;
+            flex-flow: row;
+            flex-shrink: 1 !important;
+            justify-content: space-between;
+            margin-top: 20px;
+            margin-left: 15px;
+        }
+
+
         .ul-flex {
             display: flex;
             flex-flow: column nowrap;
             justify-content: center;
             align-content: space-evenly;
+            flex-shrink: 1;
         }
 
-        .top-navbar-div {
-            display: flex;
-            flex-flow: row nowrap;
-            justify-content: space-between;
-            margin-top: 20px;
-        }
+
 
         .nav-flex {
             display: flex;
@@ -165,6 +185,60 @@
         }
     </style>
 
+    <!-- tab-switch -->
+    <style>
+        .nav-pills,
+        .nav-link {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            border-radius: 10px;
+
+        }
+
+        .nav-pills {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+            padding-top: 5px;
+        }
+
+        .nav-pills.nav-dash {
+            background-color: white !important;
+            box-shadow: none !important;
+        }
+
+        .nav-pills .nav-dash {
+            background-color: #D4F5F6 !important;
+            border-radius: 10px;
+            color: black !important;
+        }
+
+
+        .nav-link.active-tab {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+
+        }
+
+        .nav-link-btn {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+        }
+
+        .navtab-bg .nav-link {
+            margin: 5px !important;
+        }
+    </style>
+
+
+
     <!-- sidebar -->
     <style>
         #side-menu .menu-logo a:hover {
@@ -187,8 +261,47 @@
             border-radius: 25px;
             background-color: #D4F5F6;
             z-index: 700;
-            padding: 0px !important;
+            padding: 0 !important;
             height: 90% !important;
+            display: flex;
+            flex-flow: column wrap;
+        }
+
+        /* every <li> inside should be allowed to shrink */
+        .left-side-menu li {
+            flex-shrink: 1 !important;
+            min-height: 0 !important;
+            /* prevents flex bugs */
+        }
+
+        .left-side-menu ul li:hover>ul {
+            position: relative;
+            z-index: 99999 !important;
+        }
+
+
+
+        .img-inactive {
+            background-color: white;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 1px solid white;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+
+
+        .li-seperate {
+            margin: 10px 0px;
+        }
+
+        .img-active {
+            background-color: #B7F0F2;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 2px solid #00999E;
+            padding: 8px !important;
+            min-height: 43px !important;
         }
     </style>
 
@@ -228,36 +341,6 @@
             font-weight: 600 !important;
         }
 
-        .nav-link {
-            color: black !important;
-            background-color: #D4F5F6 !important;
-            font-size: small !important;
-            padding: 8px;
-            border-radius: 10px !important;
-            padding: 8px 16px;
-
-        }
-
-        .nav-link-btn {
-            color: white !important;
-            background-color: #00999E !important;
-            font-size: small !important;
-            padding: 8px 16px;
-            border-radius: 10px !important;
-        }
-
-        .nav-link.active-tab {
-            color: white !important;
-            background-color: #00999E !important;
-            font-size: small !important;
-            padding: 8px 16px;
-            border-radius: 10px !important;
-
-        }
-
-        .navtab-bg .nav-link {
-            margin: 0 5px 10px !important;
-        }
 
 
         .navbar-custom {
@@ -336,18 +419,7 @@
         /* end of loaders */
     </style>
 
-    <!-- parsley-examples section starts  -->
-    <style>
-        /* .parsley-examples 
-        {
-            background-color: #F5FFFF;
-            padding: 25px;
-            border: 2px solid #F5FFFF;
-            border-radius: 10px;
-            box-shadow: 0px 1px 1px 0px #00000040;
-        } 
-        */
-    </style>
+
 
     <!-- ticket list specific code -->
     <style>
@@ -386,49 +458,29 @@
             font-size: 12px;
         }
 
-
-        .title-text {
-            font-weight: 500;
-            font-style: normal;
-            font-size: 30px;
-            line-height: 1;
-            letter-spacing: 0;
-            color: black;
+        .secondary-title {
+            margin-left: 26px;
+            display: flex;
+            align-items: center;
         }
 
-        .sub-title-text {
-            font-weight: 500;
-            font-style: normal;
-            font-size: 18px;
-            line-height: 1;
-            letter-spacing: 0;
-            color: black;
+        .secondary-title i {
+            font-size: 43px;
+        }
+
+        .secondary-title span {
+            position: relative;
         }
 
         .font-color-black {
             color: black;
         }
 
-        .app-text-left {
-            text-align: left !important;
-        }
-
-        .app-text-right {
-            text-align: right !important;
-        }
-
-        .app-text-center {
-            text-align: center !important;
-        }
 
         .app-text-white {
             color: #ffffff !important;
         }
 
-        .app-text-black {
-            color: #000000 !important;
-        }
-
         .app-text-grey {
             color: #5D5D5D !important;
         }
@@ -672,30 +724,10 @@
         }
     </style>
 
-    <!-- img active inactive -->
-    <style>
-        .img-inactive {
-            background-color: white;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid white;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-
-        .img-active {
-            background-color: #B7F0F2;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid #00999E;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-    </style>
-
     <!-- table section starts -->
     <style>
-        table[data-custom-table-css="table"] thead th {
+        table[data-custom-table-css="table"] thead th,
+        table[data-custom-table-css="second-table"] thead th {
             background-color: #00999E;
             color: #fff !important;
             border-top: 0px solid #fff !important;
@@ -713,31 +745,37 @@
             font-weight: 400 !important;
         }
 
-        table[data-custom-table-css="table"] thead th:first-child {
+        table[data-custom-table-css="table"] thead th:first-child,
+        table[data-custom-table-css="second-table"] thead th:first-child {
             border-top-left-radius: 15px !important;
             border-bottom-left-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] thead th:last-child {
+        table[data-custom-table-css="table"] thead th:last-child,
+        table[data-custom-table-css="second-table"] thead th:last-child {
             border-top-right-radius: 15px !important;
             border-bottom-right-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr td:first-child {
+        table[data-custom-table-css="table"] tbody tr td:first-child,
+        table[data-custom-table-css="second-table"] tbody tr td:first-child {
             border-top-left-radius: 15px !important;
             border-bottom-left-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr td:last-child {
+        table[data-custom-table-css="table"] tbody tr td:last-child,
+        table[data-custom-table-css="second-table"] tbody tr td:last-child {
             border-top-right-radius: 15px !important;
             border-bottom-right-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr:hover td {
+        table[data-custom-table-css="table"] tbody tr:hover td,
+        table[data-custom-table-css="second-table"] tbody tr:hover td {
             background-color: #e0e0e0;
         }
 
-        table[data-custom-table-css="table"] {
+        table[data-custom-table-css="table"],
+        table[data-custom-table-css="second-table"] {
             border-collapse: separate !important;
             border-spacing: 0 8px !important;
             width: 100% !important;
@@ -746,6 +784,20 @@
         table[data-custom-table-css="table"].dataTable thead th {
             padding: 15px !important;
         }
+
+        table[data-custom-table-css="table"] thead.bg-light {
+            background-color: transparent !important;
+        }
+
+
+        /* ========== SECOND TABLE (white rows) ========== */
+        table[data-custom-table-css="second-table"] tbody td {
+            background: #FFFFFF !important;
+            padding: 12px;
+            border-top: 0px solid #fff !important;
+            border-bottom: 2px solid #F0F0F0 !important;
+            font-weight: 400 !important;
+        }
     </style>
 
     <!-- Datatable section starts  -->
@@ -824,6 +876,87 @@
         .buttons-html5 {
             margin-right: 10px !important;
         }
+
+        .dataTables_scrollBody thead.bg-light tr,
+        .dataTables_scrollBody thead tr {
+            visibility: collapse !important;
+            /* hides + removes row space */
+            height: 0 !important;
+        }
+
+        .dataTables_scrollBody thead.bg-light th {
+            padding: 0 !important;
+            margin: 0 !important;
+            border: none !important;
+            height: 0 !important;
+            line-height: 0 !important;
+            overflow: hidden !important;
+        }
+
+
+
+        /* Wrapper around the search input */
+        .datatable-search-wrapper {
+            position: relative;
+            display: inline-block;
+            width: 100%;
+        }
+
+        /* The search input itself */
+        .dataTables_filter input {
+            background: #F0F0F0 !important;
+            color: #707070 !important;
+            font-weight: 400 !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #F0F0F0 !important;
+            margin-left: 1px !important;
+        }
+
+        /* Placeholder styling */
+        .dataTables_filter input::placeholder {
+            color: #707070 !important;
+            font-weight: 400 !important;
+        }
+
+        /* The magnify icon */
+        .datatable-search-icon {
+            position: absolute !important;
+            right: 12px !important;
+            top: 50% !important;
+            transform: translateY(-50%) !important;
+            color: #707070 !important;
+            font-size: 18px !important;
+            pointer-events: none;
+            /* prevents blocking typing */
+        }
+
+        .datatable-search {
+            margin-right: auto;
+        }
+
+        .datatable-buttons {
+            margin-left: auto;
+        }
+
+        /* Fix DataTables buttons alignment inside card-body */
+        .card-body .card-body .dt-buttons,
+        .card-body .card-body .datatable-buttons {
+            margin-right: 0 !important;
+            padding-right: 2.25rem !important;
+            /* match card-body padding */
+        }
+
+        /* Applies only to tables with data-custom-table-css="table" */
+        table[data-custom-table-css="table"] tbody tr td {
+            padding: 8px 10px !important;
+            /* spacing */
+            line-height: 20px;
+            /* consistent spacing for text */
+            min-height: 40px;
+            /* makes sense here if you use display:block */
+            vertical-align: middle;
+            /* aligns text properly */
+        }
     </style>
 
 
@@ -981,10 +1114,84 @@
 
     <!-- jodit section -->
     <style>
-        /********************************************************************* jodit section starts ***********************************************************************************************************/
+        /* ✅ Whole editor box */
+        .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #F5FFFF !important;
+            /* fallback */
+        }
 
-        .jodit-wysiwyg {
-            color: black;
+        /* ✅ Toolbar (header) */
+        .jodit .jodit-toolbar__box,
+        .jodit .jodit-toolbar-editor-collection {
+            background-color: #F5FFFF !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .jodit .jodit-status-bar {
+            background-color: #F5FFFF !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .jodit .jodit-wysiwyg {
+            background-color: #F5FFFF !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .jodit iframe {
+            background-color: #F5FFFF !important;
+            border-radius: 0 0 10px 10px;
+        }
+    </style>
+
+    <!-- jodit section inside modal -->
+    <style>
+        /* ✅ Whole editor box */
+        .modal .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        .modal .jodit p {
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        /* ✅ Toolbar (header) */
+        .modal .jodit .jodit-toolbar__box,
+        .modal .jodit .jodit-toolbar-editor-collection {
+            background-color: #ECECEC !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .modal .jodit .jodit-status-bar {
+            background-color: #ECECEC !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .modal .jodit .jodit-wysiwyg {
+            background-color: #ECECEC !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .modal .jodit iframe {
+            background-color: #ECECEC !important;
+            border-radius: 0 0 10px 10px;
         }
     </style>
 
@@ -1023,6 +1230,10 @@
             border-color: #F5FFFF !important;
         }
 
+        .select2 textarea {
+            box-shadow: none !important;
+        }
+
 
 
         /* Chrome, Edge, Safari */
@@ -1044,10 +1255,14 @@
 
         /* Cancel Bootstrap's .form-control for file inputs */
         input[type="file"].form-control {
-            height: auto !important;         /* remove forced height */
-            padding: initial !important;     /* reset padding */
-            font-size: inherit !important;   /* reset font size */
-            line-height: normal !important;  /* reset line height */
+            height: auto !important;
+            /* remove forced height */
+            padding: initial !important;
+            /* reset padding */
+            font-size: inherit !important;
+            /* reset font size */
+            line-height: normal !important;
+            /* reset line height */
         }
 
 
@@ -1084,7 +1299,8 @@
         button[type="submit"],
         .buttons-collection,
         input[type="submit"],
-        #get-emp-list {
+        #get-emp-list,
+        .submit-btn {
             color: #fff !important;
             background-color: #E26728 !important;
             border-color: #E26728 !important;
@@ -1098,13 +1314,22 @@
             cursor: pointer;
             /* optional */
         }
+
+        .cancel-btn,
+        .modal-footer .cancel-btn {
+            color: #000000 !important;
+            background-color: #ffffff !important;
+            border-color: #E26728 !important;
+        }
     </style>
 
     <!-- accordian -->
     <style>
         .card #collapseOne .card-body,
+              #collapseOne .card-body,
         .card #collapseTwo .card-body,
-        .card #collapseThree .card-body {
+        .card #collapseThree .card-body,
+        .card #collapseFour .card-body {
             background-color: #F5FFFF !important;
             border: 2px solid #F5FFFF;
             border-radius: 10px;
@@ -1122,7 +1347,11 @@
 
         .card #collapseThree .card-body input,
         .card #collapseThree .card-body select,
-        .card #collapseThree .card-body textarea {
+        .card #collapseThree .card-body textarea,
+
+        .card #collapseFour .card-body input,
+        .card #collapseFour .card-body select,
+        .card #collapseFour .card-body textarea {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1131,7 +1360,8 @@
 
         .card #collapseOne .card-body input[type='file'],
         .card #collapseTwo .card-body input[type='file'],
-        .card #collapseThree .card-body input[type='file'] {
+        .card #collapseThree .card-body input[type='file'],
+        .card #collapseFour .card-body input[type='file'] {
             padding: 10px !important;
             background-color: white !important;
             color: black !important;
@@ -1140,7 +1370,8 @@
         /* Apply to Select2 (single select) */
         .card #collapseOne .card-body .select2-container .select2-selection--single,
         .card #collapseTwo .card-body .select2-container .select2-selection--single,
-        .card #collapseThree .card-body .select2-container .select2-selection--single {
+        .card #collapseThree .card-body .select2-container .select2-selection--single,
+        .card #collapseFour .card-body .select2-container .select2-selection--single {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1154,7 +1385,8 @@
         /* Apply to Select2 (multiple select) */
         .card #collapseOne .card-body .select2-container .select2-selection--multiple,
         .card #collapseTwo .card-body .select2-container .select2-selection--multiple,
-        .card #collapseThree .card-body .select2-container .select2-selection--multiple {
+        .card #collapseThree .card-body .select2-container .select2-selection--multiple,
+        .card #collapseFour .card-body .select2-container .select2-selection--multiple {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1195,7 +1427,6 @@
         .fixed-header {
             position: relative;
             top: 0;
-            z-index: 1000;
             background-color: #f8f9fa !important;
         }
 
@@ -1267,7 +1498,6 @@
     </style>
 
 
-
     <style>
         .custom-form .parsley-examples {
             background-color: transparent !important;
@@ -1327,6 +1557,7 @@
             text-align: center;
         }
     </style>
+
     <style>
         /* Common wrapper (works for text/file inputs) */
         .input-icon {
@@ -1372,6 +1603,67 @@
         }
     </style>
 
+    <!-- tab swich scrollable -->
+    <style>
+        .tab-wrapper {
+            display: flex;
+            align-items: center;
+            position: relative;
+        }
+
+        /* Make the UL a scrollable flex row */
+        #myTab {
+            display: flex;
+            white-space: nowrap;
+            flex-wrap: nowrap;
+            /* prevent wrapping */
+            overflow-x: auto;
+            /* enable horizontal scroll */
+            overflow-y: hidden;
+            white-space: nowrap;
+            /* keep items on one line */
+            margin: 0;
+            padding: 0 40px;
+            /* leave space for arrows */
+            flex-grow: 1;
+        }
+
+        /* Hide scrollbars */
+        #myTab::-webkit-scrollbar {
+            display: none;
+        }
+
+        #myTab {
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+        }
+
+        .scroll-btn {
+            background-color: #F4FFFF;
+            height: 55px;
+            border: none;
+            cursor: pointer;
+            font-size: 18px;
+            padding: 5px 10px;
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            z-index: 1;
+            color: #00999E;
+        }
+
+        .left-btn {
+            left: 0;
+        }
+
+        .right-btn {
+            right: 0;
+        }
+    </style>
+
+
+
+
 </head>
 
 <body class="loading" data-layout-mode="" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "sidebar": { "color": "light", "size": "condensed", "showuser": false}, "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": false}'></body>
@@ -1392,7 +1684,7 @@
     <div class="left-side-menu">
 
 
-        <div class="h-100" data-simplebar>
+        <div data-simplebar>
             <!--- Sidemenu -->
             <div id="sidebar-menu">
 
@@ -1400,23 +1692,23 @@
 
                     <li class="menu-logo">
                         <a href="<?= base_url('/dashboard/view') ?>">
-                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" height="24">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo">
                         </a>
                     </li>
 
 
 
-                    <li>
-                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive-not-working">
+                    <li class="li-seperate" id="dashboard-li">
+                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive">
                             <i class="ri-dashboard-line" style="color:black;"></i>
-                            <span> Dashboard </span>
+                            <span style="color: #02a8b5;"> Dashboard </span>
                         </a>
                     </li>
 
                     <!-- client -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a href="<?= base_url('/client/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="clients-li">
+                            <a href="<?= base_url('/client/list') ?>" class="img-inactive">
                                 <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
                                 <span> Clients </span>
@@ -1425,79 +1717,91 @@
                     <?php } ?>
 
 
-                        <!-- Enrollment process -->
-                        <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
-                            <li>
-                                <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive-not-working" >
-                                    <img style="border-radius: 5px;"
+                    <!-- Enrollment process -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="action-on-policies-li">
+                            <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive">
+                                <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
-                                    <span> Action on Policies </span>
-                                </a>
-                                <div class="collapse" id="sidebarDashboards">
-                                    <ul class="nav-second-level">
+                                <span> Action on Policies </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboards">
+                                <ul class="nav-second-level">
 
-                                        <li>
-                                            <a href="<?= base_url('/employee/upload') ?>">View Inception</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/list') ?>">View Members</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/test_members_list') ?>">Test Members List</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </li>
-                        <?php } ?>
+                                    <li>
+                                        <a href="<?= base_url('/employee/upload') ?>">View Inception</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/list') ?>">View Members</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/test_members_list') ?>">Test Members List</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
 
                         <!-- Masters -->
-                        <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
+                        <?php if (get_role_id() == 1 || get_role_id() == 5 || get_role_id() == 4) { ?>
 
-                            <li>
-                                <a href="#sidebarDashboards" data-toggle="collapse" class=" img-inactive-not-working">
-                                    <img 
+                        <li class="li-seperate" id="masters-li">
+                            <a href="#sidebarPolicies" data-toggle="collapse" class=" img-inactive">
+                                <img
                                     src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
                                     <span> Masters </span>
                                 </a>
                                 <div class="collapse" id="sidebarDashboards">
                                     <ul class="nav-second-level">
-                                        <li>
-                                            <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/user/list') ?>"> Users </a>
-                                        </li>
+
+                                        <?php if (get_role_id() == 1 || get_role_id() == 5 || ( get_role_id() == 4 && (in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())))) { ?>
+
+                                            <li>
+                                                <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
+                                            </li>
+
+                                        <?php } ?>
+
+
+                                        <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
+
+                                            <li>
+                                                <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/user/list') ?>"> Users </a>
+                                            </li>
+
+                                        <?php } ?>
+
                                     </ul>
                                 </div>
                             </li>
 
-                        <?php } ?>
+                    <?php } ?>
 
-                        <!-- <li>
+                    <!-- <li>
                             <?php
                             $sessionData = get_session_userdata();
                             $currentUrl = base_url();
@@ -1514,8 +1818,8 @@
 
                     <!-- Claims -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="claims-li">
+                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/claims_sb.png" alt="Logo" height="20">
                                 <span> Claims </span>
@@ -1550,8 +1854,8 @@
 
                     <!-- leads -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="leads-li">
+                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
                                 <span> Leads </span>
@@ -1560,8 +1864,8 @@
                     <?php } ?>
                     <!-- Tickets -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="tickets-li">
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
                                 <span>Tickets</span>
                             </a>
@@ -1569,8 +1873,8 @@
                     <?php } ?>
                     <!-- BDS -->
                     <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
-                        <li>
-                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="policy-transactions-li">
+                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/policy_transactions_sb.png" alt="Logo" height="20">
                                 <span> Policy Transactions </span>
@@ -1718,11 +2022,11 @@
 
                     <!-- Ad -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive-not-working" style="color: grey;">
+                        <li class="li-seperate" id="app-content-mng-li">
+                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/app_content_mng_sb.png" alt="Logo" height="20">
-                                <span>App Content Mgmt</span>
+                                <span style="color: #02a8b5;">App Content Mgmt</span>
                             </a>
                             <div class="collapse" id="sidebarDashboardsmenu">
                                 <ul class="nav-second-level">
@@ -1736,8 +2040,8 @@
                             </div>
                         </li>
                     <?php } ?>
-                    <li>
-                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive-not-working" target="_blank" rel="noopener noreferrer">
+                    <li class="li-seperate" id="user-manual-li">
+                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive" target="_blank" rel="noopener noreferrer">
                             <img
                                 src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
                             <span>User Manual</span>
@@ -1752,58 +2056,60 @@
     </div>
     <!-- Left Sidebar End -->
 
-
-
-
-    <!-- Top Bar -->
-    <div class="top-navbar-div" style="margin-left:130px;">
-        <div>
-            <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
-        </div>
-        <div class="nav-flex">
-
-            <!-- user pic -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-
-                    <?php
-                    $profile = get_userProfile();
-                    $default = base_url('public/assets/images/avatar_2x.png');
-                    ?>
-
-                    <img
-                        src="<?= (!empty($profile)) ? $profile : $default; ?>"
-                        onerror="this.onerror=null;this.src='<?= $default ?>';"
-                        alt="user-image"
-                        height="40" width="40"
-                        class="rounded-circle">
-                </a>
+    <!-- ========== Top Bar Start ========== -->
+    <div class="nav-bar">
+        <div class="top-navbar-div">
+            <div class="top-navbar-title">
+                <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
             </div>
+            <div class="nav-flex">
 
-            <!-- Notification -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
-                    style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
-                                border-radius:25px!important;padding:7px; position: relative;">
+                <!-- user pic -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
 
-                    <i class="fe-bell noti-icon"></i>
+                        <?php
+                        $profile = get_userProfile();
+                        $default = base_url('public/assets/images/avatar_2x.png');
+                        ?>
 
-                    <span class="notification-dot"></span>
-                </a>
+                        <img
+                            src="<?= (!empty($profile)) ? $profile : $default; ?>"
+                            onerror="this.onerror=null;this.src='<?= $default ?>';"
+                            alt="user-image"
+                            height="40" width="40"
+                            class="rounded-circle">
+                    </a>
+                </div>
 
-            </div>
-            &nbsp;&nbsp;
-            <!-- Logout -->
-            <div class="dropdown notification-list">
-                <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
-                    <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
-                </a>
+                <!-- Notification -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
+                        style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
+                                    border-radius:25px!important;padding:7px; position: relative;">
+
+                        <i class="fe-bell noti-icon"></i>
+
+                        <span class="notification-dot"></span>
+                    </a>
+
+                </div>
+                &nbsp;&nbsp;
+                <!-- Logout -->
+                <div class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
+                        <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
+                    </a>
+                </div>
             </div>
         </div>
     </div>
+
+
+
     <!-- End of Top Bar -->
 
-    <br>
+    <!-- <br> -->
 
 
     <!-- ============================================================== -->
@@ -1814,4 +2120,4 @@
         <div class="content">
 
             <!-- Start Content-->
-            <div class="container-fluid">
\ No newline at end of file
+            <div class="container-fluid-top">
\ No newline at end of file
diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php
index 86938097..75cebd29 100644
--- a/app/Views/lead_filter.php
+++ b/app/Views/lead_filter.php
@@ -1,369 +1,368 @@
 <style>
-.col-12 {
-    max-width: 98% !important;
-}
+    .col-12 {
+        max-width: 98% !important;
+    }
 </style>
 
-<div class="row" id="lead_filter_div">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <div class="row">
-                        <div class="col-md-6" style="position: relative;left: 17px;">
-                            <h4 style="text-align: left; margin-left:30px;">Lead Filter</h4>
-                        </div>
-                        <div class="col-md-6">
-                            <a style="text-align: right;" 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>
+<div class="container-fluid-min">
+    <div class="row" id="lead_filter_div">
+        <div class="col-12" style="margin-top: -12px;">
+            <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>
-                        </div>
-                    </div>
-                </h5>
-                <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+                        </h4>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_issuer_type"> Issuer Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_issuer_type" name="filter_issuer_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($issuer) && count($issuer)) {
-                                                foreach ($issuer as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                        <div id="collapseOne" class="collapse hide" 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="filter_issuer_type"> Issuer Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_issuer_type" name="filter_issuer_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($issuer) && count($issuer)) {
+                                                    foreach ($issuer as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_lead_type"> Lead Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_lead_type" name="filter_lead_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($lead_type) && count($lead_type)) {
-                                                foreach ($lead_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_lead_type"> Lead Type <span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_lead_type" name="filter_lead_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($lead_type) && count($lead_type)) {
+                                                    foreach ($lead_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_type"> Client Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_type" name="filter_client_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($client_type) && count($client_type)) {
-                                                foreach ($client_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_type"> Client Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_type" name="filter_client_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($client_type) && count($client_type)) {
+                                                    foreach ($client_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_policy_type"> Policy Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_policy_type" name="filter_policy_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($policy_type) && count($policy_type)) {
-                                                foreach ($policy_type as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_policy_type"> Policy Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_policy_type" name="filter_policy_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($policy_type) && count($policy_type)) {
+                                                    foreach ($policy_type as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_id">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_id" name="filter_client_id">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_id">Client<span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_id" name="filter_client_id">
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_branch_id">Client Branch<span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_branch_id"
-                                        name="filter_client_branch_id">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_branch_id">Client Branch<span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_branch_id"
+                                                name="filter_client_branch_id">
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_lead_status">Status<span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_lead_status" name="filter_lead_status">
-                                        <option value="0">Select</option>
-                                        <?php 
-                                            if (isset($lead_status) && count($lead_status)) {
-                                                foreach ($lead_status as $key => $value) {
-                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_lead_status">Status<span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_lead_status" name="filter_lead_status">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($lead_status) && count($lead_status)) {
+                                                    foreach ($lead_status as $key => $value) {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                       ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
-                                    <a href="<?= base_url("/leads/list"); ?>" class="btn btn-secondary"
-                                        id="clear-filters">Clear</a>
-                                    <a class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchTicketListData();">Submit</a>
-                                </div>
+                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
+                                            <a href="<?= base_url("/leads/list"); ?>" class="btn btn-secondary"
+                                                id="clear-filters">Clear</a>
+                                            <a class="btn btn-primary" id="get-emp-list"
+                                                onclick="fetchTicketListData();">Submit</a>
+                                        </div>
 
+                                    </div>
+
+                                </div>
                             </div>
-
                         </div>
                     </div>
+
                 </div>
             </div>
 
         </div>
     </div>
+
+    <!-- end page title -->
+    <div id="lead_list_div">
+        <?php include('leads_list.php'); ?>
+    </div>
 </div>
 
-<!-- end page title -->
-<div id="lead_list_div">
-    <?php include('leads_list.php'); ?>
-</div>
 
 
 <script>
-var filter_client_list = [];
-var filter_branch_list = [];
+    var filter_client_list = [];
+    var filter_branch_list = [];
 
-$(document).ready(function() {
-    $('#filter_client_id').select2();
-    $('#filter_client_branch_id').select2();
-    $('#filter_policy_type').select2();
+    $(document).ready(function() {
+        $('#filter_client_id').select2();
+        $('#filter_client_branch_id').select2();
+        $('#filter_policy_type').select2();
 
-    getfilterClientAndBranch()
-});
-
-$(document).ready(function() {
-    $('#filter_client_id').change(function() {
-
-        let client_id = $(this).val();
-        if (filter_branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = filter_branch_list[client_id];
-            appendfilterBranch(data);
-        }
-
-    })
-});
-
-//----- AJAX FUNCTIONS --------------------------------------------------------------------------------
-
-function fetchTicketListData() {
-
-    var issuer_type = $('#filter_issuer_type').val();
-    var lead_type = $('#filter_lead_type').val();
-    var policy_type = $('#filter_policy_type').val();
-    var client_type = $('#filter_client_type').val();
-    var status = $('#filter_lead_status').val();
-    var client_id = $('#filter_client_id').val();
-    var client_branch_id = $('#filter_client_branch_id').val();
-
-    var requestData = {
-        issuer: issuer_type,
-        lead_type: lead_type,
-        policy_type_id: policy_type,
-        client_type: client_type,
-        status: status,
-        client_id: client_id,
-        client_branch_id: client_branch_id,
-    };
-
-    console.log("requestData", requestData);
-
-    var url = '<?= base_url('/leads/list') ?>';
-
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-
-        console.log('Filter Responce', response);
-
-        if (response.status == true) {
-
-            $('#lead_list_div').empty();
-            $('#lead_list_div').html(response.html);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-
-            setTimeout(function(){
-                additionalDropdown();
-            }, 1000);
-
-        } else {
-
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
-        }
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the data.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
+        getfilterClientAndBranch()
     });
-}
 
-//function for fetch client, branch
-function getfilterClientAndBranch() {
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
+    $(document).ready(function() {
+        $('#filter_client_id').change(function() {
 
-            console.log('getClientAndBranchAndPolicy', res);
-            if (res.status == true) {
-                filter_client_list = res.client_data;
-                filter_branch_list = res.branch_data;
-                appendfilterClients(res.client_data);
-            } else {
-                console.log('No data found');
+            let client_id = $(this).val();
+            if (filter_branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = filter_branch_list[client_id];
+                appendfilterBranch(data);
             }
 
-        },
-        error: function(xhr, status, error) {
+        })
+    });
+
+    //----- AJAX FUNCTIONS --------------------------------------------------------------------------------
+
+    function fetchTicketListData() {
+
+        var issuer_type = $('#filter_issuer_type').val();
+        var lead_type = $('#filter_lead_type').val();
+        var policy_type = $('#filter_policy_type').val();
+        var client_type = $('#filter_client_type').val();
+        var status = $('#filter_lead_status').val();
+        var client_id = $('#filter_client_id').val();
+        var client_branch_id = $('#filter_client_branch_id').val();
+
+        var requestData = {
+            issuer: issuer_type,
+            lead_type: lead_type,
+            policy_type_id: policy_type,
+            client_type: client_type,
+            status: status,
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+        };
+
+        console.log("requestData", requestData);
+
+        var url = '<?= base_url('/leads/list') ?>';
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+
+            console.log('Filter Responce', response);
+
+            if (response.status == true) {
+
+                $('#lead_list_div').empty();
+                $('#lead_list_div').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                setTimeout(function() {
+                    additionalDropdown();
+                }, 1000);
+
+            } else {
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
+            toastr.error('An error occurred while fetching the data.', 'ERROR');
 
-//----- END AJAX FUNCTIONS --------------------------------------------------------------------------------
-
-
-function appendfilterClients(data) {
-
-    $('#filter_client_id').empty();
-
-    $('#filter_client_id').append($('<option>', {
-        value: 0,
-        text: 'Select'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
         });
-
-        $('#filter_client_id').append(option);
-    });
-
-}
-
-function appendfilterBranch(data) {
-
-    $('#filter_client_branch_id').empty();
-
-    $('#filter_client_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name
-        });
-        $('#filter_client_branch_id').append(option);
-    });
-}
-
-// -----------------------------------------------------------------------------------------------------------
-
-function additionalDropdown() {
-    const table = document.getElementById("tickets-table");
-    if (!table) return; // Prevent errors if the table is not found
-    let activeDropdown = null;
-
-    function handleDropdownClick(row, event) {
-        // Hide any active dropdown
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-        }
-
-        let customDropdown = row.customDropdown;
-        if (!customDropdown) {
-            const originalDropdown = row.querySelector('.dropdown-menu');
-            if (!originalDropdown) return;
-
-            customDropdown = document.createElement('div');
-            customDropdown.className = 'custom-dropdown-menu';
-            customDropdown.innerHTML = originalDropdown.innerHTML;
-
-            document.body.appendChild(customDropdown);
-            row.customDropdown = customDropdown;
-
-            // Preserve click handlers and add auto-close
-            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-                item.addEventListener('click', function (e) {
-                    const onclickAttr = this.getAttribute('onclick');
-                    if (onclickAttr) eval(onclickAttr);
-
-                    const href = this.getAttribute('href');
-                    if (href && href !== '#') window.location.href = href;
-
-                    customDropdown.style.display = 'none';
-                    activeDropdown = null;
-
-                    e.stopPropagation();
-                });
-            });
-        }
-
-        // Get click position
-        const rect = event.target.getBoundingClientRect();
-
-        // Position the dropdown
-        customDropdown.style.display = 'block';
-        customDropdown.style.position = 'fixed';
-        customDropdown.style.left = `${rect.left}px`;
-        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-
-        activeDropdown = customDropdown;
-        event.stopPropagation();
     }
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        row.addEventListener("click", function (event) {
-            if (!event.target.closest('td:last-child')) {
-                handleDropdownClick(row, event);
+    //function for fetch client, branch
+    function getfilterClientAndBranch() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    filter_client_list = res.client_data;
+                    filter_branch_list = res.branch_data;
+                    appendfilterClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             }
         });
-    });
+    }
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function () {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
+    //----- END AJAX FUNCTIONS --------------------------------------------------------------------------------
+
+
+    function appendfilterClients(data) {
+
+        $('#filter_client_id').empty();
+
+        $('#filter_client_id').append($('<option>', {
+            value: 0,
+            text: 'Select'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+            });
+
+            $('#filter_client_id').append(option);
+        });
+
+    }
+
+    function appendfilterBranch(data) {
+
+        $('#filter_client_branch_id').empty();
+
+        $('#filter_client_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#filter_client_branch_id').append(option);
+        });
+    }
+
+    // -----------------------------------------------------------------------------------------------------------
+
+    function additionalDropdown() {
+        const table = document.getElementById("tickets-table");
+        if (!table) return; // Prevent errors if the table is not found
+        let activeDropdown = null;
+
+        function handleDropdownClick(row, event) {
+            // Hide any active dropdown
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+            }
+
+            let customDropdown = row.customDropdown;
+            if (!customDropdown) {
+                const originalDropdown = row.querySelector('.dropdown-menu');
+                if (!originalDropdown) return;
+
+                customDropdown = document.createElement('div');
+                customDropdown.className = 'custom-dropdown-menu';
+                customDropdown.innerHTML = originalDropdown.innerHTML;
+
+                document.body.appendChild(customDropdown);
+                row.customDropdown = customDropdown;
+
+                // Preserve click handlers and add auto-close
+                customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                    item.addEventListener('click', function(e) {
+                        const onclickAttr = this.getAttribute('onclick');
+                        if (onclickAttr) eval(onclickAttr);
+
+                        const href = this.getAttribute('href');
+                        if (href && href !== '#') window.location.href = href;
+
+                        customDropdown.style.display = 'none';
+                        activeDropdown = null;
+
+                        e.stopPropagation();
+                    });
+                });
+            }
+
+            // Get click position
+            const rect = event.target.getBoundingClientRect();
+
+            // Position the dropdown
+            customDropdown.style.display = 'block';
+            customDropdown.style.position = 'fixed';
+            customDropdown.style.left = `${rect.left}px`;
+            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+            activeDropdown = customDropdown;
+            event.stopPropagation();
         }
-    });
-}
 
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            row.addEventListener("click", function(event) {
+                if (!event.target.closest('td:last-child')) {
+                    handleDropdownClick(row, event);
+                }
+            });
+        });
+
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index c8a0beba..1d8974cd 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -193,7 +193,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
     <div class="row d-flex  align-items-center">
         <div class="status_tile" style="padding-left: 25px;">
-            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="status_tile" style="padding-left: 15px;">
             <a href="#" id="main_tile">Current Tile : </a>
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index aa40bc28..52902934 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -34,6 +34,10 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    hr {
+        display: none !important;
+    }
 </style>
 
 <style>
@@ -58,7 +62,8 @@
         border-radius: 6px;
         position: absolute;
         z-index: 999;
-        bottom: 125%; /* Show above icon */
+        bottom: 125%;
+        /* Show above icon */
         left: 50%;
         transform: translateX(-50%);
         font-size: 12px;
@@ -69,7 +74,8 @@
     .info-tooltip::after {
         content: "";
         position: absolute;
-        top: 100%; /* Arrow below tooltip */
+        top: 100%;
+        /* Arrow below tooltip */
         left: 50%;
         margin-left: -5px;
         border-width: 5px;
@@ -81,292 +87,342 @@
         visibility: visible;
         opacity: 1;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */
+    /* bcoz in design */
+    .card-body {
+        margin-top: 0px !important;
+    }
+
+    /* this css as per design so not declare in golbal */
+    /* bcoz in design */
+    #collapseOne {
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
 </style>
 
-<div class="row" id="leads_form">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
+<div class="container-fluid-min">
+    <div class="row" id="leads_form">
+        <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;">
+                        <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-3" style="text-align: right; position: relative; left: 211px;">
-                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> -->
+                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> ->
                     </div>
                     <div class="col-1" style="text-align: right; position: relative; left: 193px;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
+                    </div> -->
+                        <h4 class="d-flex align-items-center" style="gap: 8px;">
+                            <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;">
+                                <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                            </a>
+                            <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                        </h4>
                     </div>
+                    <form role="form" class="parsley-examples" method="post" id="leads_form_id"
+                        enctype="multipart/form-data">
+
+                        <input type="hidden" name="id" id="leads_primarykey">
+
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="lead_type" name="lead_type" required>
+                                            <option value="">Select Lead Type</option>
+                                            <?php
+                                            if (isset($lead_type) && count($lead_type)) {
+                                                foreach ($lead_type as $key => $value) {
+                                                    if ($key == 1) {
+                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                    } else {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" name="issuer" required>
+                                            <option value="">Select Issuer</option>
+                                            <?php
+                                            if (isset($issuer) && count($issuer)) {
+                                                foreach ($issuer as $key => $value) {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- client row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                        <label class="switch">
+                                            <input id="exixting_client" type="checkbox" name="exixting_client">
+                                            <span class="slider round" style="height: 27px;"></span>
+                                        </label>
+
+                                        <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                        <label for="client_id">Client<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="client_id" name="client_id">
+                                            <option value="">Select Client</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                        <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                            onchange="getBranchData(this,1)">
+                                            <option value="">Select Branch</option>
+                                        </select>
+                                    </div>
+
+                                    <!-- <div class="form-group col-md-3 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div> -->
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                            <option value="" selected>Select Entity</option>
+                                            <?php
+                                            if (isset($entity) && count($entity)) {
+                                                foreach ($entity as $key => $value) {
+                                                    echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="client_name" name="client_name"
+                                            placeholder="Enter Client Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                            placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                    </div>
+
+                                    <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
+                                </div> -->
+
+                                    <!-- <div class="form-group col-md-3">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div> -->
+
+                                </div>
+                            </div>
+                        </div>
+                        <!-- end client row -->
+
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- branch row-->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="gst">GST<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
+                                            data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
+                                            data-parsley-trigger="change"
+                                            data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="branch_name" name="branch_name"
+                                            placeholder="Enter Branch Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="branch_code" name="branch_code"
+                                            placeholder="Enter Branch Code" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4 renewalFields">
+                                        <label for="contact_person_summary">Contact Person</label>
+                                        <select class="form-control" name="contact_person_summary" id="contact_person_summary">
+                                            <option value="">Select a Contact</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
+                                            placeholder="Enter Contact Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="contact_person_mobile">Contact Person Mobile<span
+                                                class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_mobile"
+                                            name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="contact_person_email">Contact Person Email<span
+                                                class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_email"
+                                            name="contact_person_email" placeholder="Enter Contact Email" required>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- policy row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div id="dynamic-form-container"></div>
+                            </div>
+                        </div>
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- other row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group offset-md-9 col-md-3" style="float:right;">
+                                        <label class="switch">
+                                            <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
+                                            <span class="slider round" style="height: 27px;"></span>
+                                        </label>
+                                        <label for="is_insurer_auto_mail" style="position: relative;top: 2px;">Insurer Auto Mail</label>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                            <option value="">Select Sales Person</option>
+                                            <?php if (isset($salse_team)) { ?>
+                                                <?php foreach ($salse_team as $value) { ?>
+                                                    <option value="<?= $value['id']; ?>">
+                                                        <?= $value['first_name']; ?>
+                                                    </option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                        <select class="form-control" id="lead_status" name="status" required>
+                                            <option value="" selected>Select Status</option>
+                                            <?php
+                                            if (isset($lead_status) && count($lead_status)) {
+                                                foreach ($lead_status as $key => $value) {
+                                                    if ($key == 'queued') {
+                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                    } else {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="">Next Reminder Date<span class="text-danger"></span></label>
+                                        <div class="input-icon">
+                                            <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
+                                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-12">
+                                        <label for="notes">Remarks</label>
+                                        <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group text-right m-b-0" id="submitButton">
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                                id="lead_form_submit_btn">Submit</button>
+                        </div>
+
+                    </form>
                 </div>
-                <form role="form" class="parsley-examples" method="post" id="leads_form_id"
-                    enctype="multipart/form-data">
-
-                    <input type="hidden" name="id" id="leads_primarykey">
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            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="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                    </div>
-
-                    <hr>
-
-                    <!-- client row -->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
-
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div> -->
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
-                        </div> -->
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div> -->
-
-                    </div>
-                    <!-- end client row -->
-
-                    <hr>
-
-                    <!-- branch row-->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="gst">GST<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
-                                data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
-                                data-parsley-trigger="change"
-                                data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_name" name="branch_name"
-                                placeholder="Enter Branch Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_code" name="branch_code"
-                                placeholder="Enter Branch Code" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields">
-                            <label for="contact_person_summary">Contact Person</label>
-                            <select class="form-control" name="contact_person_summary" id="contact_person_summary">
-                                <option value="">Select a Contact</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
-                                placeholder="Enter Contact Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_mobile">Contact Person Mobile<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_mobile"
-                                name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_email">Contact Person Email<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_email"
-                                name="contact_person_email" placeholder="Enter Contact Email" required>
-                        </div>
-
-                    </div>
-
-                    <!-- policy row -->
-                    <div id="dynamic-form-container"></div>
-
-                    <hr>
-
-                    <!-- other row -->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            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="">Next Reminder Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
-                        </div>
-
-                         <div class="form-group col-md-3">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
-
-                            <label for="is_insurer_auto_mail" style="position: relative;top: 35px;left: 20px;">Insurer Auto Mail</label>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
-                        </div>
-                    </div>
-
-                    <div class="form-group text-right m-b-0" id="submitButton">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                            id="lead_form_submit_btn" >Submit</button>
-                    </div>
-
-                </form>
             </div>
         </div>
-    </div>
-</div><!-- end form row -->
+    </div><!-- end form row -->
+
+    <?php include("newClientModal.php") ?>
+</div>
+
 
-<?php include("newClientModal.php") ?>
 
 
 <script>
@@ -452,8 +508,8 @@
                         // }
                     }
                 });
-            }else if (lead_type == 3) {
-                
+            } else if (lead_type == 3) {
+
                 if ($('#client_id option[value="add_client"]').length === 0) {
                     $('#client_id').prepend($('<option>', {
                         value: 'add_client',
@@ -461,43 +517,43 @@
                     }));
                 }
                 $("#source_policy_id").removeAttr("required");
-                $("#source_policy_id").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_id").closest("div").find("label .text-danger").remove();
                 $("#source_policy_id").hide();
                 $('#source_policy_id').closest('.form-group').hide();
 
                 $("#source_policy_start_date").removeAttr("required");
-                $("#source_policy_start_date").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_start_date").closest("div").find("label .text-danger").remove();
                 $("#source_policy_start_date").hide();
                 $('#source_policy_start_date').closest('.form-group').hide();
 
                 $("#source_policy_end_date").removeAttr("required");
-                $("#source_policy_end_date").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_end_date").closest("div").find("label .text-danger").remove();
                 $("#source_policy_end_date").hide();
                 $('#source_policy_end_date').closest('.form-group').hide();
 
 
-                
+
             } else if (lead_type != 3) {
-                $("#source_policy_id").prop("required",true);
+                $("#source_policy_id").prop("required", true);
                 $("#source_policy_start_date").prop("required", true);
                 $("#source_policy_end_date").prop("required", true);
 
-                 $("#source_policy_id").show();
-                 $("#source_policy_start_date").show();
-                 $("#source_policy_start_date").show();
+                $("#source_policy_id").show();
+                $("#source_policy_start_date").show();
+                $("#source_policy_start_date").show();
 
-                  $('#source_policy_id').closest('.form-group').find('label').show();
-                  $('#source_policy_start_date').closest('.form-group').find('label').show();
-                  $('#source_policy_end_date').closest('.form-group').find('label').show();
+                $('#source_policy_id').closest('.form-group').find('label').show();
+                $('#source_policy_start_date').closest('.form-group').find('label').show();
+                $('#source_policy_end_date').closest('.form-group').find('label').show();
 
                 // Check if the asterisk doesn't already exist, then add it
-                let $label = $("#source_policy_id").closest("div") .find("label");
+                let $label = $("#source_policy_id").closest("div").find("label");
 
                 if ($label.find(".text-danger").length === 0) {
                     $label.append(' <span class="text-danger">*</span>');
                 }
 
-                let $label2 = $("#source_policy_start_date").closest("div") .find("label");
+                let $label2 = $("#source_policy_start_date").closest("div").find("label");
 
                 if ($label2.find(".text-danger").length === 0) {
                     $label2.append(' <span class="text-danger">*</span>');
@@ -516,7 +572,7 @@
 
             }
 
-            if(lead_type != 1){
+            if (lead_type != 1) {
                 dataIncrement = 1;
                 // updateRenewalFields(dataIncrement);
 
@@ -576,8 +632,8 @@
             maxDate: "today"
         });
 
-       
-    })       
+
+    })
     //------------------------------ GET DATA ( EDIT, BRANCH, POLICY ) ---------------------------------------------------------------------------
 
     //view and edit Lead data function ( NOT IN USE DON'T DELETE )
@@ -653,7 +709,7 @@
 
                                     let lead_type = $('#lead_type').val();
                                     var policyStartDate = $("#source_policy_start_date");
-                                    if(lead_type == 3){
+                                    if (lead_type == 3) {
                                         policyStartDate = $("#policy_start_date");
                                     }
                                     console.log('Selected Dates:', selectedDates);
@@ -754,7 +810,7 @@
     //client branch data
     function getBranchData(input, inputType) {
 
-        if (inputType == 1 ) {
+        if (inputType == 1) {
             var client_branch_id = $(input).val();
         } else {
             client_branch_id = input;
@@ -779,11 +835,11 @@
                         $('#pan').val(res.data.pan);
                         $('#branch_name').val(res.data.branch_name);
                         $('#branch_code').val(res.data.branch_code);
-                        allContacts = res.contact;  
+                        allContacts = res.contact;
                         $('#contact_person_summary').empty();
                         $('#contact_person_summary').append($('<option>', {
-                                value: "", 
-                                text: "Select a Contact"
+                            value: "",
+                            text: "Select a Contact"
                         }));
 
                         res.contact.forEach((value, key) => {
@@ -798,8 +854,8 @@
                                     text: display_value
                                 }));
                             }
-                            
-                        });                    
+
+                        });
                         // $('#contact_person_name').val(res?.contact?.name || '');
                         // $('#contact_person_mobile').val(res?.contact?.mobile || '');
                         // $('#contact_person_email').val(res?.contact?.email || '');
@@ -864,7 +920,7 @@
 
                         console.log("res.data.source_policy_start_date", res.data.source_policy_start_date)
                         console.log("res.data.source_policy_end_date", res.data.source_policy_end_date)
-                        
+
                         $('#source_policy_start_date').val(res.data.source_policy_start_date);
                         $('#source_policy_end_date').val(res.data.source_policy_end_date);
 
@@ -977,7 +1033,7 @@
                 console.log(response.message, 'SUCCESS');
                 $('#appendArea_' + dataIncrement).append(response.data);
 
-                console.log("Policy Type ID : ",policy_type_id);
+                console.log("Policy Type ID : ", policy_type_id);
                 if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
 
                     let newId = 'appendAreaForClaim_' + dataIncrement;
@@ -1005,10 +1061,10 @@
                         $('.lifeClaimFields').show();
                     } else {
 
-                        if(lead_type == 1){
+                        if (lead_type == 1) {
                             updateRenewalFields(dataIncrement);
                         }
-                        
+
                         // let incurred_claim_date_id = 'incurred_claim_date_' + dataIncrement;
                         let incurred_claim_date_id = 'incurred_claim_date';
                         var incurred_claim_datepicker = flatpickr("#" + incurred_claim_date_id, {
@@ -1023,10 +1079,10 @@
                                 console.log('Extracted increment:', increment);
 
                                 var policyStartDate = $("#source_policy_start_date");
-                                if(lead_type == 3){
+                                if (lead_type == 3) {
                                     policyStartDate = $("#policy_start_date");
                                 }
-                                
+
                                 console.log('Selected Dates:', selectedDates);
                                 console.log('policy start date instance', policyStartDate)
                                 console.log('Policy Start Date:', policyStartDate.val());
@@ -1073,31 +1129,32 @@
         const newRow = document.createElement('div');
         newRow.className = 'form-row dynamic-form-row';
 
-        const hrElement = document.createElement('hr');
-        container.appendChild(hrElement);
+        if (increment > 1) {
+            const hrElement = document.createElement('hr');
+            container.appendChild(hrElement);
+        }
 
         // Main div
         newRow.innerHTML += `
-
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_id"> Source Policy <span id="base_danger"
-                        class="text-danger">*</span></label>
+                        class="text-danger">* </span></label>
                 <select class="form-control" id="source_policy_id" name="source_policy_id">
                     <option value="" selected>Select Source Policy</option>
                 </select>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                 <select class="form-control" id="policy_type_id_${increment}" name="policy_type_id[]" onchange="getCustomFields(this, ${increment})" required>
                     <option value="">Select Policy Type</option>
@@ -1113,7 +1170,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="insurer">Insurer <span class="text-danger"></span></label>
                 <select class="form-control" id="insurer_${increment}" name="insurer[]" onchange="insurerChange(this, ${increment})">
                     <option value="">Select Insurer</option>
@@ -1127,7 +1184,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="tpa">TPA <span class="text-danger"></span></label>
                 <select class="form-control" id="tpa_${increment}" name="tpa[]" onchange="tpaChange(this, ${increment})">
                     <option value="">Select TPA</option>
@@ -1141,19 +1198,31 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Commencement <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                <div class="input-icon">
+                        <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
+                
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Expiry <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                <div class="input-icon">
+                            <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
             </div>
 
+            
             <div id="appendArea_${increment}" class = "form-group col-md-12 appendArea"></div>
 
-            <div id="multiFileAppendArea_${increment}"></div>
+            <div class="card" style="width:100%; background-color: transparent;">
+                <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                    <div id="multiFileAppendArea_${increment}"></div>
+                </div>
+            </div>
                 
              <div class="form-group col-md-12 btnDiv" style="position: relative;top: 28px;float: right;text-align: end;">
                 <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
@@ -1398,8 +1467,8 @@
         console.log('Lead Type:', lead_type);
 
         let increment = input.id.split('_').pop(); // Extract increment
-        if(lead_type == 1){
-             return;
+        if (lead_type == 1) {
+            return;
         }
 
         let input_id = input.id;
@@ -1416,9 +1485,9 @@
             policyStartDateInput = $('#source_policy_start_date');
             console.log('Using Source Policy Start Date:', sourcePolicyDateVal);
         } else if (policyStartDateVal) {
-            if(input_id == "policy_start_date_1"){
+            if (input_id == "policy_start_date_1") {
                 policyStartDateInput = $('#policy_start_date_1');
-            }else{
+            } else {
                 policyStartDateInput = $('#policy_start_date');
             }
             console.log('Using Policy Start Date:', policyStartDateVal);
@@ -1462,7 +1531,7 @@
 
         let annualised_claims = policy_run_days > 0 ? (incurred_claims / policy_run_days) * 365 : 0;
         // let annualised_claims_roundoff = annualised_claims.toFixed(2);
-        let annualised_claims_roundoff =  Math.trunc(annualised_claims);
+        let annualised_claims_roundoff = Math.trunc(annualised_claims);
 
         console.log('Annualised Claims:', annualised_claims);
         console.log('Annualised Claims (Rounded):', annualised_claims_roundoff);
@@ -1471,9 +1540,9 @@
         let premium_as_on_date = Number($('#premium_date').val()) || 0;
         console.log('Premium as on Date:', premium_as_on_date);
 
-        let incurred_claim_ratio = (incurred_claims > 0 && premium_as_on_date > 0)
-            ? (incurred_claims / premium_as_on_date) * 100
-            : 0;
+        let incurred_claim_ratio = (incurred_claims > 0 && premium_as_on_date > 0) ?
+            (incurred_claims / premium_as_on_date) * 100 :
+            0;
         let incurred_claim_ratio_roundoff = isFinite(incurred_claim_ratio) ? incurred_claim_ratio.toFixed(2) : 0;
         console.log('Incurred Claim Ratio:', incurred_claim_ratio);
         console.log('Incurred Claim Ratio (Rounded):', incurred_claim_ratio_roundoff);
@@ -1481,8 +1550,8 @@
 
         let earned_premium = premium_as_on_date > 0 ? (premium_as_on_date / 365) * policy_run_days : 0;
         // let earned_premium_roundoff = earned_premium.toFixed(2);
-        let earned_premium_roundoff =  Math.trunc(earned_premium);
-       
+        let earned_premium_roundoff = Math.trunc(earned_premium);
+
         console.log('Earned Premium:', earned_premium);
         console.log('Earned Premium (Rounded):', earned_premium_roundoff);
         $('#earned_premium').val(earned_premium_roundoff);
@@ -1649,8 +1718,8 @@
 
         $('#contact_person_summary').empty();
         $('#contact_person_summary').append($('<option>', {
-                value: "", 
-                text: "Select a Contact"
+            value: "",
+            text: "Select a Contact"
         }));
 
         $("#gst").val("");
@@ -1677,8 +1746,8 @@
         $("#client_branch_id").prop("selectedIndex", 0);
         $("#source_policy_id").empty();
         $('#source_policy_id').append($('<option>', {
-                value: "", 
-                text: "Select a Policy"
+            value: "",
+            text: "Select a Policy"
         }));
         $("#pan").val("");
 
@@ -1708,7 +1777,7 @@
             flatpickr("#" + incurred_claim_date_id, {
                 dateFormat: "d/m/Y",
                 allowInput: false,
-                onChange: function (selectedDates) {
+                onChange: function(selectedDates) {
                     try {
                         let increment = this.input.id.split('_').pop();
                         let policyStartDate = $("#source_policy_start_date");
@@ -1793,6 +1862,7 @@
         let claimData = [];
 
         $(".claim-row").each(function() {
+
             let year = $(this).find("[name='first_year[]']").val();
             let claimAmount = $(this).find("[name='first_claim_amount[]']").val();
             let claimStatus = $(this).find("[name='first_claim_status[]']").val();
@@ -1800,13 +1870,22 @@
             let causeOfDeath = $(this).find("[name='first_cause_of_death[]']").val();
             let deathDate = $(this).find("[name='first_death_date[]']").val();
 
+            let emp_id = $(this).find("[name='emp_id[]']").val();
+            let emp_name = $(this).find("[name='emp_name[]']").val();
+            let gender = $(this).find("[name='gender[]']").val();
+            let designation = $(this).find("[name='designation[]']").val();
+            let sum_insured = $(this).find("[name='sum_insured[]']").val();
+
             claimData.push({
                 "year": year,
-                "claim_amount": claimAmount,
-                "status": claimStatus,
-                "claim_type": claimType,
+                "emp_id": emp_id,
+                "emp_name": emp_name,
+                "gender": gender,
+                "designation": designation,
+                "sum_insured": sum_insured,
+                "death_date": deathDate,
                 "cause_of_death": causeOfDeath,
-                "death_date": deathDate
+                "settled": claimAmount,
             });
         });
 
@@ -1824,6 +1903,93 @@
 
     //-----------------------------------------------------------------------------------------------------------
 
+    // do not remove this
+    // function appendThreeYearsClaims(count) {
+
+    //     // let count = $('#appendAreaForClaim').data('count'); 
+    //     console.log("count", count);
+
+    //     let policy_type_id = $('#policy_type_id_' + count).val()
+    //     console.log('policy_type_id', policy_type_id);
+
+    //     console.log('claimIndex from parent', claimIndex);
+    //     let increment = claimIndex;
+
+    //     let claimsFields = `
+    //             <div class="row claim-row">
+
+    //                 <div class="form-group col-md-2">
+    //                     <label for="first_year_${increment}">Year<span class="text-danger">*</span></label>
+    //                     <select class="form-control first_year_" id="first_year_${increment}" name="first_year[]">
+    //                         <option value="">Select Year</option>
+    //                         <?php foreach ($lastFiveYears as $year) {echo "<option value='$year'>$year</option>";} ?>
+    //                     </select>
+    //                 </div>
+    //                 <div class="form-group col-md-2">
+    //                     <label for="first_claim_amount_${increment}">Claim/Settled Amount<span class="text-danger">*</span></label>
+    //                     <input type="text" class="form-control" id="first_claim_amount_${increment}" name="first_claim_amount[]">
+    //                 </div>
+    //                 <div class="form-group col-md-2">
+    //                     <label for="first_claim_status_${increment}">Claim Status<span class="text-danger">*</span></label>
+    //                     <input type="text" class="form-control" id="first_claim_status_${increment}" name="first_claim_status[]">
+    //                 </div>
+    //                 <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
+    //                     <label for="first_cause_of_death_${increment}">Nature/Cause Of Death <span class="text-danger">*</span></label>
+    //                     <select class="form-control" id="first_cause_of_death_${increment}" name="first_cause_of_death[]">
+    //                         <option value="">Select Cause of Death</option>
+    //                         <?php foreach ($causeOfDeath as $cause => $death_value) {echo "<option value='$cause'>$death_value</option>";} ?>
+    //                     </select>
+    //                 </div>
+    //                 <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
+    //                     <label for="first_death_date_${increment}">Date of Death<span class="text-danger">*</span></label>
+    //                     <input type="text" class="form-control" id="first_death_date_${increment}" name="first_death_date[]">
+    //                 </div>
+    //                 <div class="form-group col-md-2 gpaClaimFileds" style="display:none;">
+    //                     <label for="claim_type_${increment}">Claim Type<span class="text-danger">*</span></label>
+    //                     <select class="form-control" id="claim_type_${increment}" name="claim_type[]">
+    //                         <option value="">Select Claim Type</option>
+    //                         <?php foreach ($gpaClaimType as $claimType => $claim_value) {echo "<option value='$claimType'>$claim_value</option>";} ?>
+    //                     </select>
+    //                 </div>
+    //                 <div class="form-group col-md-2">
+    //                     <div class="" style="position: relative; top: 28px; float: right; text-align: end;">
+    //                         <a class="btn btn-danger waves-effect waves-light" onclick="removeClaim(this, ${count})">x</a>
+    //                         <a class="btn btn-primary waves-effect waves-light mr-1" onclick="appendThreeYearsClaims(${count})">+</a>
+    //                     </div>
+    //                 </div>
+    //             </div>
+    //         `;
+
+    //     // Append new claim fields
+    //     let referenceDiv = document.getElementById('appendAreaForClaim_' + count);
+
+    //     if (referenceDiv) {
+    //         referenceDiv.insertAdjacentHTML('beforeend', claimsFields);
+    //     } else {
+    //         console.error('Element not found: appendAreaForClaim_' + count);
+    //     }
+
+    //     // Increment claim index
+    //     console.log("claim index " + claimIndex);
+    //     claimIndex++;
+    //     console.log("after claim index " + claimIndex);
+
+    //     if (policy_type_id == 1) {
+    //         $('.gpaClaimFileds').show();
+    //         $('.lifeClaimFields').hide();
+    //     } else if (policy_type_id == 6 || policy_type_id == 7) {
+    //         $('.gpaClaimFileds').hide();
+    //         $('.lifeClaimFields').show();
+    //     }
+
+    //     // Initialize Select2 for the newly added fields
+    //     $("#first_year_" + increment).select2();
+    //     $("#claim_type_" + increment).select2();
+    //     $("#first_cause_of_death_" + increment).select2();
+
+    //     toggleRequiredFields();
+    // }
+
     function appendThreeYearsClaims(count) {
 
         // let count = $('#appendAreaForClaim').data('count'); 
@@ -1847,15 +2013,46 @@
                             } ?>
                         </select>
                     </div>
+
                     <div class="form-group col-md-2">
-                        <label for="first_claim_amount_${increment}">Claim/Settled Amount<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="first_claim_amount_${increment}" name="first_claim_amount[]">
+                        <label for="emp_id_${increment}">Emp ID<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="emp_id_${increment}" name="emp_id[]">
                     </div>
+                    
+                    
                     <div class="form-group col-md-2">
-                        <label for="first_claim_status_${increment}">Claim Status<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="first_claim_status_${increment}" name="first_claim_status[]">
+                        <label for="emp_name_${increment}">Employee Name<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="emp_name_${increment}" name="emp_name[]">
                     </div>
-                    <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
+                    
+                    <div class="form-group col-md-2">
+                        <label for="gender_${increment}">Gender<span class="text-danger">*</span></label>
+                        <select class="form-control" id="gender_${increment}" name="gender[]">
+                            <option value="">Select Gender</option>
+                            <option value="Female">Female</option>
+                            <option value="Male">Male</option>       
+                        </select>
+                    </div>	
+                    
+                    <div class="form-group col-md-2">
+                        <label for="designation_${increment}">Designation <span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="designation_${increment}" name="designation[]">
+                    </div>
+                    
+                    <div class="form-group col-md-2">
+                        <label for="sum_insured_${increment}">Sum Insured <span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="sum_insured_${increment}" name="sum_insured[]">
+                    </div>
+
+                    <div class="form-group col-md-2">
+                        <label for="first_death_date_${increment}">Date of Death<span class="text-danger">*</span></label>
+                        <div class="input-icon">
+                            <input type="text" class="form-control death_date flatpickr-date" id="first_death_date_${increment}" name="first_death_date[]" autocomplete="off">
+                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                        </div>
+                    </div>
+
+                    <div class="form-group col-md-2">
                         <label for="first_cause_of_death_${increment}">Nature/Cause Of Death <span class="text-danger">*</span></label>
                         <select class="form-control" id="first_cause_of_death_${increment}" name="first_cause_of_death[]">
                             <option value="">Select Cause of Death</option>
@@ -1864,11 +2061,18 @@
                             } ?>
                         </select>
                     </div>
-                    <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
-                        <label for="first_death_date_${increment}">Date of Death<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="first_death_date_${increment}" name="first_death_date[]">
+
+                    <div class="form-group col-md-2">
+                        <label for="first_claim_amount_${increment}">Claim/Settled Amount<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="first_claim_amount_${increment}" name="first_claim_amount[]">
                     </div>
-                    <div class="form-group col-md-2 gpaClaimFileds" style="display:none;">
+
+                    <!-- <div class="form-group col-md-2">
+                        <label for="first_claim_status_${increment}">Claim Status<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="first_claim_status_${increment}" name="first_claim_status[]">
+                    </div> -->
+                    
+                    <!-- <div class="form-group col-md-2 gpaClaimFileds" style="display:none;">
                         <label for="claim_type_${increment}">Claim Type<span class="text-danger">*</span></label>
                         <select class="form-control" id="claim_type_${increment}" name="claim_type[]">
                             <option value="">Select Claim Type</option>
@@ -1876,7 +2080,8 @@
                                 echo "<option value='$claimType'>$claim_value</option>";
                             } ?>
                         </select>
-                    </div>
+                    </div> -->
+                    
                     <div class="form-group col-md-2">
                         <div class="" style="position: relative; top: 28px; float: right; text-align: end;">
                             <a class="btn btn-danger waves-effect waves-light" onclick="removeClaim(this, ${count})">x</a>
@@ -1912,10 +2117,18 @@
         $("#first_year_" + increment).select2();
         $("#claim_type_" + increment).select2();
         $("#first_cause_of_death_" + increment).select2();
+        $("#gender_" + increment).select2();
+
+        flatpickr('.flatpickr-date', {
+            dateFormat: 'd-m-Y', // Example format: 11-10-2025
+            allowInput: true,    // Allow manual typing
+            maxDate: 'today',    // Optional: disable future dates
+        });
 
         toggleRequiredFields();
     }
 
+
     function removeClaim(btn, count) {
         const container = document.getElementById('appendAreaForClaim_' + count);
         const rows = container.querySelectorAll('.claim-row');
@@ -1993,7 +2206,7 @@
                 $('#source_policy_start_date').closest('.form-group').show();
                 $('#source_policy_end_date').closest('.form-group').show();
 
-            }else{
+            } else {
 
                 $('#source_policy_id').hide();
                 $('#source_policy_start_date').hide();
@@ -2039,6 +2252,10 @@
                 $(this).find('.form-group').each(function() {
                     var input = $(this).find('input, select');
 
+                    if (input.attr('name') === "gender[]") {
+                        return;
+                    }
+
                     if (input.length === 0) {
                         console.warn('No input/select fields found in:', this);
                         return;
@@ -2064,12 +2281,12 @@
         });
     }
 
-    $('#exixting_client').change(function () {
+    $('#exixting_client').change(function() {
 
         $('#contact_person_summary').empty();
         $('#contact_person_summary').append($('<option>', {
-                value: "", 
-                text: "Select a Contact"
+            value: "",
+            text: "Select a Contact"
         }));
 
         $("#gst").val("");
@@ -2142,6 +2359,4 @@
 
 
     //-----------------------------------------------------------------------------------------------------------
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 2367957c..cb17bb22 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -189,7 +189,7 @@ if (isset($selected_lead_type)) {
         $('#leads_form').hide()
     }
 
-    function getClientAndBranchAndPolicy() {
+    function getClientAndBranchAndPolicy(append = true) {
 
         console.log('getClientAndBranchAndPolicy function called')
 
@@ -204,7 +204,9 @@ if (isset($selected_lead_type)) {
                     client_list = res.client_data;
                     branch_list = res.branch_data;
                     policy_list = res.policy_data;
-                    appendClients(res.client_data);
+                    if(append == true){
+                        appendClients(res.client_data);
+                    }
                 } else {
                     console.log('No data found');
                 }
@@ -217,7 +219,7 @@ if (isset($selected_lead_type)) {
         });
     }
 
-    function appendClients(data) {
+    function appendClients(data, client_id = null) {
         // console.log("lead_type",lead_type.value);
 
         $('#client_id').empty();
@@ -238,22 +240,28 @@ if (isset($selected_lead_type)) {
         }));
 
         $.each(data, function(index, item) {
-            var option = $('<option>', {
-                value: item.id,
-                text: item.client_name,
-                'data-cn': item.client_name,
-                'data-csn': item.short_name,
-                'data-ct': item.client_type,
-                'data-cet': item.entity_type_id,
-                class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
-            });
+            if(item.client_type == 1){
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.client_name,
+                    'data-cn': item.client_name,
+                    'data-csn': item.short_name,
+                    'data-ct': item.client_type,
+                    'data-cet': item.entity_type_id,
+                    class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
+                });
 
-            $('#client_id').append(option);
+                if (client_id == item.id) {
+                    option.attr('selected', true);
+                }
+
+                $('#client_id').append(option);
+            }
         });
 
     }
 
-    function appendBranch(data) {
+    function appendBranch(data, branch_id = null) {
 
         $('#client_branch_id').empty();
 
@@ -268,6 +276,11 @@ if (isset($selected_lead_type)) {
                 value: item.id,
                 text: item.branch_name
             });
+
+            if (branch_id == item.id) {
+                option.attr('selected', true);
+            }
+
             $('#client_branch_id').append(option);
         });
     }
@@ -334,6 +347,8 @@ if (isset($selected_lead_type)) {
             $("#client_short_name").val(shortName);
 
             if (client_id == 'add_client') {
+
+                $(this).val("").select2();
                 // alert("Hello");
                 var myModal = new bootstrap.Modal(document.getElementById('upload_enrollment_model'));
                 myModal.show();
@@ -378,7 +393,6 @@ if (isset($selected_lead_type)) {
             }
         });
 
-
         $('#client_branch_id').change(function() {
 
             let client_branch_id = $(this).val();
@@ -474,7 +488,7 @@ if (isset($selected_lead_type)) {
 
     // --------------------------------------------------------------------------------------------------------
 
-    function addFileField(increment) {
+    function addFileFieldold(increment) {
 
         console.log('addFileField function called');
 
@@ -519,6 +533,80 @@ if (isset($selected_lead_type)) {
         fileIndex++;
     }
 
+    function addFileField(increment) {
+
+        console.log('addFileField function called');
+
+        const container = document.getElementById(`multiFileAppendArea_${increment}`);
+        if (!container) return;
+
+        // Remove previous "+" buttons if any
+        // const prevAddBtns = container.querySelectorAll('.add-file-btn');
+        // prevAddBtns.forEach(btn => btn.remove());
+
+
+        const div = document.createElement("div");
+        div.className = "form-row d-flex align-items-end";
+        div.setAttribute("id", `fileField_${fileIndex}`);
+
+        let isFirstField = container.childElementCount === 0; // Check if it's the first field
+        let placeholder = isFirstField ? 'First file must be Demography.' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '';
+
+        
+        if(selected_lead_form_type != 1){
+            placeholder =  '';
+            accept = '';
+        }
+
+        let sample_dwn_btn = "";
+        if(selected_lead_form_type == 1 && isFirstField == 1){
+            sample_dwn_btn = `<button type="button" 
+                                        class="btn app-btn-secondary float-end" 
+                                        id="excel_download" 
+                                        data-toggle="tooltip" 
+                                        data-placement="top" 
+                                        title="Download Sample Excel"
+                                        onclick="window.location.href='<?= base_url("util/download-excel/member_data"); ?>'">
+                                        Sample Excel
+                                    </button>`;
+
+        }
+
+        let add_btn = `<button type="button" class="btn app-btn-secondary mr-1 add-file-btn" onclick="addFileField(${increment})">+</button>`;
+
+        div.innerHTML = `
+            <div class="form-group row" id="fileField_${fileIndex}" style="width: 100%;">
+                
+                <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+                </div>
+                <div class="col-md-3">
+                    <input type="text" class="form-control" name="docs_name_${increment}[]" placeholder="${placeholder}" style="background: #F5FFFF !important;">
+                </div>
+
+                <div class="col-auto" style="align-content: center;">
+                    <label>File Upload </label>
+                </div>
+                <div class="col-md-3">
+                    <div class="input-icon">
+                        <input type="file" class="form-control" id="file_name_${fileIndex}" name="file_name_${increment}[]" accept="${accept}" style="background: #F5FFFF !important;">
+                        <i class="mdi mdi-upload additional-icon"></i>
+                    </div>
+                </div>
+
+                <div class="col-auto">
+                    <button type="button" class="btn btn-danger mr-1" onclick="removeFileField(${fileIndex})"><span class="mdi mdi-trash-can"></span></button>
+                    ${add_btn}
+                    ${sample_dwn_btn}
+                </div>
+
+            </div>`;
+        
+        container.appendChild(div);
+        fileIndex++;
+    }
+
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index 8cc249c7..dad5ce01 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -160,23 +160,23 @@ table.dataTable tbody td {
                 </div>
                 <div>
                     <div class="table-responsive">
-                        <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                        <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
 
                             <thead class="bg-light">
                                 <tr>
-                                    <th><div class="column-header">S.No.</div></th>
-                                    <th><div class="column-header">Lead Type</div></th>
-                                    <th><div class="column-header">Issuer</div></th>
-                                    <th><div class="column-header">Client Type</div></th>
-                                    <th><div class="column-header">Client / Branch</div></th>
-                                    <th><div class="column-header">Entity Type</div></th>
-                                    <th><div class="column-header">Branch Name</div></th>
-                                    <th><div class="column-header">Branch Code</div></th>
-                                    <th><div class="column-header">Contact Person Name</div></th>
-                                    <th><div class="column-header">Contact Person Mobile</div></th>
-                                    <th><div class="column-header">Policy Type</div></th>
-                                    <th><div class="column-header">Status</div></th>
-                                    <th><div class="column-header">Action</div></th>
+                                    <th><div class="column-header">S.No&nbsp;</div></th>
+                                    <th><div class="column-header">Lead Type &nbsp;</div></th>
+                                    <th><div class="column-header">Issuer &nbsp;</div></th>
+                                    <th><div class="column-header">Client Type &nbsp;</div></th>
+                                    <th><div class="column-header">Client / Branch &nbsp;</div></th>
+                                    <th><div class="column-header">Entity Type &nbsp;</div></th>
+                                    <th><div class="column-header">Branch Name &nbsp;</div></th>
+                                    <th><div class="column-header">Branch Code &nbsp;</div></th>
+                                    <th><div class="column-header">Contact Person Name &nbsp;</div></th>
+                                    <th><div class="column-header">Contact Person Mobile &nbsp;</div></th>
+                                    <th><div class="column-header">Policy Type &nbsp;</div></th>
+                                    <th><div class="column-header">Status &nbsp;</div></th>
+                                    <th><div class="column-header">Action &nbsp;</div></th>
                                 </tr>
                             </thead>
 
@@ -184,7 +184,18 @@ table.dataTable tbody td {
                                 <?php if(isset($lead_data_list)) { ?>
                                     <?php foreach($lead_data_list as $index => $row){ ?>
                                     <tr>
-                                        <td><?php echo $index + 1; ?></td>
+                                        <td class="text-center">
+                                            <?php echo $index + 1; ?>
+                                            <?php if($row['demography_file_status'] == "failed") { ?>
+                                                <a href="<?= base_url('util/getMemberDataExcelFileErrors?lead_id=').$row['id'] ?>" 
+                                                    class="mdi mdi-information-outline text-danger" 
+                                                    style="cursor: pointer; font-size: 16px" 
+                                                    data-toggle="tooltip" 
+                                                    data-placement="top" 
+                                                    title="Click to view the Demography File Error data" target="_blank">
+                                                </a>
+                                            <?php } ?>
+                                        </td>
                                         <td><?php echo $lead_type[$row['lead_type']] ?? '-'; ?></td>
                                         <td><?php echo $issuer[$row['issuer']] ?? '-'; ?></td>
                                         <td><?php echo $client_type[$row['client_type']] ?? '-'; ?></td>
@@ -215,7 +226,7 @@ table.dataTable tbody td {
                                                             </a>
                                                         <?php } ?>
                                                     <?php } ?>
-                                                    <a class="dropdown-item btnHistory app-text-black"
+                                                    <a class="dropdown-item btnHistory font-color-black"
                                                         data-id="<?= $row['id']; ?>"
                                                         title="Click to view Mail History">
                                                         <i class="mdi mdi-history mr-2 text-muted font-18 vertical-middle"></i>Email History
@@ -244,7 +255,7 @@ table.dataTable tbody td {
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Select Leaad Type</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">Select Lead Type</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -420,29 +431,41 @@ document.addEventListener("DOMContentLoaded", function () {
                 dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [
+                buttons: [            
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Policy-Tranction-Inception-List',
-                        exportOptions: {
-                            columns: ':not(:last-child)'
-                        },
-                    },                
+                            text: 'Add',
+                            className: 'btn app-btn-primary  mr-2',
+                            action: function(e, dt, node, config) { 
+                                openLeadTypeAskModal();
+                            }
+                    },
                     {
-                        text: 'Add',
-                        className: 'buttons-html5 addbtnStyle',
-                        action: function (e, dt, node, config) {
-                            openLeadTypeAskModal();
+                        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-Inception-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
                     }
-                } 
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
+                pageLength: 10, // Set default number of rows per page (optional)
                 // ordering: false,
             });
         } else {
@@ -501,14 +524,14 @@ document.addEventListener("DOMContentLoaded", function () {
 
                                             <thead class="bg-light">
                                                 <tr>
-                                                    <th><div class="column-header">S.No.</div></th>
-                                                    <th><div class="column-header">From Mail</div></th>
-                                                    <th><div class="column-header">To Mail</div></th>
-                                                    <th><div class="column-header">BCC</div></th>
-                                                    <th><div class="column-header">CC</div></th>
-                                                    <th><div class="column-header">Type</div></th>
-                                                    <th><div class="column-header">Status</div></th>
-                                                    <th><div class="column-header">Date/Time</div></th>
+                                                    <th><div class="column-header">S.No&nbsp;</div></th>
+                                                    <th><div class="column-header">From Mail&nbsp;</div></th>
+                                                    <th><div class="column-header">To Mail&nbsp;</div></th>
+                                                    <th><div class="column-header">BCC&nbsp;</div></th>
+                                                    <th><div class="column-header">CC&nbsp;</div></th>
+                                                    <th><div class="column-header">Type&nbsp;</div></th>
+                                                    <th><div class="column-header">Status&nbsp;</div></th>
+                                                    <th><div class="column-header">Date/Time&nbsp;</div></th>
                                             </tr>
                                         </thead>
                                         <tbody>
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index 04e0a15d..df5d5a9a 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -36,6 +36,16 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */ /* bcoz in design */ 
+    .card-body{ margin-top: 0px !important; } 
+
+    /* this css as per design so not declare in golbal */ /* bcoz in design */ 
+    #collapseOne{
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
 </style>
 
 
@@ -45,13 +55,19 @@
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
 
-                    <div class="col-6" style="align-self: center;">
+                    <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
-                    </div>
+                    </div> -->
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;" type="button" id="btnAdd">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </a>
+                        <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                    </h4>
                 </div>
                 <form role="form" class="parsley-examples" method="post" id="leads_non_eb_form_id"
                     enctype="multipart/form-data">
@@ -59,135 +75,147 @@
                     <input type="hidden" name="id" id="leads_primarykey">
                     <input type="hidden" name="lead_form_type" id="lead_form_type_id" value="2">
 
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                     <div class="card-body">
+                        <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
+                            <div class="form-group col-md-4">
+                                <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                <select class="form-control" id="lead_type" name="lead_type" required>
+                                    <option value="">Select Lead Type</option>
+                                    <?php
+                                    if (isset($lead_type) && count($lead_type)) {
+                                        foreach ($lead_type as $key => $value) {
+                                            if ($key == 1) {
+                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                            } else {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                            }
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                <select class="form-control" id="issuer" name="issuer" required>
+                                    <option value="">Select Issuer</option>
+                                    <?php
+                                    if (isset($issuer) && count($issuer)) {
+                                        foreach ($issuer as $key => $value) {
                                             echo "<option value=" . $key . ">" . $value . "</option>";
                                         }
                                     }
-                                }
-                                ?>
-                            </select>
-                        </div>
+                                    ?>
+                                </select>
+                            </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
                         </div>
-
+                      </div>
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- client row -->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
+                                <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                    <label class="switch">
+                                        <input id="exixting_client" type="checkbox" name="exixting_client">
+                                        <span class="slider round" style="height: 27px;"></span>
+                                    </label>
 
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
+                                    <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_id">Client<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_id" name="client_id">
+                                        <option value="">Select Client</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                        onchange="getBranchData(this,1)">
+                                        <option value="">Select Branch</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                        <option value="" selected>Select Entity</option>
+                                        <?php
+                                        if (isset($entity) && count($entity)) {
+                                            foreach ($entity as $key => $value) {
+                                                echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_name" name="client_name"
+                                        placeholder="Enter Client Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                        placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div>
+
+                            </div>
                         </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div>
-
                     </div>
                     <!-- end client row -->
-
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- branch row-->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="gst">GST<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
                                 data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
@@ -195,19 +223,19 @@
                                 data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_name" name="branch_name"
                                 placeholder="Enter Branch Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_code" name="branch_code"
                                 placeholder="Enter Branch Code" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_summary">Contact Person's</label>
                             <select class="form-control" name="contact_person_summary" id="contact_person_summary">
                                 <option value="">Select a Person</option>
@@ -215,20 +243,20 @@
                         
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
                                 placeholder="Enter Contact Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_mobile">Contact Person Mobile<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_mobile"
                                 name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_email">Contact Person Email<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_email"
@@ -236,13 +264,17 @@
                         </div>
 
                     </div>
+                    </div>
+                    </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- policy row -->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row" id="dynamic-form-container">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                             <select class="form-control" id="policy_type_id" name="policy_type_id"
                                 onchange="getPolicyTypeFields(this)" required>
@@ -259,7 +291,7 @@
                             </select>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="insurer">Insurer <span class="text-danger"></span></label>
                             <select class="form-control" id="insurer" name="insurer">
                                 <option value="">Select Insurer</option>
@@ -293,78 +325,96 @@
                             </select>
                         </div> -->
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Commencement <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
-                                placeholder="Enter DOC" required>
+                            <div class="input-icon">
+                                        <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
+                                        placeholder="Enter DOC" required>
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
+                            
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Expiry <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
-                                placeholder="Enter DOE" required>
+                            <div class="input-icon">      
+                                    <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
+                                    placeholder="Enter DOE" required>
+                                    <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
                         </div>
 
                     </div>
+                    
 
                     <div id="appendArea"></div>
 
                     <div id="appendAreaForClaim">
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
-                    <div id="multiFileAppendArea_1"></div>
-
-                    <hr>
-
-                    <!-- other row -->
-                    <div class="form-row">
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="file_upload">File Upload<span class="text-danger"></span></label>
-                            <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
-                            <span class="text-danger" id="file_name_display"></span>
-                        </div> -->
-
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
+                    <div class="card" style="width:100%; background-color: transparent;">
+                        <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                            <div id="multiFileAppendArea_1"></div>
                         </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                        }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
                     </div>
 
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                    </div>
+                    </div>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
+
+                    <!-- other row -->
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
+
+                                <!-- <div class="form-group col-md-3">
+                                    <label for="file_upload">File Upload<span class="text-danger"></span></label>
+                                    <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
+                                    <span class="text-danger" id="file_name_display"></span>
+                                </div> -->
+
+                                <div class="form-group col-md-4">
+                                    <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                        <option value="">Select Sales Person</option>
+                                        <?php if (isset($salse_team)) { ?>
+                                            <?php foreach ($salse_team as $value) { ?>
+                                                <option value="<?= $value['id']; ?>">
+                                                    <?= $value['first_name']; ?>
+                                                </option>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                    <select class="form-control" id="lead_status" name="status" required>
+                                        <option value="" selected>Select Status</option>
+                                        <?php
+                                        if (isset($lead_status) && count($lead_status)) {
+                                            foreach ($lead_status as $key => $value) {
+                                                if ($key == 'queued') {
+                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                } else {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                            </div>
+
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label for="notes">Remarks</label>
+                                    <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
diff --git a/app/Views/log_view.php b/app/Views/log_view.php
index ebb77fc0..1af7ebde 100644
--- a/app/Views/log_view.php
+++ b/app/Views/log_view.php
@@ -23,16 +23,16 @@ table.dataTable tbody td {
 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
     <thead class="bg-light">
         <tr>
-            <th>S.No.</th>
-            <th>Log File</th>
-            <th>Actions</th>
+            <th>S.No&nbsp;</th>
+            <th>Log File&nbsp;</th>
+            <th>Actions&nbsp;</th>
         </tr>
     </thead>
     <tbody>
         <?php if (!empty($logs)): ?>
             <?php foreach ($logs as $index => $log): ?>
                 <tr>
-                    <td><?= $index + 1 . '.' ?></td>
+                    <td class="text-center"><?= $index + 1 . '.' ?></td>
                     <td><?= esc($log) ?></td>
                     <td>
                         <a href="<?= base_url('util/view_log/' . urlencode($log)) ?>">View</a> |
diff --git a/app/Views/login.php b/app/Views/login.php
index 081c4ef1..a3b5bccb 100755
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -161,4 +161,28 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+<script>
+document.addEventListener("DOMContentLoaded", function() {
+
+    <?php 
+        $isLoggedIn = check_session();
+        $hasCookie = check_cookie();
+    ?>
+
+    // Safely inject PHP boolean into JavaScript
+    let alreadyLogin = <?= ($isLoggedIn && $hasCookie) ? 'true' : 'false' ?>;
+
+        console.log(typeof alreadyLogin);
+        console.log(alreadyLogin);
+
+    if (!alreadyLogin) {
+        localStorage.clear();
+        console.log("Local storage cleared (no session/cookie).");
+    } else {
+        console.log("Session & cookie found, local storage kept.");
+    }
+
+});
+</script>
diff --git a/app/Views/newClientModal-old.php b/app/Views/newClientModal-old.php
new file mode 100644
index 00000000..387578c9
--- /dev/null
+++ b/app/Views/newClientModal-old.php
@@ -0,0 +1,312 @@
+<!-- Client form content modal-->
+<div class="modal fade" id="upload_enrollment_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">Add New Client</h4>
+                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body" style="overflow-y: auto;height: 90vh;">
+                <form class="parsley-examples" method="post" id="client_form" enctype="multipart/form-data">
+                    <div class="form-group">
+                        
+                        <div class="form-row">
+                            <div class="form-group col-md-12">
+                                <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="client_name" name="client_name" required>
+                            </div>
+                            <div class="form-group col-md-12">
+                                <label for="short_name">Client Short name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="short_name" name="short_name" onkeyup="validateInputForClient(this, 'clients', 'short_name')" required>
+                            </div>
+
+                            <div class="form-group col-md-12">
+                                <label for="cost_center">PAN</label>
+                                <input type="text" class="form-control" id="pan" placeholder="Enter PAN No" name="pan" onchange="validateInputForClient(this, 'clients', 'pan')">
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <!-- Client Type -->
+                        <div class="form-row clienttypediv" style="display: none;">
+
+                            <div class="form-group col-md-6">
+                                <label for="dob">Date of Birth<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="dob" placeholder="DD/MM/YYYY" name="dob" >
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="cost_center">Mobile<span class="text-danger"></span></label>
+                                <input type="text" class="form-control" id="phone" placeholder="Enter Mobile Number" maxlength="10" name="phone"
+                                onkeypress="return onlyNumbers(event)" onchange="validateInputForClient(this, 'clients', 'phone')">
+                            </div>
+
+                            <div class="form-group col-md-12">
+                                <label for="email2">Email<span class="text-danger">*</span></label>
+                                <input type="email" class="form-control" id="email2" placeholder="Enter Email" name="email2">
+                            </div>
+                            <div class="form-group col-md-12">
+                                <label for="aadhar">Aadhar</label>  
+                                <input type="text" class="form-control" id="aadhar" placeholder="Enter Aadher No" name="aadhar"  maxlength="12" onchange="validateInputForClient(this, 'clients', 'aadhar')">
+                            </div>
+
+                        </div>
+
+                        <!-- branch -->
+                        <div class="form-row branchdiv">
+
+                            <div class="form-group col-md-12">
+                                <label for="short_name">Entity Type<span class="text-danger"></span></label>
+                                <select class="form-control" id="entity_type_id_for_client" name="entity_type_id">
+                                    <option value="" selected>Select Entity</option>
+                                    <?php
+                                        if (isset($entity) && count($entity)) {
+                                            foreach ($entity as $key => $value) {
+                                                echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                            }
+                                        }
+                                    ?>
+                                </select>                            
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="client_name">Branch Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="branch_name" name="branch_name" required>
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="branch_code">Branch Code<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="branch_code" name="branch_code" required>
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="branch_code">Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="name" name="name" required>
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="branch_code">Mobile<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="mobile" maxlength="10" name="mobile"  onkeypress="return onlyNumbers(event)" required>
+                            </div>
+                            <div class="form-group col-md-12">
+                                <label for="email">Email<span class="text-danger">*</span></label>
+                                <input type="email" class="form-control" id="email" placeholder="Enter Email" name="email" required>
+                            </div>
+
+                            <div class="form-group col-md-12">
+                                <label for="gst">GST<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="gst" placeholder="Enter GST Number" oninput="validateInputForClient(this, 'client_branch', 'gst')"
+                                data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst" data-parsley-trigger="change" data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
+                            </div>
+
+                        </div>
+
+                    </div>
+                    <div class="form-group text-right m-b-0" id="hide_smbt_btn">
+                        <button type="submit" id="client_add_modal_submit_btn" class="btn btn-primary waves-effect waves-light mr-1 your">Submit</button>
+                    </div>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+<script>
+    let isGSTValidating = false;
+    let isGSTValid = false;
+
+    function validateInputForClient(input, table, field) {
+
+        let owner_type = $('#Owner_type').val();
+        let client_type = $('#client_type').val();
+
+        console.log('owner_type', owner_type);
+        console.log('client_type', client_type);
+
+        if((client_type == 2 || owner_type == 2) && field == 'short_name'){
+            return;
+        }
+
+        let value = $(input).val();
+        if (!value) return;
+
+        let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
+        let message = label ? label + " already exists!" : "Value is duplicate!";
+
+        // Set validating state
+        isGSTValidating = true;
+        isGSTValid = false;
+        $('#hide_smbt_btn button').prop('disabled', true);
+
+        checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
+            isGSTValidating = false;
+            if (isDuplicate) {
+                toastr.warning(message, 'WARNING');
+                // $(input).val('');
+                isGSTValid = false;
+                $('#client_add_modal_submit_btn').prop('disabled', true);
+            } else {
+                isGSTValid = true;
+                $('#client_add_modal_submit_btn').prop('disabled', false);
+            }
+        });
+
+        $('#hide_smbt_btn button').prop('disabled', false);
+    }
+
+
+
+    $("#client_form").submit(function(event) {
+
+        event.preventDefault();
+    
+        // If GST is currently validating, wait for it to complete
+        if (isGSTValidating) {
+            if($('#Owner_type').val() ==  1){
+                toastr.info('Please wait while we validate your GST number...', 'Validating');
+                return;
+            }else if ($('#client_type').val() ==  1){
+                toastr.info('Please wait while we validate your GST number...', 'Validating');
+                return;
+            }
+        }
+        
+        // If GST validation failed, prevent submission
+        if ($('#gst').val() && !isGSTValid) {
+            toastr.warning('Please fix the GST number before submitting', 'Validation Error');
+            return;
+        }
+
+        let form_type =  $(this).data('id') || 0;
+
+        console.log('onsubmit event', this);
+        console.log('onsubmit event get data value',form_type);
+        console.log('client_type', $('#client_type').val());
+
+        event.preventDefault(); 
+
+
+        $('#aadhar').attr('data-parsley-required', 'false');
+        $('#aadhar').removeAttr('required');
+
+        if($('#Owner_type').val() ==  2){
+            $('#gst').removeAttr('required');
+        }
+
+        var isValid = $('#client_form').parsley().validate();    
+
+        if (!isValid) {
+            var emptyFieldIds = [];
+
+            $('#client_form').parsley().fields.forEach(function(field) {
+                if (!field.isValid()) {
+                    var elem = field.$element;
+                    var id = elem.attr('id') || elem.attr('name');
+                    emptyFieldIds.push(id);
+                }
+            });
+
+            console.log('Empty/Invalid Fields:', emptyFieldIds);
+            return;
+        }
+
+        isClientFormSubmitting = true;
+
+        form_action = '<?= base_url("util/createClientWithMinimalData"); ?>';
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var client_type = $('#client_type').val() || $('#Owner_type').val() || 1;
+        console.log('client_type:', client_type);
+
+        //FORM Data
+        var formData = new FormData($('#client_form')[0]);
+        formData.append('client_type', client_type);
+        console.log("formData : ",formData);
+        // return
+        $.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('create_Client_With_Minimal_Data', res)
+
+                if(res.status == true){
+                    getClientAndBranchAndPolicy(res.client_id, res.branch_id);
+
+                    if(form_type != 1){
+
+                        setTimeout(function(){
+
+                            $('#client_id').val(res.client_id).change();
+                            $('#client_id').prepend($('<option>', {
+                                value: 'add_client',
+                                text: '+ Add Client'
+                            }));
+
+                            setTimeout(function(){
+                                
+                                $('#client_branch_id').val(res.branch_id).change();
+                                $('.loader').fadeOut();
+                                $('.loader-mask').delay(350).fadeOut('slow');
+
+                            }, 1000)
+                            
+                        }, 3000)
+
+                    }else{
+
+                        console.log("Couldn't Add Client","Error");
+                    }
+
+                    toastr.success(res.message, 'Success');
+
+                }else{
+                    toastr.error(res.message, 'Error');
+                }
+
+                $('#client_form')[0].reset();
+                $('.close').click();
+
+                if(form_type == 1){
+
+                    var myModal = new bootstrap.Modal(document.getElementById('vehicle_modal'));
+                    myModal.show();
+
+                    $('#client_form').removeAttr('data-id');
+
+                    // Load form data into #vehicle_form from localStorage
+                    setFormDataFromLocalStorage("#vehicle_form", "vehicleFormData", res.client_id);
+                    
+                    setTimeout(function(){
+                        $('#owner').val(res.client_id).change();
+                        $('#owner_branch').val(res.branch_id).change();
+
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+
+                    }, 2000)
+                }
+
+                isClientFormSubmitting = false;
+            },
+            error: function (xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                isClientFormSubmitting = false;
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php
index a4911ad4..7acdbf5a 100644
--- a/app/Views/newClientModal.php
+++ b/app/Views/newClientModal.php
@@ -57,7 +57,7 @@
                         <div class="form-row branchdiv">
 
                             <div class="form-group col-md-12">
-                                <label for="short_name">Entity Type<span class="text-danger">*</span></label>
+                                <label for="short_name">Entity Type<span class="text-danger"></span></label>
                                 <select class="form-control" id="entity_type_id_for_client" name="entity_type_id">
                                     <option value="" selected>Select Entity</option>
                                     <?php
@@ -72,22 +72,22 @@
 
                             <div class="form-group col-md-6">
                                 <label for="client_name">Branch Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="branch_name" name="branch_name">
+                                <input type="text" class="form-control" id="branch_name" name="branch_name" required>
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label for="branch_code">Branch Code<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="branch_code" name="branch_code">
+                                <input type="text" class="form-control" id="branch_code" name="branch_code" required>
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label for="branch_code">Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="name" name="name">
+                                <input type="text" class="form-control" id="name" name="name" required>
                             </div>
 
                             <div class="form-group col-md-6">
-                                <label for="branch_code">Mobile<span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="mobile" maxlength="10" name="mobile"  onkeypress="return onlyNumbers(event)">
+                                <label for="branch_code">Mobile<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="mobile" maxlength="10" name="mobile"  onkeypress="return onlyNumbers(event)" required>
                             </div>
                             <div class="form-group col-md-12">
                                 <label for="email">Email<span class="text-danger">*</span></label>
@@ -113,6 +113,7 @@
 </div>
 
 <script>
+
     let isGSTValidating = false;
     let isGSTValid = false;
 
@@ -155,8 +156,6 @@
         $('#hide_smbt_btn button').prop('disabled', false);
     }
 
-
-
     $("#client_form").submit(function(event) {
 
         event.preventDefault();
@@ -224,7 +223,7 @@
         //FORM Data
         var formData = new FormData($('#client_form')[0]);
         formData.append('client_type', client_type);
-        console.log("formData : ",formData);
+        
         // return
         $.ajax({
             data:formData,
@@ -235,37 +234,38 @@
             contentType: false,
             success: function(res) {
 
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-
                 console.log('create_Client_With_Minimal_Data', res)
 
                 if(res.status == true){
-                    getClientAndBranchAndPolicy(res.client_id, res.branch_id);
 
-                    if(form_type != 1){
+                    getClientAndBranchAndPolicy(false);
 
-                        setTimeout(function(){
+                    appendClients(res.clients, res.client_id);
+                    appendBranch(res.branches, res.branch_id);
 
-                            $('#client_id').val(res.client_id).change();
-                            $('#client_id').prepend($('<option>', {
-                                value: 'add_client',
-                                text: '+ Add Client'
-                            }));
+                    $('#gst').val(res.data.gst);
+                    $('#branch_name').val(res.data.branch_name);
+                    $('#branch_code').val(res.data.branch_code);
+                    $('#contact_person_mobile').val(res.data.mobile);
+                    $('#contact_person_email').val(res.data.email);
 
-                            setTimeout(function(){
-                                
-                                $('#client_branch_id').val(res.branch_id).change();
-                                $('.loader').fadeOut();
-                                $('.loader-mask').delay(350).fadeOut('slow');
+                    $('#contact_person_summary').empty();
+                    $('#contact_person_summary').append($('<option>', {
+                        value: "",
+                        text: "Select a Contact"
+                    }));
 
-                            }, 1000)
-                            
-                        }, 3000)
+                    if (res.data.name && res.data.email) {
 
-                    }else{
+                        // let display_value = `${res.data.name} - ${res.data.email} - ${res.data.mobile}`;
+                        let display_value = res.data.name;
+
+                        $('#contact_person_summary').append($('<option>', {
+                            value: 0, // index or key in array/object
+                            text: display_value,
+                            selected: true
+                        }));
 
-                        console.log("Couldn't Add Client","Error");
                     }
 
                     toastr.success(res.message, 'Success');
@@ -277,25 +277,8 @@
                 $('#client_form')[0].reset();
                 $('.close').click();
 
-                if(form_type == 1){
-
-                    var myModal = new bootstrap.Modal(document.getElementById('vehicle_modal'));
-                    myModal.show();
-
-                    $('#client_form').removeAttr('data-id');
-
-                    // Load form data into #vehicle_form from localStorage
-                    setFormDataFromLocalStorage("#vehicle_form", "vehicleFormData", res.client_id);
-                    
-                    setTimeout(function(){
-                        $('#owner').val(res.client_id).change();
-                        $('#owner_branch').val(res.branch_id).change();
-
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-
-                    }, 2000)
-                }
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
 
                 isClientFormSubmitting = false;
             },
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 25f89043..0242fbf4 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -1,443 +1,460 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter {
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.right-align-input {
-    text-align: right;
-}
+    .right-align-input {
+        text-align: right;
+    }
 
-.center-align-input {
-    text-align: center;
-}
+    .center-align-input {
+        text-align: center;
+    }
 </style>
 
-<div class="row" id="outstanding_filter">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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="container-fluid-min">
+    <div class="col-12" id="outstanding_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">
+                                    <!--  <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="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients 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" name="insurer_id">
-                                        <option value="0" selected>Select Insurer</option>
-                                        <?php if(isset($insurer) && count($insurer)){ ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label for="addon_policy"> Insurer <span id="base_danger"
+                                                class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id">
+                                            <option value="0" selected>Select Insurer</option>
+                                            <?php if (isset($insurer) && count($insurer)) { ?>
+                                                <?php foreach ($insurer as $value) { ?>
+                                                    <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="addon_policy"> Insurer Branch<span id="base_danger"
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id">
-                                        <option value="0" selected>Select Insurer</option>
-                                        <?php if(isset($insurer) && count($insurer)){ ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label for="addon_policy"> Insurer Branch<span id="base_danger"
+                                                class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                            <?php if (isset($insurer) && count($insurer)) { ?>
+                                                <?php foreach ($insurer as $value) { ?>
+                                                    <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                    <!-- <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_id" 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>";
-                                                }
+                                        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">
+                                    <!--  <div class="form-group col-md-3">
                                     <label for="client_branch">Issuer<span class="text-danger">*</span></label>
                                     <select class="form-control" id="issuer" 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>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div> -->
 
-                            <!-- </div>
+                                    <!-- </div>
 
                             <div class="form-row"> -->
 
-                                <!-- <div class="form-group col-md-3">
+                                    <!-- <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>";
-                                                }
+                                        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: true;" id="date_div">
-                                    <label>Statement Month<span class="text-danger"></span></label>
+                                    <div class="form-group col-md-4" style="display: true;" id="date_div">
+                                        <label>Statement Month<span class="text-danger"></span></label>
+                                        <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>
+                                        <!-- 
+                                    codeword : ***1***
+                                    if you cross check means also uncomment "star2star" (***2***) 
                                     <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>
-                                    <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/report/report-outstanding-list"); ?>"
-                                    class="btn btn-secondary" id="clear-filters">Clear</a>
-                                <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
-                                    class="btn btn-primary" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                                <div class="form-group text-right m-b-0">
+                                    <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
+                                        class="btn btn-secondary" id="clear-filters">Clear</a>
+                                    <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
+                                        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="outstanding_list">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" style="padding-bottom: 10px;">
+                    <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Outstanding Report</h4>
+                    </div>
+
+                </div>
+
+                <div class="table-responsive">
+                    <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                        <thead class="bg-light">
+                            <tr>
+                                <th>S.No&nbsp;</th>
+                                <!-- <th>Client Name</th> -->
+                                <th>Insurer&nbsp;</th>
+                                <th>Insurer<br> Branch&nbsp;</th>
+                                <th>Statement<br> Month&nbsp;</th>
+                                <th>Statement<br> No&nbsp;</th>
+                                <th>Invoice No&nbsp;</th>
+                                <th>Invoice Status&nbsp;</th>
+                                <th>Invoice Date&nbsp;</th>
+                                <th>Invoice Amount&nbsp;</th>
+                                <th>Realization <br>Amount&nbsp;</th>
+                                <th>Outstanding <br>Amount&nbsp;</th>
+
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <?php
+
+                            // dd($outstanting_list);
+                            if (isset($outstanting_list)) { ?>
+                                <?php foreach ($outstanting_list as $index => $row) { ?>
+                                    <tr>
+                                        <td class="text-center"><?= $index + 1 ?></td>
+                                        <td><?php echo $row['short_name']; ?></td>
+                                        <td><?php echo $row['branch_name']; ?></td>
+                                        <td><?php echo change_date_format($row['month'],'Y-m-d','Y-m') ?></td>
+                                        <td><?php echo $row['stmt_sno']; ?></td>
+                                        <td><?php echo $row['invoice_no']; ?></td>
+                                        <td class="center-align-input"><?php echo isset($row['invoice_status']) ? $row['invoice_status'] : ' - '; ?></td>
+                                        <td><?php echo change_date_format($row['invoice_date'],'Y-m-d','d-M-Y'); ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00'; ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['total_paid']) ? $row['total_paid'] : '0.00'; ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['outstanding_amount']) ? $row['outstanding_amount'] : '0.00'; ?></td>
+                                    </tr>
+                                <?php } ?>
+                            <?php } ?>
+                        </tbody>
+                    </table>
+
+                    <div>
+                    </div>
+                </div>
+            </div><!-- end col -->
         </div>
     </div>
 </div>
 
-<div class="col-12" id="outstanding_list">
-    <div class="card">
-        <div class="card-body">
-            <div class="row" style="padding-bottom: 10px;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Outstanding Report</h4>
-                </div>
-
-            </div>
-            <div class="table-responsive">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
-                    <thead class="bg-light">
-                        <tr>
-                            <th>S.No</th>
-                            <!-- <th>Client Name</th> -->
-                            <th>Insurer</th>
-                            <th>Insurer<br> Branch</th>
-                            <th>Statement<br> Month</th>
-                            <th>Statement<br> No</th>
-                            <th>Invoice No</th>
-                            <th>Invoice Status</th>
-                            <th>Invoice Date</th>
-                            <th>Invoice Amount</th>
-                            <th>Realization <br>Amount</th>
-                            <th>Outstanding <br>Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php 
-
-                        // dd($outstanting_list);
-                        if (isset($outstanting_list)) { ?>
-                            <?php foreach($outstanting_list as $index => $row){ ?>
-                            <tr>
-                                <td><?= $index + 1 ?></td>
-                                <td><?php echo $row['short_name']; ?></td>
-                                <td><?php echo $row['branch_name']; ?></td>
-                                <td><?php echo change_date_format($row['month'],'Y-m-d','Y-m') ?></td>
-                                <td><?php echo $row['stmt_sno']; ?></td>
-                                <td><?php echo $row['invoice_no']; ?></td>
-                                <td class="center-align-input"><?php echo isset($row['invoice_status']) ? $row['invoice_status'] : ' - '; ?></td>
-                                <td><?php echo change_date_format($row['invoice_date'],'Y-m-d','d-M-Y'); ?></td>
-                                <td class="right-align-input"><?php echo isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00'; ?></td>
-                                <td class="right-align-input"><?php echo isset($row['total_paid']) ? $row['total_paid'] : '0.00'; ?></td>
-                                <td class="right-align-input"><?php echo isset($row['outstanding_amount']) ? $row['outstanding_amount'] : '0.00'; ?></td>
-                            </tr>
-                            <?php } ?>
-                        <?php } ?>
-                    </tbody>
-                </table>
-
-                <div>
-                </div>
-            </div>
-        </div><!-- end col -->
-    </div>
-</div>
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
+    $(document).ready(function() {
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-    if (ticketsTable.length) {
-        ticketsTable.DataTable({
-            scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [{
+                    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-BDS-List',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this)
+                                        .text()); // Get the value inside the cell
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) +
+                                    2; // Find the next row index
+                                var totalRow = '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex +
+                                    '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                    '</v></c>' + // Insert sum in AB
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
-                }
-
-            ],
-            language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
-            paging: true, // Enable pagination
-            pageLength: 25 // Set default number of rows per page (optional)
-        });
-    } else {
-        console.error("Table not found.");
-    }
-});
-
-$(document).ready(function() {
-    getURLParams()
-    $('#client_id').select2();
-    $('#insurer_id').select2();
-    $('#policy_type_id').select2();
-})
-
-function fetchEmpolyeeList(event) {
-    event.preventDefault(); // Prevent default action
-
-    var start_date = $('#startDate').val();
-    var end_date = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var policy_type_id = $('#policy_type_id').val();
-    var date_type = $('#date_type').val();
-    var issuer = $('#issuer').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,
-    };
-
-    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
-
-    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)
-
-    // 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').val(client_id).change()
-            $('#insurer_id').val(insurer_id).change()
-            $('#policy_type_id').val(policy_type_id).change()
-            $('#date_type').val(date_type)
-            $('#issuer').val(issuer)
-        }, 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,
-        ranges: {
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-            'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month')
-                .endOf('month')
-            ]
+                        }
+                    ]
+                }],
+                language: {
+                    search: "_INPUT_",
+                    searchPlaceholder: "Search..."
+                },
+                paging: true, // Enable pagination
+                pageLength: 25 // Set default number of rows per page (optional)
+            });
+        } else {
+            console.error("Table not found.");
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').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
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').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,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    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
+
+        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)
+
+        // 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').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 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) {
+            // codeword : ***2***
+            // if you cross check means also uncomment "star1star" (***1***) 
+            // $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#reportrange').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,
+            // autoUpdateInput: false,
+            locale: {
+                format: 'DD-MM-YYYY' // 👈 force input format
+            },
+            ranges: {
+                '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').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').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 sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
 
-    console.log(pt_id);
+        console.log(pt_id);
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        var queryParams = {
+            pt_id: pt_id,
+        };
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index b15d5cc0..44482aab 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -98,6 +98,22 @@
     color: #000;
 }
 
+/** newly implemented */
+#insurerTable thead th:first-child {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable tbody td {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable th{
+    color: black !important;
+    background-color: transparent !important;
+}
+
 </style>
 
 <div class="row" id="endorsement_form" style="display: none;">
@@ -129,15 +145,18 @@
                         <div class="row">
                             <!-- Section 1 -->
                             <div class="col-md-12">
-                                <div class="form-section">
+                                <!-- <div class="form-section"> -->
                                     <div id="accordion_0" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Client Details
-                                                <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>
+                                        <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">
@@ -172,10 +191,11 @@
                                                     </div>
 
                                                 </div>
+                                               </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                <!-- </div> -->
                             </div>
                         </div>
 
@@ -327,15 +347,167 @@
                                                 <!-- Premium Details -->
                                                 <div class="row">
                                                     <div class="col-md-12">
-                                                        <div class="form-section">
+                                                            <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">Policy Issue Month<span id="base_danger" class="text-danger">*</span></label>
+                                                                                <input type="text" class="form-control" id="month" name="month" placeholder="MM/YYYY" >
+                                                                            </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">Date of Issue<span id="base_danger" class="text-danger">*</span></label>
+                                                                                <input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date" placeholder="DD/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="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>
+                                                    <!-- Premium Details -->
+                                                    <div class="col-md-12">
+                                                        <!-- <div class="form-section"> -->
                                                             <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">
-                                                                    <h4 class="m-1">Premium Details
-                                                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseFour" aria-expanded="true">
-                                                                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                                        </a>
-                                                                    </h4>
-                                                                    <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                  <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                    <div class="card-body">
                                                                         <div class="row d-none" id="add_more_row">
                                                                             <div class="col-md-2">
                                                                                 <input type="number" id="setInsurerCount" class="form-control" placeholder="Enter count">
@@ -349,10 +521,10 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
-                                                                                        <th>Premium Details</th>
+                                                                                        <th><span class="font-color-black">Premium Details</span></th>
                                                                                     </tr>
                                                                                 </thead>
                                                                                 <tbody>
@@ -494,19 +666,16 @@
                                                                             </table>
                                                                         </div>
                                                                     </div>
+                                                                  </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
+                                                        <!-- </div> -->
                                                     </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                                                
+                        </div>                       
+                         
 
-                    <div class="form-group text-right m-b-0" id="submitButton">
+                    <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>
 
@@ -1713,8 +1882,10 @@ function addInsurerColumn() {
     // Update header
     $('#insurerTable thead tr').append(`
         <th>
+         <span style="display:flex; justify-content:space-between; align-items:center;">
             Insurer ${insurerCount}
             ${insurerCount > 1 ? `<a class="text-danger mdi mdi-delete delete-insurer" data-count="${insurerCount}" style="margin-left: 135px;"></a>` : ''}
+         </span>
         </th>
     `);
 
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index e15ccfd8..95485df5 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -1,310 +1,309 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
-/* 
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
+
+    /* 
 table.dataTable thead th {
     padding: 4px 4px !important;
 } */
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter{
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.column-header {
-    margin-right: 10px; /* Adjust this value as needed */
-}
+    .column-header {
+        margin-right: 10px;
+        /* Adjust this value as needed */
+    }
 
-.form-section {
-    border: 1px solid #ccc;
-    padding: 15px;
-    margin-bottom: 20px;
-}
+    .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);
-}
+    .row-box {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 10px;
+    }
 
-.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 {
+        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:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}
+    .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 i {
-    margin-right: 8px !important;
-    vertical-align: middle !important;
-}
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 
-.table tbody tr {
-    cursor: pointer;
-}
+    .custom-dropdown-menu .dropdown-item i {
+        margin-right: 8px !important;
+        vertical-align: middle !important;
+    }
 
-/* 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;
-}
+    .table tbody tr {
+        cursor: pointer;
+    }
 
-/* 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;
-}
+    /* 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;
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
     }
 
-    .switch input { 
-    opacity: 0;
-    width: 0;
-    height: 0;
+    .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;
+        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;
+        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:checked+.slider {
+        background-color: #2196F3;
     }
 
-    input:focus + .slider {
-    box-shadow: 0 0 1px #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);
+    input:checked+.slider:before {
+        -webkit-transform: translateX(26px);
+        -ms-transform: translateX(26px);
+        transform: translateX(26px);
     }
 
     /* Rounded sliders */
     .slider.round {
-    border-radius: 34px;
+        border-radius: 34px;
     }
 
     .slider.round:before {
-    border-radius: 50%;
+        border-radius: 50%;
     }
 </style>
 
-<div class="row" id="endorsement_filter">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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="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
+                                    <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>
+                                            ?>
+                                        </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="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
+                                    <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>
+                                            ?>
+                                        </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
+                                    <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>
+                                            ?>
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="form-row">
+                                <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
+                                    <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>
+                                            ?>
+                                        </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
+                                    <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>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <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 col-md-3 text-right m-b-0" style="margin-top: 29px;">
+                                <div class="form-group text-right m-b-0">
                                     <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
+                                    <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
                                 </div>
 
                             </div>
-
                         </div>
                     </div>
                 </div>
+
             </div>
-
         </div>
-    </div>
-</div>
 
-<div class="row" id="endorsement_list">
-    <div class="col-12">
+    </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;">
+                 <!-- <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" id="status_change" style="text-align: right; position: relative;top: 56px; left: 291px;">
+                    <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>
-                <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>
@@ -325,136 +324,136 @@ custom-dropdown-menu {
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach($endorsement_data_list as $index => $row){ ?>
-                        <tr>
-                            <td><?php echo $index+1; ?></td>
-                            <td><?php echo $issuer[$row['issuer']] ?? ''; ?></td>
-                            <td><?php echo $row['client_short_name']; ?></td>
-                            <td><?php echo $row['client_branch_name']; ?></td>
-                            <td><?php echo $row['insurer_short_name']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $action_type[$row['action_type']]; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo empty($row['data_received_date']) ? '' : date('d/m/Y', strtotime($row['data_received_date'])); ?></td>
-                            <td class="right-align-input"><?php echo $row['emp_count']; ?></td>
-                            <td class="right-align-input"><?php echo $row['dependent_count']; ?></td>
-                            <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
-                            <td><?php echo $policy_status[$row['status']]; ?></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 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>
+                                        </div>
                                     </div>
-                                </div>
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         <?php } ?>
                     </tbody>
-                </table>
-                </div>
-            </div>
-        </div>
+                </table><!-- table -->
+            </div><!-- card-body -->
+        </div><!-- card -->
     </div><!-- end col -->
 </div>
+
+
 <!-- end table row -->
 
 <?php include('policy_transaction_endorsement_form.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;
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("tickets-table");
 
-        // 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
-        });
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-        return customDropdown;
-    }
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-    let activeDropdown = null;
+            // 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
+            });
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+            return customDropdown;
+        }
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the first column
-            if (event.target.closest('td:first-child')) return;
+        let activeDropdown = null;
 
-            if (activeDropdown) activeDropdown.style.display = 'none';
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-            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();
-        });
+            document.body.appendChild(customDropdown);
 
-        // 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);
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the first column
+                if (event.target.closest('td:first-child')) return;
 
-                // Handle href navigation
-                const href = this.getAttribute('href');
-                if (href && href !== '#') window.location.href = href;
+                if (activeDropdown) activeDropdown.style.display = 'none';
 
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
+                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;
-        }
+        // 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) ?>; 
+    var client_list = '';
+    var branch_list = '';
+    var policy_list = <?= json_encode($endorsementPolicies) ?>;
     // console.log("POLICY List",policy_list);
-    var policyListByClient = <?= json_encode($endorsementPolicyListByClient) ?>; 
+    var policyListByClient = <?= json_encode($endorsementPolicyListByClient) ?>;
     var branch_policy = '';
     var unit_list = '';
 
     // select2 document ready
-    $(document).ready(function(){
+    $(document).ready(function() {
 
         getClientAndBranchAndPolicy()
 
@@ -478,42 +477,64 @@ document.addEventListener("DOMContentLoaded", function () {
         $('#client_id').select2();
         $('#client_branch_id').select2();
         $('#client_policy_id').select2();
-        
+
     })
 
     //DataTable document ready
     $(document).ready(function() {
         var ticketsTable = $('#tickets-table');
 
-        if (ticketsTable.length) { 
+        if (ticketsTable.length) {
             ticketsTable.DataTable({
                 scrollX: true,
-                dom: "<'row'<'col-sm-6'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-Endorsement-List',
-                    exportOptions: {
-                        columns: ':not(:last-child)' 
+            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: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
-                ordering: false, 
+                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(){
+    $(document).ready(function() {
 
         var today = new Date();
 
@@ -567,14 +588,13 @@ document.addEventListener("DOMContentLoaded", function () {
         });
 
         var month = flatpickr("#month", {
-            dateFormat: "M/Y", 
-            allowInput: false, 
+            dateFormat: "M/Y",
+            allowInput: false,
         });
 
     });
 
-    function hide_list_show_add() 
-    {   
+    function hide_list_show_add() {
         removeAllColumnsExceptFirst('insurerTable');
         $('.hideter').hide()
         $('.hidetp').hide()
@@ -588,16 +608,14 @@ document.addEventListener("DOMContentLoaded", function () {
         $('#invoice_no').attr('required', false)
     }
 
-    function show_list_hide_add() 
-    {
+    function show_list_hide_add() {
         $('#endorsement_form').hide()
         $('#endorsement_list').show()
         $('#endorsement_filter').show()
 
     }
 
-    function getClientAndBranchAndPolicy()
-    {   
+    function getClientAndBranchAndPolicy() {
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
@@ -605,15 +623,15 @@ document.addEventListener("DOMContentLoaded", function () {
             success: function(res) {
 
                 console.log('getClientAndBranchAndPolicy', res);
-                
-                if(res.status == true){
+
+                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{
+                } else {
                     console.log('No data found');
                 }
 
@@ -625,8 +643,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    function appendClients(data) 
-    {
+    function appendClients(data) {
         $('#client_id').empty();
 
         $('#client_id').append($('<option>', {
@@ -641,7 +658,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
         $.each(data, function(index, item) {
 
-            if(item.client_policy_count > 0){
+            if (item.client_policy_count > 0) {
 
                 var option = $('<option>', {
                     value: item.id,
@@ -653,8 +670,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    function appendBranch(data) 
-    {
+    function appendBranch(data) {
 
         $('#client_branch_id').empty();
 
@@ -667,21 +683,20 @@ document.addEventListener("DOMContentLoaded", function () {
 
             var option = $('<option>', {
                 value: item.id,
-                text: item.branch_name 
+                text: item.branch_name
             });
             $('#client_branch_id').append(option);
         });
     }
 
-    function appendPolicies(data) 
-    {
+    function appendPolicies(data) {
         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: '',
@@ -692,25 +707,24 @@ document.addEventListener("DOMContentLoaded", function () {
             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-tpa' : item.tpa_branch_id + '-' + item.tpa_id,
-                'data-ptid' : item.policy_type_id,
+                '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-tpa': item.tpa_branch_id + '-' + item.tpa_id,
+                'data-ptid': item.policy_type_id,
             });
             $('#client_policy_id').append(option);
         });
     }
 
-    function logSelectedIds() 
-    {
+    function logSelectedIds() {
         var selectedIds = [];
         $('.row-select:checked').each(function() {
             selectedIds.push($(this).data('id'));
@@ -726,12 +740,12 @@ document.addEventListener("DOMContentLoaded", function () {
 
     $("#invoiceForm").submit(function(event) {
 
-        event.preventDefault(); 
+        event.preventDefault();
 
-        var isValid = $('#invoiceForm').parsley().validate();    
-        if (!isValid) { 
+        var isValid = $('#invoiceForm').parsley().validate();
+        if (!isValid) {
             console.log('Form is Empty', 'Warning');
-            return ; 
+            return;
         }
 
         form_action = '<?= base_url("util/updateInvoiceStatus"); ?>';
@@ -746,7 +760,7 @@ document.addEventListener("DOMContentLoaded", function () {
         formData.append('ids', JSON.stringify(ids));
 
         $.ajax({
-            data:formData,
+            data: formData,
             url: form_action,
             type: "POST",
             dataType: 'json',
@@ -757,16 +771,16 @@ document.addEventListener("DOMContentLoaded", function () {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
-                if(res.status == true){
+                if (res.status == true) {
                     toastr.success(res.message, 'Success');
-                }else{
+                } else {
                     toastr.error(res.message, 'Error');
                 }
 
                 window.location.reload();
                 $('.close').click();
             },
-            error: function (xhr, status, error) {
+            error: function(xhr, status, error) {
                 console.error(xhr.responseText);
                 console.error(status, error);
                 $('.loader').fadeOut();
@@ -775,197 +789,193 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     });
 
-    $('#invoice_status').change(function(){
+    $('#invoice_status').change(function() {
 
         let value = $(this).val()
 
-        if(value == 'generated'){
+        if (value == 'generated') {
             $('#invoice_no_div').show()
             $('#invoice_no').attr('required', true)
-        }else{
+        } else {
             $('#invoice_no_div').hide()
             $('#invoice_no').attr('required', false)
         }
     })
 
-    $('#invoice_status_modal').change(function(){
+    $('#invoice_status_modal').change(function() {
 
         let value = $(this).val()
 
-        if(value == 'generated'){
+        if (value == 'generated') {
             $('#invoice_no_div_modal').show()
             $('#invoice_no_modal').attr('required', true)
-        }else{
+        } 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();
+    })
 
-$(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
 
-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();
 
-    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);
 
-    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,
+        };
 
-    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)
+        console.log(queryParams)
 
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-}
-
-$(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'));
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
 
-    $('#reportrange').daterangepicker({
-        startDate: start,
-        endDate: end,
-        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')]
+    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)
+
         }
-    }, 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()
+    $(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
+        });
 
-        // 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();
 
-function hideDateField(input = null)
-{   
-    let val = $('#date_type').val();
+        if (input) {
+            val = input;
+        }
 
-    if(input){
-        val = input;
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
     }
-
-    if(val != 0){
-        $('#date_div').show()
-    }else{
-        $('#date_div').hide()
-    }
-}
-
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 76ae987c..4ccac05a 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -141,6 +141,22 @@
         font-size: 24px;
     }
 
+/** newly implemented */
+#insurerTable thead th:first-child {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable tbody td {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable th{
+    color: black !important;
+    background-color: transparent !important;
+}
+
 </style>
 
 <div class="tab-pane fade active show" id="form">
@@ -184,15 +200,18 @@
                         <div class="row">
                             <!-- Section 1 -->
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_0" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Client Details
-                                                <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_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="email"> Policy Type <span class="text-danger">*</span></label>
@@ -281,15 +300,15 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                         </div>
                                         </div>
                                     </div>
-                                </div>
+                                
                             </div>
                         </div>
 
                         <div class="row" id="vehicle_row_div">
                         </div>
-
                         <!-- Client Section -->
                         <div class="row" id="client_row_div">
                         </div>
@@ -297,16 +316,18 @@
                         <!-- Pre sales Row -->
                         <div class="row" id="pre_sales_row">
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_1" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Pre Sales
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
-                                            <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
-
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Pre Sales</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-1">
+                                          <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
+                                            <div class="card-body">
                                                 <div class="row" id="policyholdernamediv" style="display: none;">                                        
                                                     <div class="form-group col-md-3">
                                                         <label for="bp_igst">Policyholder Name</label>
@@ -495,24 +516,28 @@
                                                     </div> -->
                                                 </div>
                                             </div>
+                                          </div>
                                         </div>
                                     </div>
-                                </div>
+                                
                             </div>
                         </div> 
                         
                         <!-- sales Row -->
                         <div class="row" id="sales_row" style="display: none;">
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_2" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Sales
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
-                                            <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Sales</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="base_policy_id" style="display: none;">
@@ -652,20 +677,27 @@
                                                     </div>
 
                                                 </div>
-                                                <hr>
+                                            </div>
+                                         </div>
+                                        </div>
+                                    </div> <!-- accordion_2 div closed here -->
+                                
+                            </div><!-- 1st col-md-12 div closed here -->
+                        
 
-                                                <!-- Premium Details -->
-                                                <div class="row">
+                                                    <!-- Premium Details -->
                                                     <div class="col-md-12">
-                                                        <div class="form-section">
                                                             <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="#collapseFour"
+                                                                        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">
-                                                                    <h4 class="m-1">Premium Details
-                                                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseFour" aria-expanded="true">
-                                                                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                                        </a>
-                                                                    </h4>
-                                                                    <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                  <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                    <div class="card-body">
                                                                         <div class="row d-none" id="add_more_row">
                                                                             <div class="col-md-2">
                                                                                 <!-- <label for="setInsurerCount">Insurer Count : </label> -->
@@ -681,7 +713,7 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
                                                                                         <th>Premium Details</th>
@@ -821,22 +853,18 @@
                                                                                     </tr>
                                                                                 </tbody>
                                                                             </table>
-                                                                        </div>
+                                                                        </div> <!-- insurerTableContainer div closed here-->
 
                                                                     </div>
+                                                                  </div> <!-- collapseFour div closed here -->
                                                                 </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                                                            </div> <!-- accordion_3 div closed here -->
+                                                    </div> <!-- 2nd col-md-12 closed here -->
+
+                        </div> <!-- sales_row div closed here -->
+                                                
                         
-                        <div class="form-group text-right m-b-0" id="submitButton">
+                        <div class="form-group text-right mt-1 m-b-0" id="submitButton">
                             <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
                                 id="btnSubmit">Submit</button>
                         </div>
@@ -4089,8 +4117,10 @@
         // Update header
         $('#insurerTable thead tr').append(`
             <th>
+             <span style="display:flex; justify-content:space-between; align-items:center;">
                 Insurer ${insurerCount}
                 ${insurerCount > 1 ? `<a data-count="${insurerCount}" class="text-danger mdi mdi-delete delete-insurer" style="margin-left: 135px;"></a>` : ''}
+             </span>
             </th>
         `);
 
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index c3e72dcf..ef7ff681 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -146,15 +146,16 @@ table.dataTable tbody td {
 </style>
 
 <div class="row" id="inception_filter">
-    <div class="col-12" style="margin-top: -12px;">
+    <div class="col-12">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h4 class="m-1"> 
-                    <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>
+                <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">
@@ -256,7 +257,11 @@ table.dataTable tbody td {
                                     <input type="hidden" id="endDate">
                                 </div>
 
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
+                                
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-12 text-right m-b-0">
                                     <a href="<?= base_url("/policy_tranction/inception/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
                                     <a href="<?= base_url("/policy_tranction/inception/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
                                 </div>
@@ -309,21 +314,21 @@ table.dataTable tbody td {
                         <tbody>
                             <?php foreach($inception_data_list as $index => $row){ ?>
                             <tr>
-                                <td><?php echo $index+1; ?></td>
+                                <td class="text-center"><?php echo $index+1; ?></td>
                                 <td><?php echo $issuer[$row['issuer']]; ?></td>
-                                <td><?php echo $issuing_type[$row['issue_type']]; ?></td>
-                                <td><?php echo $client_type[$row['client_type']] ?? '-'; ?></td>
+                                <td><?php echo $issuing_type[$row['issue_type']] ?: 'N/A'; ?></td>
+                                <td><?php echo $client_type[$row['client_type']] ?? 'N/A'; ?></td>
                                 <td><?php echo $row['client_type'] == 2 ? $row['client_name'] . " - " . (!empty($row['pan']) ? $row['pan'] :  'N/A') : $row['client_short_name'] . ' - ' . $row['client_branch_name']; ?></td>
-                                <td><?php echo $row['insurer_short_name']; ?></td>
-                                <td><?php echo $row['policy_type']; ?></td>
-                                <td><?php echo $row['policy_no']; ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
-                                <td class="right-align-input"><?php echo $row['emp_count']; ?></td>
-                                <td class="right-align-input"><?php echo $row['dependent_count']; ?></td>
-                                <td><?php echo $policy_status[$row['status']]; ?></td>
-                                <td><?php echo $row['user_name']; ?></td>
+                                <td><?php echo $row['insurer_short_name'] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['policy_no'] ?: 'N/A'; ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_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 $policy_status[$row['status']] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['user_name'] ?: '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>
@@ -556,33 +561,44 @@ $(document).ready(function() {
     if (ticketsTable.length) {
         ticketsTable.DataTable({
             scrollX: true,
-            dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [
-                {
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-Inception-List',
-                    exportOptions: {
-                        columns: ':not(:last-child)'
+            dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            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();
+                        }
                     },
-                }, 
-                {
-                    text: 'Add',
-                    className: 'buttons-html5 addbtnStyle',
-                    action: function (e, dt, node, config) {
-                        hide_list_show_add();
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Policy-Tranction-Inception-List',
+                                        exportOptions: {
+                                              columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
                     }
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             // ordering: false,
         });
     } else {
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index b79fc7f2..990f06a5 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -1,17 +1,17 @@
 <style>
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: fixed;
     background-color: #ffffff !important;
-    border: 1px solid rgba(0,0,0,.15);
+    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);
-}
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
@@ -24,25 +24,25 @@
     border: 0 !important;
     text-decoration: none !important;
     position: relative !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item i {
+  .custom-dropdown-menu .dropdown-item i {
     margin-right: 8px !important;
     vertical-align: middle !important;
-}
+  }
 
-.table tbody tr {
+  .table tbody tr {
     cursor: pointer;
-}
+  }
 
-/* Ensure the dropdown menu has a solid background */
-.custom-dropdown-menu::before {
+  /* Ensure the dropdown menu has a solid background */
+  .custom-dropdown-menu::before {
     content: '';
     position: absolute;
     top: 0;
@@ -51,26 +51,28 @@
     bottom: 0;
     background: #ffffff;
     z-index: -1;
-}
+  }
 
-/* Add a subtle backdrop effect */
-.custom-dropdown-menu::after {
+  /* 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);
+    background: rgba(0, 0, 0, 0.05);
     z-index: -2;
     pointer-events: none;
-}
+  }
 </style>
-<div class="row" id="policy_list">
+
+<div class="container-fluid-min">
+  <div class="row" id="policy_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <!-- <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Policy Type List</h4>
                         </div>
@@ -78,32 +80,32 @@
                             <a href="<?= base_url("master/policy/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
                         </div>
                     </div> -->
-                    <div class="row" style="margin-bottom:1rem;">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Policy</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Policy Type</th>
-                            <th class="font-weight-medium">Policy Long Name</th>
-                            <th class="font-weight-medium">BAP</th>
-                            <th class="font-weight-medium">Category</th>
-                            <th class="font-weight-medium">BAP Category</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Policy Type</th>
+                <th class="font-weight-medium">Policy Long Name</th>
+                <th class="font-weight-medium">BAP</th>
+                <th class="font-weight-medium">Category</th>
+                <th class="font-weight-medium">BAP Category</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
                     <tbody>
                     <?php if(is_array($policyList)) {foreach($policyList as $row){ ?>
                       <tr>
-                        <td><?php echo $row['policy_type']; ?> </td>
-                        <td><?php echo $row['long_name']; ?> </td>
-                        <td><?php echo $row['bap']; ?></td>
-                        <td><?php echo $row['allocg']; ?></td>
-                        <td><?php echo $row['alloci']; ?></td>
+                        <td><?php echo $row['policy_type'] ?: 'N/A'; ?> </td>
+                        <td><?php echo $row['long_name'] ?: 'N/A'; ?> </td>
+                        <td><?php echo $row['bap'] ?: 'N/A'; ?></td>
+                        <td><?php echo $row['allocg'] ?: 'N/A'; ?></td>
+                        <td><?php echo $row['alloci'] ?: '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>
@@ -116,232 +118,254 @@
                       </tr>
                     <?php }}?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      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);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
 
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
 
-            // Set as active dropdown
-            activeDropdown = customDropdown;
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
 
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              e.preventDefault();
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-                
-                e.stopPropagation();
-            });
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          e.preventDefault();
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
+  });
 </script>
 
 
 <script>
-
  $(document).ready(function(){
 
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'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'<'col-sm-5'i><'col-sm-7'p>>",
+        // buttons: [
+        //     {
+        //         extend: 'csv',
+        //         text: 'CSV', 
+        //         title: 'PolicyTypeList', 
+        //         exportOptions: {
+        //             columns: ':not(:last-child)'
+        //         }
+        //     }
+        // ],
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'PolicyTypeList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            }
-        ],
-
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'PolicyTypeList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
 
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
         paging: true ,
+
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "PolicyTypeList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "PolicyTypeList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
+
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
+
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
-  }
-}
-
-
-function removePolciyType(element) {
+  function removePolciyType(element) {
 
     Swal.fire({
-        title: "Are you sure?",
-        text: "You need to remove this!",
-        icon: "info",
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        confirmButtonText: "Yes",
+      title: "Are you sure?",
+      text: "You need to remove this!",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
     }).then((result) => {
 
-        if (result.isConfirmed) {
-            var id = element.getAttribute('data-id');
-            var form_action = '<?= base_url("master/policy/remove/") ?>' + id; 
-            $.ajax({
-                url: form_action,
-                type: "GET",
-                dataType: 'json',
-                processData: false,
-                contentType: false,
-                success: function(res) {
-                  // console.log(res.status == true);
-                    if(res){
-                      if (res.status == true) {
-                        toastr.success('Policy type removed successfully', 'success');
-                        location.reload();
-                      } else {
-                        toastr.warning('Failed to remove policy type', 'warning');
-                      }
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Failed to remove policy type', 'warning');
-                  }
-            });
-        }
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/policy/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('Policy type removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove policy type', 'warning');
+              }
+            }
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove policy type', 'warning');
+          }
+        });
+      }
 
     });
 
-}
-
-
-
+  }
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index d14db3e2..392e0cfe 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div id="policy_add">
@@ -50,22 +49,32 @@ body {
                         <span class="title-text ">Policy Type</span>
                     </h4>
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
 
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <!-- <li class="nav-item">
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <!-- <li class="nav-item">
                         <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_id_type">
                             <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
                             <span class="d-none d-sm-inline-block">Policies</span>
                         </a>
                     </li> -->
-                </ul>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('policy_type_basic_info.php'); ?>
                     <?php include('policies.php'); ?>
@@ -79,22 +88,23 @@ body {
 <script>
     function policy_type_branch_contact() {
         var check_policy_type_id = $('#policytype_General_PrimaryKey');
-        
 
-        if(check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0){
+
+        if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Policy Type!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the Policy Type!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     document.getElementById("policy_id_type").addEventListener("click", function(event) {
         event.preventDefault();
         policy_type_branch_contact();
     });
-</script>
-
+</script>
\ No newline at end of file
diff --git a/app/Views/pt_form_file_upload_tab.php b/app/Views/pt_form_file_upload_tab.php
index 9390d848..cb8968fe 100644
--- a/app/Views/pt_form_file_upload_tab.php
+++ b/app/Views/pt_form_file_upload_tab.php
@@ -1,37 +1,47 @@
 <div class="row" id="pt_onboarding" style="position: relative; bottom: 25px; display:none;">
     <div class="col-xl-12">
         <div class="card-body">
-            <ul class="nav nav-pills navtab-bg">
-                <li class="nav-item">
-                    <a href="#form" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active" id="general_tab">
-                        <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                        <span class="d-none d-sm-inline-block">Policy</span>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">KYC Docs</span>
-                    </a>
-                </li>
-                <li class="nav-item" id="hide_file_upload" style="display: none;">
-                    <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">File Upload</span>
-                    </a>
-                </li>
-                <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
-                    <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">Vehicle Docs</span>
-                    </a>
-                </li>
-            </ul>
+            <div class="tab-wrapper position-relative">
+                <ul class="nav nav-pills navtab-bg" id="myTab">
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#form" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active" id="general_tab">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block">Policy</span>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">KYC Docs</span>
+                        </a>
+                    </li>
+                    <li class="nav-item" id="hide_file_upload" style="display: none;">
+                        <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">File Upload</span>
+                        </a>
+                    </li>
+                    <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
+                        <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">Vehicle Docs</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <!-- Right Arrow -->
+                        <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                    </li>
+                </ul>
+            </div>
+
             <div class="tab-content">
                 <?php include('policy_transaction_inception_form.php'); ?>
-                <?php include('drive_file_upload.php'); ?>            
-                <?php include('client_kyc.php'); ?>        
-                <?php include('vehicle_docs.php'); ?>        
+                <?php include('drive_file_upload.php'); ?>
+                <?php include('client_kyc.php'); ?>
+                <?php include('vehicle_docs.php'); ?>
             </div>
         </div>
     </div>
@@ -39,45 +49,42 @@
 
 
 <script>
+    $(document).ready(function() {
 
-$(document).ready(function() {
+        $('#kyc_tab').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
 
-    $('#kyc_tab').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#g_drive_file_upload_sbt_btn').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#g_drive_file_upload_sbt_btn').show()
+            }
+        });
 
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#g_drive_file_upload_sbt_btn').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#g_drive_file_upload_sbt_btn').show()
-        }
+        $('#kyc_tab2').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
+
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#btn_other_docs').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#btn_other_docs').show()
+            }
+        });
+
+        $('#vehicle_tab').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
+
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#vehicle_file_upload_sbt_btn').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#vehicle_file_upload_sbt_btn').show()
+            }
+        });
     });
-
-    $('#kyc_tab2').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
-
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#btn_other_docs').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#btn_other_docs').show()
-        }
-    });
-
-    $('#vehicle_tab').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
-
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#vehicle_file_upload_sbt_btn').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#vehicle_file_upload_sbt_btn').show()
-        }
-    });
-});
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index 9aa1b947..5aa04e50 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -1,236 +1,248 @@
-<div class="row">
+<div class="container-fluid-min">
     <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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"
+        <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>
-                                <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">Issuer<span class="text-danger"></span></label>
-                                <select class="form-control" id="issuer" name="issuer">
-                                    <option value="">Select Issuer</option>
-                                    <?php
+                                <div class="form-group col-md-3">
+                                    <label for="client_branch">Issuer<span class="text-danger"></span></label>
+                                    <select class="form-control" id="issuer" name="issuer">
+                                        <option value="">Select Issuer</option>
+                                        <?php
                                         if (isset($issuer) && count($issuer)) {
                                             foreach ($issuer as $key => $value) {
                                                 echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
                                         }
-                                    ?>
-                                </select>
+                                        ?>
+                                    </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>
+
                             </div>
+                            <div class="row justify-content-end">
 
-
-                            <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 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 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>
-
+                            <!-- </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>
         </div>
     </div>
+
+
+    <div id="report"></div>
 </div>
 
-<div id="report"></div>
 
 <script>
-let client_list = [];
+    let client_list = [];
 
-$(document).ready(function() {
-    getClientAndBranchAndPolicy();
-    $('#client_id').select2();
-})
+    $(document).ready(function() {
+        getClientAndBranchAndPolicy();
+        $('#client_id').select2();
+    })
 
-$(function() {
+    $(function() {
 
-    var start = $('#startDate').val();
-    var end = $('#endDate').val();
+        var start = $('#startDate').val();
+        var end = $('#endDate').val();
 
-    var start = moment(start, 'DD/MM/YYYY');
-    var end = moment(end, 'DD/MM/YYYY');
+        var start = moment(start, 'DD/MM/YYYY');
+        var end = moment(end, 'DD/MM/YYYY');
 
-    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,
-        ranges: {
-            'Today': [moment(), moment()],
-            'Next 7 Days': [moment(), moment().add(6, 'days')], // Next 7 Days
-            'Next 30 Days': [moment(), moment().add(29, 'days')], // Next 30 Days
-            'Next Month': [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf(
-                'month')], // Next Month
-            'Next Year': [moment().add(1, 'year').startOf('year'), moment().add(1, 'year').endOf(
-                'year')], // Next Year
-            'Current Year': [moment().startOf('year'), moment().endOf('year')] // Current Year
-
-        }
-    }, cb);
-
-    cb(start, end);
-});
-
-// ----------------------------------------------------------------------------------------------
-
-function fetchReportPage() {
-
-    var fromDate = $('#startDate').val();
-    var toDate = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var client_type = $('#client_type').val();
-    var issuer = $('#issuer').val();
-    var requestData = {
-        fromDate: fromDate,
-        toDate: toDate,
-        client_id: client_id,
-        client_type: client_type,
-        issuer: issuer,
-    };
-    console.log(typeof fromDate);
-    var url = '<?= base_url('/bdsReport/renewal_report') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-        if (response.status == true) {
-            $('#report').html(response.html);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-
-        } else {
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
+        function cb(start, end) {
+            $('#reportrange').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()],
+                'Next 7 Days': [moment(), moment().add(6, 'days')], // Next 7 Days
+                'Next 30 Days': [moment(), moment().add(29, 'days')], // Next 30 Days
+                'Next Month': [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf(
+                    'month')], // Next Month
+                'Next Year': [moment().add(1, 'year').startOf('year'), moment().add(1, 'year').endOf(
+                    'year')], // Next Year
+                'Current Year': [moment().startOf('year'), moment().endOf('year')] // Current Year
 
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            }
+        }, cb);
 
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
+        cb(start, end);
     });
-}
 
-// ----------------------------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
 
-//get client , branch, policy data
-function getClientAndBranchAndPolicy() {
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
+    function fetchReportPage() {
+
+        var fromDate = $('#startDate').val();
+        var toDate = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var client_type = $('#client_type').val();
+        var issuer = $('#issuer').val();
+        var requestData = {
+            fromDate: fromDate,
+            toDate: toDate,
+            client_id: client_id,
+            client_type: client_type,
+            issuer: issuer,
+        };
+        console.log(typeof fromDate);
+        var url = '<?= base_url('/bdsReport/renewal_report') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+            if (response.status == true) {
+                $('#report').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
 
-            console.log('getClientAndBranchAndPolicy', res);
-            if (res.status == true) {
-                client_list = res.client_data;
-                appendClients(res.client_data);
             } else {
-                console.log('No data found');
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
             }
-        },
-        error: function(xhr, status, error) {
+
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
 
-//append the clients data 
-function appendClients(data) {
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '0',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-name': item.client_name,
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
         });
+    }
 
-        $('#client_id').append(option).select2();
-    });
+    // ----------------------------------------------------------------------------------------------
 
-}
+    //get client , branch, policy data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
 
-$('#client_type').on('change', function() {
-
-    var selectedClientType = $(this).val();
-
-    // console.log('selectedClientType', selectedClientType);
-
-    // Clear and add default options for client
-    $('#client_id').empty().append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }))
-
-    // Populate client options based on selected client type
-    if (selectedClientType) {
-
-        $.each(client_list, function(index, item) {
-            if (item.client_type == selectedClientType) {
-                var option = $('<option>', {
-                    value: item.id,
-                    text: item.client_name,
-                });
-                $('#client_id').append(option);
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    appendClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             }
         });
+    }
+
+    //append the clients data 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '0',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-name': item.client_name,
+            });
+
+            $('#client_id').append(option).select2();
+        });
 
     }
 
-    // Initialize or refresh Select2 for both dropdowns
-    $('#client_id').select2();
-});
+    $('#client_type').on('change', function() {
+
+        var selectedClientType = $(this).val();
+
+        // console.log('selectedClientType', selectedClientType);
+
+        // Clear and add default options for client
+        $('#client_id').empty().append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }))
+
+        // Populate client options based on selected client type
+        if (selectedClientType) {
+
+            $.each(client_list, function(index, item) {
+                if (item.client_type == selectedClientType) {
+                    var option = $('<option>', {
+                        value: item.id,
+                        text: item.client_name,
+                    });
+                    $('#client_id').append(option);
+                }
+            });
+
+        }
+
+        // Initialize or refresh Select2 for both dropdowns
+        $('#client_id').select2();
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 35d114a7..9104d9f5 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -20,6 +20,21 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+
+.badge-container {
+  background: #F0F0F0;
+  padding: 6px 12px;
+  border-radius: 6px;
+  font-size: 14px;
+  display: inline-block;
+}
+#totals {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+
 </style>
 
 <div class="col-12" id="second_page">
@@ -32,14 +47,34 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-            <div id="totals" style="margin-bottom: 10px;">
-    <strong>Total Premium:</strong> <span id="total_premium">0.00</span> |
-    <strong>Total Rewards:</strong> <span id="total_rewards">0.00</span> |
-    <strong>Total IRDA Revenue INR:</strong> <span id="total_irda">0.00</span> |
-    <strong>Total Billed Amount:</strong> <span id="total_billed">0.00</span> |
-    <strong>Total Unbilled Amount:</strong> <span id="total_unbilled">0.00</span> |
-    <strong>Total Policy Count:</strong> <span id="total_policy_count"><?= $policy_count ?></span>
-</div>
+            <div id="totals" class="d-flex flex-wrap gap-2 mb-2">
+
+                <div class="badge-container">
+                    Total Premium: <span class="text-primary" id="total_premium">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Rewards: <span class="text-primary" id="total_rewards">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total IRDA Revenue INR: <span class="text-primary" id="total_irda">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Billed Amount: <span class="text-primary" id="total_billed">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Unbilled Amount: <span class="text-primary" id="total_unbilled">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Policy Count: <span class="text-primary"><?= $policy_count ?></span>
+                </div>
+
+            </div>
+
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
@@ -82,25 +117,25 @@ table.dataTable tbody td {
                         <?php foreach($report_list as $index => $row){ ?>
                         <tr>
                             <td><?= $index + 1 ?></td>
-                            <td><?php echo $row['user_name']; ?></td>
-                            <td><?php echo $row['policy_issue_month']; ?></td>
-                            <td><?php echo $row['revenue_type']; ?></td>
-                            <td><?php echo $row['client_type']; ?></td>
-                            <td><?php echo $row['client_name']; ?></td>
-                            <td><?php echo $row['action_type']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $row['bap']; ?></td>
-                            <td><?php echo $row['vehicle_no'] ?? 'N.A'; ?></td>
-                            <td><?php echo $row['policy_no']; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo $row['insurer_name']; ?> </td>
-                            <td><?php echo $row['insurer_branch_name']; ?></td>
+                            <td><?php echo $row['user_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_issue_month'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['revenue_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['client_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['client_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['action_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['bap'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['endorsement_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['insurer_name'] ?: 'N/A'; ?> </td>
+                            <td><?php echo $row['insurer_branch_name'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['tpa_name']; ?></td>
-                            <td><?php echo empty($row['endorse_eff_date']) ? '' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
-                            <td><?php echo empty($row['policy_start_date']) ? '' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                            <td><?php echo empty($row['policy_end_date']) ? '' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
-                            <td><?php echo $row['ref']; ?></td>
-                            <td><?php echo $row['remarks']; ?></td>
+                            <td><?php echo empty($row['endorse_eff_date']) ? 'N/A' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
+                            <td><?php echo empty($row['policy_start_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
+                            <td><?php echo empty($row['policy_end_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
+                            <td><?php echo $row['ref'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['remarks'] ?: 'N/A'; ?></td>
                             <td class="right-align-input"><?php echo $row['bp_amt']; ?></td>
                             <td class="right-align-input"><?php echo $row['tp_or_ter']; ?></td>
                             <td class="right-align-input"><?php echo $row['premium_wo_gst']; ?></td>
@@ -227,10 +262,15 @@ $(document).ready(function() {
             //         }
             //     }
             // ],
+            buttons: [
+            {
+            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: 'CSV',
+                    text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                     title: 'Policy-Tranction-BDS-List',
                     exportOptions: {
                         columns: ':visible', // or specify exact columns [0,1,2,...]
@@ -251,8 +291,9 @@ $(document).ready(function() {
                 },
                 {
                     extend: 'excel',
-                    text: 'Excel',
                     title: 'Policy-Tranction-BDS-List',
+                    text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                    className: 'app-btn-primary ',
                     // customize: function (xlsx) {
                     //     var sheet = xlsx.xl.worksheets['sheet1.xml'];
                     //     var total = 0;
@@ -360,14 +401,19 @@ $(document).ready(function() {
                         }
                     }
                 }
+            ]
+            }
             ],
-
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
            "footerCallback": function(row, data, start, end, display) {
                 var api = this.api();
diff --git a/app/Views/report_bds_filter.php b/app/Views/report_bds_filter.php
index 856854ed..7628a1fb 100644
--- a/app/Views/report_bds_filter.php
+++ b/app/Views/report_bds_filter.php
@@ -1,567 +1,562 @@
 <style>
-.col-12 {
 
-    max-width: 98% !important;
-}
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client</option>
-                                    </select>
-                                </div>
+<div class="container-fluid-min">
+    <div class="col-12" id="bds_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client Branch</option>
-                                    </select>
-                                </div>
+                <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" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()" >
-                                        <option value="0" selected>Select Insurer</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0" selected>Select Insurer Branch</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer</option>
+                                        </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_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Policy Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                        </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_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <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>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="client_policy_id" name="client_policy_id" >
-                                        <option value="0" selected>Select client policy</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="client_policy_id" name="client_policy_id">
+                                            <option value="0" selected>Select client policy</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" name="issuer" required>
-                                        <option value="0">Select Issure</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" 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>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="user_id">Users<span class="text-danger"></span></label>
-                                    <select class="form-control" id="user_id" name="user_id" >
-                                        <option value="0">Select user</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="user_id">Users<span class="text-danger"></span></label>
+                                        <select class="form-control" id="user_id" name="user_id">
+                                            <option value="0">Select user</option>
+                                            <?php
                                             if (isset($users) && count($users)) {
                                                 foreach ($users as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['first_name'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </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(); changeTitle();">
-                                        <option value="0">Select Date Type</option>
-                                        <?php
+                                    <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(); changeTitle();">
+                                            <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>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <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">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
+                                    <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
+                                        <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
+                                        <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
+
                                 </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
-                                </div>
-
-                            </div>
-
-                            <!-- <div class="form-group text-right m-b-0">
+                                <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
                                 <a href="<?= base_url("/policy_tranction/report/list"); ?>"
                                             class="btn btn-primary waves-effect waves-light" id="get-emp-list"
                                             onclick="fetchEmpolyeeList(event);">Submit</a>                            
                             </div> -->
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
+            </div>
         </div>
+
+    </div>
+
+
+    <!-- end page title -->
+    <div id="file_list">
+        <?php include('report_bds.php'); ?>
     </div>
 </div>
 
-<!-- end page title -->
-<div class="row" id="file_list">
-    <?php include('report_bds.php'); ?>
-</div>
 
 
 <script>
-
-let client_list = [];
-let branch_list = [];
-let policy_list = [];
-let insurer_list = [];
-let insurer_branch_list = [];
-
-
-$(document).ready(function() {
-
-    getClientAndBranchAndPolicy()
-    getURLParams()
-    $('#client_id').select2();
-    $('#client_branch_id').select2();
-    $('#insurer_id').select2();
-    $('#insurer_branch_id').select2();
-    $('#policy_type_id').select2();
-    $('#client_policy_id').select2();
-    $('#user_id').select2();
-
-})
-
-function fetchEmpolyeeList(event) 
-{
-    event.preventDefault(); // Prevent default action
-
-    var start_date = $('#startDate').val();
-    var end_date = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var policy_type_id = $('#policy_type_id').val();
-    var date_type = $('#date_type').val();
-    var issuer = $('#issuer').val();
-    var client_branch_id = $('#client_branch_id').val();
-    var insurer_branch_id = $('#insurer_branch_id').val();
-    var client_policy_id = $('#client_policy_id').val();
-    var user_id = $('#user_id').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,
-        client_branch_id: client_branch_id,
-        insurer_branch_id: insurer_branch_id,
-        client_policy_id: client_policy_id,
-        user_id: user_id,
-    };
-
-    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 client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
-    const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
-    const client_policy_id = params.get('client_policy_id') || 0; // Default to 0 if not found
-    const user_id = params.get('user_id') || 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('client_branch_id', client_branch_id)
-    console.log('insurer_branch_id', insurer_branch_id)
-    console.log('client_policy_id', client_policy_id)
-    console.log('user_id', user_id)
-
-    // 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').val(client_id).select2()
-            $('#insurer_id').val(insurer_id).select2()
-            $('#user_id').val(user_id).select2()
-            $('#policy_type_id').val(policy_type_id).select2()
-            $('#date_type').val(date_type).trigger('change');
-            $('#issuer').val(issuer)
-            setTimeout(function(){
-                $('#client_branch_id').val(client_branch_id).select2()
-                $('#insurer_branch_id').val(insurer_branch_id).select2()
-                setTimeout(function(){
-                    $('#client_policy_id').val(client_policy_id).select2();
-                }, 1000);
-            }, 2000)
-        },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,
-        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').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').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()
-    }
-}
-
-// -----------------------------------------------------------------------------------------------
-
-//featch client, client branch, insurer, insurer branch and client policy list data
-function getClientAndBranchAndPolicy()
-{   
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
-
-            console.log('getClientAndBranchAndPolicy', res);
-            if(res.status == true){
-                client_list = res.client_data;
-                branch_list = res.branch_data;
-                policy_list = res.policy_data;
-                insurer_list = res.insurer_data;
-                insurer_branch_list = res.insurer_branch_data;
-                appendClients(res.client_data);
-                appendInsurer(res.insurer_data);
-            }else{
-                console.log('No data found');
-            }
-
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
-
-//append clients for filter 
-function appendClients(data) 
-{
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-cn': item.client_name,
-            'data-ct': item.client_type,
-            class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
-        });
-
-        $('#client_id').append(option);
-    });
-
-}
-
-//append clients branch for filter 
-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);
-    });
-}
-
-//append insurer for filter 
-function appendInsurer(data) 
-{
-    $('#insurer_id').empty();
-
-    $('#insurer_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.name,
-        });
-
-        $('#insurer_id').append(option);
-    });
-
-}
-
-//append insurer branch for filter 
-function appendInsurerBranch(data) 
-{
-
-    $('#insurer_branch_id').empty();
-
-    $('#insurer_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#insurer_branch_id').append(option);
-    });
-}
-
-//append client policy for filter
-function appendPolicies(data)
-{
-    // 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,
-        });
-        $('#client_policy_id').append(option);
-    });
-}
-
-// -------------------------------------------------------------------------------------------------
-
-//client branch and insurer branch onchange document ready function
-$(document).ready(function(){
-
-    $('#client_id').change(function(){
-
-        let client_id = $(this).val();
-        console.log('client_id', client_id);
-
-        if(branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = branch_list[client_id];
-            appendBranch(data);
-        }
-        
-    })
-
-    $('#insurer_id').change(function(){
-
-        let insurer_id = $(this).val();
-        console.log('insurer_id', insurer_id);
-
-        if(insurer_branch_list != '') {
-            // console.log(insurer_branch_list[insurer_id]);
-            let data = insurer_branch_list[insurer_id];
-            appendInsurerBranch(data);
-        }
+    let client_list = [];
+    let branch_list = [];
+    let policy_list = [];
+    let insurer_list = [];
+    let insurer_branch_list = [];
+
+
+    $(document).ready(function() {
+
+        getClientAndBranchAndPolicy()
+        getURLParams()
+        $('#client_id').select2();
+        $('#client_branch_id').select2();
+        $('#insurer_id').select2();
+        $('#insurer_branch_id').select2();
+        $('#policy_type_id').select2();
+        $('#client_policy_id').select2();
+        $('#user_id').select2();
 
     })
 
-});
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-//get policy list based on the client, client_branch, insurer, insurer_branch and policy type
-function getClientPolicyDataBasedOnClientAndInsuer(){
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+        var client_branch_id = $('#client_branch_id').val();
+        var insurer_branch_id = $('#insurer_branch_id').val();
+        var client_policy_id = $('#client_policy_id').val();
+        var user_id = $('#user_id').val();
 
-    let client_id = $('#client_id').val() ?? 0;
-    let client_branch_id = $('#client_branch_id').val() ?? 0;
-    let insurer_id = $('#insurer_id').val() ?? 0;
-    let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
-    let policy_type_id = $('#policy_type_id').val() ?? 0;
 
-    let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+        console.log(start_date + '-' + end_date);
 
-    let requestData = { 
-            client_id: client_id, 
-            client_branch_id: client_branch_id, 
-            insurer_id: insurer_id, 
-            insurer_branch_id: insurer_branch_id, 
-            policy_type_id: policy_type_id, 
+        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,
+            client_branch_id: client_branch_id,
+            insurer_branch_id: insurer_branch_id,
+            client_policy_id: client_policy_id,
+            user_id: user_id,
         };
 
-    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-        console.log('Data fetched successfully:', response);
-
-        if (response.status === true) {
-
-            appendPolicies(response.data)
-            
-        } else {
-            toastr.warning(response.message, 'WARNING');
-        }
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-    });
-
-}
-
-//for the change title 
-function changeTitle(input){
-
-    let val = $(input).val();
-    if(val == 'statement_month'){
-        $('#bds_title').text(' - Statement Month Wise List')
-    }else{
-        $('#bds_title').text(' - Policy Wise List')
+        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 client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
+        const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
+        const client_policy_id = params.get('client_policy_id') || 0; // Default to 0 if not found
+        const user_id = params.get('user_id') || 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('client_branch_id', client_branch_id)
+        console.log('insurer_branch_id', insurer_branch_id)
+        console.log('client_policy_id', client_policy_id)
+        console.log('user_id', user_id)
+
+        // 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').val(client_id).select2()
+                $('#insurer_id').val(insurer_id).select2()
+                $('#user_id').val(user_id).select2()
+                $('#policy_type_id').val(policy_type_id).select2()
+                $('#date_type').val(date_type).trigger('change');
+                $('#issuer').val(issuer)
+                setTimeout(function() {
+                    $('#client_branch_id').val(client_branch_id).select2()
+                    $('#insurer_branch_id').val(insurer_branch_id).select2()
+                    setTimeout(function() {
+                        $('#client_policy_id').val(client_policy_id).select2();
+                    }, 1000);
+                }, 2000)
+            }, 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').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').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').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()
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------
+
+    //featch client, client branch, insurer, insurer branch and client policy list data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+                    insurer_list = res.insurer_data;
+                    insurer_branch_list = res.insurer_branch_data;
+                    appendClients(res.client_data);
+                    appendInsurer(res.insurer_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    //append clients for filter 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-cn': item.client_name,
+                'data-ct': item.client_type,
+                class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
+            });
+
+            $('#client_id').append(option);
+        });
+
+    }
+
+    //append clients branch for filter 
+    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);
+        });
+    }
+
+    //append insurer for filter 
+    function appendInsurer(data) {
+        $('#insurer_id').empty();
+
+        $('#insurer_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.name,
+            });
+
+            $('#insurer_id').append(option);
+        });
+
+    }
+
+    //append insurer branch for filter 
+    function appendInsurerBranch(data) {
+
+        $('#insurer_branch_id').empty();
+
+        $('#insurer_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#insurer_branch_id').append(option);
+        });
+    }
+
+    //append client policy for filter
+    function appendPolicies(data) {
+        // 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,
+            });
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //client branch and insurer branch onchange document ready function
+    $(document).ready(function() {
+
+        $('#client_id').change(function() {
+
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
+
+            if (branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch(data);
+            }
+
+        })
+
+        $('#insurer_id').change(function() {
+
+            let insurer_id = $(this).val();
+            console.log('insurer_id', insurer_id);
+
+            if (insurer_branch_list != '') {
+                // console.log(insurer_branch_list[insurer_id]);
+                let data = insurer_branch_list[insurer_id];
+                appendInsurerBranch(data);
+            }
+
+        })
+
+    });
+
+    //get policy list based on the client, client_branch, insurer, insurer_branch and policy type
+    function getClientPolicyDataBasedOnClientAndInsuer() {
+
+        let client_id = $('#client_id').val() ?? 0;
+        let client_branch_id = $('#client_branch_id').val() ?? 0;
+        let insurer_id = $('#insurer_id').val() ?? 0;
+        let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
+        let policy_type_id = $('#policy_type_id').val() ?? 0;
+
+        let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+
+        let requestData = {
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+            insurer_id: insurer_id,
+            insurer_branch_id: insurer_branch_id,
+            policy_type_id: policy_type_id,
+        };
+
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+            console.log('Data fetched successfully:', response);
+
+            if (response.status === true) {
+
+                appendPolicies(response.data)
+
+            } else {
+                toastr.warning(response.message, 'WARNING');
+            }
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+        });
+
+    }
+
+    //for the change title 
+    function changeTitle(input) {
+
+        let val = $(input).val();
+        if (val == 'statement_month') {
+            $('#bds_title').text(' - Statement Month Wise List')
+        } else {
+            $('#bds_title').text(' - Policy Wise List')
+        }
+
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/report_bds_old.php b/app/Views/report_bds_old.php
index 06c84ba2..261dade0 100644
--- a/app/Views/report_bds_old.php
+++ b/app/Views/report_bds_old.php
@@ -193,7 +193,7 @@ $(document).ready(function() {
                 searchPlaceholder: "Search..."
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false, 
         });
     } else {
diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php
index 41dc17d5..44bbacbe 100755
--- a/app/Views/retail_endorsement_list.php
+++ b/app/Views/retail_endorsement_list.php
@@ -12,82 +12,90 @@
         position: relative;
         left: 79px;
     }
+
     .emp_data_model {
-        font-size: 17px;        /* keep fixed size */
+        font-size: 17px;
+        /* keep fixed size */
         color: #555 !important;
         cursor: pointer;
-        transition: transform 0.2s, color 0.2s; /* smooth hover effect */
-        display: inline-block;  /* important for transform */
+        transition: transform 0.2s, color 0.2s;
+        /* smooth hover effect */
+        display: inline-block;
+        /* important for transform */
     }
 
     .emp_data_model:hover {
-        color: #00999E  !important;
-        transform: scale(1.5); 
+        color: #00999E !important;
+        transform: scale(1.5);
     }
 </style>
 
-<div class="container-fluid">
-    <h2>Retail Endorsement</h2>
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-xl-12">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h5 class="m-1">
-                        <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>
-                    </h5>
-                    <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-4">
-                                    <label>Client</label> <br />
-                                    <select class="form-control" id="clients">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($client as $key => $value) { ?>
-                                            <option value="<?= $value['id'] ?>" <?= (($getData['client_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
-                                                <?= $value['client_name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <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-4">
+                                        <label>Client</label> <br />
+                                        <select class="form-control" id="clients">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($client as $key => $value) { ?>
+                                                <option value="<?= $value['id'] ?>" <?= (($getData['client_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
+                                                    <?= $value['client_name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-4">
-                                    <label>Insurer</label> <br />
-                                    <select class="form-control" id="insurer">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($insurer as $key => $value) { ?>
-                                            <option value="<?= $value['id'] ?>" <?= (($getData['insurer_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
-                                                <?= $value['name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Insurer</label> <br />
+                                        <select class="form-control" id="insurer">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($insurer as $key => $value) { ?>
+                                                <option value="<?= $value['id'] ?>" <?= (($getData['insurer_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
+                                                    <?= $value['name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-4">
-                                    <label>Status</label> <br />
-                                    <select class="form-control" id="status1">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($status as $key => $value) { ?>
-                                            <option value="<?= $key ?>" <?= (($getData['status'] ?? '') == $key) ? 'selected' : '' ?>>
-                                                <?= $value ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Status</label> <br />
+                                        <select class="form-control" id="status1">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($status as $key => $value) { ?>
+                                                <option value="<?= $key ?>" <?= (($getData['status'] ?? '') == $key) ? 'selected' : '' ?>>
+                                                    <?= $value ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
+                                </div>
+                                <div class="row">
+                                    <div class="col-12" style="text-align: right;">
+                                        <a href="<?= base_url("employee/retail-endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
+                                </div>
+                                <!-- </div> -->
                             </div>
-                            <div class="row">
-                                <div class="col-12" style="text-align: right;">
-                                    <a href="<?= base_url("employee/retail-endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-                            </div>
-                            <!-- </div> -->
                         </div>
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
 
@@ -103,17 +111,17 @@
                     <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
                             <tr>
-                                <th class="font-weight-medium">SNO</th>
-                                <th class="font-weight-medium">Policy number</th>
-                                <th class="font-weight-medium">Endorsement Number</th>
-                                <th class="font-weight-medium">Description</th>
-                                <th class="font-weight-medium">Client</th>
-                                <th class="font-weight-medium">Insurer name</th>
-                                <th class="font-weight-medium">Agent</th>
-                                <th class="font-weight-medium">Mananger</th>
-                                <th class="font-weight-medium">Created At</th>
-                                <th class="font-weight-medium">Status</th>
-                                <th class="font-weight-medium">Action</th>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
+                                <th class="font-weight-medium">Policy number&nbsp;</th>
+                                <th class="font-weight-medium">Endorsement Number&nbsp;</th>
+                                <th class="font-weight-medium">Description&nbsp;</th>
+                                <th class="font-weight-medium">Client&nbsp;</th>
+                                <th class="font-weight-medium">Insurer name&nbsp;</th>
+                                <th class="font-weight-medium">Agent&nbsp;</th>
+                                <th class="font-weight-medium">Mananger&nbsp;</th>
+                                <th class="font-weight-medium">Created At&nbsp;</th>
+                                <th class="font-weight-medium">Status&nbsp;</th>
+                                <th class="font-weight-medium">Action&nbsp;</th>
                             </tr>
                         </thead>
 
@@ -126,26 +134,26 @@
                                         <td class="text-center"><?php echo $employee['policy_number'] ?></td>
                                         <td class="text-center"><?php echo $employee['endorsement_no'] ?></td>
                                         <td class="text-center"><?php echo $employee['endorsement_description'] ?></td>
-                                        <td class="text-center"><?php echo $employee['client_name'] ? $employee['client_name'] .' ( '. $employee['client_short_name'] .' ) ' : 'N/A' ?></td>
-                                        <td class="text-center"><?php echo $employee['insurer_name'] ? $employee['insurer_name'] .' ( '. $employee['insurer_short_name'] .' ) ' : 'N/A' ?></td>
+                                        <td class="text-center"><?php echo $employee['client_name'] ? $employee['client_name'] . ' ( ' . $employee['client_short_name'] . ' ) ' : 'N/A' ?></td>
+                                        <td class="text-center"><?php echo $employee['insurer_name'] ? $employee['insurer_name'] . ' ( ' . $employee['insurer_short_name'] . ' ) ' : 'N/A' ?></td>
                                         <td class="text-center"><?php echo $employee['agent_name'] ?? 'N/A' ?></td>
                                         <td class="text-center"><?php echo $employee['manager_name'] ?? 'N/A' ?></td>
                                         <td class="text-center"><?php if (!empty($employee['created_at'])):
-                                                $cd =  date("j F Y", strtotime($employee['created_at']));
-                                                $ct =  date("h:i a", strtotime($employee['created_at']));
-                                                echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
-                                                endif; ?></td>
+                                                                    $cd =  date("j F Y", strtotime($employee['created_at']));
+                                                                    $ct =  date("h:i a", strtotime($employee['created_at']));
+                                                                    echo $cd . "<br><span class='time'> " . $ct . "</span>";
+                                                                endif; ?></td>
                                         <td class="text-center"><?php if ($employee['status'] == 'open') {
-                                                  echo '<span class="badge badge-primary">' . $employee['status'] . '</span>';
-                                                 } elseif ($employee['status'] == 'inprogress') {
-                                                  echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
-                                                 } elseif ($employee['status'] == 'complete') {
-                                                  echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
-                                                 }
-                                            ?>
+                                                                    echo '<span class="badge badge-primary">' . $employee['status'] . '</span>';
+                                                                } elseif ($employee['status'] == 'inprogress') {
+                                                                    echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
+                                                                } elseif ($employee['status'] == 'complete') {
+                                                                    echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
+                                                                }
+                                                                ?>
                                         </td>
-                                        <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" data-eno="<?php echo $employee['endorsement_no'] ?>" data-status="<?php echo $employee['status'] ?>" 
-                                            class="mdi mdi-pencil text-muted vertical-middle emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
+                                        <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" data-eno="<?php echo $employee['endorsement_no'] ?>" data-status="<?php echo $employee['status'] ?>"
+                                                class="mdi mdi-pencil text-muted vertical-middle emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
                                         </td>
                                     </tr>
                             <?php }
@@ -163,47 +171,47 @@
 
 
 
-<div class="modal fade app-text-black " id="centermodal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-  <div class="modal-dialog modal-dialog-centered">
-    <div class="modal-content">
-      <form id="retailEndorsementForm">
-        <div class="modal-header">
-            <h4 class="modal-title title-text" id="myCenterModalLabel" style="font-size:27px !important">Edit Endorsement Details <span id="heading"></span></h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        </div>
+<div class="modal fade font-color-black " id="centermodal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <form id="retailEndorsementForm">
+                <div class="modal-header">
+                    <h4 class="modal-title title-text" id="myCenterModalLabel" style="font-size:27px !important">Edit Endorsement Details <span id="heading"></span></h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                </div>
 
-        <div class="modal-body">    
-          <div class="form-row">
-            <input type="hidden" id="edit_id" name="id">
-            <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
-            <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>"/>
-            
-            
-            <div class="form-group col-md-12">
-                    <label for="endorsement_no" class="sub-title-text ">Endorsement Number<span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="endorsement_no" placeholder="Enter Endorsement Number" name="endorsement_no" required>
-            </div>
-            
+                <div class="modal-body">
+                    <div class="form-row">
+                        <input type="hidden" id="edit_id" name="id">
+                        <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
+                        <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
 
-            <div class="form-group col-md-12">
-              <label for="edit_status" class="sub-title-text ">Status<span class="text-danger">*</span></label>
-              <select class="form-control" id="edit_status" name="status" required>
-                <option value="">Select Status</option>
-                <?php foreach ($status as $key => $value) { ?>
-                            <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
+
+                        <div class="form-group col-md-12">
+                            <label for="endorsement_no" class="sub-title-text ">Endorsement Number<span class="text-danger">*</span></label>
+                            <input type="text" class="form-control" id="endorsement_no" placeholder="Enter Endorsement Number" name="endorsement_no" required>
+                        </div>
+
+
+                        <div class="form-group col-md-12">
+                            <label for="edit_status" class="sub-title-text ">Status<span class="text-danger">*</span></label>
+                            <select class="form-control" id="edit_status" name="status" required>
+                                <option value="">Select Status</option>
+                                <?php foreach ($status as $key => $value) { ?>
+                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button type="submit" class="btn app-btn-secondary" id="btnSubmit" onclick="submitRetailEndorsement(event)">Save</button>
+                </div>
+            </form>
         </div>
-        
-        <div class="modal-footer">
-            <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
-            <button type="submit" class="btn app-btn-secondary" id="btnSubmit" onclick="submitRetailEndorsement(event)">Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
 
 
@@ -222,7 +230,7 @@
         console.log("window loaded");
     });
 
-    
+
     // Function to convert object to query parameters
     function objectToQueryString(obj) {
         return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
@@ -234,7 +242,7 @@
         var client_id = $('#clients').val();
         var insurer_id = $('#insurer').val();
         var status = $('#status1').val();
-        
+
         var queryParams = {
             client_id: client_id,
             insurer_id: insurer_id,
@@ -260,7 +268,7 @@
         var eno = $(this).data('eno');
         var status = $(this).data('status');
         // console.log(val);
-        fetchRetailEndorsementData(id,eno,status)
+        fetchRetailEndorsementData(id, eno, status)
 
     });
 
@@ -276,19 +284,19 @@
 
         var endorsement_no = document.getElementById('endorsement_no').value.trim();
         var edit_status = document.getElementById('edit_status').value.trim();
-         
+
         if (endorsement_no === "" || edit_status === "") {
             toastr.warning('Please fill all required fields.', 'Warning');
             form.classList.add('was-validated');
             return;
         }
-    
+
         $.ajax({
             url: "<?= base_url('/employee/retail-endorsement-save') ?>",
             type: "POST",
             data: formData,
-            processData: false,   
-            contentType: false,   
+            processData: false,
+            contentType: false,
             dataType: 'json',
             success: function(response) {
                 if (response.status === "success") {
@@ -311,17 +319,17 @@
         });
     }
 
-    function fetchRetailEndorsementData(id,eno,status) {
+    function fetchRetailEndorsementData(id, eno, status) {
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
         var form = document.getElementById('retailEndorsementForm');
-            form.reset(); 
+        form.reset();
+
+        $("#edit_id").val(id);
+        $("#endorsement_no").val(eno);
+        $("#edit_status").val(status);
 
-            $("#edit_id").val(id);
-            $("#endorsement_no").val(eno); 
-            $("#edit_status").val(status);
-        
         setTimeout(function() {
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -332,26 +340,49 @@
     $(document).ready(function() {
 
         $('#tickets-table').DataTable({
-            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+            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'<'col-sm-5'i><'col-sm-7'p>>",
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Retail-Endorsement-List',
+            //     className: 'my_class',
+            //     exportOptions: {
+            //         columns: ':not(:last-child)',
+            //         format: {
+            //             body: function (data, row, column, node) {
+            //                 // Convert data to string to avoid scientific notation in CSV
+            //                 if (!isNaN(data) && parseFloat(data) > 1e20) {
+            //                     return `'${data}`;
+            //                 }
+            //                 return data.toString();// Ensures all data is treated as strings
+            //             }
+            //         }
+            //     }
+            // }],
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Retail-Endorsement-List',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)',
-                    format: {
-                        body: function (data, row, column, node) {
-                            // Convert data to string to avoid scientific notation in CSV
-                            if (!isNaN(data) && parseFloat(data) > 1e20) {
-                                return `'${data}`;
+                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>',
+                    className: 'app-btn-primary ',
+                    title: 'Retail-Endorsement-List',
+                    exportOptions: {
+                        columns: ':not(:last-child)',
+                        format: {
+                            body: function(data, row, column, node) {
+                                // Convert data to string to avoid scientific notation in CSV
+                                if (!isNaN(data) && parseFloat(data) > 1e20) {
+                                    return `'${data}`;
+                                }
+                                return data.toString(); // Ensures all data is treated as strings
                             }
-                            return data.toString();// Ensures all data is treated as strings
                         }
                     }
-                }
+                }, ]
             }],
             initComplete: function(settings, json) {
                 $('.my_class').css({
@@ -360,13 +391,19 @@
                 });
             },
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
             // pagingType: 'full_numbers'
-            columnDefs: [
-                { type: 'scientific', targets: 0 } // Apply custom sorting type to the first column
+            columnDefs: [{
+                    type: 'scientific',
+                    targets: 0
+                } // Apply custom sorting type to the first column
             ],
         });
 
diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php
index 82cedab9..0f5bb4d0 100644
--- a/app/Views/rfq/gmc.php
+++ b/app/Views/rfq/gmc.php
@@ -130,21 +130,21 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_emp_count" class="emp_title"> No of Employees at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_dept_count" class="depnd_title"> No of Dependents at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_dept_count']) ? $lead_edit_data['incept_dept_count'] : '' ?>" type="text" class="form-control" id="incept_dept_count" name="incept_dept_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_no_of_lives" class="total_title"> Total Lives at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_no_of_lives']) ? $lead_edit_data['incept_no_of_lives'] : '' ?>" type="text" class="form-control" id="incept_no_of_lives" name="incept_no_of_lives[]"
@@ -155,20 +155,20 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_emp_count"> No of Employees at Expiry <span class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_emp_count']) ? $lead_edit_data['exp_emp_count'] : '' ?>" type="text" class="form-control" id="exp_emp_count" name="exp_emp_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_dept_count"> No of Dependents at Expiry <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_dept_count']) ? $lead_edit_data['exp_dept_count'] : '' ?>" type="text" class="form-control" id="exp_dept_count" name="exp_dept_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_no_of_lives"> Total Lives at Expiry <span class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_no_of_lives']) ? $lead_edit_data['exp_no_of_lives'] : '' ?>" type="text" class="form-control" id="exp_no_of_lives" name="exp_no_of_lives[]"
                placeholder="Enter Lives">
@@ -178,21 +178,21 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_emp_count"> No of Employees at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_emp_count']) ? $lead_edit_data['renewal_emp_count'] : '' ?>" type="text" class="form-control" id="renewal_emp_count" name="renewal_emp_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_dept_count"> No of Dependents at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_dept_count']) ? $lead_edit_data['renewal_dept_count'] : '' ?>" type="text" class="form-control" id="renewal_dept_count" name="renewal_dept_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_no_of_lives"> Total Lives at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_no_of_lives']) ? $lead_edit_data['renewal_no_of_lives'] : '' ?>" type="text" class="form-control" id="renewal_no_of_lives" name="renewal_no_of_lives[]"
diff --git a/app/Views/rfq/gpa.php b/app/Views/rfq/gpa.php
index a8cd08fc..a9c74b6f 100644
--- a/app/Views/rfq/gpa.php
+++ b/app/Views/rfq/gpa.php
@@ -2,32 +2,32 @@
 
 <div class="form-row" >
 
-        <div class="form-group col-md-3">
+        <div class="form-group col-md-4">
             <label for="incept_emp_count" class="emp_title"> No of Employees at Inception  <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]" placeholder="Enter Lives" required>
         </div>
 
-        <div class="form-group col-md-3">
+        <div class="form-group col-md-4">
             <label for="total_lives_at_incept" class="total_title"> Total Lives at Inception <span class="text-danger"></span></label>
             <input value="<?= isset($lead_edit_data['total_lives_at_incept']) ? $lead_edit_data['total_lives_at_incept'] : '' ?>" type="text" class="form-control" id="total_lives_at_incept" name="total_lives_at_incept[]" placeholder="Enter Lives" disabled>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="total_si_at_incept"> Total Sum Insured at Inception  <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['total_si_at_incept']) ? $lead_edit_data['total_si_at_incept'] : '' ?>" type="text" class="form-control" id="total_si_at_incept" name="total_si_at_incept[]" placeholder="Enter Sum Insured" required>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="premium_at_incept"> Premium at inception <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['premium_at_incept']) ? $lead_edit_data['premium_at_incept'] : '' ?>" type="text" class="form-control" id="premium_at_incept" name="premium_at_incept[]" placeholder="Enter Premium" required>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="renewal_emp_count"> No of Employees at Renewal <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['renewal_emp_count']) ? $lead_edit_data['renewal_emp_count'] : '' ?>" type="text" class="form-control" id="renewal_emp_count" name="renewal_emp_count[]" placeholder="Enter Lives" >
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="total_si_at_renewal"> Total Sum Insured at Renewal   <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['total_si_at_renewal']) ? $lead_edit_data['total_si_at_renewal'] : '' ?>" type="text" class="form-control" id="total_si_at_renewal" name="total_si_at_renewal[]" placeholder="Enter Sum Insured" >
         </div>
@@ -37,14 +37,15 @@
 <hr>
 
 <?php if(isset($lead_edit_data)) { ?>
-
     <div class="form-row" id="appendAreaForClaim_1">
         <?php 
 
         $claims = !empty($lead_edit_data['fin_years_claims_array']) ? $lead_edit_data['fin_years_claims_array'] : [ ['year' => '', 'claim_amount' => '', 'status' => '', 'claim_type' => '', 'cause_of_death' => '', 'death_date' => ''] ];
 
         foreach ($claims as $key => $value) { ?> 
+
             <div class="row claim-row">
+
                 <div class="form-group col-md-2">
                     <label for="first_year">Year<span class="text-danger">*</span></label>
                     <select class="form-control first_year_" id="first_year" name="first_year[]">
@@ -55,15 +56,43 @@
                         } ?>
                     </select>
                 </div>
+
                 <div class="form-group col-md-2">
-                    <label for="first_claim_amount">Claim/Settled Amount<span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="first_claim_amount" name="first_claim_amount[]" value="<?= htmlspecialchars($value['claim_amount']) ?>">
+                    <label for="emp_id">Emp ID<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="emp_id" name="emp_id[]" value="<?= htmlspecialchars(isset($value['emp_id']) ? $value['emp_id'] :  '-' ) ?>">
                 </div>
+                                
                 <div class="form-group col-md-2">
-                    <label for="first_claim_status">Claim Status<span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="first_claim_status" name="first_claim_status[]" value="<?= htmlspecialchars($value['status']) ?>">
+                    <label for="emp_name">Employee Name<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="emp_name" name="emp_name[]" value="<?= htmlspecialchars(isset($value['emp_name']) ? $value['emp_name'] :  '-' ) ?>">
                 </div>
-                <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
+                
+                <div class="form-group col-md-2">
+                    <label for="gender">Gender<span class="text-danger">*</span></label>
+                    <select class="form-control" id="gender" name="gender[]">
+                        <option value="">Select Gender</option>
+                        <option value="Female" <?= (isset($value['gender']) && $value['gender'] == 'Female') ? 'selected' : '' ?>>Female</option>
+                        <option value="Male" <?= (isset($value['gender']) && $value['gender'] == 'Male') ? 'selected' : '' ?>>Male</option>       
+                    </select>
+                </div>
+
+                
+                <div class="form-group col-md-2">
+                    <label for="designation">Designation <span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="designation" name="designation[]" value="<?= htmlspecialchars(isset($value['designation']) ? $value['designation'] :  '-' ) ?>">
+                </div>
+                
+                <div class="form-group col-md-2">
+                    <label for="sum_insured">Sum Insured <span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="sum_insured" name="sum_insured[]" value="<?= htmlspecialchars(isset($value['sum_insured']) ? $value['sum_insured'] :  '-' ) ?>">
+                </div>
+
+                <div class="form-group col-md-2">
+                    <label for="first_death_date">Date of Death<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control flatpickr-date" id="first_death_date" name="first_death_date[]" value="<?= htmlspecialchars($value['death_date']) ?>" autocomplete="off">
+                </div>
+
+                <div class="form-group col-md-2">
                     <label for="first_cause_of_death">Nature/Cause Of Death <span class="text-danger">*</span></label>
                     <select class="form-control" id="first_cause_of_death" name="first_cause_of_death[]">
                         <option value="">Select Cause of Death</option>
@@ -73,26 +102,37 @@
                         } ?>
                     </select>
                 </div>
-                <div class="form-group col-md-2 lifeClaimFields" style="display:none;">
-                    <label for="first_death_date">Date of Death<span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="first_death_date" name="first_death_date[]" value="<?= htmlspecialchars($value['death_date']) ?>">
+
+                <div class="form-group col-md-2">
+                    <label for="first_claim_amount">Claim/Settled Amount<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="first_claim_amount" name="first_claim_amount[]" value="<?= htmlspecialchars(isset($value['claim_amount']) ? $value['claim_amount'] : ( isset($value['settled']) ? $value['settled'] : '-' )) ?>">
                 </div>
-                <div class="form-group col-md-2 gpaClaimFileds" style="display:none;">
+
+                <!-- <div class="form-group col-md-2">
+                    <label for="first_claim_status">Claim Status<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="first_claim_status" name="first_claim_status[]" value="<?php //htmlspecialchars($value['status']) ?>">
+                </div> -->
+
+                <!-- <div class="form-group col-md-2 gpaClaimFileds" style="display:none;">
                     <label for="claim_type">Claim Type<span class="text-danger">*</span></label>
                     <select class="form-control" id="claim_type" name="claim_type[]">
                         <option value="">Select Claim Type</option>
-                        <?php foreach ($gpaClaimType as $claimType => $claim_value) {
-                            $selected = ($claimType == $value['claim_type']) ? 'selected' : '';
-                            echo "<option value='$claimType' $selected>$claim_value</option>";
-                        } ?>
+                        <?php 
+                        // foreach ($gpaClaimType as $claimType => $claim_value) {
+                        //     $selected = ($claimType == $value['claim_type']) ? 'selected' : '';
+                        //     echo "<option value='$claimType' $selected>$claim_value</option>";
+                        // } 
+                        ?>
                     </select>
-                </div>
+                </div> -->
+
                 <div class="form-group col-md-2">
                     <div class="" style="position: relative; top: 28px; float: right; text-align: end;">
                         <a class="btn btn-danger waves-effect waves-light" onclick="removeClaim(this, 1)">x</a>
                         <a class="btn btn-primary waves-effect waves-light mr-1" onclick="appendThreeYearsClaims(1)">+</a>
                     </div>
                 </div>
+
             </div>
         <?php } ?>
     </div>
@@ -100,3 +140,13 @@
     <div class="form-row" id="appendAreaForClaim"></div>
 <?php } ?>
 
+<script>
+
+flatpickr('.flatpickr-date', {
+    dateFormat: 'd-M-Y', // Example format: 11-10-2025
+    allowInput: true,    // Allow manual typing
+    maxDate: 'today',    // Optional: disable future dates
+});
+
+</script>
+
diff --git a/app/Views/rfq/multi_files.php b/app/Views/rfq/multi_files.php
index 11e517ed..09ba89ab 100644
--- a/app/Views/rfq/multi_files.php
+++ b/app/Views/rfq/multi_files.php
@@ -12,36 +12,71 @@ $increment = 1;
 ?>
 
     <div class="form-row d-flex align-items-end" id="fileField_<?= $displayIndex ?>">
+        <div class="form-group row" style="width: 100%;">
         <input type="hidden" name="leads_file_id[]" value="<?= htmlspecialchars($value['id']) ?>" id="file_id_<?= $displayIndex ?>">
 
-        <div class="form-group col-md-5">
-            <label>Document Name</label>
+        <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+        </div>
+        <div class="col-md-3">
             <input type="text" class="form-control" name="docs_name_<?= $increment ?>[]" 
-                placeholder="<?= $placeholder ?>" 
+                placeholder="<?= $placeholder ?>" style="background: #F5FFFF !important;"
                 value="<?= htmlspecialchars($value['docs_name']) ?>" id="docs_name_<?= $displayIndex ?>">
         </div>
-
-        <div class="form-group col-md-5">
+        <div class="col-auto" style="align-content: center;">
             <label>
                 File Upload<br>
                 <small id="file_name_display_<?= $displayIndex ?>" class="text-muted">
                     <?= !empty($value['file_name']) ? htmlspecialchars($value['file_name']) : 'No file chosen' ?>
                 </small>
             </label>
-            <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" 
-                name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" 
-                onchange="showFileName(this, <?= $displayIndex ?>)">
+        </div>
+        <div class="col-md-3">
+            <div class="input-icon">
+                    <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" onchange="showFileName(this, <?= $displayIndex ?>)" style="background: #F5FFFF !important;">
+                    <i class="mdi mdi-upload additional-icon"></i>
+            </div> 
         </div>
 
-        <div class="col-md-2" style="position: relative; bottom: 16px;">
-            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)">x</button>
-            <button type="button" class="btn btn-primary" onclick="addFileField(<?= $increment ?>)">+</button>
+        <div class="col-auto">
+            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)"><span class="mdi mdi-trash-can"></span></button>
+            <button type="button" class="btn app-btn-secondary" onclick="addFileField(<?= $increment ?>)">+</button>
+        </div>
         </div>
     </div>
 
-<?php } } else { ?>
+<?php } }else { ?>
     <!-- Default field if no file data exists -->
     <div class="form-row d-flex align-items-end" id="fileField_1">
+        <div class="form-group row" style="width: 100%;">
+        <input type="hidden" name="leads_file_id[]" value="">
+
+                    <div class="col-auto" style="align-content: center;">
+                        <label class="col-form-label">Document Name</label>
+                    </div>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="docs_name_1[]" 
+                            placeholder="First file must be Demography." id="docs_name_1" style="background: #F5FFFF !important;">
+                    </div>
+                    <div class="col-auto" style="align-content: center;">
+                            <label>File Upload<br>
+                            <small id="file_name_display_1" class="text-muted">No file chosen</small></label>
+                    </div>
+                    <div class="col-md-3">
+                        <div class="input-icon">
+                            <input type="file" class="form-control" id="file_name_1" 
+                                name="file_name_1[]" accept=".xls,.xlsx" onchange="showFileName(this, 1)" style="background: #F5FFFF !important;">
+                            <i class="mdi mdi-upload additional-icon"></i>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')"><span class="mdi mdi-trash-can"></span></button>
+                        <button type="button" class="btn app-btn-secondary" onclick="addFileField(1)">+</button>
+                    </div>
+                </div>
+    </div>
+
+    <!-- <div class="form-row d-flex align-items-end" id="fileField_1">
         <input type="hidden" name="leads_file_id[]" value="">
 
         <div class="form-group col-md-5">
@@ -63,5 +98,5 @@ $increment = 1;
             <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')">x</button>
             <button type="button" class="btn btn-primary" onclick="addFileField(1)">+</button>
         </div>
-    </div>
+    </div> -->
 <?php } ?>
diff --git a/app/Views/tat_report_band_wise_list.php b/app/Views/tat_report_band_wise_list.php
index 7bc6972c..813b37f9 100644
--- a/app/Views/tat_report_band_wise_list.php
+++ b/app/Views/tat_report_band_wise_list.php
@@ -8,10 +8,7 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-
-        max-width: 98% !important;
-    }
+    
 
     .dataTables_filter {
         position: absolute;
@@ -103,21 +100,45 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'TAT BAND WISE DATA',
-                    },
+                // buttons: [{
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'TAT BAND WISE DATA',
+                //     },
+                //     {
+                //         extend: 'excel',
+                //         text: 'Excel',
+                //         title: 'TAT BAND WISE DATA',
+                //     }
+                // ],
+                buttons: [
                     {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'TAT BAND WISE DATA',
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'TAT BAND WISE DATA',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'TAT BAND WISE DATA',
+                                    }
+                        ]
                     }
-
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 79b52c8b..2793884c 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -138,22 +138,22 @@ th:first-child, td:first-child {
                 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                        <th><input type="checkbox" id="selectAll" onclick="toggleAll(this)"></th>                            
-                        <th class="font-weight-medium">SNO</th>
+                        <th><input type="checkbox" id="selectAll" onclick="toggleAll(this)">&nbsp;</th>                            
+                        <th class="font-weight-medium">S.No&nbsp;</th>
                             <?php if (isset($getData)) { 
                                 if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
-                                    <th class="font-weight-medium">Client/Branch</th>
+                                    <th class="font-weight-medium">Client/Branch&nbsp;</th>
                             <?php } 
                                 if ($getData['client_id'] != '0' && $getData['branch_id'] == '0') { ?>
-                                    <th class="font-weight-medium">Branch</th>
+                                    <th class="font-weight-medium">Branch&nbsp;</th>
                             <?php } } ?>
 
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">EMP Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Gender</th>
-                            <th class="font-weight-medium">Date of Birth</th>
-                            <th class="font-weight-medium">Existing Policy Count</th>
+                            <th class="font-weight-medium">Name&nbsp;</th>
+                            <th class="font-weight-medium">EMP Code&nbsp;</th>
+                            <th class="font-weight-medium">Relationship&nbsp;</th>
+                            <th class="font-weight-medium">Gender&nbsp;</th>
+                            <th class="font-weight-medium">Date of Birth&nbsp;</th>
+                            <th class="font-weight-medium">Existing Policy Count&nbsp;</th>
                             <!-- <th class="font-weight-medium">Policy name</th>
                             <th class="font-weight-medium">Insurer name</th>
                             <th class="font-weight-medium">TPA ID</th>
@@ -557,8 +557,12 @@ document.addEventListener("DOMContentLoaded", function () {
                     className:"unmapEmployees"
                 }],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 25 // Set default number of rows per page (optional)
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index c0938ee2..5e2376a5 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -1,21 +1,29 @@
 <style>
+.table th,
+.table td {
+    padding: 8px;
+}
+
+table.dataTable tbody td {
+    padding: 4px 4px !important;
+}
 
 .col-12 {
-
     max-width: 98% !important;
 }
 
-
-.right-align-input {
-    text-align: right;
+.dataTables_filter {
+    position: absolute;
 }
 
-.text-custom {
-    font-weight: 400;            
-    font-style: normal;          
-    font-size: 11px;
-    line-height: 1.44;           
-    letter-spacing: -0.02em;     
+.column-header {
+    margin-right: 10px;
+}
+
+
+.btn {
+    font-size: 0.9rem;
+    padding: 0.5rem 1rem;
 }
 
 </style>
@@ -27,90 +35,85 @@
   color: #6c757d !important; 
 }
 
-table.dataTable td.wrap {
-    white-space: normal !important; 
-    word-break: break-word; 
-}
-
 </style>
 
+<div class="row" id="ticket_list">
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div>
+                    <div class="table-responsive">
+                        <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
 
-<div class="col-12">
-    <div class="card">
-        <div class="card-body maincard">
-            <div class="row">
-                <div class="col-6" style="align-self: center;">
-                    <p class="title-text  font-color-black" style="position: relative;">Tickets </p>
-                </div>
-            </div>
-            <div>
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                    <thead class="app-table-head">
-                        <tr>
-                            <th>Ticket ID</th>
-                            <th class="app-text-left">Name</th>
-                            <th>Policy Number</th>
-                            <th>Ticket Type</th>
-                            <th>Subject</th>
-                            <th>Status</th>
-                            <th class="app-text-left">Assign To</th>
-                            <th>Created At</th>
-                            <th>Updated At</th>
-                        </tr>
-                    </thead>
-                    <tbody class="app-table-body">
-                        <?php if (isset($ticket_data)) { ?>
-                            <?php foreach($ticket_data as $index => $row){ ?>
+                            <thead class="bg-light">
+                                <tr>
+                                    <th><div class="column-header">Ticket ID&nbsp;</div></th>
+                                    <th class="text-left"><div class="column-header">Name &nbsp;</div></th>
+                                    <th><div class="column-header">Policy Number &nbsp;</div></th>
+                                    <th><div class="column-header">Ticket Type &nbsp;</div></th>
+                                    <th><div class="column-header">Subject &nbsp;</div></th>
+                                    <th><div class="column-header">Status &nbsp;</div></th>
+                                    <th class="text-left"><div class="column-header">Assign To &nbsp;</div></th>
+                                    <th><div class="column-header">Created At &nbsp;</div></th>
+                                    <th><div class="column-header">Updated At &nbsp;</div></th>
+                                </tr>
+                            </thead>
 
-                                    <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
-                                    <td class="app-text-right"><?php echo $row['thz_id']; ?></td>
-                                    <td class="app-text-left">
-                                        <?php echo $row['name']; ?> 
-                                        <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
-                                        <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
-                                    </td>
-                                    <td class="app-text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                            <tbody class="app-table-body">
+                                <?php if(isset($ticket_data)) { ?>
+                                    <?php foreach($ticket_data as $index => $row){ ?>
+                                      <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
+                                        <td class="text-center"><?php echo $row['thz_id']; ?></td>
+                                        <td class="text-left"><?php echo $row['name']; ?> 
+                                          <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
+                                          <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
+                                        </td>
+                                        <td class="text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
                                               ? $row['policy_no'] 
                                               : 'N/A'; ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
-                                    <td class="app-text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
+                                    <td class="text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : 'N/A'; ?></td>
+                                    <td class="text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
                                       <?php 
                                           $subject = $row['subject'] ? $row['subject'] : 'N/A';
-                                          echo (strlen($subject) > 50) 
-                                              ? htmlspecialchars(substr($subject, 0, 50)) . "..." 
+                                          echo (strlen($subject) > 18) 
+                                              ? htmlspecialchars(substr($subject, 0, 18)) . "..." 
                                               : htmlspecialchars($subject);
                                       ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
-                                    <td class="app-text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
-                                    <td class="app-text-left">
+                                    <td class="text-center"><?php echo $row['status'] ? $row['status'] : 'N/A' ; ?></td>
+                                    <td class="text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : 'N/A'; ?></td>        
+                                    <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
-                                        $cd =  date("j F Y", strtotime($row['created_at']));
+                                        $cd =  date("j M Y", strtotime($row['created_at']));
                                         $ct =  date("h:i a", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
-                                    <td class="app-text-left">
+                                    <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
-                                        $ud =  date("j F Y", strtotime($row['updated_at']));
+                                        $ud =  date("j M Y", strtotime($row['updated_at']));
                                         $ut =  date("h:i a", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
-                                </tr>
-                            <?php } ?>
-                        <?php } ?>
-                    </tbody>
-                </table>
-
-                <div>
+                                    </tr>
+                                    <?php } ?>
+                                <?php } else { ?>
+                                    <tr>
+                                        <td colspan="9" class="text-center">No data available</td>
+                                    </tr>
+                                <?php } ?>
+                            </tbody>
+                            
+                        </table>
+                    </div>
                 </div>
             </div>
-        </div><!-- end col -->
-    </div>
+        </div>
+    </div><!-- end col -->
 </div>
 
 <div class="modal fade " id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
@@ -244,7 +247,7 @@ table.dataTable td.wrap {
 
             <!-- <div class="form-group col-md-12 ">
               <label for="subject">Subject<span class="text-danger">*</span></label>
-              <small id="subjectCounter" class="form-text text-muted app-text-right">0/150</small>
+              <small id="subjectCounter" class="form-text text-muted text-right">0/150</small>
             </div> -->
             <div class="form-group col-md-12 ">
               <div class="d-flex justify-content-between">
@@ -257,7 +260,7 @@ table.dataTable td.wrap {
             <div class="form-group col-md-12 ">
               <div class="d-flex justify-content-between">
                 <label for="message">Message<span class="text-danger">*</span></label>
-                <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+                <small id="messageCounter" class="form-text text-muted text-end text-right">0/1500</small>
               </div>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
               <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="3" required maxlength="1500"></textarea>
@@ -306,8 +309,69 @@ table.dataTable td.wrap {
 </div>
 
 
+
 <script>
 
+    // Datatable document ready
+    $(document).ready(function() {
+
+        var ticketsTable = $('#tickets-table');
+
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                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) { 
+                            openTicket();
+                        }
+                    },
+                    {
+                        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>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Tickets',
+                                    },
+                                    {
+                                      extend: 'excel',
+                                      text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                      exportOptions: {
+                                          orthogonal: 'sort'
+                                      },
+                                      className: 'app-btn-primary ',
+                                      title: 'Tickets'
+                                    }
+                        ]
+                    }
+                ],
+                 language: {
+                  search: `
+                  <div class="datatable-search-wrapper">
+                      _INPUT_
+                      <i class="mdi mdi-magnify datatable-search-icon"></i>
+                  </div>`,
+                  searchPlaceholder: "Search"
+                },
+                paging: true,
+                pageLength: 10,
+                order: [[0, 'desc']]
+            });
+        } else {
+            console.error("Table not found.");
+        }
+    });
+
+
     function openTicket(){
         var form = document.getElementById('ticketForm');
         form.reset(); 
@@ -344,10 +408,10 @@ table.dataTable td.wrap {
         var ticketType = document.getElementById('ticket_type').value.trim();
 
         // Validation checks
-        if (name === "" || mobile === "" || email === "" || ticketType === "") {
-            toastr.warning('Please fill all required fields.', 'Warning');
-            form.classList.add('was-validated');
-            return;
+        if (message.length === 0) {
+          toastr.error('Message cannot be empty', 'Warning');
+          form.classList.add('was-validated');
+          return;
         }
 
         if (message.length > 1500) {
@@ -356,6 +420,12 @@ table.dataTable td.wrap {
           return;
         }
 
+        if (subject.length === 0) {
+          toastr.error('Subject cannot be empty', 'Warning');
+          form.classList.add('was-validated');
+          return;
+        }
+
         if (subject.length > 150) {
           toastr.error('Subject cannot exceed 150 characters', 'Warning');
           form.classList.add('was-validated');
@@ -376,6 +446,12 @@ table.dataTable td.wrap {
             return;
         }
 
+        if (name === "" || mobile === "" || email === "" || ticketType === "" || subject === "" || message === "") {
+            toastr.warning('Please fill all required fields.', 'Warning');
+            form.classList.add('was-validated');
+            return;
+        }
+
         var form = document.getElementById("ticketForm"); // your form ID
         var formData = new FormData(form);
 
@@ -583,53 +659,6 @@ $(document).ready(function() {
     $("#modal_assignee").select2();
     hideandshowpolicy();
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
-
-    if (ticketsTable.length) {
-
-      ticketsTable.DataTable({
-          scrollX: true,
-          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
-            "<'row'<'col-sm-12'tr>>" + 
-            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
-          buttons: [
-              {
-                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Create New Ticket </span>',
-                  className: 'btn app-btn-primary  mr-2',
-                  action: function(e, dt, node, config) { 
-                      openTicket();
-                  }
-              },
-              {
-                  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>',
-                                className: 'app-btn-primary ',
-                            },
-                            {
-                                extend: 'excel',
-                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
-                                exportOptions: {
-                                    orthogonal: 'sort'
-                                },
-                                className: 'app-btn-primary ',
-                            }
-                  ]
-              }
-          ],
-          paging: true,
-          pageLength: 25,
-          order: [[0, 'desc']]
-      });
-
-    } else {
-        console.error("Table Not found.");
-    }
-
     const subjectInput = document.getElementById("subject");
     const subjectCounter = document.getElementById("subjectCounter");
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 98443f8f..b3d26b07 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -1,5 +1,4 @@
 <style>
-
 .notes-box {
   display: flex;
   align-items: center;
@@ -15,6 +14,10 @@
   resize: none;
   padding: 8px;
   font-size: 14px;
+  background-color: transparent !important;
+  border-radius: 0px !important;
+  box-shadow: 0px 0px 0px 0px transparent !important;
+  border-color: transparent !important;
 }
 
 .icon-buttons {
@@ -72,10 +75,12 @@
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
-  
   background: #F5FFFF !important;
 }
-
+.conversation-card{
+    box-shadow: 0 2px 4px 0 #00000040;
+    border-radius : 15px !important;
+}
 .master-card{
     border-radius: 15px !important;
     box-shadow: 0 2px 4px 0 #00000040;
@@ -129,146 +134,134 @@ hr{
 }
 </style>
 
+<div class="row" id="notespage">
 
+   <h3 class="secondary-title">
+    <a href="#" onclick="history.back(); return false;">
+        <i class="mdi mdi-chevron-left" title="Back"></i>
+    </a>
+    <span>Ticket ID - <?= $master[0]['thz_id']; ?></span>
+   </h3>
 
-<div class="col-12">
-    <div class="card ">
-        <div class="card-body maincard">
-            
-            <!-- Title -->
-            <div class="row" id="notes-title" style="padding-bottom: 10px;">
-                <!-- <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left" style="font-size: 24px;"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
-                </div> -->
-                <h4 class="d-flex align-items-center" style="gap: 8px;">
-                    <span onclick="history.back()" style="cursor: pointer;">
-                        <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
-                    </span>
-                    <span class="title-text ">Ticket ID-<?= $master[0]['thz_id']; ?></span>
-                </h4>
-            </div>
-
-            <!-- Body -->
-            <div class="row" id="notes-body"> 
-
-                <!-- Left Details -->
-                <div class="col-5" id="notes-body-left">
-                    <div class="card master-card" style="background:#F5FFFF;">
-                        <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
-                            <p class="sub-title-text  mb-0">Details</p>
-                            <?php if($master[0]['status'] !== "Closed") : ?>
-                            <a href="javascript:void(0);" onclick="openEditTicket()">
-                                <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
-                                <!-- <i class="mdi mdi-pencil"
-                                title="Edit"
-                                style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
-                                onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
-                                onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
-                                </i> -->
-                            </a>
-                            <?php endif; ?>
-                        </div>
-                        <div class="card-body card-scroll sub-title-text " style="padding:0 27px !important; background:#F5FFFF;">
-                            <div class="row mb-2 ml-o">
-                                <div class="col-4 app-subtitle app-text-grey ">Ticket ID</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['thz_id'];?></div>
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" id="notes-body"> 
+                    <!-- Left Details -->
+                    <div class="col-5" id="notes-body-left">
+                        <div class="card master-card" style="background:#F5FFFF; border-radius: 15px;">
+                            <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
+                                <h3 class="mb-0">Details</h3>
+                                <?php if($master[0]['status'] !== "Closed") : ?>
+                                <a href="javascript:void(0);" onclick="openEditTicket()">
+                                    <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
+                                    <!-- <i class="mdi mdi-pencil"
+                                    title="Edit"
+                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
+                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
+                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
+                                    </i> -->
+                                </a>
+                                <?php endif; ?>
                             </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Name</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['name'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Mobile</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['mobile'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Policy Number</div>
-                                <div class="col-8 app-text text-end  app-text-black" style="font-weight: 500 !important;">
-                                    <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
-                                        ? '<u class="app-text-black">
-                                                <a href="javascript:void(0);" 
-                                                class="app-text-black"
-                                                data-toggle="modal" 
-                                                data-target="#PolicyModal" 
-                                                title="Click to view Policy Terms"
-                                                data-id="'.$master[0]['policy_id'].'">'
-                                                .$master[0]['policy_no'].'
-                                                </a>
-                                        </u>'
-                                        : 'N/A'; ?>
+                            <div class="card-body card-scroll  " style="padding:0 27px !important; background:#F5FFFF; border-radius: 15px !important;">
+                                <div class="row mb-2 ml-o">
+                                    <div class="col-4 app-subtitle app-text-grey ">Ticket ID</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['thz_id'];?></div>
                                 </div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Assigned To</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['assignee_name'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Status</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;">
-                                        <?= (!empty($master[0]['status']) && strtolower($master[0]['status']) !== 'null') 
-                                            ? '<u class="app-text-black">
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Name</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['name'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Mobile</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['mobile'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Policy Number</div>
+                                    <div class="col-8 text-end  font-color-black" style="font-weight: 500 !important;">
+                                        <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
+                                            ? '<u class="font-color-black">
                                                     <a href="javascript:void(0);" 
-                                                    class="app-text-black"
-                                                    onclick="statusHistory('.$master[0]['thz_id'].')"
+                                                    class="font-color-black"
                                                     data-toggle="modal" 
-                                                    data-target="#StatusModal" 
-                                                    title="Click to view Status History">'
-                                                    .$master[0]['status'].'
+                                                    data-target="#PolicyModal" 
+                                                    title="Click to view Policy Terms"
+                                                    data-id="'.$master[0]['policy_id'].'">'
+                                                    .$master[0]['policy_no'].'
                                                     </a>
                                             </u>'
                                             : 'N/A'; ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Ticket Type</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['ticket_type'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Subject</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['subject'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Message</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['message'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Related Tickets</div>
-                                <div class="col-8 app-text text-end " style="font-weight: 500 !important;">
-                                    <u class="text-warning">
-                                        <a href="javascript:void(0);" 
-                                        class="text-warning"
-                                        data-toggle="modal" 
-                                        data-target="#relatedTicketModal" 
-                                        title="<?= empty($master[0]['created_by']) ? 'No related tickets' : 'Click to view related tickets'; ?>"
-                                        data-id="<?= $master[0]['created_by']; ?>">
-                                        View
-                                        </a>
-                                    </u>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Assigned To</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['assignee_name'];?></div>
                                 </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Status</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;">
+                                            <?= (!empty($master[0]['status']) && strtolower($master[0]['status']) !== 'null') 
+                                                ? '<u class="font-color-black">
+                                                        <a href="javascript:void(0);" 
+                                                        class="font-color-black"
+                                                        onclick="statusHistory('.$master[0]['thz_id'].')"
+                                                        data-toggle="modal" 
+                                                        data-target="#StatusModal" 
+                                                        title="Click to view Status History">'
+                                                        .$master[0]['status'].'
+                                                        </a>
+                                                </u>'
+                                                : 'N/A'; ?>
+                                    </div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Ticket Type</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['ticket_type'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Subject</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['subject'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Message</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['message'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Related Tickets</div>
+                                    <div class="col-8 text-end " style="font-weight: 500 !important;">
+                                        <u class="text-warning">
+                                            <a href="javascript:void(0);" 
+                                            class="text-warning"
+                                            data-toggle="modal" 
+                                            data-target="#relatedTicketModal" 
+                                            title="<?= empty($master[0]['created_by']) ? 'No related tickets' : 'Click to view related tickets'; ?>"
+                                            data-id="<?= $master[0]['created_by']; ?>">
+                                            View
+                                            </a>
+                                        </u>
+                                    </div>
 
+                                </div>
+                                <!-- add more fields -->
                             </div>
-                            <!-- add more fields -->
                         </div>
                     </div>
-                </div>
-
-                <!-- Right Conversation -->
-                 
-                <div class="col-7">
-                    
-                    <!-- Conversation Card -->
-                    <div class="card mb-3 conversation-card">
-                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none; padding-bottom: 0px;">
-                            <p class="sub-title-text  app-text-black" >Conversation</p>
-                        </div>
-                        <div class="card-body recard-scroll" style="padding:0 27px !important; margin:0 !important; background:#F5FFFF;">
+                    <!-- Right Conversation -->
+                    <div class="col-7" id="notes-body-right">
+                        <!-- Conversation Card -->
+                        <div class="card mb-3 conversation-card" style="background:#F5FFFF; border-radius: 15px !important;">
+                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none; padding-bottom: 0px; border-radius: 15px !important;">
+                            <h3 class="font-color-black" >Conversation</h3>
+                         </div>
+                         <div class="card-body recard-scroll" style="padding:0 27px !important; margin:0 !important; background:#F5FFFF;  border-radius: 15px !important;">
                           <?php if(!empty($notes)): ?>
                             <?php foreach($notes as $i => $conv): ?>
                                 
                                 <div style="border:none; padding: 0px; margin: 0px;">
                                         <hr/>
                                         <!-- Top Row: Message + Badge -->
-                                        <div class="d-flex justify-content-between align-items-start app-text app-text-black ">
+                                        <div class="d-flex justify-content-between align-items-start font-color-black ">
                                             <p class="mb-1 ml-0 mr-0 " style="font-weight: 400 !important;"><?= $conv['notes'] ?></p>
                                             <!-- <?php if(!empty($conv['notes_by'])): ?>
                                                 <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
@@ -294,7 +287,7 @@ hr{
                                     <p class="text-center  font-color-black"><i>No Data Found</i></p>
                                 </div>
                             <?php endif; ?>
-                        </div>
+                         </div>
                     </div>
 
                     <!-- Input Card -->
@@ -313,24 +306,27 @@ hr{
                                         <button type="button" class="btn-icon" onclick="submitConverstionTicket('External', this)"><i class="mdi mdi-email"></i></button>
                                     </div>
                             </div>
-                            <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+                            <small id="messageCounter" class="form-text text-muted text-end text-right">0/1500</small>
                         </form>
                     </div>
-
+                    </div>
                 </div>
-            </div> <!-- /notes-body -->
-
+            </div>
         </div>
     </div>
 </div>
 
-<div class="modal fade app-text-black " id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade font-color-black " id="EditModal" tabindex="-1" role="dialog" aria-hidden="true"
+data-backdrop="static" 
+     data-keyboard="false"
+     data-bs-backdrop="static" 
+     data-bs-keyboard="false">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <form id="ticketForm">
         <div class="modal-header">
             <h4 class="modal-title title-text" id="EditModalLabel" style="font-size:27px !important">Update</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body">    
@@ -339,7 +335,7 @@ hr{
             <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
-              <label for="ticket_type" class="sub-title-text ">Ticket Type<span class="text-danger">*</span></label>
+              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
               <select class="form-control" id="ticket_type" name="ticket_type" required>
                 <option value="">Select Ticket Type</option>
                 <!-- <option value="Sales">Sales</option>
@@ -356,7 +352,7 @@ hr{
 
 
             <div class="form-group col-md-12">
-              <label for="status" class="sub-title-text ">Status</label>
+              <label for="status">Status</label>
               <select class="form-control" id="status" name="status">
                 <option value="">Select Status</option>
                 <option value="Open">Open</option>
@@ -370,7 +366,7 @@ hr{
                  // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
             <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
             <div class="form-group col-md-12">
-              <label for="assign_to" class="sub-title-text ">Assign To</label>
+              <label for="assign_to">Assign To</label>
               <select class="form-control" id="assign_to" name="assign_to">
                 <option value="">Select Assign To</option>
                 <?php if(isset($assignee)) { ?>
@@ -386,7 +382,7 @@ hr{
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn app-btn-secondary " onclick="submitTicket()">Save</button>
+          <button type="button" class="btn app-btn-secondary" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -399,7 +395,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text  " style="font-size:27px !important">Related Tickets</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
@@ -446,7 +442,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text  ">Policy Terms</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
@@ -471,7 +467,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text ">Status History</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll history-container" style="padding:5px 11px 11px 11px!important;">  
@@ -481,15 +477,12 @@ hr{
   </div>
 </div>
 
-
-
 <script>
 
     $(document).ready(function() {
-            // Initialize select2
-            $("#ticket_type").select2();
-            $("#status").select2();
-            $("#assign_to").select2();
+        // Initialize select2
+        $("#ticket_type, #status, #assign_to").select2();
+
             const messageInput = document.getElementById("notes");
             const messageCounter = document.getElementById("messageCounter");
 
@@ -504,20 +497,35 @@ hr{
                 messageInput.classList.remove('is-invalid');
             }
             });
-            
 
+        const btn = document.querySelector("button[onclick='submitTicket()']");
+
+        
+        $("#ticket_type, #status, #assign_to").on('change', function() {
+            if (btn.disabled) {
+                btn.disabled = false;
+                btn.innerText = "Save";
+            }
+        });
     });
 
 
     function openEditTicket() {
             var form = document.getElementById('ticketForm');
             form.reset(); 
+            form.classList.remove('was-validated'); // remove Bootstrap validation styling
+
+            var btn = document.querySelector("button[onclick='submitTicket()']");
+            btn.disabled = false;
+            btn.innerText = "Save";            
+            
 
             var masterData = <?= json_encode($master[0]); ?>;
             console.log(masterData);
 
             $("#edit_thz_id").val(masterData.thz_id);
-            $("#ticket_type").val(masterData.ticket_type).trigger("change"); 
+            // $("#updated_by").val("<?= get_session_userid(); ?>");
+            $("#ticket_type").val(masterData.ticket_type).trigger("change");
             $("#status").val(masterData.status).trigger("change");
             $("#assign_to").val(masterData.assign_to).trigger("change");
 
@@ -633,13 +641,13 @@ function statusHistory(thzId) {
                 let table = `
                 <div class="table-responsive">
                     <table data-custom-table-css="table" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                        <thead class="app-table-head">
+                        <thead class="bg-light">
                             <tr>
-                                <th class="app-text app-text-white">S.No</th>
-                                <th class="app-text app-text-white">Old Status</th>
-                                <th class="app-text app-text-white">New Status</th>
-                                <th class="app-text app-text-white">Updated By</th>
-                                <th class="app-text app-text-white">Date/Time</th>
+                                <th class="app-text-white">S.No</th>
+                                <th class="app-text-white">Old Status</th>
+                                <th class="app-text-white">New Status</th>
+                                <th class="app-text-white">Updated By</th>
+                                <th class="app-text-white">Date/Time</th>
                             </tr>
                         </thead>
                         <tbody class="app-table-body">
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index cfa9e718..125d792e 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -1,12 +1,37 @@
 <style>
-.bg-staff {
-    background-color: #FFF5E5;
-}
+    .bg-staff {
+        background-color: #FFF5E5;
+    }
 
-.label-font-size{
-    font-size:0.875rem;
-}
+    .label-font-size {
+        font-size: 0.875rem;
+    }
 
+    .nav-pills,
+    .nav-link {
+        background-color: #F5FFFF !important;
+        color: #00999E !important;
+        border-radius: 10px;
+
+    }
+
+    .nav-pills {
+        background-color: #F5FFFF !important;
+        color: #00999E !important;
+        box-shadow: 0px 2px 4px 0px #00000040;
+        padding-top: 5px;
+    }
+
+
+    .nav-link.active-tab {
+        color: white !important;
+        background-color: #00999E !important;
+        font-size: small !important;
+        padding: 8px 16px;
+        border-radius: 10px !important;
+        box-shadow: 0px 2px 4px 0px #00000040;
+
+    }
 </style>
 <div class="row">
     <div class="col-12">
@@ -25,75 +50,85 @@
                 </div>
 
                 <!-- Navigation Tabs -->
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-tab" data-toggle="tab" class="nav-link px-2 py-1 active label-font-size" id="general_tab"
-                            aria-expanded="true">
-                            <i class="mdi mdi-ticket-account"></i>
-                            <span class="d-none d-sm-inline-block ">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#reply-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="reply_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-message-processing"></i>
-                            <span class="d-none d-sm-inline-block">Reply</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#note-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="note_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-note-text"></i>
-                            <span class="d-none d-sm-inline-block">Notes</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#history-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="history_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-history"></i>
-                            <span class="d-none d-sm-inline-block">History</span>
-                        </a>
-                    </li>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <li class="nav-item">
-                        <a href="#autoQuery-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="auto_query_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-robot mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">Auto Query Content</span>
-                        </a>
-                    </li>
-                    <?php } ?>
-                    <li class="nav-item">
-                        <a href="#uploads-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="uploads_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-file mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">Claim Files</span>
-                        </a>
-                    </li>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <li class="nav-item">
-                        <a href="#viewpolicyterms-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="viewpolicyterms_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-eye mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">View Policy Terms</span>
-                        </a>
-                    </li>
-                    <?php } ?>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-tab" data-toggle="tab" class="nav-link px-3 py-2 active label-font-size" id="general_tab"
+                                aria-expanded="true">
+                                <i class="mdi mdi-ticket-account"></i>
+                                <span class="d-none d-sm-inline-block ">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#reply-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="reply_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-message-processing"></i>
+                                <span class="d-none d-sm-inline-block">Reply</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#note-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="note_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-note-text"></i>
+                                <span class="d-none d-sm-inline-block">Notes</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#history-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="history_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-history"></i>
+                                <span class="d-none d-sm-inline-block">History</span>
+                            </a>
+                        </li>
+                        <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                            <li class="nav-item">
+                                <a href="#autoQuery-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="auto_query_tab"
+                                    aria-expanded="false">
+                                    <i class="mdi mdi-robot mr-1"></i>
+                                    <span class="d-none d-sm-inline-block">Auto Query Content</span>
+                                </a>
+                            </li>
+                        <?php } ?>
+                        <li class="nav-item">
+                            <a href="#uploads-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="uploads_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-file mr-1"></i>
+                                <span class="d-none d-sm-inline-block">Claim Files</span>
+                            </a>
+                        </li>
+                        <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                            <li class="nav-item">
+                                <a href="#viewpolicyterms-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="viewpolicyterms_tab"
+                                    aria-expanded="false">
+                                    <i class="mdi mdi-eye mr-1"></i>
+                                    <span class="d-none d-sm-inline-block">View Policy Terms</span>
+                                </a>
+                            </li>
+                        <?php } ?>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
 
                 <!-- Tab Content -->
                 <div class="tab-content">
                     <div class="tab-pane fade show active" id="general-tab">
-                        <?php 
+                        <?php
 
                         if ($ticket_data['ticket_type_id'] == 1) {
-                             include('ticket_form_gmc.php');
-                        } else if($ticket_data['ticket_type_id'] == 8){
-                             include('ticket_form_motor.php');
+                            include('ticket_form_gmc.php');
+                        } else if ($ticket_data['ticket_type_id'] == 8) {
+                            include('ticket_form_motor.php');
                         } else {
-                             include('ticket_form_gpa.php');
-                        } 
-                       ?>
+                            include('ticket_form_gpa.php');
+                        }
+                        ?>
                     </div>
                     <div class="tab-pane fade" id="reply-tab">
                         <?php include('ticket_reply.php'); ?>
@@ -104,18 +139,18 @@
                     <div class="tab-pane fade" id="history-tab">
                         <?php include('ticket_history.php'); ?>
                     </div>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <div class="tab-pane fade" id="autoQuery-tab">
-                        <?php include('ticket_auto_query.php'); ?>
-                    </div>
+                    <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                        <div class="tab-pane fade" id="autoQuery-tab">
+                            <?php include('ticket_auto_query.php'); ?>
+                        </div>
                     <?php } ?>
                     <div class="tab-pane fade" id="uploads-tab">
                         <?php include('claim_files_upload.php'); ?>
                     </div>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <div class="tab-pane fade" id="viewpolicyterms-tab">
-                        <?php include('view_policy_terms.php'); ?>
-                    </div>
+                    <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                        <div class="tab-pane fade" id="viewpolicyterms-tab">
+                            <?php include('view_policy_terms.php'); ?>
+                        </div>
                     <?php } ?>
                 </div>
             </div>
@@ -137,18 +172,18 @@
                         <select class="form-control" onchange="setMemberData(this)">
                             <option value="0">Select Insured Member</option>
                             <?php if (!empty($member_data)) : ?>
-                            <?php foreach ($member_data as $value) : ?>
-                            <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
-                                data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
-                                data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
-                                data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
-                                data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
-                                data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
-                                <?= isset($value['emp_name']) && isset($value['emp_relationship']) 
-                                    ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8') 
-                                    : 'Unknown Member' ?>
-                            </option>
-                            <?php endforeach; ?>
+                                <?php foreach ($member_data as $value) : ?>
+                                    <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
+                                        data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
+                                        data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
+                                        data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
+                                        data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
+                                        data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
+                                        <?= isset($value['emp_name']) && isset($value['emp_relationship'])
+                                            ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8')
+                                            : 'Unknown Member' ?>
+                                    </option>
+                                <?php endforeach; ?>
                             <?php endif; ?>
                         </select>
 
@@ -166,153 +201,153 @@
     <?php include("ticket_conversation.php") ?>
 </div>
 
-<?php //include("ticket_form_handler.php") ?>
+<?php //include("ticket_form_handler.php") 
+?>
 
 <script>
-    
-function submitClaimForm(event, form) {
+    function submitClaimForm(event, form) {
 
-    event.preventDefault();
+        event.preventDefault();
 
-    var isValid = $('#ticket_form_data').parsley().validate();
+        var isValid = $('#ticket_form_data').parsley().validate();
 
-    if (!isValid) {
-        toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
-        return false;
-    }
-
-    const formAction = '<?= base_url("ticket/update"); ?>';
-
-    // Show loader
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    // Collect IDs and form data
-    const formData = new FormData(form);
-
-    // AJAX request
-    $.ajax({
-        data: formData,
-        url: formAction,
-        type: "POST",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(response) {
-            // Hide loader
-
-            console.log('Form submitted response:', response);
-
-            if (response.status === true) {
-                location.reload();
-                toastr.success(response.message, 'SUCCESS');
-            } else {
-                toastr.error(response.message, 'ERROR');
-            }
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-
-            // Hide loader
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-}
-
-function openFetchEmpDataodal() {
-    var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
-    myModal.show();
-}
-
-function setMemberData(input) {is_head_approved
-
-    var selectedOption = $(input).find(':selected');
-
-    // Retrieve the data-* attributes
-    var empId = selectedOption.data('empid');
-    var empName = selectedOption.data('empname');
-    var policyNo = selectedOption.data('policyno');
-    var tpaNo = selectedOption.data('tpano');
-    var relationship = selectedOption.data('relationship');
-
-    $('#tpa_no').val(tpaNo);
-    $('#insured_emp_id').val(empId);
-    $('#insured_name').val(empName);
-    $('#policy_no').val(policyNo);
-
-    $('#relationship option').each(function() {
-        if ($(this).text() === relationship) {
-            $(this).prop('selected', true);
-        }
-    });
-}
-
-function showConfirmationModal(event) {
-    Swal.fire({
-        title: "Approve Claim Rejection",
-        // text: "Do you want to save this?",
-        icon: "warning",
-        showCancelButton: true,
-        showDenyButton: true, 
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#6c757d",
-        denyButtonColor: "#d33",
-        confirmButtonText: "Approve",
-        denyButtonText: "Reject",
-        cancelButtonText: "Cancel"
-    }).then((result) => {
-        if (result.isConfirmed) {
-            $('#is_head_approved').val(1);
-            console.log($('#ticket_form_data')[0])
-            submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
-        } else if (result.isDenied) {
-            // Show second Swal for rejection reason
-            Swal.fire({
-                title: "Rejection Reason",
-                text: "Please provide a reason for rejection",
-                input: "textarea",
-                inputPlaceholder: "Enter your reason here...",
-                icon: "info",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#6c757d",
-                confirmButtonText: "Submit",
-                cancelButtonText: "Back"
-            }).then((reasonResult) => {
-                if (reasonResult.isConfirmed) {
-                    // Check if reason is not empty
-                    if (reasonResult.value && reasonResult.value.trim() !== "") {
-                        $('#is_head_approved').val(2);
-                        $('#rejection_reason').val(reasonResult.value.trim());
-                        console.log($('#ticket_form_data')[0]);
-                        $('#head_rejection_reason').val(reasonResult.value.trim());
-                        submitClaimForm(event, $('#ticket_form_data')[0]);
-                    } else {
-                        // Alert if reason is empty
-                        Swal.fire({
-                            title: "Error",
-                            text: "Rejection reason cannot be empty",
-                            icon: "error",
-                            confirmButtonColor: "#3085d6"
-                        }).then(() => {
-                            // Go back to the rejection reason dialog
-                            showConfirmationModal(event);
-                        });
-                    }
-                } else {
-                    // If canceled, go back to first Swal
-                    showConfirmationModal(event);
-                }
-            });
-        } else {
-            $('#is_head_approved').val(0);
+        if (!isValid) {
+            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
             return false;
         }
-    });
-}
 
+        const formAction = '<?= base_url("ticket/update"); ?>';
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        // Collect IDs and form data
+        const formData = new FormData(form);
+
+        // AJAX request
+        $.ajax({
+            data: formData,
+            url: formAction,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(response) {
+                // Hide loader
+
+                console.log('Form submitted response:', response);
+
+                if (response.status === true) {
+                    location.reload();
+                    toastr.success(response.message, 'SUCCESS');
+                } else {
+                    toastr.error(response.message, 'ERROR');
+                }
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    }
+
+    function openFetchEmpDataodal() {
+        var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
+        myModal.show();
+    }
+
+    function setMemberData(input) {
+        is_head_approved
+
+        var selectedOption = $(input).find(':selected');
+
+        // Retrieve the data-* attributes
+        var empId = selectedOption.data('empid');
+        var empName = selectedOption.data('empname');
+        var policyNo = selectedOption.data('policyno');
+        var tpaNo = selectedOption.data('tpano');
+        var relationship = selectedOption.data('relationship');
+
+        $('#tpa_no').val(tpaNo);
+        $('#insured_emp_id').val(empId);
+        $('#insured_name').val(empName);
+        $('#policy_no').val(policyNo);
+
+        $('#relationship option').each(function() {
+            if ($(this).text() === relationship) {
+                $(this).prop('selected', true);
+            }
+        });
+    }
+
+    function showConfirmationModal(event) {
+        Swal.fire({
+            title: "Approve Claim Rejection",
+            // text: "Do you want to save this?",
+            icon: "warning",
+            showCancelButton: true,
+            showDenyButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#6c757d",
+            denyButtonColor: "#d33",
+            confirmButtonText: "Approve",
+            denyButtonText: "Reject",
+            cancelButtonText: "Cancel"
+        }).then((result) => {
+            if (result.isConfirmed) {
+                $('#is_head_approved').val(1);
+                console.log($('#ticket_form_data')[0])
+                submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
+            } else if (result.isDenied) {
+                // Show second Swal for rejection reason
+                Swal.fire({
+                    title: "Rejection Reason",
+                    text: "Please provide a reason for rejection",
+                    input: "textarea",
+                    inputPlaceholder: "Enter your reason here...",
+                    icon: "info",
+                    showCancelButton: true,
+                    confirmButtonColor: "#3085d6",
+                    cancelButtonColor: "#6c757d",
+                    confirmButtonText: "Submit",
+                    cancelButtonText: "Back"
+                }).then((reasonResult) => {
+                    if (reasonResult.isConfirmed) {
+                        // Check if reason is not empty
+                        if (reasonResult.value && reasonResult.value.trim() !== "") {
+                            $('#is_head_approved').val(2);
+                            $('#rejection_reason').val(reasonResult.value.trim());
+                            console.log($('#ticket_form_data')[0]);
+                            $('#head_rejection_reason').val(reasonResult.value.trim());
+                            submitClaimForm(event, $('#ticket_form_data')[0]);
+                        } else {
+                            // Alert if reason is empty
+                            Swal.fire({
+                                title: "Error",
+                                text: "Rejection reason cannot be empty",
+                                icon: "error",
+                                confirmButtonColor: "#3085d6"
+                            }).then(() => {
+                                // Go back to the rejection reason dialog
+                                showConfirmationModal(event);
+                            });
+                        }
+                    } else {
+                        // If canceled, go back to first Swal
+                        showConfirmationModal(event);
+                    }
+                });
+            } else {
+                $('#is_head_approved').val(0);
+                return false;
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_feedback_list.php b/app/Views/ticket_feedback_list.php
index 495d59ec..57ab8b6b 100644
--- a/app/Views/ticket_feedback_list.php
+++ b/app/Views/ticket_feedback_list.php
@@ -63,10 +63,10 @@ table.dataTable tbody td {
                         <?php if (isset($feedback_data)) { ?>
                             <?php foreach($feedback_data as $data){ ?>
                                     <tr onclick="viewFeedbackForm(<?php echo $data['id']; ?>)">
-                                    <td><?php echo $data['claim_number']; ?></td>
-                                    <td><?php echo $data['emp_code']; ?></td>
-                                    <td><?php echo $data['emp_name']; ?></td>
-                                    <td><?php echo $data['client_name']; ?></td>
+                                    <td><?php echo $data['claim_number'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['emp_code'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['emp_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['client_name'] ?: 'N/A'; ?></td>
                                 </tr>
                             <?php } ?>
                         <?php } ?>
@@ -98,26 +98,54 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Claim-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'claim-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                },
-            ],
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'Claim-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'claim-List',
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //     },
+            // ],
+            buttons: [
+              {
+                  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>',
+                                className: 'app-btn-primary ',
+                                title: 'Claim-List',
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                title: 'claim-List',
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
         });
     } else {
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 25d15e5b..095e8de7 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -24,425 +24,453 @@
         font-size: 24px;
     }
 
-    .label-font-size{
-        font-size:0.875rem;
+    .label-font-size {
+        font-size: 0.875rem;
     }
-
-
-
-
 </style>
-<div class="row">
-    <div class="col-12">
-        <div class="<?= !isset($ticket_data) ? "card" : "" ?>" style="margin-right: 23px;">
-            <div class="card-body">
-                <?php if (!isset($ticket_data)) { ?>
-                    <!-- Header Section -->
-                    <div class="row mb-3">
-                        <div class="col-6 d-flex align-items-center">
-                            <h4 class="mb-0">Claim GMC</h4>
+
+<div class="container-fluid-min">
+    <div class="row">
+        <div class="col-12">
+            <div class="<?= !isset($ticket_data) ? "card" : "" ?>" >
+                <div class="card-body">
+                    <?php if (!isset($ticket_data)) { ?>
+                        <!-- Header Section -->
+                        <div class="row mb-3">
+                            <div class="col-6 d-flex align-items-center">
+                                <h4 class="mb-0">Claim GMC</h4>
+                            </div>
+                            <div class="col-6 text-right">
+                                <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
+                                    <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
+                                </a>
+                            </div>
                         </div>
-                        <div class="col-6 text-right">
-                            <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                                <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
-                            </a>
-                        </div>
-                    </div>
-                <?php } ?>
-                <form role="form" class="parsley-examples" method="post" id="ticket_form_data" onsubmit="submitClaimForm(event, this)" enctype="multipart/form-data">
+                    <?php } ?>
+                    <form role="form" class="parsley-examples" method="post" id="ticket_form_data" onsubmit="submitClaimForm(event, this)" enctype="multipart/form-data">
 
-                    <input type="hidden" id="ticket_type_id" name="ticket_type_id" value="1">
-                    <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
-                    <input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
-                    <input type="hidden" id="extra_fields_array_for_validate" name="extra_fields_array_for_validate" value='<?= isset($extra_fields_array_for_validate) && !empty($extra_fields_array_for_validate) ? json_encode($extra_fields_array_for_validate) : "[]" ?>'>
-                    <input type="hidden" id="head_rejection_reason" name="head_rejection_reason">
+                        <input type="hidden" id="ticket_type_id" name="ticket_type_id" value="1">
+                        <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
+                        <input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
+                        <input type="hidden" id="extra_fields_array_for_validate" name="extra_fields_array_for_validate" value='<?= isset($extra_fields_array_for_validate) && !empty($extra_fields_array_for_validate) ? json_encode($extra_fields_array_for_validate) : "[]" ?>'>
+                        <input type="hidden" id="head_rejection_reason" name="head_rejection_reason">
 
-                    <div class="form-group">
 
-                        <h4>Employee Details</h4>
-                        <hr>
+                        <div id="accordion1" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Employee details
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                                        <i id="icon1" 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="#accordion1">
+                                    <div class="card-body">
 
-                        <!-- first_data_points -->
-                        <div class="form-row">
+                                        <!-- first_data_points -->
+                                        <div class="form-row">
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_code" class="label-font-size">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
-                                        aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span
-                                        class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
-                                    value="<?= isset($ticket_data['emp_code']) ? $ticket_data['emp_code'] : '' ?>"
-                                    name="emp_code" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_code" class="label-font-size">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
+                                                        aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span
+                                                        class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
+                                                    value="<?= isset($ticket_data['emp_code']) ? $ticket_data['emp_code'] : '' ?>"
+                                                    name="emp_code" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_name" class="label-font-size">Employee Name <span class="text-danger">*</span></label>
-                                <input type=hidden id="emp_id" name="emp_id" value="<?= isset($ticket_data['emp_id']) ? $ticket_data['emp_id'] : '' ?>">
-                                <input type="text" class="form-control" id="emp_name" placeholder="Enter Employee Name"
-                                    value="<?= isset($ticket_data['emp_name']) ? $ticket_data['emp_name'] : '' ?>"
-                                    name="emp_name" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_name" class="label-font-size">Employee Name <span class="text-danger">*</span></label>
+                                                <input type=hidden id="emp_id" name="emp_id" value="<?= isset($ticket_data['emp_id']) ? $ticket_data['emp_id'] : '' ?>">
+                                                <input type="text" class="form-control" id="emp_name" placeholder="Enter Employee Name"
+                                                    value="<?= isset($ticket_data['emp_name']) ? $ticket_data['emp_name'] : '' ?>"
+                                                    name="emp_name" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="insured_name" class="label-font-size"> Insured Name <span class="text-danger">*</span></label>
-                                <input type=hidden id="insured_emp_id" name="insured_emp_id" value="<?= isset($ticket_data['insured_emp_id']) ? $ticket_data['insured_emp_id'] : '' ?>">
-                                <input class="form-control" id="insured_name" name="insured_name" value="<?= isset($ticket_data['insured_name']) ? $ticket_data['insured_name'] : '' ?>" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="insured_name" class="label-font-size"> Insured Name <span class="text-danger">*</span></label>
+                                                <input type=hidden id="insured_emp_id" name="insured_emp_id" value="<?= isset($ticket_data['insured_emp_id']) ? $ticket_data['insured_emp_id'] : '' ?>">
+                                                <input class="form-control" id="insured_name" name="insured_name" value="<?= isset($ticket_data['insured_name']) ? $ticket_data['insured_name'] : '' ?>" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="relationship" class="label-font-size"> Relationship <span class="text-danger">*</span></label>
-                                <select class="form-control" id="relationship" name="relationship" required>
-                                    <option value="">Select Relationship</option>
-                                    <?php
-                                    if (isset($relationshipType) && count($relationshipType)) {
-                                        foreach ($relationshipType as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['relationship'] == $key) ? 'selected' : '';
-                                            echo "<option value='$key' $selected>$value</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="relationship" class="label-font-size"> Relationship <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="relationship" name="relationship" required>
+                                                    <option value="">Select Relationship</option>
+                                                    <?php
+                                                    if (isset($relationshipType) && count($relationshipType)) {
+                                                        foreach ($relationshipType as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['relationship'] == $key) ? 'selected' : '';
+                                                            echo "<option value='$key' $selected>$value</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="policy_no" class="label-font-size">Policy No <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="policy_no"
-                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
-                                    name="policy_no" placeholder="Policy Number">
-                            </div>
-                            <div class="form-group col-md-3">
-                                <label for="tpa_no" class="label-font-size">TPA ID <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="tpa_no" placeholder="Enter TPA ID"
-                                    value="<?= isset($ticket_data['tpa_no']) ? $ticket_data['tpa_no'] : '' ?>"
-                                    name="tpa_no">
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="policy_no" class="label-font-size">Policy No <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="policy_no"
+                                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
+                                                    name="policy_no" placeholder="Policy Number">
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="tpa_no" class="label-font-size">TPA ID <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="tpa_no" placeholder="Enter TPA ID"
+                                                    value="<?= isset($ticket_data['tpa_no']) ? $ticket_data['tpa_no'] : '' ?>"
+                                                    name="tpa_no">
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_mobile" class="label-font-size">Employee Mobile No <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="emp_mobile" placeholder="Enter EMP Mobile"
-                                    value="<?= isset($ticket_data['emp_mobile']) ? $ticket_data['emp_mobile'] : '' ?>"
-                                    name="emp_mobile" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_mobile" class="label-font-size">Employee Mobile No <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="emp_mobile" placeholder="Enter EMP Mobile"
+                                                    value="<?= isset($ticket_data['emp_mobile']) ? $ticket_data['emp_mobile'] : '' ?>"
+                                                    name="emp_mobile" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_mail" class="label-font-size">Employee Mail ID <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="emp_mail" placeholder="Enter EMP Mail"
-                                    value="<?= isset($ticket_data['emp_mail']) ? $ticket_data['emp_mail'] : '' ?>"
-                                    name="emp_mail" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_mail" class="label-font-size">Employee Mail ID <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="emp_mail" placeholder="Enter EMP Mail"
+                                                    value="<?= isset($ticket_data['emp_mail']) ? $ticket_data['emp_mail'] : '' ?>"
+                                                    name="emp_mail" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_personal_mail" class="label-font-size">Employee Personal Mail ID</label>
-                                <input type="text" class="form-control" id="emp_personal_mail" placeholder="Enter EMP Personal Mail"
-                                    value="<?= isset($ticket_data['emp_personal_mail']) ? $ticket_data['emp_personal_mail'] : '' ?>"
-                                    name="emp_personal_mail">
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_personal_mail" class="label-font-size">Employee Personal Mail ID</label>
+                                                <input type="text" class="form-control" id="emp_personal_mail" placeholder="Enter EMP Personal Mail"
+                                                    value="<?= isset($ticket_data['emp_personal_mail']) ? $ticket_data['emp_personal_mail'] : '' ?>"
+                                                    name="emp_personal_mail">
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="client_name" class="label-font-size">Corporate Name <span class="text-danger">*</span></label>
-                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
-                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="client_name" class="label-font-size">Corporate Name <span class="text-danger">*</span></label>
+                                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
+                                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="insurer_id" class="label-font-size">Insurer <span class="text-danger">*</span></label>
-                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
-                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly required>
-                            </div>
-                            <input type="hidden" id="empIDHidden" onchange="getClientPolicy()">
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <label class="label-font-size">Policy <span class="text-danger">*</span></label>
-                                    <select id="emp_client_policy" name="client_policy_id"
-                                        class="form-control custom-select" required onchange="setMinDateDOA(this.value); setInsurerAndTPAData(this)">
-                                        <?php if (!empty($ticket_data['client_policy_id'])) { ?>
-                                            <option value="<?= $ticket_data['client_policy_id'] ?>"><?= $ticket_data['client_policy_id_text'] ?></option>
-                                        <?php } else { ?>
-                                            <option value="">Policy</option>
-                                        <?php } ?>
-                                    </select>
+                                            <div class="form-group col-md-3">
+                                                <label for="insurer_id" class="label-font-size">Insurer <span class="text-danger">*</span></label>
+                                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
+                                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly required>
+                                            </div>
+                                            <input type="hidden" id="empIDHidden" onchange="getClientPolicy()">
+                                            <div class="col-md-3">
+                                                <div class="form-group">
+                                                    <label class="label-font-size">Policy <span class="text-danger">*</span></label>
+                                                    <select id="emp_client_policy" name="client_policy_id"
+                                                        class="form-control custom-select" required onchange="setMinDateDOA(this.value); setInsurerAndTPAData(this)">
+                                                        <?php if (!empty($ticket_data['client_policy_id'])) { ?>
+                                                            <option value="<?= $ticket_data['client_policy_id'] ?>"><?= $ticket_data['client_policy_id_text'] ?></option>
+                                                        <?php } else { ?>
+                                                            <option value="">Policy</option>
+                                                        <?php } ?>
+                                                    </select>
+                                                </div>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="tpa_name">TPA <span class="text-danger"></span></label>
+                                                <input type=hidden id="tpa_id" name="tpa_id" value="<?= isset($ticket_data['tpa_id']) ? $ticket_data['tpa_id'] : '' ?>">
+                                                <input type=text class="form-control" id="tpa_name" placeholder="TPA" value="<?= isset($ticket_data['tpa_name']) ? $ticket_data['tpa_name'] : '' ?>" readonly>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="acm_id">Account Manager <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="acm_id" name="acm_id" required>
+                                                    <!-- <option value="0">Select Account Manager</option> -->
+                                                    <?php
+                                                    if (isset($acms) && count($acms)) {
+                                                        foreach ($acms as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
+                                                            echo "<option value=" . $value['id'] . "  $selected >" . $value['first_name'] . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                        </div>
+                                        <!-- end first_data_points -->
+                                        <!-- </div> -->
+                                    </div>
                                 </div>
                             </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="tpa_name">TPA <span class="text-danger"></span></label>
-                                <input type=hidden id="tpa_id" name="tpa_id" value="<?= isset($ticket_data['tpa_id']) ? $ticket_data['tpa_id'] : '' ?>">
-                                <input type=text class="form-control" id="tpa_name" placeholder="TPA" value="<?= isset($ticket_data['tpa_name']) ? $ticket_data['tpa_name'] : '' ?>" readonly>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="acm_id">Account Manager <span class="text-danger">*</span></label>
-                                <select class="form-control" id="acm_id" name="acm_id" required>
-                                    <!-- <option value="0">Select Account Manager</option> -->
-                                    <?php
-                                    if (isset($acms) && count($acms)) {
-                                        foreach ($acms as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
-                                            echo "<option value=" . $value['id'] . "  $selected >" . $value['first_name'] . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                        </div>
-                        <!-- end first_data_points -->
-
-                        <br><br>
-
-                        <div style="display: flex; align-items: center; gap: 10px;">
-                            <h5 style="margin: 0;">
-                                Claim Details 
-                                <i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details" style="margin-left: 5px;"></i>
-                                <?= isset($ticket_data['claim_number']) && !empty($ticket_data['claim_number']) ? '( Claim No : ' . $ticket_data['claim_number'] . ' )' : '' ?>
-                            </h5>
                         </div>
 
-                        <hr>
+                        <div id="accordion2" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Claim Details
+                                    <i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details" style="margin-left: 5px;"></i>
+                                    <?= isset($ticket_data['claim_number']) && !empty($ticket_data['claim_number']) ? '( Claim No : ' . $ticket_data['claim_number'] . ' )' : '' ?>
 
-                        <!-- second_data_points -->
-                        <div class="form-row">
 
-                            <div class="form-group col-md-3">
-                                <label  class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label>
-                                <select class="form-control" id="claim_status_id" name="claim_status_id" required>
-                                    <!-- <option value="0">Select status</option> -->
-                                    <?php
-                                    if (isset($claim_status) && count($claim_status)) {
-                                        foreach ($claim_status as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
-                                            echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo" aria-expanded="true">
+                                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                                    </a>
+                                </h4>
+                                <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion2">
+                                    <div class="card-body">
+                                        <!-- second_data_points -->
+                                        <div class="form-row">
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="claim_status_id" name="claim_status_id" required>
+                                                    <!-- <option value="0">Select status</option> -->
+                                                    <?php
+                                                    if (isset($claim_status) && count($claim_status)) {
+                                                        foreach ($claim_status as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
+                                                            echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="priority">Priority <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="priority" name="priority" required>
+                                                    <!-- <option value="0">Select Priority</option> -->
+                                                    <?php
+                                                    if (isset($priorityType) && count($priorityType)) {
+                                                        foreach ($priorityType as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['priority'] == $key) ? 'selected' : '';
+                                                            echo "<option value=" . $key . " $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="mode_of_intimation"> Mode of Submission <span
+                                                        class="text-danger">*</span></label>
+                                                <select class="form-control" id="mode_of_intimation" name="mode_of_intimation" required>
+                                                    <!-- <option value="0">Select Mode</option> -->
+                                                    <?php
+                                                    if (isset($modeOFIntimate) && count($modeOFIntimate)) {
+                                                        foreach ($modeOFIntimate as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['mode_of_intimation'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_type"> Claim Type <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="claim_type" name="claim_type" required>
+                                                    <!-- <option value="0">Select claim Type</option> -->
+                                                    <?php
+                                                    if (isset($claim_type) && count($claim_type)) {
+                                                        foreach ($claim_type as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "' $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="hospital_name">Hospital Name <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="hospital_name"
+                                                    placeholder="Enter Hospital Name"
+                                                    value="<?= isset($ticket_data['hospital_name']) ? $ticket_data['hospital_name'] : '' ?>"
+                                                    name="hospital_name" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="doa">DOA <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="doa" placeholder="Enter DOA"
+                                                    value="<?= isset($ticket_data['doa']) ? $ticket_data['doa'] : '' ?>"
+                                                    name="doa" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="dod">DOD <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="dod" placeholder="Enter DOD"
+                                                    value="<?= isset($ticket_data['dod']) ? $ticket_data['dod'] : '' ?>" name="dod" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_amount">Claim Amount <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="claim_amount"
+                                                    placeholder="Enter Claim Amount"
+                                                    value="<?= isset($ticket_data['claim_amount']) ? $ticket_data['claim_amount'] : '' ?>"
+                                                    name="claim_amount" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" id="pod_no_label_1" for="pod_no">POD No with Courier Name <span id="pod_no_label_1_span" class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="pod_no" placeholder="Enter POD NO"
+                                                    value="<?= isset($ticket_data['pod_no']) ? $ticket_data['pod_no'] : '' ?>"
+                                                    name="pod_no">
+                                            </div>
+
+                                        </div>
+                                        <!-- end second_data_points -->
+                                    </div>
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="priority">Priority <span class="text-danger">*</span></label>
-                                <select class="form-control" id="priority" name="priority" required>
-                                    <!-- <option value="0">Select Priority</option> -->
-                                    <?php
-                                    if (isset($priorityType) && count($priorityType)) {
-                                        foreach ($priorityType as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['priority'] == $key) ? 'selected' : '';
-                                            echo "<option value=" . $key . " $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="mode_of_intimation"> Mode of Submission <span
-                                        class="text-danger">*</span></label>
-                                <select class="form-control" id="mode_of_intimation" name="mode_of_intimation" required>
-                                    <!-- <option value="0">Select Mode</option> -->
-                                    <?php
-                                    if (isset($modeOFIntimate) && count($modeOFIntimate)) {
-                                        foreach ($modeOFIntimate as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['mode_of_intimation'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="claim_type"> Claim Type <span class="text-danger">*</span></label>
-                                <select class="form-control" id="claim_type" name="claim_type" required>
-                                    <!-- <option value="0">Select claim Type</option> -->
-                                    <?php
-                                    if (isset($claim_type) && count($claim_type)) {
-                                        foreach ($claim_type as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "' $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="hospital_name">Hospital Name <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="hospital_name"
-                                    placeholder="Enter Hospital Name"
-                                    value="<?= isset($ticket_data['hospital_name']) ? $ticket_data['hospital_name'] : '' ?>"
-                                    name="hospital_name" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="doa">DOA <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="doa" placeholder="Enter DOA"
-                                    value="<?= isset($ticket_data['doa']) ? $ticket_data['doa'] : '' ?>"
-                                    name="doa" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="dod">DOD <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="dod" placeholder="Enter DOD"
-                                    value="<?= isset($ticket_data['dod']) ? $ticket_data['dod'] : '' ?>" name="dod" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="claim_amount">Claim Amount <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="claim_amount"
-                                    placeholder="Enter Claim Amount"
-                                    value="<?= isset($ticket_data['claim_amount']) ? $ticket_data['claim_amount'] : '' ?>"
-                                    name="claim_amount" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" id="pod_no_label_1" for="pod_no">POD No with Courier Name <span id="pod_no_label_1_span" class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="pod_no" placeholder="Enter POD NO"
-                                    value="<?= isset($ticket_data['pod_no']) ? $ticket_data['pod_no'] : '' ?>"
-                                    name="pod_no">
-                            </div>
-
                         </div>
-                        <!-- end second_data_points -->
 
-                        <br><br>
-                        <h5>Additional Details</h5>
-                        <hr>
 
-                        <!-- third_data_points -->
-                        <div class="form-row">
+                        <div id="accordion3" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Additional Documents
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseThree" aria-expanded="true">
+                                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                                    </a>
+                                </h4>
+                                <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion3">
+                                    <div class="card-body">
+                                        <!-- third_data_points -->
+                                        <div class="form-row">
 
-                            <div class="form-group col-md-3 up_cnu" style="display: none;">
-                                <label class="label-font-size" for="claim_number">Claim Number <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="claim_number" placeholder="Enter Claim NO"
-                                    value="<?= isset($ticket_data['claim_number']) ? $ticket_data['claim_number'] : '' ?>"
-                                    name="claim_number">
+                                            <div class="form-group col-md-3 up_cnu" style="display: none;">
+                                                <label class="label-font-size" for="claim_number">Claim Number <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="claim_number" placeholder="Enter Claim NO"
+                                                    value="<?= isset($ticket_data['claim_number']) ? $ticket_data['claim_number'] : '' ?>"
+                                                    name="claim_number">
+                                            </div>
+
+                                            <div class="form-group col-md-3 up_cnu" style="display: none;">
+                                                <label class="label-font-size" for="registration_date">Registration Date</label>
+                                                <input type="text" class="form-control datepicker" id="registration_date" placeholder="Select Registration Date"
+                                                    value="<?= isset($ticket_data['registration_date']) ? $ticket_data['registration_date'] : '' ?>" name="registration_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 cda_ir" style="display: none;">
+                                                <label class="label-font-size" for="raised_date">Raised Date</label>
+                                                <input type="text" class="form-control datepicker" id="raised_date" placeholder="Select Raised Date"
+                                                    value="<?= isset($ticket_data['raised_date']) ? $ticket_data['raised_date'] : '' ?>" name="raised_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 up_qdr" style="display: none;">
+                                                <label class="label-font-size" for="query_received_date">Query Received Date</label>
+                                                <input type="text" class="form-control datepicker" id="query_received_date" placeholder="Select Query Received Date"
+                                                    value="<?= isset($ticket_data['query_received_date']) ? $ticket_data['query_received_date'] : '' ?>" name="query_received_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 rejected" style="display: none;">
+                                                <label class="label-font-size" for="denial_reason">Denial Reason</label>
+                                                <input type="text" class="form-control" id="denial_reason" placeholder="Enter Denial Reason"
+                                                    value="<?= isset($ticket_data['denial_reason']) ? $ticket_data['denial_reason'] : '' ?>" name="denial_reason">
+                                            </div>
+
+                                            <div class="form-group col-md-3 rejected" style="display: none;">
+                                                <label class="label-font-size" for="denial_date">Denial Date</label>
+                                                <input type="text" class="form-control datepicker" id="denial_date" placeholder="Select Denial Date"
+                                                    value="<?= isset($ticket_data['denial_date']) ? $ticket_data['denial_date'] : '' ?>" name="denial_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_amount">Approved Amount</label> #
+                                                <input type="text" class="form-control" id="approved_amount" placeholder="Enter Approved Amount"
+                                                    value="<?= isset($ticket_data['approved_amount']) ? $ticket_data['approved_amount'] : '' ?>" name="approved_amount">
+                                            </div>
+
+                                            <div class="form-group col-md-3 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_date">Approved Date</label>
+                                                <input type="text" class="form-control datepicker" id="approved_date" placeholder="Select Approved Date"
+                                                    value="<?= isset($ticket_data['approved_date']) ? $ticket_data['approved_date'] : '' ?>" name="approved_date">
+                                            </div>
+
+                                            <div class="form-group col-md-6 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_letter">Approved Letter</label>
+                                                <input type="text" class="form-control" id="approved_letter" placeholder="Enter Approved Letter"
+                                                    value="<?= isset($ticket_data['approved_letter']) ? $ticket_data['approved_letter'] : '' ?>" name="approved_letter">
+                                            </div>
+
+                                            <div class="form-group col-md-6 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_description">Approved Description</label>
+                                                <input type="text" class="form-control" id="approved_description" placeholder="Enter Approved Description"
+                                                    value="<?= isset($ticket_data['approved_description']) ? $ticket_data['approved_description'] : '' ?>" name="approved_description">
+                                            </div>
+
+                                            <div class="form-group col-md-3 settled" style="display: none;">
+                                                <label class="label-font-size" for="utr_details">UTR Details</label>
+                                                <input type="text" class="form-control" id="utr_details" placeholder="Enter UTR Details"
+                                                    value="<?= isset($ticket_data['utr_details']) ? $ticket_data['utr_details'] : '' ?>" name="utr_details">
+                                            </div>
+
+                                            <div class="form-group col-md-3 settled" style="display: none;">
+                                                <label class="label-font-size" for="settled_date">Settled Date</label>
+                                                <input type="text" class="form-control datepicker" id="settled_date" placeholder="Select Settled Date"
+                                                    value="<?= isset($ticket_data['settled_date']) ? $ticket_data['settled_date'] : '' ?>" name="settled_date">
+                                            </div>
+
+                                            <div class="form-group col-md-6 settled" style="display: none;">
+                                                <label class="label-font-size" for="settle_letter">Settle Letter</label>
+                                                <input type="text" class="form-control" id="settle_letter" placeholder="Enter Settle Letter"
+                                                    value="<?= isset($ticket_data['settle_letter']) ? $ticket_data['settle_letter'] : '' ?>" name="settle_letter">
+                                            </div>
+
+                                            <div class="form-group col-md-3 payment" style="display: none;">
+                                                <label class="label-font-size" for="pay_initiate_date">Payment Initiate Date</label>
+                                                <input type="text" class="form-control datepicker" id="pay_initiate_date" placeholder="Select Payment Initiate Date"
+                                                    value="<?= isset($ticket_data['pay_initiate_date']) ? $ticket_data['pay_initiate_date'] : '' ?>" name="pay_initiate_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 canceled" style="display: none;">
+                                                <label class="label-font-size" for="cancel_remark">Cancel Remark</label>
+                                                <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
+                                            </div>
+
+                                            <div class="form-group col-md-3 returned" style="display: none;">
+                                                <label class="label-font-size" for="return_remark">Return Remark</label>
+                                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
+                                            </div>
+
+                                            <div class="form-group col-md-6 returned" style="display: none;">
+                                                <label class="label-font-size" for="awb_no_courier_name">Return AWB No with Courier Name</label>
+                                                <input type="text" class="form-control" id="awb_no_courier_name" placeholder="eg : 0001/ST Courier"
+                                                    value="<?= isset($ticket_data['awb_no_courier_name']) ? $ticket_data['awb_no_courier_name'] : '' ?>" name="awb_no_courier_name">
+                                            </div>
+
+                                            <div class="form-group col-md-3 non_id" style="display: none;">
+                                                <label class="label-font-size" for="non_id_reason">Non ID Reason <span id="non_id_reason_lable_id" class="text-danger"></span></label>
+                                                <select class="form-control" id="non_id_reason" name="non_id_reason">
+                                                    <option value="">Select Reason</option>
+                                                    <?php
+                                                    if (isset($nonIDReason) && count($nonIDReason)) {
+                                                        foreach ($nonIDReason as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['non_id_reason'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                        </div>
+                                        <!-- end third_data_points -->
+                                    </div>
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-3 up_cnu" style="display: none;">
-                                <label class="label-font-size" for="registration_date">Registration Date</label>
-                                <input type="text" class="form-control datepicker" id="registration_date" placeholder="Select Registration Date"
-                                    value="<?= isset($ticket_data['registration_date']) ? $ticket_data['registration_date'] : '' ?>" name="registration_date">
-                            </div>
-
-                            <div class="form-group col-md-3 cda_ir" style="display: none;">
-                                <label class="label-font-size" for="raised_date">Raised Date</label>
-                                <input type="text" class="form-control datepicker" id="raised_date" placeholder="Select Raised Date"
-                                    value="<?= isset($ticket_data['raised_date']) ? $ticket_data['raised_date'] : '' ?>" name="raised_date">
-                            </div>
-
-                            <div class="form-group col-md-3 up_qdr" style="display: none;">
-                                <label class="label-font-size" for="query_received_date">Query Received Date</label>
-                                <input type="text" class="form-control datepicker" id="query_received_date" placeholder="Select Query Received Date"
-                                    value="<?= isset($ticket_data['query_received_date']) ? $ticket_data['query_received_date'] : '' ?>" name="query_received_date">
-                            </div>
-
-                            <div class="form-group col-md-3 rejected" style="display: none;">
-                                <label class="label-font-size" for="denial_reason">Denial Reason</label>
-                                <input type="text" class="form-control" id="denial_reason" placeholder="Enter Denial Reason"
-                                    value="<?= isset($ticket_data['denial_reason']) ? $ticket_data['denial_reason'] : '' ?>" name="denial_reason">
-                            </div>
-
-                            <div class="form-group col-md-3 rejected" style="display: none;">
-                                <label class="label-font-size" for="denial_date">Denial Date</label>
-                                <input type="text" class="form-control datepicker" id="denial_date" placeholder="Select Denial Date"
-                                    value="<?= isset($ticket_data['denial_date']) ? $ticket_data['denial_date'] : '' ?>" name="denial_date">
-                            </div>
-
-                            <div class="form-group col-md-3 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_amount">Approved Amount</label>
-                                <input type="text" class="form-control" id="approved_amount" placeholder="Enter Approved Amount"
-                                    value="<?= isset($ticket_data['approved_amount']) ? $ticket_data['approved_amount'] : '' ?>" name="approved_amount">
-                            </div>
-
-                            <div class="form-group col-md-3 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_date">Approved Date</label>
-                                <input type="text" class="form-control datepicker" id="approved_date" placeholder="Select Approved Date"
-                                    value="<?= isset($ticket_data['approved_date']) ? $ticket_data['approved_date'] : '' ?>" name="approved_date">
-                            </div>
-
-                            <div class="form-group col-md-6 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_letter">Approved Letter</label>
-                                <input type="text" class="form-control" id="approved_letter" placeholder="Enter Approved Letter"
-                                    value="<?= isset($ticket_data['approved_letter']) ? $ticket_data['approved_letter'] : '' ?>" name="approved_letter">
-                            </div>
-
-                            <div class="form-group col-md-6 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_description">Approved Description</label>
-                                <input type="text" class="form-control" id="approved_description" placeholder="Enter Approved Description"
-                                    value="<?= isset($ticket_data['approved_description']) ? $ticket_data['approved_description'] : '' ?>" name="approved_description">
-                            </div>
-
-                            <div class="form-group col-md-3 settled" style="display: none;">
-                                <label class="label-font-size" for="utr_details">UTR Details</label>
-                                <input type="text" class="form-control" id="utr_details" placeholder="Enter UTR Details"
-                                    value="<?= isset($ticket_data['utr_details']) ? $ticket_data['utr_details'] : '' ?>" name="utr_details">
-                            </div>
-
-                            <div class="form-group col-md-3 settled" style="display: none;">
-                                <label class="label-font-size" for="settled_date">Settled Date</label>
-                                <input type="text" class="form-control datepicker" id="settled_date" placeholder="Select Settled Date"
-                                    value="<?= isset($ticket_data['settled_date']) ? $ticket_data['settled_date'] : '' ?>" name="settled_date">
-                            </div>
-
-                            <div class="form-group col-md-6 settled" style="display: none;">
-                                <label class="label-font-size" for="settle_letter">Settle Letter</label>
-                                <input type="text" class="form-control" id="settle_letter" placeholder="Enter Settle Letter"
-                                    value="<?= isset($ticket_data['settle_letter']) ? $ticket_data['settle_letter'] : '' ?>" name="settle_letter">
-                            </div>
-
-                            <div class="form-group col-md-3 payment" style="display: none;">
-                                <label class="label-font-size" for="pay_initiate_date">Payment Initiate Date</label>
-                                <input type="text" class="form-control datepicker" id="pay_initiate_date" placeholder="Select Payment Initiate Date"
-                                    value="<?= isset($ticket_data['pay_initiate_date']) ? $ticket_data['pay_initiate_date'] : '' ?>" name="pay_initiate_date">
-                            </div>
-
-                            <div class="form-group col-md-3 canceled" style="display: none;">
-                                <label class="label-font-size" for="cancel_remark">Cancel Remark</label>
-                                <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
-                            </div>
-
-                            <div class="form-group col-md-3 returned" style="display: none;">
-                                <label class="label-font-size" for="return_remark">Return Remark</label>
-                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
-                            </div>
-
-                            <div class="form-group col-md-6 returned" style="display: none;">
-                                <label class="label-font-size" for="awb_no_courier_name">Return AWB No with Courier Name</label>
-                                <input type="text" class="form-control" id="awb_no_courier_name" placeholder="eg : 0001/ST Courier"
-                                    value="<?= isset($ticket_data['awb_no_courier_name']) ? $ticket_data['awb_no_courier_name'] : '' ?>" name="awb_no_courier_name">
-                            </div>
-
-                            <div class="form-group col-md-3 non_id" style="display: none;">
-                                <label class="label-font-size" for="non_id_reason">Non ID Reason <span id="non_id_reason_lable_id" class="text-danger"></span></label>
-                                <select class="form-control" id="non_id_reason" name="non_id_reason">
-                                    <option value="">Select Reason</option>
-                                    <?php
-                                    if (isset($nonIDReason) && count($nonIDReason)) {
-                                        foreach ($nonIDReason as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['non_id_reason'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
                         </div>
-                        <!-- end third_data_points -->
 
-                    </div>
-                    <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
-                        <?php if (get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
-                            <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
-                        <?php } ?>
-                        <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
-                    </div>
+                        <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                            <?php if (get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
+                                <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
+                            <?php } ?>
+                            <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
+                        </div>
 
+                </div>
+                </form>
             </div>
-            </form>
         </div>
     </div>
 </div>
 
+
 <!-- Info Modal -->
 <div class="modal fade" id="moreInfoModal" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl" role="document">
@@ -635,17 +663,17 @@
         console.log('Selected Value:', selectedVal);
         console.log('Element ID:', elementId);
 
-        if(selectedVal == 2 || selectedVal == 14){
+        if (selectedVal == 2 || selectedVal == 14) {
             $field = $('#non_id_reason')
             $field.prop('required', false);
-        }else if(selectedVal == 1){
+        } else if (selectedVal == 1) {
 
-            if($('#tpa_no').val() != ""){
+            if ($('#tpa_no').val() != "") {
                 $field = $('#non_id_reason')
                 $field.prop('required', false);
                 var $parentDiv = $field.closest("div");
                 $parentDiv.find("label[for='non_id_reason'] .text-danger").remove();
-            }else{
+            } else {
                 $field = $('#non_id_reason')
                 $field.prop('required', true);
             }
@@ -805,7 +833,7 @@
         $field.prop('required', false);
         var $parentDiv = $field.closest("div");
         $parentDiv.find("label[for='approved_description'] .text-danger").remove();
-        
+
     });
 
     // function addRequiredFieldSymbol(field_name) {
@@ -1059,11 +1087,11 @@
             if (ticket_type == 1 && item.policy_type_id != 1) {
                 $('#emp_client_policy').append($('<option>', {
                     value: item.client_policy_value,
-                    text: item.client_policy_name, 
-                    'data-insurerid' : item.insurer_id ?? "",
-                    'data-tpaid' : item.tpa_id ?? "",
-                    'data-insurername' : item.insurer_name ?? "",
-                    'data-tpaname' : item.tpa_name ?? "",
+                    text: item.client_policy_name,
+                    'data-insurerid': item.insurer_id ?? "",
+                    'data-tpaid': item.tpa_id ?? "",
+                    'data-insurername': item.insurer_name ?? "",
+                    'data-tpaname': item.tpa_name ?? "",
                 }));
                 $("#policy_no").val("");
                 if (policyCount == 1) {
@@ -1173,7 +1201,6 @@
         $('#tpa_id').val(tap_id);
         $('#tpa_name').val(tap_name);
     }
-
 </script>
 <script>
     $("#infoIcon").click(function() {
diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php
index 31ec5ced..505fe971 100644
--- a/app/Views/ticket_history.php
+++ b/app/Views/ticket_history.php
@@ -60,9 +60,13 @@ if (ticketsTable.length) {
 
         // ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
         paging: true, // Enable pagination
         pageLength: 10, // Set default number of rows per page (optional)
         ordering: false,
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index a915f604..e1b306e9 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -54,17 +54,17 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="scroll-horizontal-datatable">  
                     <thead class="bg-light">
                         <tr>
-                            <th>Status</th>
-                            <th>Policy Type</th>
-                            <th>Claim number</th>
-                            <th>TPA ID</th>
-                            <th>Emp ID</th>
-                            <th>Emp name</th>
-                            <th>Insured Name</th>
-                            <th>Corporate name</th>
+                            <th>Status&nbsp;</th>
+                            <th>Policy Type&nbsp;</th>
+                            <th>Claim number&nbsp;</th>
+                            <th>TPA ID&nbsp;</th>
+                            <th>Emp ID&nbsp;</th>
+                            <th>Emp name&nbsp;</th>
+                            <th>Insured Name&nbsp;</th>
+                            <th>Corporate name&nbsp;</th>
                             
                             <th style="display: none;">ACM</th>
                             <th style="display: none;">Insurer</th>
@@ -161,13 +161,13 @@ table.dataTable tbody td {
                                         </span>
                                     </td>
 
-                                    <td><?php echo str_replace("Claim-", "", $ticket_type[$row['ticket_type_id']] ?? ""); ?></td>
-                                    <td><?php echo $row['claim_no']; ?></td>
-                                    <td><?php echo $row['tpa_no']; ?></td>
-                                    <td><?php echo $row['emp_code']; ?></td>
-                                    <td><?php echo $row['emp_name']; ?></td>
-                                    <td><?php echo $row['insured_name']; ?></td>
-                                    <td><?php echo $row['short_name']; ?></td>
+                                    <td><?php echo str_replace("Claim-", "", $ticket_type[$row['ticket_type_id']] ?? 'N/A'); ?></td>
+                                    <td><?php echo $row['claim_no'] ?: 'N/A' ; ?></td>
+                                    <td><?php echo $row['tpa_no'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['emp_code'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['emp_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['insured_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['short_name'] ?: 'N/A'; ?></td>
                                     
                                     <td style="display: none;"><?php echo $row['acm_name']; ?></td>
                                     <td style="display: none;"><?php echo $row['insurer_name']; ?></td>
@@ -271,33 +271,68 @@ $(document).ready(function() {
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Claim-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'claim-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                },
-                {
-                    text: 'New Claim',
-                    className: 'buttons-html5 addbtnStyle',
-                    action: function(e, dt, node, config) { 
-                        openTicketTypeAskModal()
-                    }
-                }
-            ],
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'Claim-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'claim-List',
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //     },
+            //     {
+            //         text: 'New Claim',
+            //         className: 'buttons-html5 addbtnStyle',
+            //         action: function(e, dt, node, config) { 
+            //             openTicketTypeAskModal()
+            //         }
+            //     }
+            // ],
+            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) { 
+                      openTicketTypeAskModal()
+                  }
+              },
+              {
+                  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>',
+                                className: 'app-btn-primary ',
+                                title: 'Claim-List',
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                title: 'claim-List',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
         });
     } else {
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index b5da3f7f..d816f2a3 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -8,10 +8,7 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-
-        max-width: 98% !important;
-    }
+    
 
     .dataTables_filter {
         position: absolute;
@@ -55,8 +52,8 @@
     /* strongest, beats most parent rules and pasted styles on wrappers */
     .jodit-container .jodit-wysiwyg,
     .jodit-container .jodit-wysiwyg * {
-    color: #000 !important;
-    background-color: #fff !important; /* optional: ensure white background */
+        color: #000 !important;
+        background-color: #fff !important; /* optional: ensure white background */
     }
 
 </style>
@@ -193,17 +190,17 @@
                                 <input type="text" readonly id="claim_status_for_template" class="form-control" />
                             </div>
 
-
-                        </div>
-
-                        <div class="form-row">
-                            <div class="form-group col-md-12">
-                                <label for="template_subject">Subject</label>
-                                <input type="text" id="template_subject" name="subject" class="form-control"
-                                    placeholder="Subject" required>
+                            <div class="form-group col-md-6">
+                                    <label for="template_subject">Subject</label>
+                                    <input type="text" id="template_subject" name="subject" class="form-control"
+                                        placeholder="Subject" required>
                             </div>
+
+
                         </div>
 
+
+
                         <hr>
 
                         <div class="form-row">
@@ -264,15 +261,19 @@
                     text: 'Add Template',
                     className: 'buttons-html5 addbtnStyle',
                     action: function(e, dt, node, config) {
-                        openModal()
+                        openModal('new_mail_template')
                     }
                 }],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
+                pageLength: 10, // Set default number of rows per page (optional)
                 ordering: false,
             });
         } else {
@@ -507,7 +508,7 @@
                 if (res) {
                     if (res.status == true) {
                         // Open the modal
-                        openModal();
+                        openModal('new_mail_template');
 
                         // Populate the form fields
                         $('#template_subject').val(res.data.subject);
diff --git a/app/Views/ticket_reports.php b/app/Views/ticket_reports.php
index 57c73a2e..08785950 100644
--- a/app/Views/ticket_reports.php
+++ b/app/Views/ticket_reports.php
@@ -1,68 +1,74 @@
-<div class="row">
-    <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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-4" 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 class="container-fluid-min">
+    <div class="row">
+        <!-- <h3 class="ml-3">Claim Reports</h3> -->
+        <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-4" 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" value=<?= $default_start ?>>
+                                        <input type="hidden" id="endDate" value=<?= $default_end ?>>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Policy Type<span class="text-danger"> *</span></label> <br />
+                                        <select name="policy_type" class="form-control" id="policy_type" required>
+                                            <option value="">Select</option>
+                                            <?php foreach ($policy_type as $policy => $key) : ?>
+                                                <option value="<?= $policy ?>"><?= $key ?></option>
+                                            <?php endforeach ?>
+                                        </select>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Report Type<span class="text-danger"> *</span></label> <br />
+                                        <select class="form-control" id="report_type" required>
+                                            <option value="0">Select</option>
+                                            <?php foreach ($report_type as $reports => $key) : ?>
+                                                <option value="<?= $reports ?>"><?= $key ?></option>
+                                            <?php endforeach ?>
+                                        </select>
+                                    </div>
+
+
                                 </div>
-                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
-                            </div>
+                                <div class="row justify-content-end">
 
-
-                            <div class="form-group col-md-4">
-                                <label>Policy Type<span class="text-danger"> *</span></label> <br />
-                                <select name="policy_type" class="form-control" id="policy_type" required>
-                                    <option value="">Select</option>
-                                    <?php foreach ($policy_type as $policy => $key) : ?>
-                                        <option value="<?= $policy ?>"><?= $key ?></option>
-                                    <?php endforeach ?>
-                                </select>
-                            </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Report Type<span class="text-danger"> *</span></label> <br />
-                                <select class="form-control" id="report_type" required>
-                                    <option value="0">Select</option>
-                                    <?php foreach ($report_type as $reports => $key) : ?>
-                                        <option value="<?= $reports ?>"><?= $key ?></option>
-                                    <?php endforeach ?>
-                                </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 class="col-auto">
+                                        <a href="#" class="btn btn-primary waves-effect waves-light submit-btn" id="get-report-page" onclick="fetchReportPage(event);">Submit</a>
+                                    </div>
+                                </div>
+                                <!-- </div> -->
                             </div>
                         </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
+    <div class="row" id="report"></div>
 </div>
-<div class="card mb-1">
 
-    <div id="report"></div>
-</div>
+
 
 <script>
     $(function() {
@@ -97,44 +103,43 @@
     });
 </script>
 <script>
+    function fetchReportPage() {
 
-function fetchReportPage() {
+        var fromDate = $('#startDate').val();
+        var toDate = $('#endDate').val();
+        var policy_type = $('#policy_type').val();
+        var report_type = $('#report_type').val();
+        var requestData = {
+            fromDate: fromDate,
+            toDate: toDate,
+            policy_type: policy_type,
+            report_type: report_type
+        };
+        // console.log(requestData);
+        var url = '<?= base_url('/ticket/ticket_reports') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+            if (response.status == true) {
+                $('#report').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+            } else {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
 
-    var fromDate = $('#startDate').val();
-    var toDate = $('#endDate').val();
-    var policy_type = $('#policy_type').val();
-    var report_type = $('#report_type').val();
-    var requestData = {
-        fromDate: fromDate,
-        toDate: toDate,
-        policy_type: policy_type,
-        report_type: report_type
-    };
-    // console.log(requestData);
-    var url = '<?= base_url('/ticket/ticket_reports') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-        if (response.status == true) {
-            $('#report').html(response.html);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-
-        }else{
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message,'ERROR');
-        }
-
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the report page.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
-}
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_search.php b/app/Views/ticket_search.php
index 8a79e1e9..f59a18d7 100644
--- a/app/Views/ticket_search.php
+++ b/app/Views/ticket_search.php
@@ -1,259 +1,258 @@
 <style>
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <br>
-                <div class="row ml-4">
-                    <div class="col-md-6">
-                    <h4 style="text-align: left;">Claim Filter</h4>
-                    </div>
-                    <div class="col-md-6">
-                <a style="text-align: right;" 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></div>
-                </div>
-                </h5>
-                <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+<div class="container-fluid-min">
+    <div class="row">
+        <div class="col-12" style="margin-top: -12px;">
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <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 hide" 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="ticket_type"> Claim Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="ticket_type" name="ticket_type">
-                                        <option value="0">Select claim Type</option>
-                                        <?php
-                                            if (isset($ticket_type) && count($ticket_type)) {
-                                                foreach ($ticket_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="ticket_type"> Claim Type <span class="text-danger"></span></label>
+                                            <select class="form-control" id="ticket_type" name="ticket_type">
+                                                <option value="0">Select claim Type</option>
+                                                <?php
+                                                if (isset($ticket_type) && count($ticket_type)) {
+                                                    foreach ($ticket_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                        <!-- <div class="form-group col-md-3">
                                     <label for="pod_no">POD No<span class="text-danger"></span></label>
                                     <input type="text" class="form-control" id="pod_no" name="pod_no">
                                 </div> -->
 
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id">Insurer<span class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id">
-                                        <option value="0">Select Insurer</option>
-                                        <?php
-                                            if (isset($insurer_list) && count($insurer_list)) {
-                                                foreach ($insurer_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="insurer_id">Insurer<span class="text-danger"></span></label>
+                                            <select class="form-control" id="insurer_id" name="insurer_id">
+                                                <option value="0">Select Insurer</option>
+                                                <?php
+                                                if (isset($insurer_list) && count($insurer_list)) {
+                                                    foreach ($insurer_list as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="tpa_id">TPA<span class="text-danger"></span></label>
-                                    <select class="form-control" id="tpa_id" name="tpa_id">
-                                        <option value="0">Select TPA</option>
-                                        <?php
-                                            if (isset($tpa_list) && count($tpa_list)) {
-                                                foreach ($tpa_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="tpa_id">TPA<span class="text-danger"></span></label>
+                                            <select class="form-control" id="tpa_id" name="tpa_id">
+                                                <option value="0">Select TPA</option>
+                                                <?php
+                                                if (isset($tpa_list) && count($tpa_list)) {
+                                                    foreach ($tpa_list as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="claim_no">Claim No<span class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="claim_no" name="claim_no">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="claim_no">Claim No<span class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="claim_no" name="claim_no">
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_id"> Corporate Name <span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id">
-                                        <option value="0">Select Corporate</option>
-                                        <?php
-                                            if (isset($client_list) && count($client_list)) {
-                                                foreach ($client_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="client_id"> Corporate Name <span class="text-danger"></span></label>
+                                            <select class="form-control" id="client_id" name="client_id">
+                                                <option value="0">Select Corporate</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>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="emp_code">Employee ID<span class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="emp_code" name="emp_code">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="emp_code">Employee ID<span class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="emp_code" name="emp_code">
+                                        </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                        <!-- <div class="form-group col-md-3">
                                     <label for="tpa_id">TPA ID<span class="text-danger"></span></label>
                                     <input type="text" class="form-control" id="tpa_id" name="tpa_id">
                                 </div> -->
 
-                                <div class="form-group col-md-3">
-                                    <label for="emp_mobile_no">Employee Mobile No<span
-                                            class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="emp_mobile_no" name="emp_mobile_no">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="emp_mobile_no">Employee Mobile No<span
+                                                    class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="emp_mobile_no" name="emp_mobile_no">
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="claim_status">Status<span class="text-danger"></span></label>
-                                    <select class="form-control" id="claim_status" name="claim_status">
-                                        <option value="0">Select status</option>
-                                        <?php /*
+                                        <div class="form-group col-md-3">
+                                            <label for="claim_status">Status<span class="text-danger"></span></label>
+                                            <select class="form-control" id="claim_status" name="claim_status">
+                                                <option value="0">Select status</option>
+                                                <?php /*
                                             if (isset($claim_status) && count($claim_status)) {
                                                 foreach ($claim_status as $key => $value) {
                                                     echo "<option value=" . $value['id'] . ">" . $value['status'] . "</option>";
                                                 }
                                             }
                                        */ ?>
-                                    </select>
-                                </div>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
-                                    <a href="#" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a class="btn btn-primary" id="get-emp-list" onclick="fetchTicketListData();">Submit</a>
-                                </div>
+                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
+                                            <a href="#" class="btn btn-secondary" id="clear-filters">Clear</a>
+                                            <a class="btn btn-primary" id="get-emp-list" onclick="fetchTicketListData();">Submit</a>
+                                        </div>
 
+                                    </div>
+
+                                </div>
                             </div>
-
                         </div>
                     </div>
+
                 </div>
             </div>
 
         </div>
     </div>
+    <div class="row" id="ticket_list_div">
+        <?php include('ticket_list.php'); ?>
+    </div>
 </div>
 
+
 <!-- end page title -->
-<div class="row" id="ticket_list_div">
-    <?php include('ticket_list.php'); ?>
-</div>
+
 
 
 <script>
-
-$(document).ready(function() {
+    $(document).ready(function() {
         // Initialize select2
         $('#client_id').select2();
         $('#claim_status').select2();
         $('#insurer_id').select2();
         $('#tpa_id').select2();
-        
-        
+
+
     });
 
-    $('#ticket_type').on('change',function(){
+    $('#ticket_type').on('change', function() {
         var ticket_type = $('#ticket_type').val();
         var claim_status = <?= json_encode($claim_status) ?>;
         $('#claim_status').empty();
         $('#claim_status').append($('<option>', {
-        value: '',
-        text: 'Select Claim Status'
-    }));
+            value: '',
+            text: 'Select Claim Status'
+        }));
 
         // console.log('Claim Status:', claim_status);
-        for (var i = 0;i<claim_status.length;i++){
-            if(claim_status[i]['ticket_type'] == ticket_type){
+        for (var i = 0; i < claim_status.length; i++) {
+            if (claim_status[i]['ticket_type'] == ticket_type) {
                 $('#claim_status').append($('<option>', {
-                value: claim_status[i]['id'], // Use 'id' as the value
-                text: claim_status[i]['claim_status'] // Use 'claim_status' as the text
+                    value: claim_status[i]['id'], // Use 'id' as the value
+                    text: claim_status[i]['claim_status'] // Use 'claim_status' as the text
                 }));
             }
         }
     })
 
-function fetchTicketListData() {
+    function fetchTicketListData() {
 
-    var ticket_type = $('#ticket_type').val();
-    var pod_no = $('#pod_no').val();
-    var claim_no = $('#claim_no').val();
-    var emp_code = $('#emp_code').val();
-    var claim_status = $('#claim_status').val();
-    var emp_mobile_no = $('#emp_mobile_no').val();
-    var tpa_id = $('#tpa_id').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var tpa_id = $('#tpa_id').val();
+        var ticket_type = $('#ticket_type').val();
+        var pod_no = $('#pod_no').val();
+        var claim_no = $('#claim_no').val();
+        var emp_code = $('#emp_code').val();
+        var claim_status = $('#claim_status').val();
+        var emp_mobile_no = $('#emp_mobile_no').val();
+        var tpa_id = $('#tpa_id').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var tpa_id = $('#tpa_id').val();
 
-    var requestData = {
-        ticket_type_id: ticket_type,
-        pod_no: pod_no,
-        claim_number: claim_no,
-        emp_code: emp_code,
-        claim_status_id: claim_status,
-        emp_mobile: emp_mobile_no,
-        tpa_id: tpa_id,
-        client_id: client_id,
-        insurer_id: insurer_id,
-        tpa_id: tpa_id,
-    };
+        var requestData = {
+            ticket_type_id: ticket_type,
+            pod_no: pod_no,
+            claim_number: claim_no,
+            emp_code: emp_code,
+            claim_status_id: claim_status,
+            emp_mobile: emp_mobile_no,
+            tpa_id: tpa_id,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            tpa_id: tpa_id,
+        };
 
-    let filterData = requestData;
-    localStorage.setItem('filterData', JSON.stringify(filterData));
+        let filterData = requestData;
+        localStorage.setItem('filterData', JSON.stringify(filterData));
 
-    console.log("requestData", requestData);
+        console.log("requestData", requestData);
 
-    var url = '<?= base_url('/ticket/list') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        var url = '<?= base_url('/ticket/list') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
 
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
 
-        console.log('Filter Responce', response);
+            console.log('Filter Responce', response);
+
+            if (response.status == true) {
+                $('#ticket_list_div').empty();
+                $('#ticket_list_div').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+            } else {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the data.', 'ERROR');
 
-        if (response.status == true) {
-            $('#ticket_list_div').empty();
-            $('#ticket_list_div').html(response.html);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-
-        } else {
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
-        }
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the data.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
+        });
 
 
-}
-
+    }
 </script>
 
 <script>
-    $(document).ready(function(){
+    $(document).ready(function() {
         let filterData = localStorage.getItem('filterData');
 
         filterData = filterData ? JSON.parse(filterData) : null;
 
         console.log('Filter Data', filterData);
 
-        if(filterData){
+        if (filterData) {
 
             var url = '<?= base_url('/ticket/list') ?>';
             $('.loader').fadeIn();
@@ -261,29 +260,29 @@ function fetchTicketListData() {
 
             sendAjaxRequestForGlobal(url, 'POST', filterData, function(response) {
 
-                    console.log('Filter Responce', response);
-
-                    if (response.status == true) {
-                        $('#ticket_list_div').empty();
-                        $('#ticket_list_div').html(response.html);
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-
-                    } else {
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-                        let message = response.message;
-                        toastr.error(message, 'ERROR');
-                    }
-
-                }, function(xhr, status, error) {
-                    console.error('Error fetching data:', error);
-                    console.error(xhr.responseText);
-                    toastr.error('An error occurred while fetching the data.', 'ERROR');
+                console.log('Filter Responce', response);
 
+                if (response.status == true) {
+                    $('#ticket_list_div').empty();
+                    $('#ticket_list_div').html(response.html);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                });
+
+                } else {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    let message = response.message;
+                    toastr.error(message, 'ERROR');
+                }
+
+            }, function(xhr, status, error) {
+                console.error('Error fetching data:', error);
+                console.error(xhr.responseText);
+                toastr.error('An error occurred while fetching the data.', 'ERROR');
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            });
 
             $('#ticket_type').val(filterData.ticket_type_id);
             $('#pod_no').val(filterData.pod_no);
@@ -301,9 +300,9 @@ function fetchTicketListData() {
 </script>
 
 <script>
-    $(document).on('click', '#clear-filters', function (e) {
+    $(document).on('click', '#clear-filters', function(e) {
 
-      e.preventDefault(); // Stops the browser from following the link
+        e.preventDefault(); // Stops the browser from following the link
 
         console.log('Clear Filters Area');
 
@@ -318,9 +317,7 @@ function fetchTicketListData() {
         $('#tpa_id').val('0');
         $('#client_id').val('0');
         $('#insurer_id').val('0');
-        
-        window.location.href = "<?= base_url("/ticket/list")?>";
-});
-
 
+        window.location.href = "<?= base_url("/ticket/list") ?>";
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index ba336120..4237421b 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -446,7 +446,7 @@ $(document).ready(function () {
                      if (data.length === 0) {
                         tpaBranchTableInsert += `
                             <tr>
-                                <td colspan="3" class="text-center app-text-black">No data available in table</td>
+                                <td colspan="3" class="text-center font-color-black">No data available in table</td>
                             </tr>
                         `;
                     } else {
@@ -575,7 +575,7 @@ $(document).ready(function () {
                     if (data.length === 0) {
                         branchTable += `
                             <tr>
-                                <td colspan="3" class="text-center app-text-black ">No data available in table</td>
+                                <td colspan="3" class="text-center font-color-black ">No data available in table</td>
                             </tr>
                         `;
                     } else {
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index ace4ba84..19737cdc 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -1,6 +1,5 @@
 <style>
-
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: absolute;
     background-color: #ffffff !important;
@@ -10,306 +9,319 @@
     min-width: 10rem;
     z-index: 9999;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
     color: #212529 !important;
     text-decoration: none !important;
     background-color: transparent !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   
+  }
 
-.btn-color{
-  background-color: rgba(52, 174, 178, 1);
-  color: white;
-  border:1px solid rgba(52, 174, 178, 1);
-}
+  .btn-color {
+    background-color: rgba(52, 174, 178, 1);
+    color: white;
+    border: 1px solid rgba(52, 174, 178, 1);
+  }
 
-.btn-color:hover{
+  .btn-color:hover {
     background-color: rgba(41, 139, 142, 1);
     color: white;
-    border:1px solid  rgba(41, 139, 142, 1);
-}
-
+    border: 1px solid rgba(41, 139, 142, 1);
+  }
 </style>
-<div class="row" id="tpa_list">
+<div class="container-fluid-min">
+  <div class="row" id="tpa_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">TPA</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Name</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
-                    <tbody>
-                    <?php if(is_array($tpaList)) {foreach($tpaList as $row){ ?>
-                      <tr>
-                        <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </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" href="<?= base_url("master/tpa/list/"); ?><?= $row['id'];?>"><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="removeTPA(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                    <?php }}?>
+            <tbody>
+              <?php if (is_array($tpaList)) {
+                foreach ($tpaList as $row) { ?>
+                  <tr>
+                    <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </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" href="<?= base_url("master/tpa/list/"); ?><?= $row['id']; ?>"><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="removeTPA(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+              <?php }
+              } ?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 <script>
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      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);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              e.preventDefault();
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-
-                // Close the dropdown after handling the click
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
-            });
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
+
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
+
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers and add auto-close
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          e.preventDefault();
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          // Close the dropdown after handling the click
+          if (activeDropdown) {
+            activeDropdown.style.display = 'none';
+            activeDropdown = null;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
+  });
 </script>
 
 <script>
+  $(document).ready(function() {
 
- $(document).ready(function(){
-
+    
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'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'<'col-sm-5'i><'col-sm-7'p>>",
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'TPAList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
+              {
+                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                  className: 'btn app-btn-primary  mr-2',
+                  action: function () {
                     window.location.href = "<?= base_url("master/tpa/create"); ?>";
-                }
-            }
-
-        ],
-
-
+                  }
+              },
+              {
+                  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: 'TPAList',
+                                className: 'app-btn-primary ',
+                                exportOptions: {
+                                  columns: ':not(:last-child)'
+                                }
+                            }
+                  ]
+              }
+          ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true ,
+            search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+        searchPlaceholder: "Search"
+      },
+      paging: true,
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "TPAList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "TPAList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
+
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
+
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
-  }
-}
+  function removeTPA(element) {
 
+    Swal.fire({
+      title: "Are you sure?",
+      text: "You need to remove this TPA",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
+    }).then((result) => {
 
-function removeTPA(element) {
-
-  Swal.fire({
-            title: "Are you sure?",
-            text: "You need to remove this TPA",
-            icon: "info",
-            showCancelButton: true,
-            confirmButtonColor: "#3085d6",
-            confirmButtonText: "Yes",
-        }).then((result) => {
-
-            if (result.isConfirmed) {
-              var id = element.getAttribute('data-id');
-              var form_action = '<?= base_url("master/tpa/remove/") ?>' + id; 
-              $.ajax({
-                  url: form_action,
-                  type: "GET",
-                  dataType: 'json',
-                  processData: false,
-                  contentType: false,
-                  success: function(res) {
-                    // console.log(res.status == true);
-                      if(res){
-                        if (res.status == true) {
-                          toastr.success('TPA removed successfully', 'success');
-                          location.reload();
-                        } else {
-                          toastr.warning('Failed to remove TPA', 'warning');
-                        }
-                      }
-                  },
-                  error: function (xhr, status, error) {
-                      console.error(xhr.responseText);
-                      console.error(status, error);
-                      $('.loader').fadeOut();
-                      $('.loader-mask').delay(350).fadeOut('slow');
-                      toastr.warning('Failed to remove TPA', 'warning');
-                  }
-              });
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/tpa/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('TPA removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove TPA', 'warning');
+              }
             }
-
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove TPA', 'warning');
+          }
         });
+      }
+
+    });
   }
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index c12b6d06..9c5edb72 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div class="row" id="tpa_add">
@@ -41,7 +40,7 @@ body {
                         </span>
                         <span class="title-text ">TPA</span>
                     </h4>
-            
+
                     <!-- <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">TPA</h4>
                     </div>
@@ -49,21 +48,31 @@ body {
                         <a href="<?= base_url("master/tpa/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div> -->
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="tpa_branch_contacts_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="tpa_branch_contacts_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
+                            </a>
+                        </li>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('tpa_basic_info.php'); ?>
                     <?php include('tpa_branch.php'); ?>
@@ -79,20 +88,21 @@ body {
         var check_tpa_id = $('#tpa_General_PrimaryKey');
 
 
-        if(check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0){
+        if (check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the TPA!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the TPA!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             // if ($('#btnBranchBack')[0].style.display == 'none') {
-                $('#btnBranchAdd').show();
+            $('#btnBranchAdd').show();
             // }
         }
-        
+
     }
 
     document.getElementById("tpa_branch_contacts_id").addEventListener("click", function(event) {
         event.preventDefault();
         tpa_branch_contact();
     });
-</script>
-
+</script>
\ No newline at end of file
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 650e9fa1..476a0439 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -1,188 +1,185 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter {
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.right-align-input {
-    text-align: right;
-}
+    .right-align-input {
+        text-align: right;
+    }
 
-.center-align-input {
-    text-align: center;
-}
+    .center-align-input {
+        text-align: center;
+    }
 </style>
 
-<div class="row" id="varience_filter">
+<div class="container-fluid-min">
+    <div class="col-12" id="varience_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="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <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>
-                </h5>
-                <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" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client</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" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client Branch</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()" >
-                                        <option value="0" selected>Select Insurer</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0" selected>Select Insurer Branch</option>
-                                    </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_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Policy Type</option>
-                                        <?php
+                                    <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_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <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>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="client_policy_id" name="client_policy_id" >
-                                        <option value="0" selected>Select client policy</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="client_policy_id" name="client_policy_id">
+                                            <option value="0" selected>Select client policy</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" name="issuer" required>
-                                        <option value="0">Select Issure</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" 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>
+                                            ?>
+                                        </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
+                                    <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>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <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">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
+                                </div>
+
+                                <div class="form-group text-right m-b-0">
+                                    <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
+                                        class="btn btn-secondary" id="clear-filters">Clear</a>
+                                    <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
+                                        class="btn btn-primary" id="get-emp-list"
+                                        onclick="fetchEmpolyeeList(event);">Submit</a>
                                 </div>
 
                             </div>
-
-                            <div class="form-group text-right m-b-0">
-                                <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
-                                    class="btn btn-secondary" id="clear-filters">Clear</a>
-                                <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
-                                    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="varience_list">
-    <div class="card">
-        <div class="card-body">
-            <div class="row" style="padding-bottom: 10px;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Variance Report</h4>
+    <div class="col-12" id="varience_list">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" style="padding-bottom: 10px;">
+                    <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Variance Report</h4>
+                    </div>
+
                 </div>
-
-            </div>
             <div class="table-responsive">
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client</th>
-                            <th>Client Branch</th>
-                            <th>Insurer</th>
-                            <th>Insurer Branch</th>
-                            <th>Policy</th>
-                            <th>Endorsement No</th>
-                            <th>Premium</th>
-                            <th>Statement Premium</th>
-                            <th>Premium Variance</th>
-                            <th>Expected Amount</th>
-                            <th>Statement Amount</th>
-                            <th>Variance</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client&nbsp;</th>
+                            <th>Client Branch&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Insurer Branch&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Premium&nbsp;</th>
+                            <th>Statement Premium&nbsp;</th>
+                            <th>Premium Variance&nbsp;</th>
+                            <th>Expected Amount&nbsp;</th>
+                            <th>Statement Amount&nbsp;</th>
+                            <th>Variance&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php if (isset($varience_list)) { ?>
                         <?php foreach($varience_list as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['client_name']; ?></td>
                             <td><?php echo $row['client_branch_name']; ?></td>
                             <td><?php echo $row['insurer_name']; ?></td>
@@ -203,78 +200,86 @@ table.dataTable tbody td {
 
                 <div>
                 </div>
-            </div>
-        </div><!-- end col -->
+            </div><!-- end col -->
+        </div>
     </div>
 </div>
 
+
 <script>
+    let client_list = [];
+    let branch_list = [];
+    let policy_list = [];
+    let insurer_list = [];
+    let insurer_branch_list = [];
 
-let client_list = [];
-let branch_list = [];
-let policy_list = [];
-let insurer_list = [];
-let insurer_branch_list = [];
+    // Datatable document ready
+    $(document).ready(function() {
 
-// Datatable document ready
-$(document).ready(function() {
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [{
+                    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-BDS-List',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-    if (ticketsTable.length) {
-        ticketsTable.DataTable({
-            scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this)
+                                        .text()); // Get the value inside the cell
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) +
+                                    2; // Find the next row index
+                                var totalRow = '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex +
+                                    '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                    '</v></c>' + // Insert sum in AB
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
-                }
-
-            ],
+                        } 
+                    ]
+                }],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
             paging: true, // Enable pagination
             pageLength: 25 // Set default number of rows per page (optional)
         });
     } else {
-        console.error("Table not found.");
+         console.error("Table not found.");
     }
 });
 
@@ -401,7 +406,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').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'));
     }
@@ -409,6 +414,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -501,181 +507,398 @@ function getClientAndBranchAndPolicy()
     });
 }
 
-//append clients for filter 
-function appendClients(data) 
-{
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-cn': item.client_name,
-            'data-ct': item.client_type,
-            class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
-        });
-
-        $('#client_id').append(option);
-    });
-
-}
-
-//append clients branch for filter 
-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);
-    });
-}
-
-//append insurer for filter 
-function appendInsurer(data) 
-{
-    $('#insurer_id').empty();
-
-    $('#insurer_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.name,
-        });
-
-        $('#insurer_id').append(option);
-    });
-
-}
-
-//append insurer branch for filter 
-function appendInsurerBranch(data) 
-{
-
-    $('#insurer_branch_id').empty();
-
-    $('#insurer_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#insurer_branch_id').append(option);
-    });
-}
-
-//append client policy for filter
-function appendPolicies(data)
-{
-    // 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,
-        });
-        $('#client_policy_id').append(option);
-    });
-}
-
-// -------------------------------------------------------------------------------------------------
-
-//client branch and insurer branch onchange document ready function
-$(document).ready(function(){
-
-    $('#client_id').change(function(){
-
-        let client_id = $(this).val();
-        console.log('client_id', client_id);
-
-        if(branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = branch_list[client_id];
-            appendBranch(data);
-        }
-        
+    $(document).ready(function() {
+        getClientAndBranchAndPolicy()
+        getURLParams()
+        $('#client_id').select2();
+        $('#client_branch_id').select2();
+        $('#insurer_id').select2();
+        $('#insurer_branch_id').select2();
+        $('#client_policy_id').select2();
+        $('#policy_type_id').select2();
     })
 
-    $('#insurer_id').change(function(){
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-        let insurer_id = $(this).val();
-        console.log('insurer_id', insurer_id);
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+        var client_branch_id = $('#client_branch_id').val();
+        var insurer_branch_id = $('#insurer_branch_id').val();
+        var client_policy_id = $('#client_policy_id').val();
 
-        if(insurer_branch_list != '') {
-            // console.log(insurer_branch_list[insurer_id]);
-            let data = insurer_branch_list[insurer_id];
-            appendInsurerBranch(data);
-        }
+        console.log(start_date + '-' + end_date);
 
-    })
-
-});
-
-//get policy list based on the client, client_branch, insurer, insurer_branch and policy type
-function getClientPolicyDataBasedOnClientAndInsuer(){
-
-    let client_id = $('#client_id').val() ?? 0;
-    let client_branch_id = $('#client_branch_id').val() ?? 0;
-    let insurer_id = $('#insurer_id').val() ?? 0;
-    let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
-    let policy_type_id = $('#policy_type_id').val() ?? 0;
-
-    let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
-
-    let requestData = { 
-            client_id: client_id, 
-            client_branch_id: client_branch_id, 
-            insurer_id: insurer_id, 
-            insurer_branch_id: insurer_branch_id, 
-            policy_type_id: policy_type_id, 
+        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,
+            client_branch_id: client_branch_id,
+            insurer_branch_id: insurer_branch_id,
+            client_policy_id: client_policy_id,
         };
 
-    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-        console.log('Data fetched successfully:', response);
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 
-        if (response.status === true) {
+    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 client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
+        const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
+        const client_policy_id = params.get('client_policy_id') || 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('client_branch_id', client_branch_id)
+        console.log('insurer_branch_id', insurer_branch_id)
+        console.log('client_policy_id', client_policy_id)
+
+        // 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').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+                setTimeout(function() {
+                    $('#client_branch_id').val(client_branch_id).change()
+                    $('#insurer_branch_id').val(insurer_branch_id).change()
+                    setTimeout(function() {
+                        $('#client_policy_id').val(client_policy_id).change();
+                    }, 1000);
+                }, 2000)
+            }, 2000)
 
-            appendPolicies(response.data)
-            
-        } else {
-            toastr.warning(response.message, 'WARNING');
         }
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
+
+    }
+
+    $(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').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').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').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 sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //featch client, client branch, insurer, insurer branch and client policy list data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+                    insurer_list = res.insurer_data;
+                    insurer_branch_list = res.insurer_branch_data;
+                    appendClients(res.client_data);
+                    appendInsurer(res.insurer_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    //append clients for filter 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-cn': item.client_name,
+                'data-ct': item.client_type,
+                class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
+            });
+
+            $('#client_id').append(option);
+        });
+
+    }
+
+    //append clients branch for filter 
+    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);
+        });
+    }
+
+    //append insurer for filter 
+    function appendInsurer(data) {
+        $('#insurer_id').empty();
+
+        $('#insurer_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.name,
+            });
+
+            $('#insurer_id').append(option);
+        });
+
+    }
+
+    //append insurer branch for filter 
+    function appendInsurerBranch(data) {
+
+        $('#insurer_branch_id').empty();
+
+        $('#insurer_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#insurer_branch_id').append(option);
+        });
+    }
+
+    //append client policy for filter
+    function appendPolicies(data) {
+        // 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,
+            });
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //client branch and insurer branch onchange document ready function
+    $(document).ready(function() {
+
+        $('#client_id').change(function() {
+
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
+
+            if (branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch(data);
+            }
+
+        })
+
+        $('#insurer_id').change(function() {
+
+            let insurer_id = $(this).val();
+            console.log('insurer_id', insurer_id);
+
+            if (insurer_branch_list != '') {
+                // console.log(insurer_branch_list[insurer_id]);
+                let data = insurer_branch_list[insurer_id];
+                appendInsurerBranch(data);
+            }
+
+        })
+
+    });
+
+    //get policy list based on the client, client_branch, insurer, insurer_branch and policy type
+    function getClientPolicyDataBasedOnClientAndInsuer() {
+
+        let client_id = $('#client_id').val() ?? 0;
+        let client_branch_id = $('#client_branch_id').val() ?? 0;
+        let insurer_id = $('#insurer_id').val() ?? 0;
+        let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
+        let policy_type_id = $('#policy_type_id').val() ?? 0;
+
+        let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+
+        let requestData = {
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+            insurer_id: insurer_id,
+            insurer_branch_id: insurer_branch_id,
+            policy_type_id: policy_type_id,
+        };
+
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+            console.log('Data fetched successfully:', response);
+
+            if (response.status === true) {
+
+                appendPolicies(response.data)
+
+            } 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/vehicle_docs.php b/app/Views/vehicle_docs.php
index d5d2a83f..28f817d4 100644
--- a/app/Views/vehicle_docs.php
+++ b/app/Views/vehicle_docs.php
@@ -36,7 +36,8 @@
         </div>
     </div>
 
-    <div id="vehicle_file_table" class="card">
+    <div id="collapseOne">
+     <div id="vehicle_file_table" class="card">
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
@@ -45,13 +46,13 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="vehicle_table_bd">
@@ -61,6 +62,7 @@
                 </div>
             </div>
         </div><!-- end col -->
+     </div>
     </div>
 
 </div>
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index 4456b5f1..9d83d62e 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -66,35 +66,35 @@ table.dataTable tbody td {
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                <div class="row" style="margin-bottom:1rem;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Vehicle Master</h4>
                     </div>
-                </div>
+                </div> -->
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No.</th>
-                            <th class="font-weight-medium">Owner Type</th>
-                            <th class="font-weight-medium">Owner Name</th>
-                            <th class="font-weight-medium">RC Book No</th>
-                            <th class="font-weight-medium">Vehicle No</th>
-                            <th class="font-weight-medium">Vehicle type</th>
-                            <th class="font-weight-medium">Description</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Owner Type&nbsp;</th>
+                            <th class="font-weight-medium">Owner Name&nbsp;</th>
+                            <th class="font-weight-medium">RC Book No&nbsp;</th>
+                            <th class="font-weight-medium">Vehicle No&nbsp;</th>
+                            <th class="font-weight-medium">Vehicle type&nbsp;</th>
+                            <th class="font-weight-medium">Description&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
                     <tbody>
                         <?php foreach($vehicle_Master_Data as $index => $row){ ?>
                         <tr>
-                            <td><?php echo $index+1; ?></td>
-                            <td><?php echo $row['owner_type']; ?></td>
-                            <td><?php echo $row['owner_name']; ?></td>
-                            <td><?php echo $row['rc']; ?></td>
-                            <td><?php echo $row['vehicle_no']; ?></td>
-                            <td><?php echo $row['vehicle_type']; ?></td>
-                            <td><?php echo $vehicle_des[$row['description']] ?? ""; ?></td>
+                            <td class="text-center"><?php echo $index+1; ?></td>
+                            <td><?php echo $row['owner_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['owner_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['rc'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $vehicle_des[$row['description']] ?? "N/A"; ?></td>
                             <td>
                                 <div class="btn-group dropdown">
                                     <a href="javascript: void(0);"
@@ -466,40 +466,61 @@ $(document).ready(function() {
 $(document).ready(function() {
 
     $('#scroll-horizontal-datatable').DataTable({
-        scrollX: true,
-        dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
-            "<'row'<'col-sm-12'tr>>" +
-            "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-        buttons: [
-            {
-            extend: 'csv',
-            text: 'CSV',
-            title: 'Vehicle-Master-List',
-            className: 'my_class',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-            },
-            {
-                text: 'ADD',
-                className: 'btn-color',
-                attr: {
-                    id: 'btnAdd',
-                    title: 'Add'
-                },
-                action: function () {
-                    showModal('add')
-                }
-            }
-    ],
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true,
-    });
-
-})
+          scrollX: true,
+          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
+            "<'row'<'col-sm-12'tr>>" + 
+            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+            buttons: [  
+              {
+                    text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                    className: 'btn app-btn-primary btn-color mr-2',
+                    attr: {
+                        id: 'btnAdd',
+                        title: 'Add'
+                    },
+                    action: function () {
+                        showModal('add')
+                    }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                title: 'Vehicle-Master-List',
+                                className: 'my_class',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary my_class',
+                                exportOptions: {
+                                    columns: ':not(:last-child)'
+                                },
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
+          language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+          },
+          paging: true,
+          pageLength: 10,
+          order: [[0, 'desc']]
+         });
+});
 
 function getEditVehicleDetailsData(input) {
 
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index bf25aeac..606da89e 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -226,8 +226,8 @@
                 </div> -->
                 
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary" id="saveTransactionBtn">Save Transaction</button>
+                    <button type="button" class="btn cancel-btn" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary submit-btn" id="saveTransactionBtn">Submit</button>
                 </div>
 
             </div>
@@ -258,51 +258,101 @@
                 dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
                     "<'row'<'col-sm-12'tr>>" + 
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
-
+                // buttons: [
+                //     {
+                //         text: '+ add',
+                //         className: 'btn btn-primary buttons-html5',
+                //         action: function () {
+                //             var myModal = new bootstrap.Modal(document.getElementById('addTransactionModal'));
+                //             myModal.show();
+                //         }
+                //     }
+                //     ,
+                //     {
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'CD TransactionDetails',
+                //         exportOptions: {
+                //             columns: ''
+                //         }
+                //     },
+                //     {
+                //         extend: 'pdf',
+                //         text: 'PDF',
+                //         title: 'TransactionDetails',
+                //         exportOptions: {
+                //             columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                //             format: {
+                //                 body: function (data, row, column, node) {
+                //                     return data.replace(/<.*?>/g, '');
+                //                 }
+                //             }
+                //         },
+                //         customize: function (doc) {
+                //             doc.pageOrientation = 'landscape';
+                //             doc.styles.tableHeader.alignment = 'left';
+                //             doc.defaultStyle.alignment = 'left';
+                //             doc.content[1].table.widths = [
+                //                 '9%', '9%', '8%', '9%', '10%',
+                //                 '9%', '9%', '9%', '9%', '11%', '8%'
+                //             ];
+                //         }
+                //     }
+                // ],
                 buttons: [
                     {
-                        text: '+ add',
-                        className: 'btn btn-primary buttons-html5',
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
                         action: function () {
                             var myModal = new bootstrap.Modal(document.getElementById('addTransactionModal'));
                             myModal.show();
                         }
-                    }
-                    ,
-                    {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'CD TransactionDetails',
-                        exportOptions: {
-                            columns: ''
-                        }
                     },
                     {
-                        extend: 'pdf',
-                        text: 'PDF',
-                        title: 'TransactionDetails',
-                        exportOptions: {
-                            columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-                            format: {
-                                body: function (data, row, column, node) {
-                                    return data.replace(/<.*?>/g, '');
+                        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: 'CD TransactionDetails',
+                                        exportOptions: { columns: '' },
+                                        className: 'app-btn-primary ',
+                                    },
+                                    {
+                                extend: 'pdf',
+                                text: 'PDF',
+                                text: '<i class="mdi mdi-file-pdf" ></i><span class="  btn-custom">  EXCEL </span>',
+                                title: 'TransactionDetails',
+                                exportOptions: {
+                                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                                    format: {
+                                        body: function (data, row, column, node) {
+                                            return data.replace(/<.*?>/g, '');
+                                        }
+                                    }
+                                },
+                                customize: function (doc) {
+                                    doc.pageOrientation = 'landscape';
+                                    doc.styles.tableHeader.alignment = 'left';
+                                    doc.defaultStyle.alignment = 'left';
+                                    doc.content[1].table.widths = [
+                                        '9%', '9%', '8%', '9%', '10%',
+                                        '9%', '9%', '9%', '9%', '11%', '8%'
+                                    ];
                                 }
                             }
-                        },
-                        customize: function (doc) {
-                            doc.pageOrientation = 'landscape';
-                            doc.styles.tableHeader.alignment = 'left';
-                            doc.defaultStyle.alignment = 'left';
-                            doc.content[1].table.widths = [
-                                '9%', '9%', '8%', '9%', '10%',
-                                '9%', '9%', '9%', '9%', '11%', '8%'
-                            ];
-                        }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 ordering: false,
                 paging: true
diff --git a/app/Views/view_policy_terms.php b/app/Views/view_policy_terms.php
index 1b9df63a..944ba3e2 100644
--- a/app/Views/view_policy_terms.php
+++ b/app/Views/view_policy_terms.php
@@ -97,21 +97,17 @@
 ?> -->
 
 <style>
-    .policy-terms-container {
-        border: 1px solid #ddd;
-        border-radius: 8px;
-        background-color: #fafafa;
-        padding: 20px;
-        max-width: 1200px;
-        margin: 20px auto;
-        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    }
 
     .policy-row {
         display: flex;
         border-bottom: 1px solid #eee;
         padding: 12px 0;
         align-items: center;
+        background-color: #F4FFFF;
+        border:1px solid #A0F0FF;
+        border-radius: 10px;
+        margin-bottom: 10px;
+        padding-left: 40px;
     }
 
     .policy-row:last-child {
@@ -181,6 +177,15 @@
             padding-top: 8px;
             width: 100%;
         }
+
+        .key-value-pair{
+            border:2px solid white !important;
+            background-color: white !important;
+            color: black !important;
+            padding: 5px !important;
+
+        }
+
     }
 </style>
 
@@ -191,8 +196,20 @@
                 <div class="policy-label">
                     <label><?= htmlspecialchars($key) ?></label>
                 </div>
-                <div class="policy-value">
-                    <span><?= $value ?></span>
+                <div class="policy-value d-flex flex-wrap">
+                <?php
+                    if(str_contains($value,":")){
+                            $value_array = explode(",", $value);
+                            foreach($value_array as $val){
+                                echo "<span style='border:2px solid #C3EDEE; border-radius:10px;background-color:white;padding:0 10px 0 10px; margin:10px;'>".
+                                         $val .
+                                    "</span> &nbsp;&nbsp;";
+                            }
+                    }else{ ?>
+                        <span><?= $value ?></span>
+                <?php }
+                ?>
+                    
                 </div>
             </div>
         <?php } ?>
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 3fcbe414..d3139864 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -1,7 +1,5 @@
 <style>
 
-
-
     .table-container {
         overflow-x: auto !important;
         /* margin-top: 20px; */
@@ -178,18 +176,18 @@
         width: 300px;
     }
 
-    .dialog-header {
+    /* .dialog-header {
         font-size: 18px;
         margin-bottom: 10px;
-    }
+    } */
 
     .dialog-content {
         margin-bottom: 15px;
     }
 
-    .dialog-footer {
+    /* .dialog-footer {
         text-align: right;
-    }
+    } */
 
     .dialog button {
         padding: 5px 10px;
@@ -310,16 +308,205 @@
 
 </style>
 
+<style>
+        
+    .dialog {
+        position: fixed;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        background: white;
+        border-radius: 8px;
+        box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
+        z-index: 1000;
+        width: 90%;
+        max-width: 450px;
+        max-height: 90vh;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .dialog-header {
+        padding: 10px 20px;
+        border-bottom: 1px solid #ddd;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        flex-shrink: 0;
+        background: #f8f9fa;
+        border-radius: 8px 8px 0 0;
+        position: relative;
+        top: -7px;
+    }
+
+    .dialog-content {
+        padding: 22px;
+        /* overflow-y: auto;
+        overflow-x: hidden; */
+        flex: 1;
+        /* max-height: calc(80vh - 120px); */
+    }
+
+    .dialog-content::-webkit-scrollbar {
+        width: 8px;
+    }
+
+    .dialog-content::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 4px;
+    }
+
+    .dialog-content::-webkit-scrollbar-thumb {
+        background: #888;
+        border-radius: 4px;
+    }
+
+    .dialog-content::-webkit-scrollbar-thumb:hover {
+        background: #555;
+    }
+
+    .dialog-footer {
+        padding: 5px 5px;
+        /* border-top: 1px solid #ddd; */
+        text-align: right;
+        flex-shrink: 0;
+        /* background: #f8f9fa; */
+        /* border-radius: 0 0 8px 8px; */
+        margin-top: -41px;  
+    }
+
+    /* Family Row Layout */
+    .family-row {
+        display: flex;
+        align-items: flex-start;
+        gap: 15px;
+        margin-bottom: 15px;
+        min-height: 45px;
+    }
+
+    .family-member-col {
+        flex: 0 0 200px;
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+    }
+
+    .family-member-col.full-width {
+        flex: 1;
+    }
+
+    .family-member-col > label {
+        font-weight: 500;
+        margin-bottom: 5px;
+        display: block;
+    }
+
+    .family-member-col input[type="checkbox"] {
+        margin-right: 8px;
+    }
+
+    .age-inputs-col {
+        flex: 1;
+        display: flex;
+        gap: 15px;
+        align-items: flex-start;
+        transition: opacity 0.3s ease;
+    }
+
+    .age-inputs-col.hidden {
+        opacity: 0;
+        visibility: hidden;
+        pointer-events: none;
+    }
+
+    .age-input-group {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+    }
+
+    .age-label {
+        font-size: 12px;
+        font-weight: 500;
+        color: #666;
+        margin-bottom: 3px;
+        display: block;
+    }
+
+    .age-input {
+        width: 100%;
+        max-width: 120px;
+        padding: 6px 10px;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+        font-size: 14px;
+    }
+
+    .age-input:focus {
+        outline: none;
+        border-color: #007bff;
+        box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+    }
+
+    .select-small {
+        width: 200px !important;
+        display: inline-block;
+    }
+
+    .form-control {
+        width: 100%;
+        padding: 6px 10px;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+        font-size: 14px;
+    }
+
+    /* Responsive */
+    @media (max-width: 576px) {
+        .family-row {
+            flex-direction: column;
+            align-items: stretch;
+        }
+        
+        .family-member-col {
+            flex: 1;
+            width: 100%;
+        }
+        
+        .age-inputs-col {
+            width: 100%;
+        }
+        
+        .age-input {
+            max-width: none;
+        }
+    }
+</style>
+
+
 <div class="row" id="inception_list">
     <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;">
+                    <div class="col-4" style="align-self: center;">
                         <h4 style="position: relative;" id="rfq_qcr_page_title"> <?= isset($page_name) ? $page_name : 'RFQ' ?></h4>
                     </div>
 
+                    <div class="col-2" style="position: relative;right: 255px;">
+                        <?php if($lead_data['demography_file_status'] == "failed") { ?>
+                            <a href="<?= base_url('util/getMemberDataExcelFileErrors?lead_id=').$lead_data['id'] ?>" 
+                                class="mdi mdi-information-outline text-danger" 
+                                style="cursor: pointer; font-size: 27px" 
+                                data-toggle="tooltip" 
+                                data-placement="top" 
+                                title="Member data demography file validation failed Click to view the Error data" target="_blank">
+                            </a>
+                        <?php }  ?>
+                    </div>
+
                     <div class="col-2" id="status_change"
                         style="text-align: right; position: relative;top: 56px; left: 386px;">
                         <a onclick="checkTheTableDataChanged(1)" class="btn btn-primary">Back</a>
@@ -339,6 +526,7 @@
                 <?php } ?>
                 <button id="submitPlacement" class="btn btn-primary" onclick="checkTheTableDataChanged(6)">Placement</button>
                 <button id="viewDemography" class="btn btn-primary" onclick="viewDemography()">Demography</button>
+                <button id="viewDocs" class="btn btn-primary" onclick="viewDocs()">Docs</button>
                 <input type="hidden" id="lead_id" name="lead_id" value="<?= isset($lead_id) ? $lead_id : '' ?>">
                 <input type="hidden" id="rfq_primaryKey" name="rfq_primaryKey" value="<?= isset($rfq_data['id']) ? $rfq_data['id'] : '' ?>">
                 <input type="hidden" id="qcr_count" value="<?= isset($qcr_count) ? $qcr_count : 0 ?>">
@@ -349,7 +537,7 @@
                     <table  id="rfqTable" class="table table-bordered mt-3">
                         <thead>
                             <tr>
-                                <th class="sticky no-border" style="border-right: 2px solid rgb(0, 123, 255) !important; border-left: 2px solid rgb(0, 123, 255) !important; border-top: 2px solid rgb(0, 123, 255) !important; min-width: 72px !important;"><span class="key_name" style="display: none;">Sno</span><span class="display_name">S.No.</span></th>
+                                <th class="sticky no-border" style="border-right: 2px solid rgb(0, 123, 255) !important; border-left: 2px solid rgb(0, 123, 255) !important; border-top: 2px solid rgb(0, 123, 255) !important; min-width: 72px !important;"><span class="key_name" style="display: none;">Sno</span><span class="display_name">S.No&nbsp;</span></th>
                                 <th class="hidden no-border" style="border-right: 2px solid rgb(0, 123, 255) !important;">Item Key</th>
                                 <th class="sticky no-border" style="border-top: 2px solid rgb(0, 123, 255) !important; border-right: 2px solid rgb(0, 123, 255) !important;">Particulars</th>
                                 <th class="sticky no-border" style="background-color: white !important;" contenteditable="false" id="first_proposel_title" ><span class="key_name" style="display: none;">Proposal 1</span><span class="display_name">Proposal Coverage 1</span>
@@ -425,51 +613,130 @@
 </div>
 
 <!-- familiy floater dialog -->
-<div class="dialog" id="familyFloaterDialog">
-    <div class="dialog-header ">
-        <span style="color:black;" >Family Members </span>
+<div class="dialog" id="familyFloaterDialog" style="display: none;">
+    <div class="dialog-header">
+        <span style="color:black;">Family Members</span>
         <span>
             <i class="mdi mdi-close remove-icon" id="closeDialogBtn" aria-hidden="true"
                 style="color: black;text-align: right;margin-left: 80px;margin-top:10px;"></i>
         </span>
     </div>
     <div class="dialog-content">
-        <label>
-            <input type="checkbox" id="family_self" checked>
-            Self
-        </label><br>
-        <label>
-            <input type="checkbox" id="family_spouse">
-            Spouse
-        </label><br>
-        <label for="children">Children:</label>
-        <select class="form-control" id="family_children">
-            <option value="0">0</option>
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-        </select><br>
-        <label for="otherMembers">Other Members:</label>
-        <select class="form-control" id="family_other_members" onchange="setEldersCount(this)">
-            <option value="0">Select</option>
-            <option data-value="1" value="oneparent">Only one parent (Either Father / Mother)</option>
-            <option data-value="2" value="twoparent">Only two parents (Father+Mother)</option>
-            <option data-value="1" value="onepil">Only one parent in law (Either MIL / FIL)</option>
-            <option data-value="2" value="twopil">Only two parents in law (FIL + MIL)</option>
-            <option data-value="2" value="either_par_pil">Parents or PIL (Any two of Father, Mother, MIl, FIL)</option>
-            <option data-value="2" value="any_two">Either Parents or PIL (Parents or Parents In Law)</option>
-            <option data-value="4" value="all">Parents + PIL (Father + Mother + MIL + FIL)</option>
-        </select><br>
-        <label for="eldersCount">Elders Count:</label>
-        <input class="form-control" type="text" id="family_elders_count" readonly>
+        <!-- Self -->
+        <div class="family-row">
+            <div class="family-member-col" style="margin-top: 15px;">
+                <label>
+                    <input type="checkbox" id="family_self" checked onchange="toggleAgeFields(this, 'self')">
+                    Self
+                </label>
+            </div>
+            <div class="age-inputs-col" id="self_age_fields">
+                <div class="age-input-group" style="margin-top: -23px;">
+                    <label class="age-label">Min Age</label>
+                    <input type="number" class="age-input" id="family_self_min_age" 
+                           placeholder="18" min="18" max="99">
+                </div>
+                <div class="age-input-group" style="margin-top: -23px;">
+                    <label class="age-label">Max Age</label>
+                    <input type="number" class="age-input" id="family_self_max_age" 
+                           placeholder="99" min="18" max="99">
+                </div>
+            </div>
+        </div>
+
+        <!-- Spouse -->
+        <div class="family-row">
+            <div class="family-member-col" style="margin-top: 24px;">
+                <label>
+                    <input type="checkbox" id="family_spouse" onchange="toggleAgeFields(this, 'spouse')">
+                    Spouse
+                </label>
+            </div>
+            <div class="age-inputs-col hidden" id="spouse_age_fields">
+                <div class="age-input-group" style="margin-top: -11px;">
+                    <label class="age-label">Min Age</label>
+                    <input type="number" class="age-input" id="family_spouse_min_age" 
+                           placeholder="18" min="18" max="99">
+                </div>
+                <div class="age-input-group" style="margin-top: -11px;">
+                    <label class="age-label">Max Age</label>
+                    <input type="number" class="age-input" id="family_spouse_max_age" 
+                           placeholder="99" min="18" max="99">
+                </div>
+            </div>
+        </div>
+
+        <!-- Children -->
+        <div class="family-row">
+            <div class="family-member-col">
+                <label for="children">Children:</label>
+                <select class="form-control select-small" id="family_children" onchange="toggleAgeFields(this, 'children')">
+                    <option value="0">0</option>
+                    <option value="1">1</option>
+                    <option value="2">2</option>
+                    <option value="3">3</option>
+                    <option value="4">4</option>
+                </select>
+            </div>
+            <div class="age-inputs-col hidden" id="children_age_fields">
+                <div class="age-input-group">
+                    <label class="age-label">Min Age</label>
+                    <input type="number" class="age-input" id="family_children_min_age" 
+                           placeholder="0" min="0" max="25">
+                </div>
+                <div class="age-input-group">
+                    <label class="age-label">Max Age</label>
+                    <input type="number" class="age-input" id="family_children_max_age" 
+                           placeholder="25" min="0" max="25">
+                </div>
+            </div>
+        </div>
+
+        <!-- Other Members -->
+        <div class="family-row">
+            <div class="family-member-col">
+                <label for="otherMembers">Other Members:</label>
+                <select class="form-control" id="family_other_members" onchange="setEldersCount(this); toggleAgeFields(this, 'others')">
+                    <option value="0">Select</option>
+                    <option data-value="1" value="oneparent">Only one parent (Either Father / Mother)</option>
+                    <option data-value="2" value="twoparent">Only two parents (Father+Mother)</option>
+                    <option data-value="1" value="onepil">Only one parent in law (Either MIL / FIL)</option>
+                    <option data-value="2" value="twopil">Only two parents in law (FIL + MIL)</option>
+                    <option data-value="2" value="either_par_pil">Parents or PIL (Any two of Father, Mother, MIl, FIL)</option>
+                    <option data-value="2" value="any_two">Either Parents or PIL (Parents or Parents In Law)</option>
+                    <option data-value="4" value="all">Parents + PIL (Father + Mother + MIL + FIL)</option>
+                </select>
+            </div>
+            <div class="age-inputs-col hidden" id="others_age_fields">
+                <div class="age-input-group">
+                    <label class="age-label">Min Age</label>
+                    <input type="number" class="age-input" id="family_others_min_age" 
+                           placeholder="40" min="40" max="99">
+                </div>
+                <div class="age-input-group">
+                    <label class="age-label">Max Age</label>
+                    <input type="number" class="age-input" id="family_others_max_age" 
+                           placeholder="99" min="40" max="99" >
+                </div>
+            </div>
+        </div>
+
+        <!-- Elders Count -->
+        <div class="family-row">
+            <div class="family-member-col full-width">
+                <label for="eldersCount">Elders Count:</label>
+                <input class="form-control" type="text" id="family_elders_count" readonly>
+            </div>
+        </div>
+        
         <input type="text" id="familiy_dialog_row_index" style="display: none;" readonly>
         <input type="text" id="familiy_dialog_column_index" style="display: none;" readonly>
     </div>
     <div class="dialog-footer">
-        <button class="btn btn-primary btn-sm" id="savefamiliy" onclick="saveFamilyMembersDetails()">save</button>
+        <button class="btn btn-primary btn-sm" id="savefamiliy" onclick="saveFamilyMembersDetails()">Save</button>
     </div>
 </div>
+
 <!-- familiy floater dialog end -->
 
 <!-- Modal content for Send Insurer and Client Mail -->
@@ -492,7 +759,7 @@
                 <hr>
 
                 <div class="form-group" id="insurer_or_clinet_mail_attachment">
-                    <div class="form-row" >
+                    <div class="form-row attachmet_row">
                         <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
                     </div>
                 </div>
@@ -565,7 +832,7 @@
                 <hr>
 
                 <div class="form-group" id="internal_mail_attachment">
-                    <div class="form-row" >
+                    <div class="form-row attachmet_row">
                         <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
                     </div>
                 </div>
@@ -600,6 +867,22 @@
 
                     <div class="form-row">
 
+                        <div class="form-group col-md-3">
+                            <label for="tpa">TPA <span class="text-danger"></span></label>
+                            <select class="form-control" id="tpa_id" name="tpa">
+                                <option value="">Select TPA</option>
+                                <?php if (isset($tpa_list)) { 
+                                    $tpa_id = isset($lead_data['tpa_id']) ? $lead_data['tpa_id'] : "";
+                                    $tpa_branch_id = isset($lead_data['tpa_branch_id']) ? $lead_data['tpa_branch_id'] : "";
+                                    foreach ($tpa_list as $value) { ?>
+                                        <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>" 
+                                            <?= ($tpa_id == $value['tpa_id'] && $tpa_branch_id == $value['id']) ? 'selected' : '' ?>>
+                                            <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                        </option>
+                                <?php } } ?>
+                            </select>
+                        </div>
+
                         <div class="form-group col-md-3">
                             <label for="policy_start_date">Policy Start Date</label>
                             <input type="text" class="form-control" id="policy_start_date" name="policy_start_date" placeholder="DD/MM/YYY" value="<?= isset($lead_data['policy_start_date']) ? date('d-m-Y', strtotime($lead_data['policy_start_date'])) : "" ?>">
@@ -617,15 +900,15 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
+                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="219" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
                         </div>
 
                         <div class="form-group col-md-3">
-                            <label for="premium_amount">Premium Amount</label>
+                            <label for="premium_amount">Pre Amount include GST</label>
                             <input type="text" class="form-control" id="premium_amount" name="premium_amount" placeholder="Enter Premium Amount" value="<?= isset($lead_data['premium_amount']) ? $lead_data['premium_amount'] : "" ?>">
                         </div>
 
-                        <?php if (isset($lead_data['is_cd']) && $lead_data['is_cd'] == 1 || !isset($lead_data['is_cd'])) { ?>
+                        <?php if (isset($lead_data['is_cd']) && $lead_data['is_cd'] == 1 || !isset($lead_data['is_cd']) || $lead_data['is_cd'] == null) { ?>
 
                             <div class="form-group col-md-3">
                                 <label for="cd_amount">CD Amount</label>
@@ -706,6 +989,22 @@
                             </select>   
                         </div>
 
+                        <div class="form-group col-md-6">
+                            <label for="acm_id">Account Manager</label>
+                            <select class="form-control" id="acm_id" name="acm_id" required>
+                                <option value="">Select Account Manager Mail</option>
+                                <?php if (isset($account_manager)) { ?>
+                                    <?= $acm_id = isset($lead_data['acm_id']) ? $lead_data['acm_id'] : ""; ?>
+                                <?php foreach ($account_manager as $user) { ?>
+                                    <option value="<?= $user['email'];?>" data-id="<?= $user['id'] ?>" 
+                                        <?= ($acm_id == $user['id']) ? 'selected' : '' ?>>
+                                        <?= $user['first_name'].' - '.$user['email'];?>
+                                    </option>
+                                <?php } ?>
+                                <?php } ?>
+                            </select>   
+                        </div>
+
                         <div class="form-group col-md-12">
                             <label for="subject">Subject</label>
                             <input type="text" class="form-control" id="placement_subject" name="placement_subject" value="<?= isset($placement_subject) ? $placement_subject : " " ?>" placeholder="Enter Subject">
@@ -727,21 +1026,25 @@
                 <hr>
 
                 <div class="form-group" id="placement_mail_attachment">
-                    <div class="form-row" >
+                    <div class="form-row attachmet_row" >
                         <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
                     </div>
                 </div>
 
-                <div class="form-group text-right m-b-0" id="hide_smbt_btn">
+                <div class="form-group text-right m-b-0" id="send_mail_btn">
                     <button type="submit" class="btn btn-primary" onclick="constructURL(3)">Send Mail</button>
                 </div>
 
+                <div class="form-group text-right m-b-0" id="validate_file_btn" style="display: none;">
+                    <button type="submit" class="btn btn-warning" onclick="savePlacementDataAndValidateMemberDataFile(3)">Validate File</button>
+                </div>
+
             </div>
         </div><!-- /.modal-content -->
     </div>
 </div><!-- /.modal -->
 
-<!-- Modal content for View Demography Mail -->
+<!-- Modal content for View Demography Modal -->
 <div class="modal fade" id="view_demography_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
     aria-hidden="false">
     <div class="modal-dialog modal-full-width">
@@ -765,6 +1068,31 @@
     </div>
 </div><!-- /.modal -->
 
+<!-- Modal content for Other Docs Upload Modal -->
+<div class="modal fade" id="other_docs_upload_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+    aria-hidden="false">
+    <div class="modal-dialog modal-full-width">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="docsCenterModalLabel">Documents</h4>
+                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <form id="multiFileForm" enctype="multipart/form-data">
+                    <input type="hidden" name="lead_id" value="<?= isset($lead_id) ? $lead_id : '' ?>">
+                    <input type="hidden" name="lead_form_type" value="1">
+                    <div id="multiFileAppendArea">
+                        <?php echo isset($multi_file_data_html) && !empty($multi_file_data_html) ? $multi_file_data_html : ''; ?>
+                    </div>
+                    <div class="form-group text-right m-b-0 mt-3">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </div>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div>
+</div><!-- /.modal -->
+
 <script>
 
     var isFormDataModified = false;
@@ -948,6 +1276,8 @@
             placeholder: 'Select CC Mail',
         });
 
+        $('#acm_id').select2();
+
         $('#proposals').select2({
             placeholder: 'Select proposal',
         });
@@ -1021,16 +1351,24 @@ let intervalId;
 $(document).ready(function () {
     console.log("Document ready");
 
+    var demography_file_status_for_hide_and_show = '<?= $lead_data['demography_file_status'] ?>';
+    toggleButtons(demography_file_status_for_hide_and_show);
+
     let lead_status = '<?= isset($lead_data['status']) ?  $lead_data['status'] : '' ?>';
     console.log('Lead status retrieved:', lead_status);
 
     if (lead_status != "won") {
         console.log("Lead status is not 'won', setting interval for submitData");
 
-        startInterval();
+        // startInterval();
     } else {
         console.log("Lead status is 'won', submitData will not be called");
     }
+
+    <?php if (!isset($multi_file_data_html) || empty($multi_file_data_html)) : ?>
+        addFileField();
+    <?php endif; ?>
+
 });
 
 function startInterval() {
@@ -1056,10 +1394,12 @@ const closeDialogBtn = document.getElementById('closeDialogBtn');
 // };
 $('.remove-icon').on('click', function() {
     $('#familyFloaterDialog').css('display', 'none');
+    resetFamiliyDialogModalValues();
 });
 
 var currentThrdottedMenu = '';
 var proposal_colum_count = 1;
+var demography_file_status = '<?= $lead_data['demography_file_status'] ?>';
 
 var over_all_column_data = {
     "Proposal 1": {
@@ -1068,6 +1408,7 @@ var over_all_column_data = {
         'insurers': []
     }
 };
+
 document.addEventListener('DOMContentLoaded', function () {
     const textarea = document.getElementById('placement_mail_content');
     const textarea2 = document.getElementById("placement_subject");
@@ -1114,7 +1455,7 @@ function showFamilyFloaterDialogBox(target) {
     let hiddenInput = target.querySelector('input[type="hidden"]');
     // alert(hiddenInput);
     let inputValue = hiddenInput ? hiddenInput.value : null;
-    // console.log('hidden input value');
+    console.log('hidden input value');
     console.log(inputValue);
     if (inputValue !== null && inputValue !== '') {
         //get stored familiy composition json if any in hidden input and display it
@@ -1124,6 +1465,8 @@ function showFamilyFloaterDialogBox(target) {
 
         setFamilyDialogValues(inputValue);
         // return true;
+    }else{
+        resetFamiliyDialogModalValues();
     }
 
     // setCellInnerHTMLByCellIndex('rfqTable', currentTD.rowIndex, (currentTD.columnIndex), '<b>TEST</b>');
@@ -1142,6 +1485,19 @@ function saveFamilyMembersDetails() {
     var elders = $('#family_other_members').val();
     var elders_count = $('#family_elders_count').val();
 
+    // --- Get min/max age values ---
+    let self_min_age = $('#family_self_min_age').val();
+    let self_max_age = $('#family_self_max_age').val();
+
+    let spouse_min_age = $('#family_spouse_min_age').val();
+    let spouse_max_age = $('#family_spouse_max_age').val();
+
+    let children_min_age = $('#family_children_min_age').val();
+    let children_max_age = $('#family_children_max_age').val();
+
+    let others_min_age = $('#family_others_min_age').val();
+    let others_max_age = $('#family_others_max_age').val();
+
     console.log('Current Family Modal Values');
     console.log('self' + '-' + self);
     console.log('spouse' + '-' + spouse);
@@ -1162,8 +1518,17 @@ function saveFamilyMembersDetails() {
         'spouse': spouse,
         'children': children,
         'family_other_members': elders,
-        'elders_count': elders_count
+        'elders_count': elders_count,
+        'self_min_age': self_min_age,
+        'self_max_age': self_max_age,
+        'spouse_min_age': spouse_min_age,
+        'spouse_max_age': spouse_max_age,
+        'children_min_age': children_min_age,
+        'children_max_age': children_max_age,
+        'others_min_age': others_min_age,
+        'others_max_age': others_max_age
     });
+
     console.log('display string');
     console.log(display_value);
 
@@ -1191,16 +1556,36 @@ function saveFamilyMembersDetails() {
 }
 
 function resetFamiliyDialogModalValues() {
+
     $('#familiy_dialog_row_index').val('');
     $('#familiy_dialog_column_index').val('');
-    // $('#family_self').val('');
-    $('#family_self').prop('checked', true); // Checks the checkbox
-
-    // $('#family_spouse').val('');
-    $('#family_spouse').prop('checked', false); // Checks the checkbox
-    $('#family_children').val(0)
+    
+    // Reset Self
+    $('#family_self').prop('checked', true);
+    $('#family_self_min_age').val('18');
+    $('#family_self_max_age').val('99');
+    $('#self_age_fields').removeClass('hidden');
+    
+    // Reset Spouse
+    $('#family_spouse').prop('checked', false);
+    $('#family_spouse_min_age').val('0');
+    $('#family_spouse_max_age').val('0');
+    $('#spouse_age_fields').addClass('hidden');
+    
+    // Reset Children
+    $('#family_children').val('0');
+    $('#family_children_min_age').val('0');
+    $('#family_children_max_age').val('0');
+    $('#children_age_fields').addClass('hidden');
+    
+    // Reset Other Members
     $('#family_other_members').val('0');
-    $('#family_elders_count').val(0);
+    $('#family_others_min_age').val('0');
+    $('#family_others_max_age').val('0');
+    $('#others_age_fields').addClass('hidden');
+    
+    // Reset Elders Count
+    $('#family_elders_count').val('0');
 }
 
 function createFamilyDisplayString(familyArray) {
@@ -1242,6 +1627,9 @@ function createFamilyDisplayString(familyArray) {
 }
 
 function createFamilyJSONString(familyArray) {
+
+    console.log('familyArray', familyArray);
+
     let result = {
         "self": familyArray['self'] || 0,
         "spouse": familyArray['spouse'] || 0,
@@ -1252,6 +1640,15 @@ function createFamilyJSONString(familyArray) {
         "elders_count": familyArray['elders_count'] || "0"
     };
 
+    let familyAgeLimits = {
+        "self":   { "min": familyArray['self_min_age'], "max": familyArray['self_max_age'] },
+        "spouse": { "min": familyArray['spouse_min_age'],  "max": familyArray['spouse_max_age'] },
+        "child":  { "min": familyArray['children_min_age'],  "max": familyArray['children_max_age'] },
+        "elders": { "min": familyArray['others_min_age'],  "max": familyArray['others_max_age'] }
+    };
+
+    result['age_ratio'] = familyAgeLimits;
+
     // Process the family_other_members values to set parents and parents-in-law
     switch (familyArray['family_other_members']) {
         case 'oneparent':
@@ -1285,19 +1682,74 @@ function createFamilyJSONString(familyArray) {
             break;
     }
 
+    // Conditionally add min/max ages
+    if (result['self'] == 1) {
+        result['self_min_age'] = familyArray['self_min_age'];
+        result['self_max_age'] = familyArray['self_max_age'];
+    }
+
+    if (result['spouse'] == 1) {
+        result['spouse_min_age'] = familyArray['spouse_min_age'];
+        result['spouse_max_age'] = familyArray['spouse_max_age'];
+    }
+
+    if (parseInt(result['childrens']) > 0) {
+        result['children_min_age'] = familyArray['children_min_age'];
+        result['children_max_age'] = familyArray['children_max_age'];
+    }
+
+    if (familyArray['family_other_members'] && familyArray['family_other_members'] != "0") {
+        result['elders_min_age'] = familyArray['others_min_age'];
+        result['elders_max_age'] = familyArray['others_max_age'];
+    }
+
+    console.log('result', result);
+
     // Convert the result object to a JSON string
     return JSON.stringify(result);
 }
 
 function setFamilyDialogValues(familyData) {
+
     // Set Self checkbox
     $('#family_self').prop('checked', familyData.self === 1);
+    $('#family_self_min_age').val(familyData.self_min_age || 18);
+    $('#family_self_max_age').val(familyData.self_max_age || 99);
+    if (familyData.self === 1) {
+        $('#self_age_fields').removeClass('hidden');
+    } else {
+        $('#self_age_fields').addClass('hidden');
+    }
+
 
     // Set Spouse checkbox
     $('#family_spouse').prop('checked', familyData.spouse === 1);
+    $('#family_spouse_min_age').val(familyData.spouse_min_age || 18);
+    $('#family_spouse_max_age').val(familyData.spouse_max_age || 99);
+    if (familyData.spouse === 1) {
+        $('#spouse_age_fields').removeClass('hidden');
+    } else {
+        $('#spouse_age_fields').addClass('hidden');
+    }
 
     // Set Children select
     $('#family_children').val(familyData.childrens);
+    $('#family_children_min_age').val(familyData.children_min_age || 0);
+    $('#family_children_max_age').val(familyData.children_max_age || 25);
+    if (parseInt(familyData.childrens) > 0) {
+        $('#children_age_fields').removeClass('hidden');
+    } else {
+        $('#children_age_fields').addClass('hidden');
+    }
+
+    // Set Other Members
+    $('#family_others_min_age').val(familyData.elders_min_age || 40);
+    $('#family_others_max_age').val(familyData.elders_max_age || 99);
+    if (familyData.elders_count && familyData.elders_count != 0) {
+        $('#others_age_fields').removeClass('hidden');
+    } else {
+        $('#others_age_fields').addClass('hidden');
+    }
 
     // Determine which value to select for family other members (parents, parents-in-law)
     if (familyData.parents === 1) {
@@ -3945,7 +4397,7 @@ function constructURL_ForInternalMailSend() {
 }
 
 //placement mail
-function constructURL_ForPlacementMailSend() {
+function constructURL_ForPlacementMailSend(return_type = false) {
 
     var lead_id = $('#lead_id').val();
     let to = $('#placement_to').val();
@@ -3964,8 +4416,10 @@ function constructURL_ForPlacementMailSend() {
     let insurer_and_branch = $('#proposals').val();
     let cc = $('#placement_cc').val();
     let no_of_installment = $('#no_of_installment').val();
+    let tpa_id = $('#tpa_id').val();
+    let acm_email = $('#acm_id').val();
+    let acm_pk = $('#acm_id option:selected').data('id');
     let is_installment = $("#is_installment_switch").is(":checked") ? 1 : 0;
-    console.log("cc1", cc);
 
     // Process `to` field
     to = to.split(',').map(email => email.trim());
@@ -4000,7 +4454,6 @@ function constructURL_ForPlacementMailSend() {
         data.push(obj);
     });
 
-
     // Prepare FormData
     var formData = new FormData();
     formData.append('lead_id', lead_id);
@@ -4025,9 +4478,44 @@ function constructURL_ForPlacementMailSend() {
     formData.append('installments', JSON.stringify(data));
     formData.append('no_of_installment', no_of_installment);
     formData.append('is_installment', is_installment);
+    formData.append('tpa_id', tpa_id);
+    formData.append('acm_email', acm_email);
+    formData.append('acm_pk', acm_pk);
 
+        // Prepare plain key-value object
+    let dataObj = {
+        lead_id: lead_id,
+        file_type: RFQ_or_QCR == 2 ? 'qcr' : 'rfq',
+        recipient_type: 'placement',
+        recipient_mail: to,
+        cc: cc,
+        subject: subject,
+        proposal_insurer: proposal_insurer,
+        insurer_and_branch: insurer_and_branch,
+        placement_date: placement_date,
+        payment_date: payment_date,
+        policy_end_date: policy_end_date,
+        policy_start_date: policy_start_date,
+        is_cd: is_cd,
+        utr_no: utr_no,
+        premium_amount: premium_amount,
+        total_amount: total_amount,
+        cd_amount: cd_amount,
+        mail_content: mail_content,
+        selected_attachment_files: selectedFiles,
+        installments: JSON.stringify(data),
+        no_of_installment: no_of_installment,
+        is_installment: is_installment,
+        tpa_id: tpa_id,
+        acm_email: acm_email,
+        acm_pk: acm_pk
+    };
 
-    ajaxRequest(formData);
+    if(return_type == false){
+        ajaxRequest(formData);
+    }else{
+        return dataObj;
+    }
 
 }
 
@@ -4371,9 +4859,13 @@ function checkTheTableDataChanged(redirect_type, url){
             window.location.href = url;
 
         }else if(redirect_type == 6){ 
-            //INTERNAL MAIL SEND
+            //PLACEMENT MAIL SEND
             showModal(3);
-
+            // if(demography_file_status == "failed"){
+            //     toastr.warning('Member Demography file validation failed. Please re-upload', 'WARNING');
+            // }else{
+            //     showModal(3);
+            // }
         }
     }
 }
@@ -4714,7 +5206,7 @@ function jsonToTable(json) {
         } else {
             if(["Sno"].includes(header.parentHeader)){
                 let snoKeyName = header.parentHeader;
-                let snoDisplayName = "S.No.";
+                let snoDisplayName = "S.No";
                 parentTh.innerHTML = ` <span class="key_name" style="display: none;">${snoKeyName}</span><span class="display_name">${snoDisplayName}</span>`;
             }else{
                 parentTh.innerText = header.parentHeader;
@@ -6805,6 +7297,12 @@ function appendMultiFileData(data) {
         const myModal = new bootstrap.Modal(document.getElementById('view_demography_modal'));
         myModal.show();
     }
+
+    function viewDocs(){
+        // Show the modal
+        const myModal = new bootstrap.Modal(document.getElementById('other_docs_upload_modal'));
+        myModal.show();
+    }
     
 
 </script>
@@ -6819,4 +7317,330 @@ function appendMultiFileData(data) {
         }, 2000);
     }
 
+</script>
+
+<script>
+
+    let fileIndex = 1;
+    function addFileField() {
+
+        console.log('addFileField function called');
+
+        const container = document.getElementById('multiFileAppendArea');
+        if (!container) return;
+
+        const div = document.createElement("div");
+        div.className = "form-row d-flex align-items-end";
+        div.setAttribute("id", `fileField_${fileIndex}`);
+        
+        let isFirstField = container.childElementCount === 0; // Check if it's the first field
+        let placeholder = isFirstField ? 'First file must be Demography.' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '';
+
+        
+        if(isFirstField == 1){
+            placeholder =  '';
+            accept = '';
+        }
+
+        let sample_dwn_link = "";
+        if(isFirstField == 1){
+            sample_dwn_link = '&nbsp;[ <a href="<?= base_url("util/download-excel/member_data"); ?>" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ]';
+        }
+
+        
+        div.innerHTML = `
+            <div class="form-group col-md-5">
+                <label>Document Name ${sample_dwn_link}<span class="text-danger"></span></label>
+                <input type="text" class="form-control" name="docs_name[]" placeholder="${placeholder}">
+            </div>
+            <div class="form-group col-md-5">
+                <label>File Upload<span class="text-danger"></span></label>
+                <input type="file" class="form-control" id="file_name_${fileIndex}" name="file_name[]" accept="${accept}">
+            </div>
+            <div class="col-md-2" style="position: relative; bottom: 16px;">
+                <button type="button" class="btn btn-danger" onclick="removeFileField(${fileIndex})">x</button>
+                <button type="button" class="btn btn-primary" onclick="addFileField()">+</button>
+            </div>
+        `;
+
+        container.appendChild(div);
+        fileIndex++;
+    }
+
+    function removeFileField(index, lead_file_id = null) {
+
+        if(index  == 1){
+            toastr.warning("You can't remove the first file field", 'WARNING');
+            return false;
+        }
+
+        if(lead_file_id != null) {
+
+            Swal.fire({
+                title: "Do you want to remove this file?",
+                // text: "Do you want Save this!",
+                icon: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#3085d6",
+                cancelButtonColor: "#d33",
+                confirmButtonText: "Yes, Procced!"
+            }).then((result) => {
+
+                if (result.isConfirmed) {
+
+                    let url = '<?= base_url('util/removeMultiFile') ?>';
+
+                    let requestData = {
+                        lead_file_id: lead_file_id
+                    };
+
+                    $('.loader').fadeIn();
+                    $('.loader-mask').fadeIn();
+
+                    // Send AJAX request
+                    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+                        console.log('Data fetched successfully:', response);
+
+                        if (response.status == true) {
+                            toastr.success(response.message, 'SUCCESS');
+
+                            //remove the file field
+                            const field = document.getElementById(`fileField_${index}`);
+                            if(index != 1){
+                                if (field) field.remove();
+                            }
+                            
+                        } else {
+                            toastr.error(response.message, 'WARNING');
+                        }
+
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+
+                    }, function(xhr, status, error) {
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        console.error('Error fetching data:', error);
+                        console.error(xhr.responseText);
+                        toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                    });
+
+                }else{
+                    return false;
+                }
+
+            });
+
+        }else{
+            const field = document.getElementById(`fileField_${index}`);
+            if(index != 1){
+                if (field) field.remove();
+            }
+        }
+            
+    }
+
+    function showFileName(input, index) {
+        if (input.files.length > 0) {
+            document.getElementById(`file_name_display_${index}`).textContent = input.files[0].name;
+        } else {
+            document.getElementById(`file_name_display_${index}`).textContent = "No file chosen";
+        }
+    }
+
+    // Submit form
+    $("#multiFileForm").on("submit", function (e) {
+        e.preventDefault();
+
+        let formData = new FormData(this);
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        $.ajax({
+            url: "<?= base_url('util/uploadMultiFileFromRfq'); ?>",
+            type: "POST",
+            data: formData,
+            contentType: false,
+            processData: false,
+            success: function (res) {
+
+                console.log('uploadMultiFileFromRfq reponse', res);
+
+                if(res.status == true){
+                    toastr.success(res.message, 'SUCCESS');
+                    $('#multiFileAppendArea').empty();
+                    $('.attachmet_row').empty();
+                    $('#multiFileAppendArea').append(res.document_data);
+                    $('.attachmet_row').html(res.attachment_html);
+                    window.location.reload();
+                }else{
+                    toastr.warning(res.message, 'WARNING');
+                }
+
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                $('.close').click();
+
+            },
+            error: function (xhr) {
+                console.error("Upload error:", xhr.responseText);
+            }
+        });
+    });
+
+    function toggleAgeFields(element, type) {
+
+        const ageFieldsDiv = document.getElementById(type + '_age_fields');
+        const minAgeInput = document.getElementById('family_' + type + '_min_age');
+        const maxAgeInput = document.getElementById('family_' + type + '_max_age');
+        
+        if (type === 'self' || type === 'spouse') {
+            // For checkboxes
+            if (element.checked) {
+                ageFieldsDiv.classList.remove('hidden');
+                minAgeInput.value = '18';
+                maxAgeInput.value = '99';
+            } else {
+                ageFieldsDiv.classList.add('hidden');
+                // Clear values when unchecked
+                minAgeInput.value = '0';
+                maxAgeInput.value = '0';
+            }
+        } else if (type === 'children') {
+            // For children dropdown
+            if (element.value > 0) {
+                ageFieldsDiv.classList.remove('hidden'); 
+                minAgeInput.value = '0';
+                maxAgeInput.value = '25';
+            } else {
+                ageFieldsDiv.classList.add('hidden');
+                minAgeInput.value = '0';
+                maxAgeInput.value = '0';
+            }
+        } else if (type === 'others') {
+            // For other members dropdown
+            if (element.value !== '0') {
+                ageFieldsDiv.classList.remove('hidden');
+                minAgeInput.value = '40';
+                maxAgeInput.value = '99';
+            } else {
+                ageFieldsDiv.classList.add('hidden');
+                minAgeInput.value = '0';
+                maxAgeInput.value = '0';
+            }
+        }
+    }
+
+    function savePlacementDataAndValidateMemberDataFile(){
+                
+        let url = '<?= base_url('util/savePlacementDataAndValidateMemberDataFile') ?>';
+        console.log('url', url);
+
+        // Data to send in the AJAX request
+        let requestData = constructURL_ForPlacementMailSend(true);
+        console.log('requestData', requestData);
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        // Send AJAX request
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(res) {
+
+            if (res.status == true) {
+                toastr.success(res.message, 'SUCCESS');
+                checkMemberDataValidationStatus(res.lead_id)
+            } else {
+                toastr.warning(res.message, 'WARNING');
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+
+        }, function(xhr, status, error) {
+            clearInterval(interval);
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while validation.', 'ERROR');
+            console.error("❌ Error checking validation status:", err);
+            // Hide loader
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        });
+    }
+
+    function checkMemberDataValidationStatus(lead_id) {
+
+        if (!lead_id) {
+            console.error("Lead ID is required");
+            return;
+        }
+
+        let url = '<?= base_url('util/checkMemberDataFileValidationStatus') ?>';
+
+        // Data to send in the AJAX request
+        let requestData = {
+            lead_id: lead_id,
+        };
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        let interval = setInterval(() => {
+
+            // Send AJAX request
+            sendAjaxRequestForGlobal(url, 'GET', requestData, function(res) {
+
+                if (res.code === 200 && res.data.status != "pending") {
+
+                    clearInterval(interval); // stop checking
+                    if(res.data.status == 'success'){
+                        toastr.success("✅ Validation Completed status : " + res.data.status, 'SUCCESS');
+                    }else{
+                        toastr.warning("✅ Validation Completed status : " + res.data.status, 'WARNING');
+                    }
+
+                    window.location.reload();
+
+                    // if (typeof callback === "function") {
+                    //     callback(res.data); // send final result to callback
+                    // }
+
+                } else {
+                    console.log("⏳ Validation still in progress...");
+                }
+
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+            }, function(xhr, status, error) {
+                clearInterval(interval);
+                console.error('Error fetching data:', error);
+                console.error(xhr.responseText);
+                toastr.error('An error occurred while validation.', 'ERROR');
+                console.error("❌ Error checking validation status:", err);
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            });
+
+        }, 2000); // check every 2 seconds
+    }
+
+    function toggleButtons(status) {
+        if (status === "failed") {
+            $("#send_mail_btn").hide();
+            $("#validate_file_btn").show();
+        } else {
+            $("#validate_file_btn").hide();
+            $("#send_mail_btn").show();
+        }
+    }
+
 </script>
\ No newline at end of file
diff --git a/app/Views/view_rfq_non_eb_new.php b/app/Views/view_rfq_non_eb_new.php
index 843905f7..f2293ebb 100644
--- a/app/Views/view_rfq_non_eb_new.php
+++ b/app/Views/view_rfq_non_eb_new.php
@@ -1,5829 +1,3422 @@
 <style>
-    #allTableContainer {
-        max-width: 100%;
-        overflow-x: auto;
-        display: block;
-    }
-
-    .btn-custom {
-        background-color: #007bff;
-        color: #fff;
-        margin-right: 10px;
-    }
-
-    .readonly-select {
-        pointer-events: none;
-        background-color: #f0f0f0; 
-        color: #666; 
+    h3 {
+        margin-bottom: 15px !important;
     }
 
+    /* Table general styles */
     table {
-        /* border-collapse: collapse; */
-        margin-bottom: 20px;
-        /* max-width: 800px; */
-        /* table-layout: fixed; */
+        margin-bottom: 15px;
         width: 1400px;
         min-width: 1200px;
         table-layout: fixed;
         border-collapse: collapse;
         word-wrap: break-word;
-
-    }
-
-    table thead tr:nth-child(1) th {
-        background-color: #bfe0e2;
-        border: 1px solid #007bff;
-    }
-
-    table thead tr:nth-child(2) th {
-        background-color: #bfe0e2;
-        border: 1px solid #007bff;
-    }
-
-    /* Apply styles to the first column, accounting for rowspan */
-    table th:nth-child(1),
-    table td:nth-child(1) {
-        width: 110px;
-        background-color: #bfe0e2;
-    }
-
-    /* Ensure rowspan cells in the first column inherit the same styles */
-    table td[rowspan]:nth-child(1) {
-        width: 110px;
-        /* background-color: #bfe0e2; */
-    }
-
-    .table {
-        border: 1px solid #007bff; /* Border around the table */
-        border-collapse: collapse; /* Ensures borders don’t double up */
-        width: 100%;
-    }
-
-    .table th, 
-    .table td {
-        border: 1px solid #007bff; /* Border for all table cells */
-        padding: 8px; /* Optional: Adds spacing inside cells */
-        text-align: left; /* Optional: Aligns text inside cells */
-    }
-
-    th:nth-child(2),
-    td:nth-child(2) {
-        width: 720px;
-        background-color: #bfe0e2;
-        /* Adjust first column width */
-    }
-
-    .bold {
-        font-weight: bold;
-        color: red;
-    }
-
-    th:nth-last-child(1),
-    td:nth-last-child(1) {
-        width: 230px;
-        /* Adjust last column width */
+        font-size: 11px;
     }
 
+    /* Header and body cells */
     th,
     td {
-        border: 1px solid #000;
-        padding: 8px;
+        padding: 2px 4px !important;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 1 !important;
     }
 
+    /* Table header */
     th {
-        /* background-color: #f2f2f2 !important; */
+        font-size: 12px;
+        font-weight: 600;
+        background-color: #f8f9fa;
+        text-align: center;
+        vertical-align: middle;
+    }
+
+    #policyTable,
+    #policyTable th,
+    #policyTable td {
+        border: 1px solid #007bff;
+    }
+
+
+    /* Fixed width columns */
+    #policyTable th:nth-child(1),
+    #policyTable td:nth-child(1) {
+        width: 110px !important;
+        min-width: 120px !important;
+        max-width: 120px !important;
+        word-wrap: break-word;
+        white-space: normal;
+        text-align: center;
+        vertical-align: middle;
+
+    }
+        
+    #policyTable th:last-child,
+    #policyTable td:last-child {
+        width: 260px !important;
+        min-width: 260px !important;
+        max-width: 260px !important;
+        text-align: center;
+        white-space: nowrap;
+        text-align: center;
+        vertical-align: middle;
+    }
+
+     /* Fixed width for particulars columns */
+    .particulars {
+        width: 400px !important;
+        min-width: 400px !important;
+        max-width: 400px !important;
+        word-wrap: break-word !important;
+        white-space: normal !important;
+        text-align: center !important;
+        vertical-align: middle !important;
+    }
+
+    /* Fixed width for risk location columns */
+    .risk-col {
+        width: 180px !important;
+        min-width: 180px !important;
+        max-width: 180px !important;
+        text-align: center !important;
+        vertical-align: middle !important;
+    }
+
+    /* Fixed width for index value columns */
+    .index-val-col {
+        width: 180px !important;
+        min-width: 180px !important;
+        max-width: 180px !important;
+        text-align: center !important;
+        vertical-align: middle !important;
+    }
+
+    /* Fixed width for insurer columns */
+    .insurer-col {
+        width: 180px !important;
+        min-width: 180px !important;
+        max-width: 180px !important;
+        text-align: center !important;
+        vertical-align: middle !important;
+    }
+
+    /* Fixed width for total sum insured columns */
+    .sum_insured {
+        width: 180px !important;
+        min-width: 180px !important;
+        max-width: 180px !important;
+        text-align: center !important;
+        vertical-align: middle !important;
+    }
+
+    /* Fixed width for index sum insured columns */
+    .index_sum_insured {
+        width: 180px !important;
+        min-width: 180px !important;
+        max-width: 180px !important;
+        text-align: center !important;
+        ;
+        vertical-align: middle !important;
+    }
+
+    /* Compact rows */
+    #policyTable tbody tr {
+        height: 28px !important;
+    }
+
+    /* Compact rows */
+    #policyTable thead tr {
+        height: 30px !important;
+        /* Fixed row height */
+    }
+
+    /* Sub-options and checkboxes */
+    .sub-options {
+        margin-left: 15px;
+        margin-top: 3px;
+        font-size: 11px;
+    }
+
+    .sub-options label {
+        margin-right: 12px;
+    }
+
+    input[type="checkbox"] {
+        transform: scale(0.9);
+        margin: 1px 3px;
+    }
+
+    /* Labels and forms */
+    label {
+        font-size: 11px;
+        margin-right: 12px;
+        margin-bottom: 3px;
+    }
+
+    .form-control {
+        font-size: 11px;
+        padding: 4px 6px;
+    }
+
+     /* Dropdown items */
+    .dropdown .btn {
+        padding: 2px 4px;
+        font-size: 10px;
+        margin: 0;
+    }
+
+    .dropdown-menu {
+        font-size: 11px;
+        min-width: 100px;
+    }
+
+    .dropdown-item {
+        padding: 4px 8px;
+    }
+
+    .dropdown-item .form-check-label{
         position: relative !important;
+        left: 30px !important;
     }
 
-    .three-dot-menu {
+    /* Policy header rows */
+    .policy-header-row {
         cursor: pointer;
-    }
-
-    .dropdown-content {
-        display: none;
-        position: absolute;
-        background-color: #f9f9f9;
-        box-shadow: 0px 8px 16px rgba(0, 0, 0, 0.2);
-        z-index: 1;
-    }
-    /* Selects the last cell in each row */
-    table tr td:last-child,
-    table tr th:last-child {
-        background-color: white !important; 
-    }
-
-    .dropdown-content button {
-        display: block;
-        width: 100%;
-        padding: 8px;
-        text-align: left;
-        border: none;
-        background: none;
-        cursor: pointer;
-    }
-
-    .dropdown-content button:hover {
-        background-color: #ddd;
-    }
-
-    /* Dropdown container */
-    .simple-dropdown {
-        position: absolute;
-        background: white;
-        border: 1px solid #ccc;
-        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-        z-index: 1000;
-    }
-
-    /* Individual dropdown options */
-    .dropdown-option {
-        padding: 8px 16px;
-        cursor: pointer;
-        min-width: 80px;
-        user-select: none;
-        background-color: #ff9999;
-    }
-
-    /* Hover effect for options */
-    .dropdown-option:hover {
-        background-color: #333;
-        color : white;
-    }
-
-    /* Optional: Add transition for smoother hover effect */
-    .dropdown-option {
-        transition: background-color 0.2s ease;
-    }
-
-    /* Optional: Style the TD when it's clickable */
-    td[onclick] {
-        cursor: pointer;
-    }
-
-    /* Optional: Style for selected state */
-    .selected-option {
         background-color: #f8f9fa;
     }
 
-    .modal {
-        display: block !important;
-        /* Ensures visibility */
-        opacity: 0;
-        /* Initial state */
-        visibility: hidden;
-        /* Prevents flickering */
-    }
-
-    .modal.show {
-        opacity: 1;
-        visibility: visible;
-        z-index: 1050;
-        /* Correct z-index for Bootstrap 5 modals */
-    }
-
-    .modal-backdrop {
-        z-index: 1040 !important;
-        /* Ensures backdrop is below the modal */
-    }
-
-    .swal2-html-container {
-        overflow: hidden !important;
-    }
-
-    .select2-selection__choice {
-        background-color: #0a8794 !important;
-        color: white !important;
-        font-weight: bold;
-    }
-
-    .select2-selection__choice__remove {
-        color: white !important;
-        margin-right: 5px;
-    }
-
-    .table-collapsible-bar {
-        min-width: 1300px;
-        background-color: #f1f1f1;
-        padding: 10px;
-        cursor: pointer;
-        border: 1px solid #ddd;
-        border-radius: 4px 4px 0 0;
-        font-weight: bold;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 0;
-    }
-
-    .table-collapsible-bar .collapse-icon {
-        transition: transform 0.3s ease;
-    }
-
-    .table-collapsible-bar.collapsed .collapse-icon {
-        transform: rotate(-90deg);
-    }
-
-    .table-content {
-        overflow-x: auto;
-        width: 100%;
-    }
-
-    /* Ensure these styles are present */
-    .table-content {
-        transition: all 0.3s ease;
-        /* overflow: hidden; */
-    }
-
-    .table-content.collapse:not(.show) {
+    /* Hidden policy details rows */
+    .policy-detail-row {
         display: none;
     }
 
-    .table-content.collapse.show {
-        display: block;
+    /*------------------------------------------------------------------------------------------------------*/
+
+
+    /* Collapsed column styles */
+    .risk-col.collapsed 
+    {
+        width: 40px !important;
+        min-width: 50px !important;
+        max-width: 50px !important;
+        overflow: visible !important;
+        position: relative;
+        padding: 5px !important;
     }
 
-    .collapse-icon {
+    .index-val-col.collapsed 
+    {
+        width: 40px !important;
+        min-width: 50px !important;
+        max-width: 50px !important;
+        overflow: visible !important;
+        position: relative;
+        padding: 5px !important;
+    }
+
+    .insurer-col.collapsed 
+    {
+        width: 40px !important;
+        min-width: 50px !important;
+        max-width: 50px !important;
+        overflow: visible !important;
+        position: relative;
+        padding: 5px !important;
+    }
+
+    /* Hide content when collapsed, but keep dropdown visible */
+    .risk-col.collapsed>div:not(.dropdown) {
+        display: none;
+    }
+
+    .insurer-col.collapsed>*:not(.dropdown) {
+        display: none;
+    }
+
+    .index-val-col.collapsed>*:not(.dropdown) {
+        display: none;
+    }
+
+    /* Position and style dropdown in collapsed state */
+    .risk-col.collapsed .dropdown,
+    .insurer-col.collapsed .dropdown, 
+    .index-val-col.collapsed .dropdown 
+    {
+        position: static !important;
+        display: block !important;
+        width: 100%;
+        text-align: center;
+        float: none !important;
+    }
+
+    .risk-col.collapsed .dropdown .btn,
+    .insurer-col.collapsed .dropdown .btn, 
+    .index-val-col.collapsed .dropdown .btn 
+    {
+        width: 100% !important;
+        height: 25px;
+        display: flex !important;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #dee2e6;
+        background-color: #f8f9fa;
+        font-size: 13px;
+        font-weight: bold;
+    }
+
+    /* Hide cell content when parent column is collapsed */
+    .risk-col.collapsed[data-risk-id="1"]~* td.risk-col[data-risk-id="1"],
+    .risk-col.collapsed[data-risk-id="2"]~* td.risk-col[data-risk-id="2"],
+    .risk-col.collapsed[data-risk-id="3"]~* td.risk-col[data-risk-id="3"] 
+    {
+        width: 40px !important;
+        min-width: 40px !important;
+        max-width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    .insurer-col.collapsed[data-insurer-id="1"]~* td.insurer-col[data-insurer-id="1"],
+    .insurer-col.collapsed[data-insurer-id="2"]~* td.insurer-col[data-insurer-id="2"],
+    .insurer-col.collapsed[data-insurer-id="3"]~* td.insurer-col[data-insurer-id="3"] 
+    {
+        width: 40px !important;
+        min-width: 40px !important;
+        max-width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    .index-val-col.collapsed[data-index-value-id="1"]~* td.index-val-col[data-index-value-id="1"],
+    .index-val-col.collapsed[data-index-value-id="2"]~* td.index-val-col[data-index-value-id="2"],
+    .index-val-col.collapsed[data-index-value-id="3"]~* td.index-val-col[data-index-value-id="3"] 
+    {
+        width: 40px !important;
+        min-width: 40px !important;
+        max-width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    /* Apply collapsed state to matching data attributes */
+    th.risk-col.collapsed[data-risk-id="1"]~tbody tr td[data-risk-id="1"],
+    th.risk-col.collapsed[data-risk-id="2"]~tbody tr td[data-risk-id="2"],
+    th.risk-col.collapsed[data-risk-id="3"]~tbody tr td[data-risk-id="3"] {
+        width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    th.insurer-col.collapsed[data-insurer-id="1"]~tbody tr td[data-insurer-id="1"],
+    th.insurer-col.collapsed[data-insurer-id="2"]~tbody tr td[data-insurer-id="2"],
+    th.insurer-col.collapsed[data-insurer-id="3"]~tbody tr td[data-insurer-id="3"] 
+    {
+        width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    th.index-val-col.collapsed[data-index-value-id="1"]~tbody tr td[data-index-value-id="1"],
+    th.index-val-col.collapsed[data-index-value-id="2"]~tbody tr td[data-index-value-id="2"],
+    th.index-val-col.collapsed[data-index-value-id="3"]~tbody tr td[data-index-value-id="3"] 
+    {
+        width: 40px !important;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    /* Transition effect */
+    .risk-col,
+    .insurer-col, 
+    .index-val-col
+    {
+        transition: width 0.3s ease, min-width 0.3s ease, max-width 0.3s ease;
+    }
+
+    /* Table responsive wrapper */
+    .table-wrapper {
+        overflow-x: auto;
+        max-width: 100%;
+    }
+
+    /* Dropdown menu styling */
+    .dropdown-menu {
+        min-width: 180px;
+    }
+
+    /* Add visual indicator for collapsed state */
+    .risk-col.collapsed .dropdown-toggle::after,
+    .insurer-col.collapsed .dropdown-toggle::after ,
+    .index-val-col.collapsed .dropdown-toggle::after 
+    {
+        content: "▶";
+        border: none;
+        vertical-align: middle;
+        font-size: 10px;
+        margin-left: 4px;
+    }
+
+    .risk-col:not(.collapsed) .dropdown-toggle::after,
+    .insurer-col:not(.collapsed) .dropdown-toggle::after,
+    .index-val-col:not(.collapsed) .dropdown-toggle::after 
+    {
+        content: "▼";
+        border: none;
+        vertical-align: middle;
+    }
+
+    /*-------------------------------------------------------------------------------------*/
+
+    .table-scroll-container {
+        width: 100%;
+        overflow-x: auto;
+        overflow-y: visible;
+    }
+
+    /* Scrollbar styling */
+    .table-scroll-container::-webkit-scrollbar {
+        height: 5px;
+    }
+
+    .table-scroll-container::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        /* border-radius: 3px; */
+    }
+
+    .table-scroll-container::-webkit-scrollbar-thumb {
+        background: #888;
+        /* border-radius: 3px; */
+    }
+
+    .table-scroll-container::-webkit-scrollbar-thumb:hover {
+        background: #555;
+    }
+
+    /* Content editable styling */
+    [contenteditable="true"]:focus {
+        outline: 2px solid #0d6efd;
+        outline-offset: -2px;
+        background-color: #f8f9fa;
+    }
+
+    .policy-collapse {
+        display: inline-block;
+        width: 20px;          /* increased size */
+        height: 20px;         /* increased size */
+        margin-left: 8px;
+        vertical-align: middle;
+        cursor: pointer;
+        position: relative;
+        border: 1.5px solid #4a90e2; /* slightly thicker */
+        border-radius: 50%;
+        background: #f8f9fa;
+        transition: all 0.3s ease;
+    }
+
+    /* Arrow pointing up (collapsed - will expand down when clicked) */
+    .policy-collapse::before {
+        content: '';
+        position: absolute;
+        top: 6px;             /* adjusted for bigger circle */
+        left: 6px;
+        width: 6px;           /* bigger arrow */
+        height: 6px;
+        border-right: 2px solid #4a90e2;
+        border-bottom: 2px solid #4a90e2;
+        transform: rotate(-135deg);
         transition: transform 0.3s ease;
     }
 
-    .table-collapsible-bar {
-        cursor: pointer;
-        user-select: none;
+    /* Arrow pointing down (expanded - will collapse up when clicked) */
+    .policy-collapse.expanded::before {
+        transform: rotate(45deg);
+        top: 5px;
+        left: 6px;
     }
 
-    .toggle.btn {
-        height: 38px !important;
-        line-height: 33px !important;
+    /* Hover effect */
+    .policy-collapse:hover {
+        background: #4a90e2;
+        transform: scale(1.2); /* slightly larger on hover */
     }
 
-    .save-indicator {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        background: #28a745;
-        color: white;
-        padding: 2px 8px;
-        border-radius: 10px;
-        font-size: 11px;
+    .policy-collapse:hover::before {
+        border-color: white;
+    }
+
+
+    /*  For check box switch */
+    .switch {
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
+    }
+
+    .switch input { 
         opacity: 0;
-        transition: opacity 0.3s;
+        width: 0;
+        height: 0;
     }
 
-    .save-indicator.show {
-        opacity: 1;
+    .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%;
+    }
+
+    tbody .sum_insured, tbody .index_sum_insured, tbody .insurer-col {
+        cursor: pointer;
+        position: relative;
+    }
+    
+    /* Skip cursor pointer for particulars rows */
+    tbody tr[data-key="particulars"] .sum_insured, 
+    tbody tr[data-key="particulars"] .index_sum_insured, 
+    tbody tr[data-key="particulars"] .insurer-col 
+    {
+        cursor: default;
+    }
+    
+    tbody .sum_insured:hover, tbody .index_sum_insured:hover, tbody .insurer-col:hover {
+        background-color: #e8f5e8 !important;
+    }
+    
+    /* Skip hover effect for particulars rows */
+    tbody tr[data-key="particulars"] .sum_insured:hover, 
+    tbody tr[data-key="particulars"] .index_sum_insured:hover, 
+    tbody tr[data-key="particulars"] .insurer-col:hover 
+    {
+        background-color: rgb(224, 254, 201) !important; /* Keep original color */
+    }
+    
+    .cell-dropdown {
+        position: absolute;
+        top: 100%;
+        left: 0;
+        right: 0;
+        background: white;
+        border: 1px solid #ccc;
+        border-top: none;
+        box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+        z-index: 1000;
+        max-height: 200px;
+        overflow-y: auto;
+        display: none;
+    }
+    
+    .cell-dropdown-item {
+        padding: 8px 12px;
+        cursor: pointer;
+        border-bottom: 1px solid #eee;
+    }
+    
+    .cell-dropdown-item:hover {
+        background-color: #f0f8ff;
+    }
+    
+    .cell-dropdown-item.selected {
+        background-color: #007bff;
+        color: white;
+        font-weight: bold;
+    }
+    
+    .cell-dropdown-item.selected:hover {
+        background-color: #0056b3;
+    }
+    
+    .cell-dropdown-item:last-child {
+        border-bottom: none;
+    }
+
+    .btn-add-row, .btn-remove-row {
+        padding: 2px 6px;
+        font-size: 16px;
+        line-height: 1.2;
+    }
+        
 </style>
 
+<style>
 
-<div class="col-12">
-    <div class="card">
-        <div class="card-body">
+    #policyCheckboxes {
+        max-width: 100%;
+        margin: 0 auto;
+        background: white;
+        padding: 15px;
+        border-radius: 8px;
+        box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+    }
 
-            <div class="row" style="margin-bottom: 1rem;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 id="rfq_qcr_page_title">
-                        <?= isset($page_name) ? htmlspecialchars($page_name, ENT_QUOTES, 'UTF-8') : 'RFQ Non-EB' ?>
-                    </h4>
-                </div>
+    /* Hide the actual checkbox */
+    #policyCheckboxes input[type="checkbox"] {
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+    }
 
-                <div class="col-2" id="status_change" style="text-align: right; position: relative; top: 56px; left: 386px;">
-                    <a onclick="checkTheTableDataChanged(1)" class="btn btn-primary">Back</a>
+    /* Style the labels as compact buttons */
+    #policyCheckboxes label {
+        display: inline-block;
+        margin: 2px;
+        padding: 4px 8px;
+        background-color: #ffffff;
+        border: 1px solid #e0e0e0;
+        border-radius: 15px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        font-weight: 500;
+        text-align: center;
+        user-select: none;
+        position: relative;
+        min-width: 60px;
+        font-size: 0.75em;
+        height: 28px;
+        line-height: 18px;
+    }
+
+    /* Hover effect with your specified border */
+    #policyCheckboxes label:hover {
+        background-color: #f8f9fa;
+        border: 2px solid #007bff;
+        transform: translateY(-1px);
+        box-shadow: 0 2px 6px rgba(0,123,255,0.2);
+    }
+
+    /* Checked state - Fixed for proper HTML structure */
+    #policyCheckboxes input[type="checkbox"]:checked + span,
+    #policyCheckboxes label:has(input[type="checkbox"]:checked) 
+    {
+        background-color: #007bff !important;
+        color: white !important;
+        border-color: #007bff !important;
+        box-shadow: 0 2px 8px rgba(0,123,255,0.3) !important;
+    }
+
+    /* Fallback for browsers without :has support */
+    #policyCheckboxes input[type="checkbox"]:checked {
+        + label {
+            background-color: #007bff !important;
+            color: white !important;
+            border-color: #007bff !important;
+        }
+    }
+
+    /* Fire sub-options styling - default same as main buttons */
+    .sub-options {
+        display: inline-block;
+        margin-left: 8px;
+    }
+
+    /* Sub-options default style (compact) */
+    .sub-options label {
+        background-color: #ffffff;
+        border: 1px solid #e0e0e0;
+        color: #333333;
+        font-size: 0.7em;
+        min-width: 55px;
+        padding: 3px 6px;
+        height: 26px;
+        line-height: 18px;
+    }
+
+    .sub-options label:hover {
+        background-color: #f8f9fa !important;
+        border: 2px solid rgba(253, 32, 106, 1) !important;
+        color: #333333 !important;
+    }
+
+    /* When sub-option checkbox is CHECKED - turn pink - Fixed */
+    .sub-options input[type="checkbox"]:checked + span,
+    .sub-options label:has(input[type="checkbox"]:checked) {
+        background-color: rgba(253, 32, 106, 1) !important;
+        border-color: #ee3390ff !important;
+        color: white !important;
+    }
+
+    /* Active/pressed effect */
+    #policyCheckboxes label:active {
+        transform: translateY(0);
+        box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+    }
+
+    /* Responsive design */
+    @media (max-width: 768px) {
+        #policyCheckboxes label {
+            margin: 1px;
+            font-size: 0.7em;
+            min-width: 50px;
+            padding: 3px 6px;
+            height: 24px;
+            line-height: 16px;
+        }
+        
+        .sub-options {
+            margin-left: 4px;
+        }
+
+        .sub-options label {
+            margin: 1px;
+            min-width: 45px;
+            padding: 2px 4px;
+            font-size: 0.65em;
+            height: 22px;
+            line-height: 16px;
+        }
+    }
+
+    /* Focus accessibility */
+    #policyCheckboxes input[type="checkbox"]:focus + label {
+        outline: 1px solid #007bff;
+        outline-offset: 1px;
+    }
+</style>
+
+<h3>RFQ</h3>
+
+<!-- Controls -->
+ <div>
+    <button class="btn btn-sm btn-secondary" id="addLocation">+ Add Risk Location</button>&nbsp;&nbsp;
+    <button class="btn btn-sm btn-primary" onclick="getJson()">Save</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <button class="btn btn-sm btn-info" id="addInsurer">+ Add Insurer</button>&nbsp;&nbsp;
+    <button class="btn btn-sm btn-success" onclick="generateTableFromLocal()">Generate Table</button>
+</div>
+
+<br>
+
+<!-- Policies Checkbox -->
+<div id="policyCheckboxes">
+    <label><input type="checkbox" class="policy" value="fire" id="fire_check_box"> Fire</label>
+    <label><input type="checkbox" class="policy" value="burglary" id="burglary_check_box"> Burglary</label>
+    <label><input type="checkbox" class="policy" value="flop" id="flop_check_box"> FLOP</label>
+    <label><input type="checkbox" class="policy" value="all_risk" id="all_risk_check_box"> All Risk</label>
+    <label><input type="checkbox" class="policy" value="MBD" id="MBD_check_box"> MBD</label>
+    <label><input type="checkbox" class="policy" value="EEI" id="EEI_check_box"> EEI</label>
+    <label><input type="checkbox" class="policy" value="fidelity" id="fidelity_check_box"> Fidelity</label>
+    <label><input type="checkbox" class="policy" value="money" id="money_check_box"> Money</label>
+    <label><input type="checkbox" class="policy" value="plate_glass" id="plate_glass_check_box"> Plate Glass</label>
+    <label><input type="checkbox" class="policy" value="neon_sign" id="neon_sign_check_box"> Neon Sign</label>
+    <label><input type="checkbox" class="policy" value="public_liability" id="public_liability_check_box"> Public
+        Liability</label>
+    <label><input type="checkbox" class="policy" value="pedal_cycle" id="pedal_cycle_check_box"> Pedal Cycle</label>
+    <label><input type="checkbox" class="policy" value="premium" id="premium_check_box"> Premium</label>
+</div>
+
+<br>
+
+ <!-- table div -->
+<div class="table-wrapper table-scroll-container" id="container">
+    <table id="policyTable" class="table table-bordered">
+        <thead>
+            <tr id="policyHeader">
+                <th>Policy</th>
+                <th class="particulars">Particulars</th>
+                <!-- Risk Locations will be inserted here -->
+                <th class="sum_insured">Total Sum Insured</th>
+                <th class="index_sum_insured">
+                    Index Sum Insured &nbsp;&nbsp;
+                    <div class="dropdown d-inline-block float-end loc-menu">
+                        <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                            &#x22EE;
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li class="dropdown-item">
+                                <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-risk-id="${riskCount}" checked>
+                                <label class="form-check-label">
+                                    QCR
+                                </label>
+                            </li>
+                            <li class="dropdown-item">
+                                <input type="checkbox" class="form-check-input me-2 client-check-col" data-risk-id="${riskCount}" checked>
+                                <label class="form-check-label">
+                                    Client
+                                </label>
+                            </li>
+                        </ul>
+                    </div>
+                </th>
+                <!-- Insurers will be inserted here -->
+                <th>Action</th>
+            </tr>
+        </thead>
+        <tbody>
+
+        </tbody>
+    </table>
+</div>
+
+<!-- Insurer Selection Modal -->
+<div class="modal fade" id="insurerModal" tabindex="-1" aria-labelledby="insurerModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="insurerModalLabel">Insurer</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
+            </div>
+            <div class="modal-body">
+                <div class="mb-4">
+                    <select id="insurerSelect2" class="form-control" required>
+                        <option value="">Select an insurer</option>
+                        <?php if (isset($insurer) && !empty($insurer) && is_array($insurer)) { ?>
+                        <?php foreach ($insurer as $key => $value): ?>
+                            <option data-id="<?= esc($value['id'] . '-' . $value['insurer_id']) ?>" value="<?= esc($value['insurer_name'] . '-' . $value['branch_code']) ?>"><?= esc($value['insurer_name'] . '-' . $value['branch_code']) ?></option>
+                        <?php endforeach; ?>
+                        <?php } ?>
+                    </select>
                 </div>
             </div>
-
-            <div class="row" style="margin-bottom: 1rem;margin-left: 0px;">
-                <button class="btn btn-custom rfqbtn" id="addProposal" style="margin-right: 10px;">Add New Proposal</button>
-                <button id="saveRFQ" onclick="saveRFQ()" class="btn btn-primary" style="margin-right: 10px;">Save RFQ</button>
-                <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team())) { ?>
-                    <button id="openQCR" onclick="openQCR()" class="btn btn-primary rfqbtn actionBtns" style="margin-right: 20px;">Proceed to QCR</button>
-                <?php } ?>
-                <a id="submitExcel" onclick="checkTheTableDataChanged(2)" class="btn btn-primary actionBtns" style="margin-right: 10px;">Export Excel</a>
-                <button id="submitInternalMail" class="btn btn-primary actionBtns" style="margin-right: 10px;" onclick="checkTheTableDataChanged(4)">Send Internal Mail</button>
-                <button id="submitMail" class="btn btn-primary actionBtns" style="margin-right: 10px;" onclick="checkTheTableDataChanged(3)">Send Insurer Mail</button>
-                <button id="submitPlacement" class="btn btn-primary qcrbtn actionBtns" onclick="checkTheTableDataChanged(6)">Placement</button>
-            </div>
-
-
-            <input type="hidden" id="lead_id" value="<?= htmlspecialchars($lead_data['id'] ?? "", ENT_QUOTES, 'UTF-8') ?>" />
-            <input type="hidden" id="rfq_primaryKey" name="rfq_primaryKey" value="<?= isset($rfq_data['id']) ? $rfq_data['id'] : '' ?>">
-
-            <div class="save-indicator" id="saveIndicator">Saved</div>
-            <div id="allTableContainer">
-                <div id="tablesContainer"></div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="insurer_save">Save</button>
             </div>
         </div>
     </div>
 </div>
 
-<!-- Modal content for Send Insurer and Client Mail -->
-<div class="modal fade" id="list_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-    aria-hidden="false">
-    <div class="modal-dialog modal-full-width">
+ <!-- Risk Location Details Modal -->
+ <div class="modal fade" id="riskLocationModal" tabindex="-1" aria-labelledby="riskLocationModalLabel"
+    aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <!-- wider modal for 3 columns -->
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel"></h4>
-                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h5 class="modal-title" id="riskLocationModalLabel">Add Risk Location Details</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
             </div>
             <div class="modal-body">
-
-                <div class="form-group">
-                    <div class="form-row" id="input_for_row">
-                    </div>
-                </div>
-
-                <br>
-                <h4>Attachments Files</h4>
-                <hr>
-
-                <div class="form-group" id="insurer_or_clinet_mail_attachment">
-                    <div class="form-row" >
-                        <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
-                    </div>
-                </div>
-
-                <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                    <button type="submit" class="btn btn-primary" onclick="constructURL(1)">Send Mail</button>
-                </div>
-            </div>
-        </div><!-- /.modal-content -->
-    </div>
-</div><!-- /.modal -->
-
-<!-- Modal content for Send Internal Mail -->
-<div class="modal fade" id="internal_mail_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-    aria-hidden="false">
-    <div class="modal-dialog modal-full-width">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="internal_mail_modal_label">Send Internal Mail</h4>
-                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            </div>
-            <div class="modal-body">
-
-                <div class="form-group">
-
+                <form id="riskLocationForm">
                     <div class="form-row">
+
+                        <!-- Location Name -->
                         <div class="form-group col-md-4">
-                            <label for="to">TO</label>
-                            <select class="form-control" id="to" name="to" required>
-                                <?php if (isset($userList)) { ?>
-                                    <?php foreach ($userList as $user) { ?>
-                                        <option value="<?= $user['email']; ?>">
-                                            <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
+                            <label for="locationName" class="form-label">Location Name</label>
+                            <input type="text" class="form-control" id="locationName" placeholder="e.g., Mumbai Branch"
+                                value="Karnataka Branch" required>
                         </div>
 
+                        <!-- Address -->
                         <div class="form-group col-md-4">
-                            <label for="cc">CC </label>
-                            <select class="form-control" id="cc" name="cc" required multiple>
-                                <?php if (isset($userList)) { ?>
-                                    <?php foreach ($userList as $user) { ?>
-                                        <option value="<?= $user['id']; ?>">
-                                            <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
+                            <label for="locationAddress" class="form-label">Address</label>
+                            <textarea class="form-control" id="locationAddress" rows="2"
+                                placeholder="Enter full address" required>123, MG Road, Indiranagar, Bengaluru, Karnataka 560038, India</textarea>
+                        </div>
+
+                        <!-- Constructio -->
+                        <div class="form-group col-md-4">
+                            <label for="construction_type" class="form-label">Construction Type</label>
+                            <select class="form-control" id="construction_type" required>
+                                <option value="">Select</option>
+                                <option value="Kutcha">Kutcha</option>
+                                <option value="Pucca">Pucca</option>
                             </select>
                         </div>
 
-                        <div class="form-group col-md-12">
-                            <label for="subject">Subject</label>
-                            <input id="subject" type="text" class="form-control" name="subject" value="<?= isset($subject) ? $subject : " " ?>">
+                        <!-- Basement -->
+                        <div class="form-group col-md-4">
+                            <label class="switch" style="position: relative;top: 22px;left: 0px;">
+                                <input id="has_basement" type="checkbox" name="has_basement">
+                                <span class="slider round" style="height: 27px;"></span>
+                            </label>
+
+                            <label for="has_basement" style="position: relative;top: 25px;left: 0px;">Basement</label>
                         </div>
 
-                        <div class="form-group col-md-12">
-                            <label for="internal_mail_content">Mail Content</label>
-                            <textarea id="internal_mail_content" class="form-control" name="internal_mail_content" rows="3">
-                                <?= isset($mail_content) ? $mail_content : " " ?>
-                            </textarea>
+                        <!-- Basement Utilisation -->
+                        <div class="form-group col-md-4 d-none" id="basementUtilisationDiv">
+                            <label for="basement_utilisation" class="form-label">Basement Utilisation</label>
+                            <textarea class="form-control" id="basement_utilisation" rows="2"
+                                placeholder="Describe basement usage"></textarea>
                         </div>
+
+                        <!-- Occupancy Risk -->
+                        <div class="form-group col-md-4">
+                            <label for="occupancy_risk" class="form-label">Occupancy Risk</label>
+                            <select class="form-control occupancy-risk" id="occupancy_risk">
+                                <option value="">Select</option>
+                                <option value="OR1">Occupancy 1</option>
+                                <option value="OR2">Occupancy 2</option>
+                                <option value="OR3">Occupancy 3</option>
+                            </select>
+                        </div>
+
+                        <!-- IIB Code -->
+                        <div class="form-group col-md-4">
+                            <label for="iib_code" class="form-label">IIB Code</label>
+                            <input type="text" class="form-control" id="iib_code"
+                                placeholder="Auto-filled from Occupancy Risk" required>
+                        </div>
+
+                        <!-- Business Description -->
+                        <div class="form-group col-md-8">
+                            <label for="business_description" class="form-label">Business Description</label>
+                            <textarea class="form-control" id="business_description" rows="2"
+                                placeholder="Enter business description"></textarea>
+                        </div>
+
                     </div>
-
-                </div>
-
-                <br>
-                <h4>Attachments Files</h4>
-                <hr>
-
-                <div class="form-group" id="internal_mail_attachment">
-                    <div class="form-row" >
-                        <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
-                    </div>
-                </div>
-
-                <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                    <button type="submit" class="btn btn-primary" onclick="constructURL(2)">Send Mail</button>
-                </div>
+                </form>
             </div>
-        </div><!-- /.modal-content -->
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="saveRiskLocation">Add Location</button>
+            </div>
+        </div>
     </div>
-</div><!-- /.modal -->
+</div>
 
-<!-- Modal content for Send Placement Mail -->
-<div class="modal fade" id="placement_mail_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-    aria-hidden="false">
-    <div class="modal-dialog modal-full-width">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Placement</h4>
-                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            </div>
-            <div class="modal-body">
-
-                <div class="form-group">
-
-                    <!-- For display perpose placement alredy submited text display -->
-                    <div class="form-group col-md-12">
-                        <label><span id="alert_msg" class="text-danger"></span></label>
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="policy_start_date">Policy Start Date</label>
-                            <input type="text" class="form-control" id="policy_start_date" name="policy_start_date" placeholder="DD/MM/YYY" value="<?= isset($lead_data['policy_start_date']) ? date('d-m-Y', strtotime($lead_data['policy_start_date'])) : "" ?>">
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="policy_end_date">Policy End Date</label>
-                            <input type="text" class="form-control" id="policy_end_date" name="policy_end_date" placeholder="DD/MM/YYY" value="<?= isset($lead_data['policy_end_date']) ? date('d-m-Y', strtotime($lead_data['policy_end_date'])) : "" ?>">
-                        </div>
-                        
-
-                        <div class="form-group col-md-3">
-                            <label for="placement_date">Placement Date</label>
-                            <input type="text" class="form-control" id="placement_date" name="placement_date" placeholder="DD/MM/YYY" value="<?= isset($lead_data['placement_date']) ? date('d-m-Y', strtotime($lead_data['placement_date'])) : "" ?>">
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218"  <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="premium_amount">Premium Amount</label>
-                            <input type="text" class="form-control" id="premium_amount" name="premium_amount" placeholder="Enter Premium Amount" value="<?= isset($lead_data['premium_amount']) ? $lead_data['premium_amount'] : "" ?>">
-                        </div>
-
-                        <?php if (isset($lead_data['is_cd']) && $lead_data['is_cd'] == 1 || !isset($lead_data['is_cd'])) { ?>
-
-                            <div class="form-group col-md-3">
-                                <label for="cd_amount">CD Amount</label>
-                                <input type="text" class="form-control" id="cd_amount" name="cd_amount" placeholder="Enter CD Amount" value="<?= isset($lead_data['cd_amount']) ? $lead_data['cd_amount'] : "" ?>">
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="total_amount">Total Amount</label>
-                                <input type="text" class="form-control" id="total_amount" name="total_amount" placeholder="Enter Total Amount" value="<?= isset($lead_data['cd_amount']) ? $lead_data['cd_amount'] : "" ?>">
-                            </div>
-
-                        <?php } ?>
-
-                        <div class="form-group col-md-3">
-                            <label for="is_installment_switch">Installemnt </label>
-                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" style="height: 37.53px;" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
-                        </div>
-
-                        <div class="form-group col-md-3" style="<?= (!empty($lead_data['is_installment']) && $lead_data['is_installment'] == 1) ? 'display: block;' : 'display: none;' ?>">
-                            <label for="no_of_installment">No of Installments</label>
-                            <input type="text" class="form-control" id="no_of_installment" name="no_of_installment" 
-                                value="<?= isset($lead_data['no_of_installment']) ? $lead_data['no_of_installment'] : 1 ?>">
-                        </div>
-
-                    </div>
-                        <div class="row" id="not_installment">
-
-
-                        <?php if (isset($lead_data['is_installment']) && $lead_data['is_installment'] == 0 || !isset($lead_data['is_installment'])) { ?>
-
-                            <div class="form-group col-md-3">
-                                <label for="payment_date">Payment Date</label>
-                                <input type="text" class="form-control" id="payment_date" name="payment_date" placeholder="DD/MM/YYY" value="<?= isset($lead_data['payment_date']) ? date('d-m-Y', strtotime($lead_data['payment_date'])) : "" ?>">
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="utr_no">UTR No.</label>
-                                <input type="text" class="form-control" id="utr_no" name="utr_no" placeholder="Enter UTR No." value="<?= isset($lead_data['utr_no']) ? $lead_data['utr_no'] : "" ?>">
-                            </div>
-
-                        <?php } ?>
-
-                    </div>
-                    <hr>
-                    <div id="installment_form_row">
-                        <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 && isset($lead_data['installment_data']) && !empty($lead_data['installment_data']) ? $lead_data['installment_data'] : '' ?>
-                    </div>
-                    <hr>
-                    <div class="form-row">
-
-                        <div class="form-group col-md-6">
-                            <label for="proposals"> Proposal(s) / Insurer(s) <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="proposals" name="proposals" onchange="getInsurerBranchContacts(this)" required>
-                                <option value="">Select Proposals</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-6">
-                            <label for="placement_to"> TO <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="placement_to" name="placement_to" required>
-                                <option value="">Select TO Mail</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-6">
-                            <label for="placement_cc">CC </label>
-                            <select class="form-control" id="placement_cc" name="placement_cc" required multiple>
-                                <?php if (isset($userList)) { ?>
-                                    <?php foreach ($userList as $user) { ?>
-                                        <option value="<?= $user['email']; ?>">
-                                            <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-12">
-                            <label for="subject">Subject</label>
-                            <input type="text" class="form-control" id="placement_subject" name="placement_subject" value="<?= isset($placement_subject) ? $placement_subject : " " ?>" placeholder="Enter Subject">
-                        </div>
-
-                    </div>
-                    <hr>
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="mail_content">Mail Content</label>
-                            <textarea id="placement_mail_content" class="form-control" name="placement_mail_content" rows="3"><?= isset($placement_mail_content) ? $placement_mail_content : " " ?></textarea>
-                        </div>
-                    </div>
-
-                </div>
-
-                <br>
-                <h4>Attachments Files</h4>
-                <hr>
-
-                <div class="form-group" id="placement_mail_attachment">
-                    <div class="form-row" >
-                        <?php echo isset($attachment_html) && !empty($attachment_html) ? $attachment_html : ''; ?>
-                    </div>
-                </div>
-
-                <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                    <button type="submit" class="btn btn-primary" onclick="constructURL(3)">Send Mail</button>
-                </div>
-
-            </div>
-        </div><!-- /.modal-content -->
-    </div>
-</div><!-- /.modal -->
 
 <script>
 
-    const dynamicExcessJson = {
-        "excess_fire":[
-            {
-                "blu":"5% of claim amount subject to minimum of Rs. 10000/- for each and every claim",
-                "bsu":"5% of claim amount subject to minimum of Rs. 5000/- for each and every claim",
-                "sfsp":"For location having SI upto INR 10Cr: 5% of claim amount subject to a minimum of Rs.10,000/- for each and every claim. For location having SI above INR 10Cr and upto 100 Cr: 5% of claim amount subject to a minimum of Rs.25,000/- For each and every claim .For location having SI above INR 100Cr and upto 1500 Cr: 5% of claim amount subject to a minimum of Rs.500,000/- for each and every claim"
-            }
-        ],
-        "excess_burglary":[
-            {
-                "blu":"5% of claim amount subject to minimum of Rs.5,000/-",
-                "bsu": "5% of claim amount subject to minimum of Rs.2,500/- for Burglary & 5,000/- for Theft each and every claim"
-            }
-        ]
-    }
+    // let policyData = {
 
-    var isSaved = true;
-    // var randomColor = 'hsl(' + Math.random() * 360 + ', 100%, 93%)';
-    var rfq_data = <?= isset($rfq_data['json']) ? json_encode($rfq_data['json'], JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) : '""' ?>;
-    rfq_data = rfq_data ? JSON.parse(rfq_data) : {}; // Convert to object if not already
+    //     "fire": {
+    //         "particulars": {
+    //             "fire_building": " <strong> Building : </strong> All Buildings and civil structures including Super Structure, plinth & foundation, other Civil Structures, Roads, gates, pavements, internal Pathways, stone works, stone arts etc., Street Lights, Landscaping, Play Area, Culvert, drainage, retaining walls, etc. Compound Wall including utility, admin block, security office and all other similar structures pertaining to insured within the premises, Kutcha Constructions, Temporary Sheds, parking Sheds, Shelters, Civil Structure / bed for DG set / Genset, Interlocking Pathways, LVP Pathway Widening, Roads including internal roads, Mini Conference, Swimming pool, rest areas, shelters, Kitchen-Exhaust System Work, Red Earth for Garden, Arch Wall, Retaining Wall, Boundary, compound walls, Water, Vetrified Tiles, Capital Additions related to Building. All other civil structures related to insured at the covered premises.",
+    //             "fire_content": "<strong> Content : </strong> Contents, AC & Accessories, FFF, P & M & Accessories, Electronic Equipments & Accessories, Electrical Items & Fittings, Plumbing Items, Structural Products, Structures, Leasehold Work including Civil Works, Interiors Temporary Structures including Sheds and Containers, Interiors, Plate Glass, Workstations, Office Equipments, Consumables, Goods held in commission / Trust, Trading Goods, Other contents / Items related to Insured's trade, Other Contents related to Insured's Trade",
+    //         },
+    //         "risk_split_up": [
+    //             "Building",
+    //             "Contents",
+    //             "Plant and Machinery",
+    //             "Electronic Equipments",
+    //             "FFF",
+    //             "Office Equipments / Contents",
+    //             "Stocks (RM, WIP, SFG, FG, PM & Any others stocks related to Insured's Trade)"
+    //         ],
+    //         "add_on_covers": [
+    //             "STFI (Storm Tempest Flood & Inundation)",
+    //             "EQ (EarthQuake)",
+    //             "Terrorism",
+    //             "Designated Property Clause",
+    //             "Agreed Bank Clause",
+    //             "Reinstatement Value Clause",
+    //             "Local Authorites Clause",
+    //             "Payment on Account Clause of 75% of Claim amount on recommendation of Surveyor"
+    //         ],
+    //         "inbuilt_covers": [
+    //             "Fire and Allied Perils, Including STFI",
+    //             "Costs for Removal of debris upto 2 % of the claim amount",
+    //             "Additions, alterations or extensions upto 15% of the Sum Insured for that item (excluding stocks)",
+    //             "Temporary removal of stocks upto 10% of value",
+    //             "Start-Up Expenses upto 5 Lakhs",
+    //             "Costs compelled by Municipal Regulations",
+    //             "Cover for Specific Contents- Money upto 50,000",
+    //             "Cover for documents upto 50,000",
+    //             "Cover for computer programmes, information and data upto 5 Lakh",
+    //             "Cover for personal effects of employees, Directors and visitors upto 15,000"
+    //         ],
+    //         "excess": "Policy Fire"
+    //     },
+    //     "burglary": {
+    //         "particulars": "Contents, AC & Accessories, FFF, P & M & Accessories, Electronic Equipments & Accessories, Electrical Items & Fittings, Plumbing Items, Structural Products, Structures, Leasehold Work including Civil Works, Interiors Temporary Structures including Sheds and Containers, Interiors, Plate Glass, Workstations, Office Equipments, Consumables, Goods held in commission / Trust, Trading Goods, Other contents / Items related to Insured's trade, Other Contents related to Insured's Trade",
+    //         "risk_split_up": [
+    //             "Building",
+    //             "Contents",
+    //             "Furniture/Office Equipment",
+    //             "Plant and Machinery",
+    //             "Electrical Fittings",
+    //             "Stock In Process",
+    //             "Raw Material",
+    //             "Stock"
+    //         ],
+    //         "additional_coverage": [
+    //             "First Loss Limit",
+    //             "Theft & RSMD",
+    //             "Waiver of FIR, NTC and Final Investigation reports",
+    //             "Goods held in trust are covered if the same is included in TSI"
+    //         ],
+    //         "excess": "Policy Burglary"
+    //     },
+    //     "flop": {
+    //         "particulars": "Loss of Gross Profit due to peril covered in the Standard Fire & Special Perils Policy.",
+    //         "risk_split_up": ["Sample Flop Risk Split Up"],
+    //         "flop_coverage": [
+    //             "Sum Insured",
+    //             "Indemnity Period",
+    //             "Basis of Sum Insured / Indemnification",
+    //             "Insurance on Gross Profit"
+    //         ],
+    //         "add_on_coverage": [
+    //             "Earthquake",
+    //             "STFI (Storm, Tempest, Flood and Inundation)",
+    //             "Terrorism",
+    //             "Prevention of Access",
+    //             "Auditors Fees",
+    //             "Alternate basis clause",
+    //             "Claims preparation clause",
+    //             "Accumulated stocks clause"
+    //         ],
+    //         "excess": "Policy Flop"
+    //     },
+    //     "all_risk": {
+    //         "particulars": "Laptops, Notebooks Computers, Tablets, Mobile Phones & Cameras, projectors, and other portable equipments.",
+    //         "risk_split_up": ["Sample Risk Split Up"],
+    //         "additional_coverage": [
+    //             "RSMD",
+    //             "Terrorism",
+    //             "Coverage",
+    //             "Electrical and Mechanical Breakdown",
+    //             "Asset warranty clause",
+    //             "Water/liquid damage cover",
+    //             "No restriction on age of the asset / equipments - all the equipments / assets to be covered"
+    //         ],
+    //         "excess": "Policy All Risk"
+    //     },
+    //     "MBD": {
+    //         "particulars": "Plant & Machinery including and not limited to DG Set, Lifts, Refrigerator, Cooler, Air Conditioner, Pump, Water Dispenser, Freezer, Oven, Motor, Transformer, etc. and other P&M related to Insured",
+    //         "risk_split_up": ["Sample Risk Split Up"],
+    //         "additional_coverage": [
+    //             "Accidental / Mechanical breakdown",
+    //             "Express Freight",
+    //             "Air Freight",
+    //             "Third Party Liability (Limited upto 10% of Individual Equipment Value)",
+    //             "Owner's Surrounding Property",
+    //             "Reinstatement Value Clause",
+    //             "Escalation--10% of Individual Equipment Value"
+    //         ],
+    //         "excess": "Policy MBD Excess"
+    //     },
+    //     "EEI": {
+    //         "particulars": "Various electronic Items including and not limited to Computer, Printer, CCTV, Telephone Instruments, Control System, Router, Switches, BMS System, DVD Player, Music Systems, Scanner, Photo Copier and Electronic Lock System, and other electronic items.",
+    //         "risk_split_up": ["Sample Risk Split Up"],
+    //         "additional_coverage": [
+    //             "As per Electronic Equipment Policy including STFI, EQ, Terrorism",
+    //             "Accidental / Electrical Breakdown",
+    //             "Damage to electronic equipment incl. systems software, cost of external data media, cost of reconstruction of data",
+    //             "Waiver of FIR, NTC and Final Investigation reports for claims upto INR 2 Lacs",
+    //             "No restriction on age of the asset / equipments - all the equipments / assets to be covered",
+    //             "Depreciation subject to 10% PA subject to maximum of 50%",
+    //             "Reinstatement Value Clause"
+    //         ],
+    //         "excess": "Policy EEI"
+    //     },
+    //     "fidelity": {
+    //         "particulars": [
+    //             "Dishonest acts / Fraudulent Act of employees",
+    //             "No Of Employees",
+    //             "Per Person Limit",
+    //             "Third Party Fidelity Cover"
+    //         ],
+    //         "risk_split_up": ["Sample Fidelity Risk Split Up"],
+    //         "additional_coverage": [
+    //             "Any One Person",
+    //             "Including contract Employees",
+    //             "Un-named Basis",
+    //             "Employees are covered without any selection",
+    //             "Floater Cover"
+    //         ],
+    //         "excess": "Policy Fidelity"
+    //     },
+    //     "money": {
+    //         "particulars": [
+    //             "Money in transit",
+    //             "Money in Safe",
+    //             "Money in Counter",
+    //             "Annual Transit"
+    //         ],
+    //         "risk_split_up": ["Sample Money Split up"],
+    //         "additional_coverage": [
+    //             "RSMD",
+    //             "Terrorism",
+    //             "Cash by Public Transport/Vehicle",
+    //             "Cash by Two Wheeler",
+    //             "Cash should be carried by the authorised/designated employee of the company. Employee should be read as Pay Rolls of the company including Contract Employee",
+    //             "Employee means any such person as authorised by the Employer either expressly or impliedly in the course of employment",
+    //             "Place of Transit:- Cash in Transit Between Bank to office/ Resorts and offices / resorts to bank and Viceversa"
+    //         ],
+    //         "excess": "Policy Money"
+    //     },
+    //     "plate_Glass": {
+    //         "particulars": "Glass items, including frames and fittings",
+    //         "risk_split_up": ["Sample Plate Glass Risk Split up"],
+    //         "coverage": [
+    //             "Accidental Damage",
+    //             "RSMD",
+    //             "Waiver of Survey upto INR 2 Lacs",
+    //             "Including frames and fittings",
+    //             "Self destruction due to climatic change / due to temp"
+    //         ],
+    //         "excess": "Policy Plate Glass"
+    //     },
+    //     "neon_sign": {
+    //         "particulars": "Neon Tubes, Frame, Electrical Components, Glass Panels, Lettering and Graphics",
+    //         "risk_split_up": ["Sample Neon Sign Risk split up"],
+    //         "coverage": [
+    //             "Accidental/Physical/Electronic Damage",
+    //             "RSMD",
+    //             "Waiver of Survey upto INR 2 Lacs"
+    //         ],
+    //         "excess": "Policy Neon"
+    //     },
+    //     "public_liability": {
+    //         "particulars": [
+    //             "As per Public Liability including extensions such as Lift Liability & Food & Beverage: AOA : AOY - 1:4",
+    //             "AOA:AOY"
+    //         ],
+    //         "risk_split_up": ["Sample Public Liability Risk Split Up"],
+    //         "coverage": [
+    //             "AOG Perils Extension",
+    //             "Third Party Includes visitors",
+    //             "Owners / Tenants occupying the premises",
+    //             "Terrorism",
+    //             "Liability Arising out from use",
+    //             "Ownership or operations of lifts elevators",
+    //             "Food & Beverage Extn"
+    //         ]
+    //     },
+    //     "pedal_cycle": {
+    //         "particulars": "Financial protection against various risks associated with owning and using a bicycle or other pedal-powered vehicle.",
+    //         "risk_split_up": ["Sample Pedal Cycle Risk Split Up"],
+    //         "coverage": [
+    //             "Coverage is Limited to Fire and Allied Perils including Eq as per AIFT",
+    //             "Burglary including Theft and Impact Damage with in the radius of 50Kms from Insured Premises",
+    //             "Reistatement Value Clause",
+    //             "Accidental Damage Cover"
+    //         ],
+    //         "excess": "Policy Pedal Cycle"
+    //     },
+    //     "premium": {
+    //         "premium": [
+    //             "Premium",
+    //             "GST (%)",
+    //             "GST Amount (₹)",
+    //             "Total",
+    //         ]
+    //     }
+    // };
 
-    var policySI = "";
-    var rfq_or_qcr = 1;
-    var proposalDataForDropDown = {};
-    var lead_type = "<?= $lead_data['lead_type'] ?>";
-    // alert(lead_type);
-    var rollover_or_renewal = "";
+    let policyData = {
+        "fire": {
+            "particulars": {
+                "fire_building": " <strong> Building : </strong> All Buildings and civil structures including Super Structure, plinth & foundation, other Civil Structures, Roads, gates, pavements, internal Pathways, stone works, stone arts etc., Street Lights, Landscaping, Play Area, Culvert, drainage, retaining walls, etc. Compound Wall including utility, admin block, security office and all other similar structures pertaining to insured within the premises, Kutcha Constructions, Temporary Sheds, parking Sheds, Shelters, Civil Structure / bed for DG set / Genset, Interlocking Pathways, LVP Pathway Widening, Roads including internal roads, Mini Conference, Swimming pool, rest areas, shelters, Kitchen-Exhaust System Work, Red Earth for Garden, Arch Wall, Retaining Wall, Boundary, compound walls, Water, Vetrified Tiles, Capital Additions related to Building. All other civil structures related to insured at the covered premises.",
+                "fire_content": "<strong> Content : </strong> Contents, AC & Accessories, FFF, P & M & Accessories, Electronic Equipments & Accessories, Electrical Items & Fittings, Plumbing Items, Structural Products, Structures, Leasehold Work including Civil Works, Interiors Temporary Structures including Sheds and Containers, Interiors, Plate Glass, Workstations, Office Equipments, Consumables, Goods held in commission / Trust, Trading Goods, Other contents / Items related to Insured's trade, Other Contents related to Insured's Trade",
+            },
+            "risk_split_up": [
+                { "name": "Building", "default_answer": "Agreed" },
+                { "name": "Contents", "default_answer": "Agreed" },
+                { "name": "Plant and Machinery", "default_answer": "Agreed" },
+                { "name": "Electronic Equipments", "default_answer": "Agreed" },
+                { "name": "FFF", "default_answer": "Agreed" },
+                { "name": "Office Equipments / Contents", "default_answer": "Agreed" },
+                { "name": "Stocks (RM, WIP, SFG, FG, PM & Any others stocks related to Insured's Trade)", "default_answer": "Agreed" }
+            ],
+            "add_on_covers": [
+                { "name": "STFI (Storm Tempest Flood & Inundation)", "default_answer": "Agreed" },
+                { "name": "EQ (EarthQuake)", "default_answer": "Agreed" },
+                { "name": "Terrorism", "default_answer": "Agreed" },
+                { "name": "Designated Property Clause", "default_answer": "Agreed" },
+                { "name": "Agreed Bank Clause", "default_answer": "Agreed" },
+                { "name": "Reinstatement Value Clause", "default_answer": "Agreed" },
+                { "name": "Local Authorites Clause", "default_answer": "Agreed" },
+                { "name": "Payment on Account Clause of 75% of Claim amount...", "default_answer": "Agreed" }
+            ],
+            "inbuilt_covers": [
+                { "name": "Fire and Allied Perils, Including STFI", "default_answer": "Agreed" },
+                { "name": "Costs for Removal of debris upto 2 % of the claim amount", "default_answer": "Agreed" },
+                { "name": "Additions, alterations or extensions upto 15%", "default_answer": "Agreed" },
+                { "name": "Temporary removal of stocks upto 10% of value", "default_answer": "Agreed" },
+                { "name": "Start-Up Expenses upto 5 Lakhs", "default_answer": "Agreed" },
+                { "name": "Costs compelled by Municipal Regulations", "default_answer": "Agreed" },
+                { "name": "Cover for Specific Contents- Money upto 50,000", "default_answer": "Agreed" },
+                { "name": "Cover for documents upto 50,000", "default_answer": "Agreed" },
+                { "name": "Cover for computer programmes upto 5 Lakh", "default_answer": "Agreed" },
+                { "name": "Cover for personal effects upto 15,000", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Fire"
+        },
 
-    var rfq_count = "<?= $rfq_count ?? null?>";
-    // alert(rfq_count);
-                                        
-    if (lead_type != 1){
+        "burglary": {
+            "particulars": "Contents, AC & Accessories, FFF, P & M & Accessories...",
+            "risk_split_up": [
+                { "name": "Building", "default_answer": "Agreed" },
+                { "name": "Contents", "default_answer": "Agreed" },
+                { "name": "Furniture/Office Equipment", "default_answer": "Agreed" },
+                { "name": "Plant and Machinery", "default_answer": "Agreed" },
+                { "name": "Electrical Fittings", "default_answer": "Agreed" },
+                { "name": "Stock In Process", "default_answer": "Agreed" },
+                { "name": "Raw Material", "default_answer": "Agreed" },
+                { "name": "Stock", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "First Loss Limit", "default_answer": "Agreed" },
+                { "name": "Theft & RSMD", "default_answer": "Agreed" },
+                { "name": "Waiver of FIR, NTC and Final Investigation reports", "default_answer": "Agreed" },
+                { "name": "Goods held in trust covered if included in TSI", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Burglary"
+        },
 
-        rollover_or_renewal = lead_type == 2 ? "Existing Renewal" : "Existing Roll Over";
-    }
-    // alert(rollover_or_renewal);
+        "flop": {
+            "particulars": "Loss of Gross Profit due to peril covered...",
+            "risk_split_up": [
+                { "name": "Sample Flop Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "flop_coverage": [
+                { "name": "Sum Insured", "default_answer": "Agreed" },
+                { "name": "Indemnity Period", "default_answer": "Agreed" },
+                { "name": "Basis of Sum Insured / Indemnification", "default_answer": "Agreed" },
+                { "name": "Insurance on Gross Profit", "default_answer": "Agreed" }
+            ],
+            "add_on_coverage": [
+                { "name": "Earthquake", "default_answer": "Agreed" },
+                { "name": "STFI (Storm, Tempest, Flood and Inundation)", "default_answer": "Agreed" },
+                { "name": "Terrorism", "default_answer": "Agreed" },
+                { "name": "Prevention of Access", "default_answer": "Agreed" },
+                { "name": "Auditors Fees", "default_answer": "Agreed" },
+                { "name": "Alternate basis clause", "default_answer": "Agreed" },
+                { "name": "Claims preparation clause", "default_answer": "Agreed" },
+                { "name": "Accumulated stocks clause", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Flop"
+        },
 
-    var policyConfig = {
-        1: ['Sum Insured']
-    };
+        "all_risk": {
+            "particulars": "Laptops, Notebooks Computers, Tablets, Mobile Phones & Cameras...",
+            "risk_split_up": [
+                { "name": "Sample Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "RSMD", "default_answer": "Agreed" },
+                { "name": "Terrorism", "default_answer": "Agreed" },
+                { "name": "Coverage", "default_answer": "Agreed" },
+                { "name": "Electrical and Mechanical Breakdown", "default_answer": "Agreed" },
+                { "name": "Asset warranty clause", "default_answer": "Agreed" },
+                { "name": "Water/liquid damage cover", "default_answer": "Agreed" },
+                { "name": "No restriction on age of the asset", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy All Risk"
+        },
 
-    let myModal;
-    var over_all_column_data = {
-        "Proposal 1": {
-            "qcr": 0,
-            "stc": 0,
-            'insurers': []
+        "MBD": {
+            "particulars": "Plant & Machinery including and not limited to DG Set, Lifts...",
+            "risk_split_up": [
+                { "name": "Sample Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "Accidental / Mechanical breakdown", "default_answer": "Agreed" },
+                { "name": "Express Freight", "default_answer": "Agreed" },
+                { "name": "Air Freight", "default_answer": "Agreed" },
+                { "name": "Third Party Liability (Limited upto 10%)", "default_answer": "Agreed" },
+                { "name": "Owner's Surrounding Property", "default_answer": "Agreed" },
+                { "name": "Reinstatement Value Clause", "default_answer": "Agreed" },
+                { "name": "Escalation--10% of Individual Equipment Value", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy MBD Excess"
+        },
+
+        "EEI": {
+            "particulars": "Various electronic Items including and not limited to Computer, Printer, CCTV...",
+            "risk_split_up": [
+                { "name": "Sample Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "As per Electronic Equipment Policy including STFI, EQ, Terrorism", "default_answer": "Agreed" },
+                { "name": "Accidental / Electrical Breakdown", "default_answer": "Agreed" },
+                { "name": "Damage to electronic equipment incl. software", "default_answer": "Agreed" },
+                { "name": "Waiver of FIR/NTC for claims upto INR 2 Lacs", "default_answer": "Agreed" },
+                { "name": "No restriction on age of the asset", "default_answer": "Agreed" },
+                { "name": "Depreciation subject to 10% PA max 50%", "default_answer": "Agreed" },
+                { "name": "Reinstatement Value Clause", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy EEI"
+        },
+
+        "fidelity": {
+            "particulars": [
+                { "name": "Dishonest acts / Fraudulent Act of employees", "default_answer": "Agreed" },
+                { "name": "No Of Employees", "default_answer": "Agreed" },
+                { "name": "Per Person Limit", "default_answer": "Agreed" },
+                { "name": "Third Party Fidelity Cover", "default_answer": "Agreed" }
+            ],
+            "risk_split_up": [
+                { "name": "Sample Fidelity Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "Any One Person", "default_answer": "Agreed" },
+                { "name": "Including contract Employees", "default_answer": "Agreed" },
+                { "name": "Un-named Basis", "default_answer": "Agreed" },
+                { "name": "Employees covered without selection", "default_answer": "Agreed" },
+                { "name": "Floater Cover", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Fidelity"
+        },
+
+        "money": {
+            "particulars": [
+                { "name": "Money in transit", "default_answer": "Agreed" },
+                { "name": "Money in Safe", "default_answer": "Agreed" },
+                { "name": "Money in Counter", "default_answer": "Agreed" },
+                { "name": "Annual Transit", "default_answer": "Agreed" }
+            ],
+            "risk_split_up": [
+                { "name": "Sample Money Split up", "default_answer": "Agreed" }
+            ],
+            "additional_coverage": [
+                { "name": "RSMD", "default_answer": "Agreed" },
+                { "name": "Terrorism", "default_answer": "Agreed" },
+                { "name": "Cash by Public Transport/Vehicle", "default_answer": "Agreed" },
+                { "name": "Cash by Two Wheeler", "default_answer": "Agreed" },
+                { "name": "Cash carried by authorised employee", "default_answer": "Agreed" },
+                { "name": "Employee means payroll & contract", "default_answer": "Agreed" },
+                { "name": "Place of Transit: Bank ↔ Office/Resorts", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Money"
+        },
+
+        "plate_Glass": {
+            "particulars": "Glass items, including frames and fittings",
+            "risk_split_up": [
+                { "name": "Sample Plate Glass Risk Split up", "default_answer": "Agreed" }
+            ],
+            "coverage": [
+                { "name": "Accidental Damage", "default_answer": "Agreed" },
+                { "name": "RSMD", "default_answer": "Agreed" },
+                { "name": "Waiver of Survey upto INR 2 Lacs", "default_answer": "Agreed" },
+                { "name": "Including frames and fittings", "default_answer": "Agreed" },
+                { "name": "Self destruction due to climatic change", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Plate Glass"
+        },
+
+        "neon_sign": {
+            "particulars": "Neon Tubes, Frame, Electrical Components, Glass Panels...",
+            "risk_split_up": [
+                { "name": "Sample Neon Sign Risk split up", "default_answer": "Agreed" }
+            ],
+            "coverage": [
+                { "name": "Accidental/Physical/Electronic Damage", "default_answer": "Agreed" },
+                { "name": "RSMD", "default_answer": "Agreed" },
+                { "name": "Waiver of Survey upto INR 2 Lacs", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Neon"
+        },
+
+        "public_liability": {
+            "particulars": [
+                { "name": "As per Public Liability including extensions", "default_answer": "Agreed" },
+                { "name": "AOA:AOY", "default_answer": "Agreed" }
+            ],
+            "risk_split_up": [
+                { "name": "Sample Public Liability Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "coverage": [
+                { "name": "AOG Perils Extension", "default_answer": "Agreed" },
+                { "name": "Third Party Includes visitors", "default_answer": "Agreed" },
+                { "name": "Owners / Tenants occupying the premises", "default_answer": "Agreed" },
+                { "name": "Terrorism", "default_answer": "Agreed" },
+                { "name": "Liability Arising out from use", "default_answer": "Agreed" },
+                { "name": "Ownership or operations of lifts elevators", "default_answer": "Agreed" },
+                { "name": "Food & Beverage Extn", "default_answer": "Agreed" }
+            ]
+        },
+
+        "pedal_cycle": {
+            "particulars": "Financial protection against risks of bicycles...",
+            "risk_split_up": [
+                { "name": "Sample Pedal Cycle Risk Split Up", "default_answer": "Agreed" }
+            ],
+            "coverage": [
+                { "name": "Coverage is Limited to Fire and Allied Perils", "default_answer": "Agreed" },
+                { "name": "Burglary incl. Theft and Impact Damage", "default_answer": "Agreed" },
+                { "name": "Reinstatement Value Clause", "default_answer": "Agreed" },
+                { "name": "Accidental Damage Cover", "default_answer": "Agreed" }
+            ],
+            "excess": "Policy Pedal Cycle"
+        },
+
+        "premium": {
+            "premium": [ 
+                "Premium", 
+                "GST (%)", 
+                "GST Amount (₹)", 
+                "Total", 
+            ]
         }
     };
 
-    var tdChanged = false;
-    var changedNewSI = "";
-    var suggestions = {};
-    var policyInformationData = <?= isset($rfq_data['registration_json']) ? json_encode($rfq_data['registration_json'], JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) : '""' ?>;
-    var storedData = {};
-    // // console.log("stored data : ", typeof(policyInformationData))
+    let policyOrder = {
+        fire: 1,
+        burglary: 2,
+        flop: 3,
+        all_risk: 4,
+        mbd: 5,
+        eei: 6,
+        fidelity: 7,
+        money: 8,
+        plate_glass: 9,
+        neon_sign: 10,
+        public_liability: 11,
+        pedal_cycle: 12,
+        premium: 13
+    };
 
-    localStorage.removeItem('policyData');
-    if (policyInformationData.length) {
+    // GLOBAL VARABLES DECLARATION
 
-        localStorage.setItem('policyData', (policyInformationData));
-        storedData = policyInformationData;
-    }
+    let riskCount = 0; // for Risk Location Count
+    let insurerCount = 0; // for Insurer Count
+    let insurerVersionCount = 1; // for Insurer Version controll 
+    let editingInsurerId = null; // for Edit Insurer
+    let editingLocationIndex = null; // for Edit Risk Location
+    let risk_location_details = {}; // for Store Risk Location Details
+    let insurer_details = {}; // for Store Insurer Details
+    let active_policy_data = {}; // for Store the Active Policy Data (eg : Fire, Burglary) based on the checkbox
 
-    var policySummary = [];
-
-    // // console.log("policy summary is set :", !$.isEmptyObject(policySummary) ? "no" : "yes")
     $(document).ready(function() {
-        myModal = new bootstrap.Modal(document.getElementById('policyRegisterModel'));
-        // monitorTableChanges();
-    });
 
-    let intervalId;
-
-    $(document).ready(function () {
-        console.log("Document ready");
-
-        let lead_status = '<?= isset($lead_data['status']) ?  $lead_data['status'] : '' ?>';
-        console.log('Lead status retrieved:', lead_status);
-
-        if (lead_status != "won") {
-            console.log("Lead status is not 'won', setting interval for submitData");
-
-            // startInterval();
-        } else {
-            console.log("Lead status is 'won', submitData will not be called");
-        }
-    });
-
-    function startInterval() {
-        intervalId = setInterval(function () {
-            console.log("Calling submitData(1) at 20-second interval");
-            saveRFQ(true);
-        }, 20000);
-    }
-
-    var tableCount = 0;
-    const policies = <?= json_encode($policies) ?>;
-    // // console.log('policies', policies);
-
-    const child_table_data = <?= json_encode($child_table_data) ?>;
-    // // console.log('child_table_data', child_table_data);
-
-    const policyOrder = [{
-            'fire': {
-                "priority": 1
-            }
-        },
-        {
-            'burglary': {
-                "priority": 2
-            }
-        },
-        {
-            'flop': {
-                "priority": 3
-            }
-        },
-        {
-            'all_risk': {
-                "priority": 4
-            }
-        },
-        {
-            'mbd': {
-                "priority": 5
-            }
-        },
-        {
-            'eei': {
-                "priority": 6
-            }
-        },
-        {
-            'fidelity': {
-                "priority": 7
-            }
-        },
-        {
-            'money': {
-                "priority": 8
-            }
-        },
-        {
-            'plate_glass': {
-                "priority": 9
-            },
-        },
-        {
-            'neon_sign': {
-                "priority": 10
-            }
-        },
-        {
-            'public_liability': {
-                "priority": 11
-            }
-        }
-    ];
-
-    let selectedPolicies = new Set();
-
-    let proposalCount = 1;
-    // // console.log("Proposal count changed", proposalCount);
-    let quotesConfig = {
-        1: ['Sum Insured']
-    }; // Stores quote columns for each proposal
-
-
-
-    // Update all tables with the new quote column
-    function updateAllTables_old(proposalNumber, newQuote) {
-        const tables = document.querySelectorAll('table');
-        tables.forEach(table => {
-            const headerRow1 = table.querySelector('thead tr:first-child');
-            const headerRow2 = table.querySelector('thead tr:last-child');
-
-            // Update proposal header colspan
-            const proposalHeader = headerRow1.querySelector(`th[data-proposal="${proposalNumber}"]`);
-            if (proposalHeader) {
-                proposalHeader.colSpan = quotesConfig[proposalNumber].length;
-            }
-
-            // Calculate the position to insert the new quote column
-            let insertPosition = 2; // Start after Particulars column
-            for (let i = 1; i < proposalNumber; i++) {
-                insertPosition += quotesConfig[i]?.length || 0;
-            }
-            insertPosition += quotesConfig[proposalNumber].length - 1;
-            let table_id = table.id ? table.id : 'parent';
-            // // console.log('insert position of ' + table.id + ' - ' + insertPosition);
-            // Add new quote sub-header
-            const newQuoteHeader = document.createElement('th');
-            newQuoteHeader.textContent = newQuote;
-            headerRow2.insertBefore(newQuoteHeader, headerRow2.children[insertPosition]);
-
-            // Add new editable cells to all rows
-            table.querySelectorAll('tbody tr').forEach(row => {
-                const newCell = document.createElement('td');
-                newCell.contentEditable = true; // Make cell editable
-                row.insertBefore(newCell, row.children[insertPosition]);
-            });
-        });
-    }
-
-    // Generate the table (parent or child)
-
-    // Show dropdown menu
-    function showDropdown(event) {
-        // // console.log("dropdown function triggered");
-        const dropdown = event.target.nextElementSibling;
-        // // console.log(dropdown);
-        dropdown.style.display = dropdown.style.display === 'block' ? 'none' : 'block';
-        event.stopPropagation();
-    }
-
-    // Remove a proposal column
-    function removeProposal(proposalNumber) {
-
-        isSaved = false;
-        // alert(proposalNumber);
-        var rowIdCount = {};
-
-        let startIndex = 0;
-        // console.log("Remove Proposal startIndex :   ",startIndex);
-        // console.log("Remove Proposal proposalNumber :   ",proposalNumber);
-
-
-        // // console.log('removeProposal');
-        // console.log("quotesConfig",quotesConfig);
-
-        if (!quotesConfig[proposalNumber]) return; // If proposal doesn't exist, exit
-        if(Object.keys(quotesConfig).length == 1){
-            toastr.warning("You cannot Delete All the Proposals","Warning");
-            return;
-        }
-        // Remove all child columns for the proposal
-        const tables = document.querySelectorAll('table');
-        tables.forEach(table => {
-
-            const headerRow1 = table.querySelector('thead tr:first-child');
-            const headerRow2 = table.querySelector('thead tr:last-child');
-
-            // Find the proposal header and calculate its colspan
-            const proposalHeader = headerRow1.querySelector(`th[data-proposal="${proposalNumber}"]`);
-            if (proposalHeader) {
-                // console.log("Remove Proposal : quotesConfig ",quotesConfig[proposalNumber]);
-                // console.log("Remove Proposal : proposalHeader ",proposalHeader);
-
-                if (rfq_or_qcr == 1){
-                    var colspan = parseInt(quotesConfig[proposalNumber].length);
-                }else{
-                    var colspan = parseInt(proposalHeader.getAttribute('colspan'), 10);
-                }
-                // console.log("Remove Proposal : colspan ",colspan);
-                // Remove the proposal header
-                proposalHeader.remove();
-
-                // Remove corresponding sub-headers in the second header row
-                const subHeaders = headerRow2.querySelectorAll(`th`);
-                startIndex = 2; // Start after the first two columns (checkbox and Particulars)
-                // console.log("Remove Proposal : startIndex 2",startIndex);
-                // if (lead_type != 1){
-                //     proposalNumber  = proposalNumber + 1;
-                // }else{
-                    
-                // }
-                if (lead_type != 1){
-                    for (let i = 0; i < proposalNumber; i++) {
-                        // // console.log("quotesConfig[i] be", quotesConfig[i])
-                        // // console.log("quotesConfig[i] length", quotesConfig[i]?.length)
-
-
-                        startIndex += quotesConfig[i]?.length || 0;
-
-
-                        // console.log("quotesConfig[i] after", quotesConfig[i]);
-                        // console.log("Remove Proposal : startIndex 3",startIndex);
-                    }
-                }else{
-                    for (let i = 1; i < proposalNumber; i++) {
-                        // // console.log("quotesConfig[i] be", quotesConfig[i])
-                        // // console.log("quotesConfig[i] length", quotesConfig[i]?.length)
-
-
-                        startIndex += quotesConfig[i]?.length || 0;
-
-
-                        // console.log("quotesConfig[i] after", quotesConfig[i]);
-                        // console.log("Remove Proposal : startIndex 3",startIndex);
-                    }
-                }
-                
-                for (let i = 0; i < colspan; i++) {
-                    // console.log("Remove Proposal : colspan ",colspan);
-                    // console.log("Remove Proposal : startIndex 4",startIndex)
-                    headerRow2.removeChild(headerRow2.children[startIndex]);
-                }
-
-                // Remove corresponding cells in all rows
-                table.querySelectorAll('tbody tr').forEach(row => {
-                    for (let i = 0; i < colspan; i++) {
-                        var rowId = row.id;
-                        if (rowIdCount[rowId] === undefined) {
-                            rowIdCount[rowId] = 0;
-                        } else {
-                            rowIdCount[rowId]++;
-                        }
-                        // console.log("rowIdCount[rowId]", rowIdCount[rowId]);
-                        newStartIndex = rowIdCount[rowId] > 0 ? startIndex-1 : startIndex; 
-                        // console.log("newStartIndex", newStartIndex)
-                        row.removeChild(row.children[newStartIndex]);
-
-                    }
-                });
-            }
+        // Add Risk Location Column (show modal first)
+        $("#addLocation").click(function() {
+            editingLocationIndex = null; // Clear editing mode
+            $("#riskLocationForm")[0].reset();
+            $("#riskLocationModalLabel").text("Add Risk Location Details");
+            $("#saveRiskLocation").text("Add Location");
+            // $("#riskLocationModal").modal('show');
+            var myModal = new bootstrap.Modal(document.getElementById('riskLocationModal'));
+            myModal.show();
         });
 
-        // Remove the proposal from quotesConfig
-        delete quotesConfig[proposalNumber];
-
-        delete policyConfig[proposalNumber];
-        // // console.log("DELETE INSURE : policyConfig",policyConfig);
-        // // console.log("DELETE INSURE : quotesConfig",quotesConfig);
-        // alert(quotesConfig);
-        // alert(policyConfig)
-        // console.log('End of the functions')
-    }
-
-    // Add a new row
-    function addRow(event, element) {
-
-        // // console.log(' event  ', element);
-        isSaved = false;
-        const button = event.target;
-        const row = button.closest('tr');
-        const table = row.closest('table');
-        const newRow = row.cloneNode(true);
-        // // console.log("old Row ", row);
-        // return false;
-        var tableID = table.id;
-
-        let nextSNO = getSNO(tableID);
-        // Clear input values and generate new IDs
-        newRow.querySelectorAll('td').forEach((td, index) => {
-            if (index === 0) {
-                // // console.log("Trying to set sno");
-                td.innerHTML = "";
-                td.innerHTML = `${nextSNO}`;
-            }
-            if (index !== 0 && index !== row.cells.length - 1) td.textContent = '-';
-        });
-
-        table.querySelector('tbody').appendChild(newRow);
-        updateSNO(table.id);
-    }
-
-    // Remove a row
-    function removeRow(event) {
-        isSaved = false;
-        const button = event.target;
-        const row = button.closest('tr');
-        const table = row.closest('table');
-        if (row && row.parentElement.children.length > 1) {
-            // // console.log("Row Removed");
-            row.remove();
-            updateSNO(table.id);
-        }
-    }
-
-    //function to hide all the 3 dot actions for the child table
-    function hideProposalOptionsForChild() {
-        // // // console.log('function called');
-        const parentTable = document.querySelector("table");
-        const tables = document.querySelectorAll('table');
-
-        // // // console.log('parentTable    : ',parentTable);
-        tables.forEach(table => {
-            if (table !== parentTable) {
-                // Hide .three-dot-menu in all other tables
-                $(table).find(".three-dot-menu").hide();
-                // // // console.log("hided 3 dot menu in the table",table);
-            }
-        });
-    }
-    document.addEventListener("change", function(event) {
-        const checkbox = event.target;
-        if (checkbox.classList.contains("qcr-checkbox")) {
-            // // // console.log("QCR checkbox change detected");
-
-            // Get the row containing the checkbox
-            const row = checkbox.closest('tr');
-
-            // Find the corresponding client-checkbox in the same row
-            const clientCheckbox = row.querySelector('.client-checkbox');
-
-            if (clientCheckbox) {
-                // Sync the client-checkbox state with the qcr-checkbox state
-                clientCheckbox.checked = checkbox.checked;
-
-                // Optionally, you can trigger any additional logic here
-                if (checkbox.checked) {
-                    // // // console.log("QCR checkbox is checked, client-checkbox is also checked");
-                } else {
-                    // // // console.log("QCR checkbox is unchecked, client-checkbox is also unchecked");
-                }
-            } else {
-                // // console.warn("No client-checkbox found in the same row");
-            }
-        } else if (checkbox.classList.contains("client-checkbox")) {
-            // // console.log("trying to change");
-            const row = checkbox.closest('tr');
-            const qcrCheckbox = row.querySelector('.qcr-checkbox');
-
-            if (!qcrCheckbox.checked) {
-                toastr.warning("QCR checkbox is not checked, preventing client-checkbox selection", "Warning");
-                checkbox.checked = false; // Prevent selection
-            }
-        }
-    })
-
-    // Add this once during initial page setup
-    document.getElementById('tablesContainer').addEventListener('change', function(event) {
-
-        checkCellValueAndHighlight();
-        const container = document.getElementById('tablesContainer');
-        const checkbox = event.target;
-        if (checkbox.classList.contains('sno-checkbox')) {
-            const rowId = checkbox.closest('tr').id;
-            const table = checkbox.closest('table');
-            if (checkbox.checked) {
-                const childContainer = document.createElement('div');
-                selectedPolicies.add(rowId);
-                child_table_data[rowId]?.forEach(childTable => {
-                    if (childTable.table_type == "append") {
-                        var tableName = childTable.table_id;
-                        // // console.log("table name ", tableName);
-                        // Handle excess table
-                        const excessContainer = document.createElement('div');
-                        excessContainer.setAttribute('data-parent-row', tableName);
-                        excessContainer.setAttribute(`data-${tableName}-container`, 'true');
-
-                        var result = generateExcessTable(childTable, rowId, tableName);
-                        if (result) {
-                            generateTable(excessContainer, true, rowId, childTable);
-                            container.appendChild(excessContainer);
-                            $("#excess .three-dot-menu").hide();
-                            moveExcessTableLast();
-                        }
-                    } else {
-                        // Handle regular table
-                        childContainer.setAttribute('data-parent-row', rowId);
-                        generateTable(childContainer, true, rowId, childTable);
-                        // // // console.log('Row id for excess table', rowId);
-                        $(childContainer).find(".three-dot-menu").hide();
-
-                        // alert(`${rowId.toUpperCase()}_register`);
-                        $(`#${rowId.toUpperCase()}_register`).prop("disabled", false);
-                        moveExcessTableLast();
-                        
-                    }
-                });
-
-                // Only append regular container if it has content
-                if (childContainer.hasChildNodes()) {
-                    container.appendChild(childContainer);
-                }
-                styleTableColumns();
-                arrangeTables();
-                alignTableColumn();
-            } else {
-                // // console.log('UNCHECKED:', rowId);
-                selectedPolicies.delete(rowId);
-                // Remove regular child tables
-                const regularContainers = container.querySelectorAll(`div[data-parent-row="${rowId}"]:not([data-excess-container])`);
-                regularContainers.forEach(container => {
-                    // // console.log(" contaitner ", container);
-
-                    $(`#${rowId.toUpperCase()}_register`).prop("disabled", true);
-                    container.remove();
-                });
-                // // console.log("row id ", rowId);
-                // Handle excess table rows
-                const excessTable = document.getElementById('excess');
-                if (excessTable) {
-                    // Remove rows associated with this checkbox
-                    const excessRows = excessTable.querySelectorAll(`tbody tr[data-excess-row-parent="${rowId}"]`);
-                    excessRows.forEach(row => row.remove());
-
-                    // Check if excess table is empty
-                    const remainingRows = excessTable.querySelector('tbody').children;
-                    // // // console.log(remainingRows);
-                    if (remainingRows.length === 0) {
-                        // Remove the entire excess table container
-                        // const excessContainer = excessTable.closest('div[data-excess-container]');
-                        const excessContainer = $('#excess');
-                        const excessCollapseBar = document.querySelector('.table-collapsible-bar.Excess');
-                        if (excessContainer) {
-                            excessContainer.remove();
-                            excessCollapseBar.remove();
-                        }
-                    } else {
-                        updateSNO('excess')
-                    }
-                }
-            }
-        } else if (checkbox.classList.contains("qcr-checkbox")) {
-            // // console.log("QCR checkbox change detected");
-
-            // Get the row containing the checkbox
-            const row = checkbox.closest('tr');
-
-            // Find the corresponding client-checkbox in the same row
-            const clientCheckbox = row.querySelector('.client-checkbox');
-
-            if (clientCheckbox) {
-                // Sync the client-checkbox state with the qcr-checkbox state
-                clientCheckbox.checked = checkbox.checked;
-
-                // Optionally, you can trigger any additional logic here
-                if (checkbox.checked) {
-                    // // console.log("QCR checkbox is checked, client-checkbox is also checked");
-                } else {
-                    // // console.log("QCR checkbox is unchecked, client-checkbox is also unchecked");
-                }
-            } else {
-                // console.warn("No client-checkbox found in the same row");
-            }
-        }
-    });
-    
-    // Add a new proposal
-    document.getElementById('addProposal').addEventListener('click', () => {
-        // // console.log("proposal count before ", proposalCount);
-        proposalCount++;
-        isSaved = false;
-        // // console.log("proposal count after ", proposalCount);
-
-        quotesConfig[proposalCount] = ['Sum Insured'];
-        policyConfig[proposalCount] = ['Sum Insured'];
-        const tables = document.querySelectorAll('table');
-        let increaseBy = 150;
-        increaseTableWidth(increaseBy);
-        var randomColor = `hsl(${Math.random() * 360}, 100%, 93%)`;
-
-        tables.forEach(table => {
-            const headerRow1 = table.querySelector('thead tr:first-child');
-            const headerRow2 = table.querySelector('thead tr:last-child');
-
-            // Add new proposal header
-            const newProposalHeader = document.createElement('th');
-            newProposalHeader.setAttribute('data-proposal', proposalCount);
-            newProposalHeader.colSpan = 1;
-            newProposalHeader.style.backgroundColor = randomColor;
-            newProposalHeader.innerHTML = `
-                Proposal ${proposalCount}
-                <span class="three-dot-menu" onclick="showDropdown(event)">⋮</span>
-                <div class="dropdown-content">
-                    <button id="isQCR" onclick="addOrRemoveIcon(this,event)" class="qcrProposal" style="background-color: rgb(221, 221, 221);">QCR <i
-                        class="mdi mdi-checkbox-marked"
-                        style="color: green; margin-left: 8px;"></i></button>
-                    <button id="isSTC" class="sendClientProposal" onclick="addOrRemoveIcon(this,event)"
-                        style="background-color: rgb(221, 221, 221);">Send to Client <i
-                        class="mdi mdi-checkbox-marked"
-                        style="color: green; margin-left: 8px;"></i></button>
-                    <button class = "removeProposal" onclick="removeProposal(${proposalCount})">Remove Proposal</button>
-                    <button class="newInsurer" onclick="addNewQuote(${proposalCount})">Add New Insurer</button>
-                </div>
-            `;
-            headerRow1.insertBefore(newProposalHeader, headerRow1.lastElementChild);
-
-            // Add new quote sub-header
-            const newQuoteHeader = document.createElement('th');
-            if (table.id != "public_liability_addOnCoverage"){
-
-                newQuoteHeader.textContent = 'Sum Insured';
-
-            }else{
-                newQuoteHeader.textContent = "Liability Limit";
-            }
-            newQuoteHeader.style.backgroundColor = randomColor;
-            newQuoteHeader.setAttribute('data-proposal', proposalCount);
-            headerRow2.insertBefore(newQuoteHeader, headerRow2.querySelector('th:last-child'));
-
-            // Add new cells to all rows
-            table.querySelectorAll('tbody tr').forEach(row => {
-                const cells = Array.from(row.getElementsByTagName('td'));
-                let targetCell = null;
-                let columnCount = 0;
-                let spannedColumns = 0;
-
-                // Account for cells spanned from previous rows
-                const rowIndex = Array.from(table.querySelectorAll('tbody tr')).indexOf(row);
-                table.querySelectorAll('tbody tr').forEach((prevRow, prevIndex) => {
-                    if (prevIndex >= rowIndex) return;
-                    Array.from(prevRow.getElementsByTagName('td')).forEach(cell => {
-                        const rowspan = parseInt(cell.getAttribute('rowspan') || 1);
-                        if (rowspan > 1 && prevIndex + rowspan > rowIndex) {
-                            spannedColumns++;
-                        }
-                    });
-                });
-
-                // Find the actual third column cell
-                for (let i = 0; i < cells.length && columnCount < 3; i++) {
-                    columnCount++;
-                    if (columnCount + spannedColumns === 3) {
-                        targetCell = cells[i];
-                        break;
-                    }
-                }
-
-                if (!targetCell) {
-                    // Fallback: use the last available cell if third column not found
-                    targetCell = cells[cells.length - 1];
-                }
-
-                // // console.log("ADD PROPOSAL : targetCell", targetCell);
-                const newCell = targetCell.cloneNode(true);
-                // // console.log("ADD PROPOSAL : newCell", newCell);
-
-                newCell.contentEditable = true;
-                newCell.onclick = () => getAnswer(table.id, row.id);
-                newCell.style.backgroundColor = randomColor;
-                row.insertBefore(newCell, row.querySelector('td:last-child'));
-            });
-        });
-
-        // console.log(quotesConfig);
-        // console.log(policyConfig);
-
-        hideProposalOptionsForChild();
-        showOrHideFieldsBasedOnRFQorQCR();
-        // styleTableColumns();
-        
-        monitorTableChanges();
-    });
-
-    // #################################################################################
-
-    function addNewQuote(proposalNumber) {
-        // // console.log("add new Quote start : ", quotesConfig);
-        const insurers = <?= json_encode($insurer); ?>;
-        selectInsurer(insurers).then(result => {
-            insurer = result.selectedInsurer;
-            version = result.insurerDetails;
-            dataId = result.dataId;
-
-            insurerName = `${insurer}${version != "" ? " v"+ version : ""}`;
-
-            let increaseBy = 100;
-            increaseTableWidth(increaseBy);
-            // // // console.log("Selected Insurer:", insurerName);
-            // // // console.log("Entered Version:", version);
-            // // // console.log("Entered data id:", dataId);
-            // // console.log("add new Quote : ", proposalNumber);
-            // // console.log("add new Quote : ", quotesConfig);
-            // // console.log("Add new quote insurer name : ", insurerName);
-            if (!quotesConfig[proposalNumber]) return;
-            // // console.log("add new quote ", quotesConfig[proposalNumber]);
-            if (quotesConfig[proposalNumber].includes(insurerName)) {
-                // // console.log("add new quote is duplicate");
-                Swal.fire({
-                    title: "Insurer Dublicate Found?",
-                    text: "Do you want version control!",
-                    icon: "warning",
-                    showCancelButton: true,
-                    confirmButtonColor: "#3085d6",
-                    cancelButtonColor: "#d33",
-                    confirmButtonText: "Yes, Procced!"
-                }).then((result) => {
-
-                    if (result.isConfirmed) {
-                        // Handle versioning logic here for duplicate insurer
-                        let baseInsurerName = insurer;
-                        let count = 0;
-
-                        // Count how many times this insurer appears in the current proposal
-                        for (let i = 0; i < quotesConfig[proposalNumber].length; i++) {
-                            if (quotesConfig[proposalNumber][i].startsWith(baseInsurerName)) {
-                                count++;
-                                // // console.log("add count ", count);
-                            }
-                        }
-
-                        // Auto-increment version
-                        if (version === "") {
-                            insurerName = `${baseInsurerName} v${count + 1}`;
-                            version = count + 1;
-                            // // console.log("add inurer name ", insurerName);
-                        } else {
-                            // If user already specified version, append count to make it unique
-                            insurerName = `${baseInsurerName} v${version}_${count + 1}`;
-                            version = `${version}_${count + 1}`;
-                            // // console.log("add inurer name else", insurerName);
-
-                        }
-                        var insurerDetails = {
-                            id: dataId,
-                            version: version,
-                            insurerName: insurerName
-                        }
-                        policyConfig[proposalNumber].push(insurerDetails);
-                        const newQuote = insurerName;
-                        quotesConfig[proposalNumber].push(newQuote);
-                        // // console.log("add Quotes config", quotesConfig);
-                        updateAllTables(proposalNumber, insurerName);
-
-                        var proposalName = `Proposal ${proposalNumber}`;
-                        const proposalHeader = document.querySelector(`th[data-proposal="${proposalNumber}"]`);
-                        if (proposalHeader) {
-                            proposalHeader.colSpan = quotesConfig[proposalNumber].length;
-                        }
-
-                    }
-                });
-            } else {
-                var insurerDetails = {
-                    id: dataId,
-                    version: version,
-                    insurerName: insurerName
-                }
-                policyConfig[proposalNumber].push(insurerDetails);
-                const newQuote = insurerName;
-                quotesConfig[proposalNumber].push(newQuote);
-                // // console.log("add Quotes config", quotesConfig);
-                updateAllTables(proposalNumber, insurerName);
-
-                var proposalName = `Proposal ${proposalNumber}`;
-                const proposalHeader = document.querySelector(`th[data-proposal="${proposalNumber}"]`);
-                if (proposalHeader) {
-                    // // console.log("Proposal heade length : ", quotesConfig[proposalNumber].length)
-                    proposalHeader.colSpan = quotesConfig[proposalNumber].length;
-                }
-            }
-
-
-
-            showOrHideFieldsBasedOnRFQorQCR();
-            // styleTableColumns();
-            hideProposalOptionsForChild();
-        });
-
-    }
-
-    function changeInsurer(event, proposalNumber, currentInsurer) {
-        // Stop event propagation
-        event.stopPropagation();
-        // // console.log("insurer change function called ", quotesConfig[proposalNumber]);
-        if (!quotesConfig[proposalNumber]) return;
-        const insurers = <?= json_encode($insurer); ?>;
-
-        selectInsurer(insurers).then(result => {
-            let newInsurerName = result.selectedInsurer;
-            let newversion = result.insurerDetails;
-            let newdataId = result.dataId;
-            var insurerDetailsChange = {
-                id: newdataId,
-                version: newversion,
-                insurerName: newInsurerName
-            }
-            if (newversion.trim() !== '') {
-                newInsurerName = `${newInsurerName}-${newversion.trim()}`.replace(/\s+/g, '');
-            }
-
-            // // console.log('insurer newInsurerName', newInsurerName);
-            // // console.log('insurer newversion', newversion);
-
-            if (newInsurerName) {
-                // // // console.log("insurer inside new insurer name : ",headerRow2);
-                // Update all tables with the new insurer
-                document.querySelectorAll('table').forEach(table => {
-                    const headerRow2 = table.querySelector('thead tr:last-child');
-                    // // console.log("insurer inside ", headerRow2);
-                    // Find the header cells that match our criteria
-                    Array.from(headerRow2.children).forEach(th => {
-                        // Check if this cell contains our insurer and proposal
-                        // // console.log("insurer proposal number : ", proposalNumber);
-                        // // console.log("insurer header proposal number : ", th);
-                        if (th.getAttribute('data-proposal') === proposalNumber.toString()) {
-                            // Get the first text node (the insurer name part)
-                            let content = th.innerHTML;
-                            // // console.log("insurer inside ", content);
-                            // Only replace the exact insurer name, not any menu text
-                            if (content.includes(currentInsurer)) {
-                                // Create a regex to match just the insurer name
-                                const regex = new RegExp(currentInsurer, 'g');
-                                th.innerHTML = content.replace(regex, newInsurerName);
-
-                                // Update attributes
-                                if (th.hasAttribute('data-insurer')) {
-                                    th.setAttribute('data-insurer', newInsurerName);
-                                }
-
-                                if (newdataId && th.hasAttribute('data-id')) {
-                                    th.setAttribute('data-id', dataId);
-                                }
-
-                                // Update quote code in quotesConfig
-                                const oldQuoteCode = th.getAttribute('data-quote');
-                                if (oldQuoteCode) {
-                                    const quoteIndex = quotesConfig[proposalNumber].indexOf(oldQuoteCode);
-                                    if (quoteIndex !== -1) {
-                                        // Generate new quote code based on new insurer
-                                        const newQuoteCode = oldQuoteCode.replace(currentInsurer, newInsurerName);
-                                        quotesConfig[proposalNumber][quoteIndex] = newQuoteCode;
-                                        // // console.log("Existing policy data ", policyConfig[proposalNumber][quoteIndex]);
-                                        policyConfig[proposalNumber][quoteIndex] = insurerDetailsChange;
-                                        // // console.log("quote index ", quoteIndex);
-                                        // // console.log("changed like this ", insurerDetailsChange);
-                                        // Update data-quote attribute
-                                        th.setAttribute('data-quote', newQuoteCode);
-                                    }
-                                }
-
-                                // Find and update corresponding data cells
-                                const colIndex = Array.from(th.parentNode.children).indexOf(th);
-                                table.querySelectorAll(`tbody tr`).forEach(row => {
-                                    const cell = row.children[colIndex];
-                                    if (cell) {
-                                        if (cell.hasAttribute('data-insurer')) {
-                                            cell.setAttribute('data-insurer', newInsurerName);
-                                        }
-                                        if (cell.hasAttribute('data-quote')) {
-                                            const oldQuote = cell.getAttribute('data-quote');
-                                            const newQuote = oldQuote.replace(currentInsurer, newInsurerName);
-                                            cell.setAttribute('data-quote', newQuote);
-                                        }
-                                    }
-                                });
-                            }
-                        }
-                    });
-                });
-
-                // Show success message
-                toastr.success("Insurer Changed", "Success");
-            }
-        });
-    }
-
-    function removeQuote(event, proposalNumber, quoteCode) {
-        event.stopPropagation();
-        var rowIdCount = {};
-
-        if (!quotesConfig[proposalNumber]) return;
-
-        // Remove quote from config
-        const quoteIndex = quotesConfig[proposalNumber].indexOf(quoteCode);
-        // // console.log("quote index ", quoteIndex);
-        if (quoteIndex !== -1) {
-            quotesConfig[proposalNumber].splice(quoteIndex, 1);
-            policyConfig[proposalNumber].splice(quoteIndex, 1);
-            if (quotesConfig[proposalNumber].length === 0) {
-                delete quotesConfig[proposalNumber];
-                delete policyConfig[proposalNumber];
-            }
-        }
-
-        // Remove from all tables
-        document.querySelectorAll('table').forEach(table => {
-            const headerRow1 = table.querySelector('thead tr:first-child');
-            const headerRow2 = table.querySelector('thead tr:last-child');
-
-            // Find and remove quote header
-            const targetIndex = Array.from(headerRow2.children).findIndex(th =>
-                th.textContent.includes(quoteCode) &&
-                th.getAttribute('data-proposal') === proposalNumber.toString()
-            );
-            // // console.log("quote target index ", targetIndex);
-            if (targetIndex !== -1) {
-                // // console.log("quote target index inside if", targetIndex);
-                // Remove from header row 2
-                headerRow2.removeChild(headerRow2.children[targetIndex]);
-
-                // Update proposal header colspan
-                const proposalHeader = headerRow1.querySelector(`th[data-proposal="${proposalNumber}"]`);
-                // // console.log("quote target index inside if proposal header", proposalHeader);
-
-                if (proposalHeader) {
-                    const newColspan = parseInt(proposalHeader.colSpan) - 1;
-                    // // console.log("Quote new colspan : ", newColspan);
-                    if (newColspan > 0) {
-                        proposalHeader.colSpan = newColspan;
-                    } else {
-                        proposalHeader.remove();
-                    }
-                }
-
-                // Remove from data rows
-                table.querySelectorAll('tbody tr').forEach(row => {
-                    const cellIndex = targetIndex; // No need to add 2 since we're using children array
-                    // console.log("quote target index", cellIndex);
-
-                    var rowId = row.id;
-                        if (rowIdCount[rowId] === undefined) {
-                            rowIdCount[rowId] = 0;
-                        } else {
-                            rowIdCount[rowId]++;
-                        }
-                        // console.log("rowIdCount[rowId]", rowIdCount[rowId]);
-                        newStartIndex = rowIdCount[rowId] > 0 ? cellIndex-1 : cellIndex; 
-                        // console.log("quote target index inside if proposal header", newStartIndex);
-
-                    if (row.children[cellIndex]) {
-                        row.removeChild(row.children[newStartIndex]);
-                        // // console.log("quote target index inside if proposal header", row);
-
-                    }
-                });
-            }
-        });
-    }
-
-    function updateAllTables(proposalNumber, newQuote) {
-        // alert(proposalNumber);
-        document.querySelectorAll('table').forEach(table => {
-
-            const headerRow1 = table.querySelector('thead tr:first-child');
-            const headerRow2 = table.querySelector('thead tr:last-child');
-            // // console.log('headerRow2 data', headerRow2);
-            // // console.log('headerRow2 headerRow2.children', headerRow2.children);
-
-
-            const proposalHeader = headerRow1.querySelector(`th[data-proposal="${proposalNumber}"]`);
-            console.log("Proposal proposalNumber : ", proposalNumber);
-            // Create new quote header
-            const newQuoteHeader = document.createElement('th');
-            newQuoteHeader.innerHTML = `
-                ${newQuote}
-                <span class="three-dot-menu" onclick="showDropdown(event)">⋮</span>
-                <div class="dropdown-content">
-                    <button id="isInsurerSTC" class="sendInsurerClientProposal" onclick="addOrRemoveIconInsurer(this,event)"
-                        style="background-color: rgb(221, 221, 221;">
-                        Send to Client <i class="mdi mdi-checkbox-marked" style="color: green; margin-left: 8px;"></i>
-                    </button>
-                    <button onclick="changeInsurer(event, ${proposalNumber}, '${newQuote}')">Change Insurer</button>
-                    <button onclick="removeQuote(event, ${proposalNumber}, '${newQuote}')">Remove Quote</button>
-                </div>
-            `;
-            newQuoteHeader.dataset.proposal = proposalNumber;
-            newQuoteHeader.dataset.quote = newQuote;
-
-            // Calculate header insert position
-            let insertPosition = 2;
-            if (lead_type == 1){
-                for (let i = 1; i < proposalNumber; i++) {
-                    insertPosition += quotesConfig[i]?.length || 0;
-                }
-            }else{
-                for (let i = 0; i < proposalNumber; i++) {
-                    insertPosition += quotesConfig[i]?.length || 0;
-                }
-            }
-            
-            insertPosition += quotesConfig[proposalNumber].length - 1;
-            // // console.log("Header insert position : ", insertPosition);
-
-            if (headerRow2.children[insertPosition - 1]) {
-                
-                let referenceChild = headerRow2.children[insertPosition - 1]; // Get the target child
-                // // console.log("referenceChild", referenceChild);
-                let computedStyle = window.getComputedStyle(referenceChild);
-                // // console.log("computedStyle", computedStyle);
-
-
-                // Copy all computed styles
-                let backgroundColor = computedStyle.getPropertyValue("background-color");
-                newQuoteHeader.style.backgroundColor = backgroundColor;
-
-            }
-
-            headerRow2.insertBefore(newQuoteHeader, headerRow2.children[insertPosition]);
-            if (proposalHeader) proposalHeader.colSpan = quotesConfig[proposalNumber].length;
-
-            // Add new cells to body rows
-            table.querySelectorAll('tbody tr').forEach((row, rowIndex) => {
-                const cells = Array.from(row.children);
-                let hasRowspanGreaterThan1 = false;
-
-                // Check if any cell in this row or previous rows affecting this row has rowspan > 1
-                for (let r = 0; r <= rowIndex; r++) {
-                    const checkRow = table.querySelectorAll('tbody tr')[r];
-                    Array.from(checkRow.children).forEach(cell => {
-                        const rowspan = parseInt(cell.getAttribute('rowspan') || 1);
-                        if (rowspan > 1 && r + rowspan > rowIndex) {
-                            hasRowspanGreaterThan1 = true;
-                        }
-                    });
-                }
-
-                if (!hasRowspanGreaterThan1) {
-                    // Original method for rowspan = 1 or no rowspan
-                    const lastCell = row.querySelector(`td:nth-child(${insertPosition})`);
-                    const newCell = lastCell.cloneNode(true);
-                    if (lastCell.classList.contains("readonly-select")) {
-                        newCell.classList.remove("readonly-select");
-                    }
-                    newCell.contentEditable = true;
-                    newCell.onclick = () => getAnswer(table.id, row.id);
-                    row.insertBefore(newCell, row.children[insertPosition]);
-                } else {
-                    // Handle rowspan > 1
-                    let visualColumn = 0;
-                    let referenceCell = null;
-                    let insertBeforeCell = null;
-
-                    // Map visual columns considering spans from this and previous rows
-                    const columnOccupancy = new Array(headerRow2.children.length).fill(false);
-                    
-                    // Mark columns occupied by rowspans from previous rows
-                    for (let prevRowIndex = 0; prevRowIndex < rowIndex; prevRowIndex++) {
-                        const prevRow = table.querySelectorAll('tbody tr')[prevRowIndex];
-                        let prevVisualColumn = 0;
-                        Array.from(prevRow.children).forEach(cell => {
-                            const colspan = parseInt(cell.getAttribute('colspan') || 1);
-                            const rowspan = parseInt(cell.getAttribute('rowspan') || 1);
-                            if (prevRowIndex + rowspan > rowIndex) {
-                                for (let i = 0; i < colspan; i++) {
-                                    columnOccupancy[prevVisualColumn + i] = true;
-                                }
-                            }
-                            prevVisualColumn += colspan;
-                        });
-                    }
-
-                    // Process current row
-                    for (let i = 0; i < cells.length; i++) {
-                        const cell = cells[i];
-                        const colspan = parseInt(cell.getAttribute('colspan') || 1);
-
-                        // Skip columns occupied by previous rowspans
-                        while (columnOccupancy[visualColumn]) {
-                            visualColumn++;
-                        }
-
-                        if (visualColumn === insertPosition - 1) {
-                            referenceCell = cell;
-                            insertBeforeCell = cells[i + 1] || null;
-                        } else if (visualColumn < insertPosition && visualColumn + colspan > insertPosition) {
-                            referenceCell = cell;
-                            insertBeforeCell = cells[i + 1] || null;
-                        }
-
-                        visualColumn += colspan;
-                    }
-
-                    // If no reference found, use last cell before insertPosition
-                    if (!referenceCell) {
-                        for (let i = cells.length - 1; i >= 0; i--) {
-                            const cell = cells[i];
-                            let cellStartColumn = 0;
-                            for (let j = 0; j < i; j++) {
-                                cellStartColumn += parseInt(cells[j].getAttribute('colspan') || 1);
-                            }
-                            if (cellStartColumn <= insertPosition - 1) {
-                                referenceCell = cell;
-                                insertBeforeCell = cells[i + 1] || null;
-                                break;
-                            }
-                        }
-                    }
-
-                    // Fallback to first cell if still no reference
-                    if (!referenceCell && cells.length > 0) {
-                        referenceCell = cells[0];
-                        insertBeforeCell = cells[1] || null;
-                    }
-
-                    const newCell = referenceCell.cloneNode(true);
-                    newCell.contentEditable = true;
-                    newCell.onclick = () => getAnswer(table.id, row.id);
-                    newCell.removeAttribute('rowspan');
-                    newCell.removeAttribute('colspan');
-
-                    if (insertBeforeCell) {
-                        row.insertBefore(newCell, insertBeforeCell);
-                    } else {
-                        row.appendChild(newCell);
-                    }
-                }
-            });
-        });
-    }
-
-    function generateTable(container, isChildTable = false, parentRowId = null, tableData = null) {
-        
-        const tableContainer = document.createElement('div');
-        tableContainer.className = 'table-container';
-
-        // Create collapsible bar with Bootstrap 4 attributes
-        const collapsibleBar = document.createElement('div');
-        collapsibleBar.className = `table-collapsible-bar ${tableData ? tableData.table_name : 'Particulars'} collapsed`;
-        collapsibleBar.setAttribute('data-toggle', 'collapse'); // Bootstrap 4 collapse trigger
-        const collapseId = `collapse-${tableData ? tableData.table_id : 'parent'}`; // Unique ID
-        collapsibleBar.setAttribute('data-target', `#${collapseId}`);
-        collapsibleBar.innerHTML = `
-        ${tableData ? tableData.table_name : "Particulars"}
-        <span class="collapse-icon">▼</span>
-        `;
-
-        // Create table content wrapper with Bootstrap 4 collapse class
-        const tableContent = document.createElement('div');
-        tableContent.className = 'table-content collapse'; // Bootstrap 4 collapse class
-        tableContent.id = collapseId; // Matches data-target
-
-        const table = document.createElement('table');
-        if (tableData) {
-            table.id = tableData.table_id;
-        }
-
-        tableName = tableData ? tableData.table_name : "Particulars";
-        // // // console.log("table Name ",tableName);
-        // Header setup
-        const thead = document.createElement('thead');
-        const headerRow1 = document.createElement('tr');
-        headerRow1.innerHTML = `
-        ${isChildTable ? '<th>S.NO</th>' : '<th>Policy</th>'}
-        <th>${tableData ? tableData.table_name : "Particulars"}</th>
-        ${Object.keys(quotesConfig).map(proposal => `
-            <th data-proposal="${proposal}" colspan="${quotesConfig[proposal].length}">
-                Proposal ${proposal}
-                <span class="three-dot-menu" onclick="showDropdown(event)">&#8942;</span>
-                <div class="dropdown-content">
-                    <button id="isQCR" onclick="addOrRemoveIcon(this,event)" class="qcrProposal" style="background-color: rgb(221, 221, 221);">QCR <i class="mdi mdi-checkbox-marked" style="color: green; margin-left: 8px;"></i></button>
-                    <button id="isSTC" class="sendClientProposal" onclick="addOrRemoveIcon(this,event)" style="background-color: rgb(221, 221, 221);">Send to Client <i class="mdi mdi-checkbox-marked" style="color: green; margin-left: 8px;"></i></button>
-                    <button class = "removeProposal" onclick="removeProposal(${proposal})">Remove Proposal</button>
-                    <button class="newInsurer" onclick="addNewQuote(${proposal})">Add New Insurer</button>
-                </div>
-            </th>   
-        `).join('')}
-        <th>Action</th>`;
-        console.log("quotesConfig",quotesConfig);
-        const headerRow2 = document.createElement('tr');
-        headerRow2.innerHTML = `
-        <th>-</th>
-        <th>-</th>
-        
-         ${Object.entries(quotesConfig).flatMap(([proposal, codes]) => 
-        //     codes.map(code => `
-        //         <th data-proposal="${proposal}" data-quote="${code}" class="${code !== 'Sum Insured' && code !== "Liability Limit" ? 'insurer_proposal' : ''}">
-        //             ${table.id == "public_liability_addOnCoverage" ? "Liability Limit" : code}
-        //             <span class="three-dot-menu" onclick="showDropdown(event)">&#8942;</span>
-        //             <div class="dropdown-content">
-        //                 <button onclick="removeQuote(event, ${proposal}, '${code}')">Remove Quote</button>
-        //             </div>
-        //         </th>
-        //     `)
-        // ).join('')}
-            codes.map(code => `
-                <th data-proposal="${proposal}" data-quote="${code}" class="${code !== 'Sum Insured' && code !== "Liability Limit" ? 'insurer_proposal' : ''}">
-                    ${table.id == "public_liability_addOnCoverage" ? "Liability Limit" : code}
-                </th>
-            `)
-        ).join('')}
-        <th>-</th>`;
-
-        thead.append(headerRow1, headerRow2);
-        table.appendChild(thead);
-        let latestWidth = $("table").last().width();
-        // // // console.log('Latest width', latestWidth);
-        if (tableData) {
-            // // // console.log("table ",$(table));
-            $(table).width(latestWidth); // Convert to jQuery object using $(table)
-            // // // console.log('table data',tableData);
-
-        }
-
-        // Body setup
-        // Inside generateTable function, when creating tbody for parent table
-        const tbody = document.createElement('tbody');
-        if (!isChildTable) {
-            policies.forEach((policy) => {
-                const descriptions = policy.description;
-                const quoteAsked = policy.quote_asked;
-                const allQuotes = Object.values(quotesConfig).flat();
-
-                descriptions.forEach((desc, descIndex) => {
-                    const row = document.createElement('tr');
-                    row.id = policy.name.replace(/\s+/g, '_').toLowerCase();
-
-                    const quoteCells = allQuotes.map((_, index) => {
-                        const value = quoteAsked[index] || '-';
-                        return `<td contenteditable="true">${value}</td>`;
-                    }).join('');
-
-                    if (descIndex === 0) {
-                        row.innerHTML = `
-                        <td rowspan="${descriptions.length}">
-                            <input type="checkbox" class="sno-checkbox">
-                            ${policy.name}
-                            ${policy.name === 'Fire' || policy.name === 'Burglary' ? 
-                                `<br><button id="${policy.name.toUpperCase()}_register" class="btn btn-primary btn-sm" onclick="getPolicyInfo('${policy.name}')" class="policy-link" data-policy-name="${policy.name}" disabled>Register</button>` : 
-                                ''}
-                        </td>
-                        <td contenteditable="true">${desc}</td>
-                        ${quoteCells}
-                        <td></td>`;
-                    } else {
-                        row.innerHTML = `
-                        <td contenteditable="true">${desc}</td>
-                        ${quoteCells}
-                        <td></td>`;
-                    }
-
-                    tbody.appendChild(row);
-                });
-            });
-        } else {
-            const rowsData = tableData ? tableData.table_row_contents : policies;
-            rowsData.forEach((policy, index) => {
-                var row_fields = rowsData[index];
-                let rowID = Object.keys(row_fields)[0];
-                const row = document.createElement('tr');
-                row.id = isChildTable ? `${parentRowId}_child_${index}` : policy.name.replace(/\s+/g, '_').toLowerCase();
-                row.id = isChildTable ? `${rowID}` : policy.name.replace(/\s+/g, '_').toLowerCase();
-
-                if (tableData && tableData.table_id === 'excess') {
-                    row.setAttribute('data-excess-row-parent', parentRowId);
-                }
-                var policy_question = row_fields[rowID].display_value;
-                var answer_type = row_fields[rowID].answer_type;
-                var tableID = tableData?.table_id ?? null;
-                var SNO = getSNO(tableID);
-                if (tableData) {
-                    suggestions[rowID] = row_fields[rowID].answer_type;
-                    if (answer_type == 'dropdown') {
-                        default_answers_array = row_fields[rowID].default_answer;
-                        default_value = default_answers_array[0].key;
-                        default_answer = default_answers_array[0].display_value;
-                    } else {
-                        default_answers_array = row_fields[rowID].default_answer ? row_fields[rowID].default_answer : "-";
-                        default_value = default_answers_array;
-                        default_answer = default_answers_array;
-                    }
-                }
-
-                row.innerHTML = `
-                
-                    ${isChildTable
-                            ? `<td>${SNO}</td>`
-                            : `<td rowspan = "${policy.description.length}"><input type="checkbox" class="sno-checkbox">${policy.name}${policy.name == 'Fire' || policy.name == 'Burglary'
-                                ? `<br><button id = '${policy.name.toUpperCase()}_register'  class = "btn btn-primary btn-sm" onclick = "getPolicyInfo('${policy.name}')"  class="policy-link" data-policy-name="${policy.name}" disabled>Register</a>`
-                                : ""}</td>`
-                        }
-
-            <td contenteditable="true">${tableData ? policy_question : policy.description}</td>
-            
-            ${Object.values(quotesConfig).flatMap(codes =>
-            codes.map((codeValue, colIndex) => {
-        // // console.log("Subheader th: colinded : ",colIndex);
-        // Get the subheader (assuming it's the second <tr> inside <thead>)
-        let subHeaderThList = [...document.querySelectorAll("thead tr:nth-child(2) th")];
-        // // console.log("subHeaderThList", subHeaderThList);
-
-        // Filter <th> elements that have a valid 'data-proposal' attribute
-        let validSubHeaders = subHeaderThList.filter(th => {
-            let dataProposal = th.getAttribute("data-proposal");
-            // // console.log("Subheader th: dataProposal : ",dataProposal);
-            return dataProposal !== null && dataProposal !== undefined && dataProposal.trim() !== "";
-        });
-        
-
-        // // console.log("Subheader th: validSubHeaders",validSubHeaders);
-        // let validSubHeaders = subHeaderThList.filter(th => th.hasAttribute("data-proposal"));
-        // // console.log("Subheader th: validSubHeaders",validSubHeaders);
-
-
-        let subHeaderTh = validSubHeaders.find(th => th.textContent.trim());
-        // // console.log("Subheader th: codeValue",codeValue);
-        // // console.log("Subheader th: subHeaderTh",subHeaderTh);
-        // if (subHeaderTh.classList.contains("insurer_proposal")) {
-        //     alert(subHeaderTh);
-        // }
-        let subHeaderText = subHeaderTh ? subHeaderTh.textContent.trim() : '';
-        // // console.log("Subheader th: below code",subHeaderText);
-        // Check if subheader is NOT "Sum Insured"
-        let className = !subHeaderText.startsWith("Sum Insured") && subHeaderText != "-" && !subHeaderText.startsWith("Liability Limit")? 
-        "insurer_proposal" : "";
-        // console.log("className", className);
-        // alert(subHeaderText);
-        let defaultJsonString = typeof default_answers_array == "object" ? JSON.stringify(default_answers_array[0]) : String(default_answers_array);
-
-        return `<td class="${className}" onblur="setValueForHiddenField(this,'${answer_type}')"
-            onclick="getAnswer('${tableID}','${rowID}')"
-            contenteditable="true">
-
-           ${tableData ? 
-                (default_value === '-' ? 
-                    `${default_value} <input type="hidden" value="${default_value}" />` 
-                    : `${default_answer} <input type="hidden" value='${defaultJsonString}' />`
-                ) 
-                : policy.quote_asked
-            }
-
-        </td>`;
-    })
-
-        ).join('')
-        }
-
-            <td>
-                ${isChildTable ? `
-                <input id = "qcrCheckbox" name = "qcr" checked type="checkbox"  class="qcr-checkbox"> <label for = "qcrCheckbox">QCR</label>
-                <input id = "stcCheckbox" name = "stc" checked type="checkbox"  class="client-checkbox">Client &nbsp;
-                <button  class="btn btn-primary btn-sm"  onclick="addRow(event,this)">+</button>
-                <button  class="btn btn-danger btn-sm" onclick="removeRow(event)">-</button>
-                ` : ''}
-            </td>`;
-                tbody.appendChild(row);
-            });
-        }
-        table.appendChild(tbody);
-
-        // Apply jQuery classes and width (unchanged)
-        // let latestWidth = $("table").last().width();
-        $(table).width(latestWidth);
-        $(collapsibleBar).width(latestWidth);
-        $(table).addClass("table table-bordered mt-3");
-
-        // Append to DOM
-        tableContent.appendChild(table);
-        tableContainer.appendChild(collapsibleBar);
-        tableContainer.appendChild(tableContent);
-        container.appendChild(tableContainer);
-        monitorTableChanges();
-
-        if (changedNewSI != null && changedNewSI != ""){
-            
-            console.log("Changed new SI",changedNewSI);
-            setTimeout(function() {
-                updateAddON(changedNewSI)
-            }, 500);
-            
-        }
-        
-    }
-
-
-
-    function generateExcessTable(tableData, parentRowId, tableName) {
-        var excessTable = document.getElementById(tableName);
-
-        if (excessTable) {
-            // If table exists, append new rows to it
-            const tbody = excessTable.querySelector('tbody');
-            // // // console.log("table data ",tableData);
-            // Add new rows from tableData
-            tableData.table_row_contents.forEach((rowData, index) => {
-                let rowID = Object.keys(rowData)[0];
-                // console.log("rowData: ",rowData);
-                // alert(rowID.answer_type);
-                var question = rowData[rowID].display_value;
-
-                const row = document.createElement('tr');
-                // Add data attribute to track which parent checkbox created this row
-                row.setAttribute('data-excess-row-parent', parentRowId);
-                let SNO = getSNO(tableName);
-                row.innerHTML = `
-                <td>${SNO}</td>
-                <td contenteditable="true">${question}</td>
-                ${Object.values(quotesConfig).flatMap(codes =>
-                        codes.map((codeValue, colIndex) => {
-        // // console.log("Subheader th: colinded : ",colIndex);
-        // Get the subheader (assuming it's the second <tr> inside <thead>)
-        let subHeaderThList = [...document.querySelectorAll("thead tr:nth-child(2) th")];
-
-        // Filter <th> elements that have a valid 'data-proposal' attribute
-        let validSubHeaders = subHeaderThList.filter(th => {
-            let dataProposal = th.getAttribute("data-proposal");
-            // // console.log("Subheader th: dataProposal : ",dataProposal);
-            return dataProposal !== null && dataProposal !== undefined && dataProposal.trim() !== "";
-        });
-        
-
-        // // console.log("Subheader th: subHeaderThList",subHeaderThList);
-        // let validSubHeaders = subHeaderThList.filter(th => th.hasAttribute("data-proposal"));
-        // // console.log("Subheader th: validSubHeaders",validSubHeaders);
-        
-        // // console.log("Subheader th: subHeaderTh",subHeaderTh);
-        // if (subHeaderTh.classList.contains("insurer_proposal")) {
-        //     alert(subHeaderTh);
-        // }
-        // console.log("Subheader th: ",subHeaderTh);
-
-        let subHeaderTh = validSubHeaders.find(th => th.textContent.trim());
-
-        let subHeaderText = subHeaderTh ? subHeaderTh.textContent.trim() : '';
-        // Check if subheader is NOT "Sum Insured"
-        let className = !subHeaderText.startsWith("Sum Insured") && subHeaderText != "-" && !subHeaderText.startsWith("Liability Limit")? 
-        "insurer_proposal" : "";        // alert(subHeaderText);
-        // console.log("default_answers_array",default_answers_array)
-        let default_answers_array = rowData[rowID].default_answer
-        
-        let defaultJsonString = typeof default_answers_array == "object" ? JSON.stringify(default_answers_array[0]) : String(default_answers_array);
-        let defaul_value = typeof default_answers_array == "object" ? JSON.stringify(default_answers_array[0]) : String(default_answers_array);
-        let default_answer = typeof default_answers_array == "object" ? JSON.stringify(default_answers_array[0]) : String(default_answers_array);
-
-        // console.log("defaultJsonString", defaultJsonString);
-        // console.log("defaultJsonString type",  typeof defaultJsonString);
-        // console.log("defaultJsonString string", String(defaultJsonString));
-
-
-
-        return `<td class="${className}" onblur="setValueForHiddenField(this,'${rowData[rowID].answer_type}')"
-            onclick="getAnswer('${'excess'}','${rowID}')"
-            contenteditable="true">
-
-           ${tableData ? 
-                (default_value === '-' ? 
-                    `${default_value} <input type="hidden" value="${default_value}" />` 
-                    : `${default_answer} <input type="hidden" value='${defaultJsonString}' />`
-                ) 
-                : policy.quote_asked
-            }
-
-        </td>`;
-    })
-
-).join('')}
-
-                <td>
-                    <input id = "qcrCheckbox" name = "qcr" checked value = "1" type="checkbox" class="qcr-checkbox"> <label for = "qcrCheckbox">QCR</label>
-                    <input  name = "stc" checked value = "1" type="checkbox" class="client-checkbox">Client &nbsp;
-                    <button class="btn btn-primary btn-sm" onclick="addRow(event,this)">+</button>
-                    <button  class="btn btn-danger btn-sm" onclick="removeRow(event)">-</button>
-                </td>`;
-                tbody.appendChild(row);
-            });
-            moveExcessTableLast();
-            styleTableColumns();
-            monitorTableChanges()
-            return false;
-        } else {
-            return true;
-        }
-        
-    }
-    // Initialize the parent table
-    document.addEventListener('DOMContentLoaded', () => {
-        // // // console.log("bjnglfkrg ", rfq_data.length);
-        // const url = window.location.pathname; // Get the path (e.g., "/nhance/rfq/list/75/1")
-        // const segments = url.split("/"); // Split by "/"
-        // segments[segments.length - 1] = "1"; // Change the last segment
-        // const newUrl = segments.join("/"); // Rebuild the URL
-        const path = window.location.pathname; // Get the current URL path
-        const segments = path.split('/'); // Split the path into segments
-        const lead_id = segments[segments.length - 2]; // Get the second last segment (15)
-        const type = segments[segments.length - 1];
-        rfq_or_qcr = type;
-        // history.pushState(null, "", newUrl); // Change the URL without reloading
-
-        if (rfq_data.length) {
-            // // console.log("inside if conditoon");
-            localStorage.setItem('allTablesJsonData', JSON.stringify(rfq_data));
-            jsonToTables();
-            styleTableColumns();
-            monitorTableChanges();
-            proposalDataForDropDown = rfq_data[rfq_data.length - 1].proposal_data;
-            // // console.log("proposalDataForDropDown", proposalDataForDropDown);
-            if (!$.isEmptyObject(storedData)) {
-                // // console.log("DATA FROM DB : ", JSON.parse(storedData));
-                let data = JSON.parse(storedData);
-                Object.keys(data).forEach(key => {
-
-                    policySummary[key] = addPolicySummaryTable(data[key], key);
-
-                    // prependTable(policySummary[key],key);
-
-
-                });
-
-                // // // console.log("policy summary : ",child_table_data[key])
-
-                // // console.log("generate policy summary : ", policySummary);
-                styleTableColumns();
-
-            }
-            // generateTable(document.getElementById('tablesContainer'));
-            // // // console.log("polices Length ", policies.length);
-
-        } else {
-            generateTable(document.getElementById('tablesContainer'));
-            styleTableColumns();
-            // // console.log("polices Length ", policies.length);
-            if (policies.length == 1) {
-                setTimeout(() => {
-                    $(".sno-checkbox").each(function() {
-                        // // console.log("time completed function called");
-                        $(".sno-checkbox").prop("checked", true);
-                        this.dispatchEvent(new Event("change", {
-                            bubbles: true
-                        }));
-                    });
-                }, 100);
-
-            }
-        }
-        // styleTableColumns();
-        showOrHideFieldsBasedOnRFQorQCR();
-    });
-
-    // Close dropdown when clicking outside
-    window.addEventListener('click', () => {
-        document.querySelectorAll('.dropdown-content').forEach(dropdown => {
-            dropdown.style.display = 'none';
-        });
-    });
-
-    function getAnswer(table_id, rowID) {
-        event.stopPropagation();
-        // alert();
-        // // console.log("Function called");
-        
-        // // console.log("Function called", table_id);
-        var policy = table_id.split('_').slice(0, -1).join('_');
-        // var policy = 'policy_' + table;
-        // // console.log('policy ', rowID);
-
-        Object.entries(child_table_data).forEach(([key, value]) => {
-            if (key == policy) {
-                var table_data = value;
-                // // // console.log("table data ",table_data);
-                // Loop through all available table data (removing hardcoded [0])
-                table_data.forEach(table => {
-                    var table_row = table['table_row_contents'];
-                    // // // console.log("table Row ",table_row);
-                    Object.entries(table_row).forEach(([key, value]) => {
-                        var question_id = Object.keys(value)[0];
-                        // // // console.log("Question ID : ",question_id," row ID : ",rowID);
-                        if (question_id == rowID) {
-                            let questionData = value[question_id];
-                            // // console.log("question data", questionData);
-                            if (questionData.answer_type == 'dropdown') {
-
-                                var answerAndValues = questionData.answers;
-                                createDropdown(answerAndValues);
-                            } else {
-                                return true;
-                            }
-                        }
-                    });
-                });
-            }
-        });
-    }
-
-
-    function createDropdown(answerAndValues) {
-        // // // console.log(answerAndValues);
-        const originalTd = event.target;
-        const dropdown = document.createElement("div");
-        dropdown.classList.add("simple-dropdown");
-
-        answerAndValues.forEach(answer => {
-            const option = document.createElement("div");
-            option.classList.add("dropdown-option");
-            option.textContent = answer.display_value;
-            option.dataset.key = answer.key;
-
-            option.addEventListener("click", function(e) {
-                e.stopPropagation();
-                originalTd.innerHTML = `${this.textContent} 
-                <input type="hidden" value='${JSON.stringify({ key: answer.key, display_value: answer.display_value })}' />`;
-                checkCellValueAndHighlight();
-                // originalTd.dataset.selectedKey = this.dataset.key;
-                dropdown.remove();
-            });
-
-            dropdown.appendChild(option);
-        });
-
-        const rect = originalTd.getBoundingClientRect();
-        dropdown.style.top = rect.bottom + window.scrollY + 'px';
-        dropdown.style.left = rect.left + window.scrollX + 'px';
-
-        const existingDropdown = document.querySelector('.simple-dropdown');
-        if (existingDropdown) {
-            existingDropdown.remove();
-        }
-
-        document.body.appendChild(dropdown);
-
-        document.addEventListener("click", function(e) {
-            if (!dropdown.contains(e.target) && e.target !== originalTd) {
-                dropdown.remove();
-            }
-        });
-
-        originalTd.addEventListener('click', function(e) {
-            e.preventDefault();
-            if (this.getAttribute('contenteditable') === 'true') {
-                // this.setAttribute('contenteditable', 'false');
-            }
-        });
-    }
-
-    function moveExcessTableLast() {
-        const excessTable = document.getElementById("excess");
-        const overallContainer = document.getElementById('allTableContainer');
-
-        if (!excessTable) {
-            // // console.log("Excess table not found.");
-            return;
-        }
-
-        // Find or create the collapsible bar
-        let excessCollapseBar = document.querySelector('.table-collapsible-bar.Excess');
-
-        if (!excessCollapseBar) {
-            excessCollapseBar = document.createElement('div');
-            excessCollapseBar.className = 'table-collapsible-bar Excess collapsed';
-            excessCollapseBar.innerHTML = `
-            Excess
-            <span class="collapse-icon">▼</span>
-        `;
-
-            // Add click handler for collapse/expand
-            excessCollapseBar.addEventListener('click', function() {
-                this.classList.toggle('collapsed');
-                const content = this.nextElementSibling;
-                content.classList.toggle('collapsed');
-            });
-        }
-
-        // Create container if needed
-        let tableContainer = excessTable.closest('.table-container');
-        if (!tableContainer) {
-            tableContainer = document.createElement('div');
-            tableContainer.className = 'table-container';
-
-            // Build proper structure
-            tableContainer.appendChild(excessCollapseBar);
-            tableContainer.appendChild(excessTable);
-        }
-
-        // Move to end of container
-        overallContainer.appendChild(tableContainer);
-    }
-    // Global object to track SNO for each table
-    let tableSNOTracker = {};
-
-    function getSNO(tableID) {
-        if (!tableID) {
-            return 1;
-        }
-
-        // Initialize counter if not present
-        if (!tableSNOTracker[tableID]) {
-            tableSNOTracker[tableID] = 1;
-        } else {
-            tableSNOTracker[tableID]++;
-        }
-
-        return tableSNOTracker[tableID];
-    }
-
-    function updateSNO(tableID) {
-        // // console.log("Function Called Update Sno");
-        const table = document.getElementById(tableID);
-        // // console.log("table : ", table);
-        if (!table) return;
-
-        const rows = table.querySelectorAll("tbody tr");
-        let sno = 1; // Start numbering from 1
-
-        rows.forEach(row => {
-            const firstCell = row.querySelector("td:first-child"); // Get SNO cell
-            if (firstCell) {
-                firstCell.innerHTML = `<td "class="sno-checkbox"> ${sno}</td>`;
-                sno++; // Increment SNO for the next row
-            }
-        });
-
-        // ✅ Reset the tracker based on remaining rows
-        tableSNOTracker[tableID] = sno;
-    }
-
-    
-
-    function increaseTableWidth(increaseBy) {
-
-        $('.table-collapsible-bar').each(function() {
-            let currentWidth = ($(this).width());
-            let increaseTableWidth = (currentWidth + increaseBy);
-            if (increaseTableWidth < 1200){
-                increaseTableWidth = 1200+increaseBy
-            }
-            $(this).width(currentWidth + increaseBy);
-        });
-        // // // console.log("function called tablewidth increase");
-        $("table").each(function() {
-            let currentWidth = ($(this).width());
-            // alert(currentWidth);
-            let increaseTableWidth = (currentWidth + increaseBy);
-            console.log("Table Width increased to ",increaseTableWidth);
-            if (increaseTableWidth < 1200){
-                increaseTableWidth = 1200+increaseBy
-            }
-            $(this).width(increaseTableWidth);
-        });
-    }
-
-    function arrangeTables() {
-        // Target the container
-        const container = document.getElementById('tablesContainer');
-        if (!container) {
-            // console.error('Error: tablesContainer not found');
-            return;
-        }
-
-        // Select divs with data-parent-row (your containers)
-        const divContainers = container.querySelectorAll('div[data-parent-row]');
-
-        const containerArray = Array.from(divContainers).map(div => {
-            const policyName = div.getAttribute('data-parent-row').toLowerCase();
-            const policyDetails = policyOrder.find(policy =>
-                Object.keys(policy)[0] === policyName
-            );
-            return {
-                element: div, // Work with the div, not the table
-                policyName: policyName,
-                priority: policyDetails ? policyDetails[policyName].priority : Infinity
-            };
-        });
-
-        // Filter to only selected policies
-        const selectedContainers = containerArray.filter(container =>
-            selectedPolicies.has(container.policyName)
-        );
-        // // // console.log('container selected ',selectedContainers);
-        // Sort by priority
-        selectedContainers.sort((a, b) => a.priority - b.priority);
-
-        // Reorder the divs in the container
-        selectedContainers.forEach(containerData => {
-            container.appendChild(containerData.element);
-        });
-    }
-
-    function setValueForHiddenField(element, answer_type) {
-        // alert("hi");
-        if (answer_type != 'dropdown') {
-            // // // console.log(element);
-            const hiddenInput = element.querySelector("input[type='hidden']");
-            const updatedText = element.textContent.trim();
-            var updated_Text = element.textContent.trim();
-            // // // console.log('updated text ',updated);
-            if (hiddenInput) {
-
-                hiddenValue = updated_Text;
-
-                // alert(hiddenValue);
-                // Convert it back to a JSON string and set the value
-                hiddenInput.value = hiddenValue;
-
-                // // console.log("Updated Hidden Input Value:", hiddenInput.value);
-            } else {
-                // console.warn("No hidden input found inside the element.");
-            }
-        }
-        checkCellValueAndHighlight();
-    }
-
-    function addOrRemoveIcon(element, event) {
-        isSaved = false;
-        event.stopPropagation();
-
-        // Get the parent dropdown to access both buttons reliably
-        const dropdown = element.closest('.dropdown-content');
-        const qcrButton = dropdown.querySelector('.qcrProposal');
-        const stcButton = dropdown.querySelector('.sendClientProposal');
-
-        // Get current icons
-        let qcrIcon = qcrButton.querySelector('.fa-check-square');
-        let stcIcon = stcButton.querySelector('.fa-check-square');
-
-        // If clicked on QCR button
-        if (element.classList.contains('qcrProposal')) {
-            if (!qcrIcon) {
-                // QCR being checked: add icon to both
-                createIcon(qcrButton);
-                if (!stcIcon) {
-                    createIcon(stcButton);
-                }
-            } else {
-                // QCR being unchecked: remove icon from both
-                qcrButton.removeChild(qcrIcon);
-                if (stcIcon) {
-                    stcButton.removeChild(stcIcon);
-                }
-            }
-        }
-        // If clicked on Send to Client button
-        else if (element.classList.contains('sendClientProposal')) {
-            if (!stcIcon) {
-                // STC being checked: must ensure QCR is checked first
-                if (!qcrIcon) {
-                    createIcon(qcrButton); // Ensure QCR is checked
-                }
-                createIcon(stcButton);
-            } else {
-                // STC being unchecked: only remove STC icon
-                stcButton.removeChild(stcIcon);
-                // QCR remains unchanged
-            }
-        }
-
-        // Update your data model or save state if needed
-        // updateHeaderCheckBoxProperties();
-    }
-
-    function createIcon(element) {
-        let icon = document.createElement('i');
-        icon.classList.add('fa', 'fa-check-square');
-        icon.style.color = 'green';
-        icon.style.marginLeft = '8px';
-        element.appendChild(icon);
-    }
-
-    document.addEventListener('click', function(e) {
-        if (e.target.classList.contains('policy-link')) {
-            const policyName = e.target.getAttribute('data-policy-name');
-            getPolicyInfo(policyName);
-            e.preventDefault();
-        }
-        checkCellValueAndHighlight();
-    });
-
-    function getPolicyInfo(policyName) {
-        // // console.log("anchor link clicked ", policyName);
-
-
-        myModal = new bootstrap.Modal(document.getElementById('policyRegisterModel'),{
-            backdrop: 'static',
-            keyboard: false
-        });
-        // // console.log("inside if condition");
-
-        var leadID = $("#lead_id").val();
-        let policy = policies.find(p => p.name === policyName);
-        // alert(policy.quote_asked[0]);
-        // var policySI = policies[]
-        policySI = rfq_count == 0 && !tdChanged ? policy.quote_asked[0] : (changedNewSI) != "" && changedNewSI != 0? changedNewSI : policy.quote_asked[0];
-        // alert(policySI)
-        if (policySI == "-" || policySI == 0 || policySI == undefined){
-            toastr.warning("Please Enter the Sum Insured in the RFQ First","Warning");
-            return;
-        }
-        console.log("policy si",policySI,"rfq ount ",rfq_count,"tdchanged ",tdChanged,"changedNewSI",changedNewSI);
-        $("#policyName").val(policyName);
-        $("#policySI").val(policySI);
-        $("#leadID").val(leadID);
-        $("#multilocation_type_div").hide();
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-
-        // Add 'show active' to the 'product-selection' tab
-        $("#policy_register_forms .tab-pane.show.active").removeClass("active show");
-
-        // Add 'show active' to the 'product-selection' tab
-        $("#product-selection").addClass("active show");
-        hideAndShowBurglary();
-
-        storedPolicyData = JSON.parse(localStorage.getItem('policyData'));
-        if (!$.isEmptyObject(storedPolicyData)) {
-            // alert("not empty");
-            prepareDataForEdit(storedPolicyData);
-        }
-        myModal.show();
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    }
-
-    function addPolicySummaryTable(storedData, policyName) {
-        // alert(policyName);
-        var locationCount = storedData.locations.length;
-        var tableRowContent = [];
-
-        // Loop through each location and generate the summary rows dynamically
-        for (let i = 0; i < locationCount; i++) {
-            let locationIndex = i + 1;
-
-            let rowContents = [
-                {
-                    [`fire_plantMachineries_${locationIndex}`]: {
-                        "display_value": "Plant & Machineries and Accessories",
-                        "answer_type": "free-text",
-                        "default_answer": storedData.locations[i].policyRiskSplitUp?.plant_and_machinery || ""
-                    }
-                },
-                {
-                    [`fire_electricalFittings_${locationIndex}`]: {
-                        "display_value": "Electronic Equipments and Accessories",
-                        "answer_type": "free-text",
-                        "default_answer": storedData.locations[i].policyRiskSplitUp?.electrical_fittings || ""
-                    }
-                },
-                {
-                    [`fire_furnitureFittings_${locationIndex}`]: {
-                        "display_value": "FFF (Furniture, Fixtures & Fittings)",
-                        "answer_type": "free-text",
-                        "default_answer": storedData.locations[i].policyRiskSplitUp?.furniture || ""
-                    }
-                },
-                {
-                    [`fire_content_${locationIndex}`]: {
-                        "display_value": "Other Contents Related to Insured",
-                        "answer_type": "free-text",
-                        "default_answer": storedData.locations[i].policyRiskSplitUp?.content || ""
-                    }
-                },
-                {
-                    [`fire_content_${locationIndex}`]: {
-                        "display_value": "Stock",
-                        "answer_type": "free-text",
-                        "default_answer": storedData.locations[i].policyRiskSplitUp?.finished_stock || ""
-                    }
-                }
-            ];
-
-            // ✅ Keep the structure, add extra only if value is present
-            const riskSplit = storedData.locations[i].policyRiskSplitUp || {};
-
-            if (riskSplit.stock_in_process) {
-                rowContents.push({
-                    [`fire_content_${locationIndex}`]: {
-                        "display_value": "Stock In Process",
-                        "answer_type": "free-text",
-                        "default_answer": riskSplit.stock_in_process
-                    }
-                });
-            }
-
-            if (riskSplit.raw_material) {
-                rowContents.push({
-                    [`fire_content_${locationIndex}`]: {
-                        "display_value": "Raw Materials",
-                        "answer_type": "free-text",
-                        "default_answer": riskSplit.raw_material
-                    }
-                });
-            }
-
-            tableRowContent.push({
-                table_type: "new",
-                table_id: `${policyName}_summary_` + locationIndex,
-                table_editable: true,
-                table_name: "Risk Location " + locationIndex,
-                table_row_contents: rowContents
-            });
-        }
-
-        var policySummary = tableRowContent;
-        console.log("policy summary ", policySummary);
-        return policySummary;
-    }
-
-    async function selectInsurer(insurers) {
-
-        // // console.log("Async function called");
-        // Build the HTML for the Select2 dropdown and the input text field
-        const selectHTML = `
-        <div class="form-row">
-
-        <div class="form-group col-md-8">
-            <select id="insurerSelect">
-                <option></option> <!-- Placeholder for Select2 -->
-                ${insurers.map(insurer => `<option data-id="${insurer.id}-${insurer.insurer_id}" value="${insurer.insurer_name}-${insurer.branch_code}">${insurer.insurer_name}-${insurer.branch_code}</option>`).join('')}
-            </select>
-        </div>
-
-        <div class="form-group col-md-4">
-                <input type="text" class="form-control" id="insurerDetails" placeholder="Enter Version">
-            </div>
-
-        </div>
-        `;
-
-        // Display SweetAlert with the Select2 dropdown and text input as HTML content
-        const result = await Swal.fire({
-            title: 'Select an insurer',
-            html: selectHTML,
-            showCancelButton: true,
-            preConfirm: () => {
-
-                const selectedInsurer = document.getElementById('insurerSelect').value;
-                const insurerDetails = document.getElementById('insurerDetails').value;
-
-                const insurerSelect = document.getElementById('insurerSelect');
-                const selectedOption = insurerSelect.options[insurerSelect.selectedIndex];
-                const dataId = selectedOption.getAttribute('data-id');
-
-                if (!selectedInsurer) {
-                    Swal.showValidationMessage("You need to select an insurer :)");
-                }
-
-                return {
-                    selectedInsurer,
-                    insurerDetails,
-                    dataId
-                };
-            },
-            didOpen: () => {
-                // Initialize Select2 on the dropdown
-                $('#insurerSelect').select2({
-                    placeholder: 'Select an insurer',
-                    dropdownParent: $(
-                        '.swal2-popup') // Ensure Select2 is rendered inside SweetAlert
-                });
-            }
-        });
-
-        // Return the selected insurer and input details if confirmed
-        if (result.isConfirmed) {
-            return result.value;
-        }
-        return null; // If canceled, return null
-    }
-
-    function saveRFQ(isAutoSave = false) {
-        // alert("Function Called");
-        isSaved = true;
-        // // console.log("save button clicked");
-        leadJson = tablesToJson();
-        console.log("json from function ", leadJson);
-        var policyJson = localStorage.getItem("policyData") ?? null;
-        saveRFQTODB(leadJson, policyJson, isAutoSave);
-    }
-
-    function saveRFQTODB(tableJSON, policyJson,isAutoSave = false) {
-
-        let submit_type = "RFQ"
-        if(rfq_or_qcr == 2){submit_type = 'QCR'} 
-
-        var formData = {
-            lead_id: $("#lead_id").val(),
-            json: JSON.stringify(tableJSON),
-            submit_type: submit_type,
-            registration_json: policyJson
-        }
-
-        let rfq_primaryKey = $('#rfq_primaryKey').val();
-
-        if (isAutoSave) {
-            formData['rfq_primaryKey'] = rfq_primaryKey;
-        }
-
-        var url = '<?= base_url('rfq/create') ?>';
-
-        if (!isAutoSave) {
-
-            $('.loader').fadeIn();
-            $('.loader-mask').fadeIn();
-        }
-        
-        $.ajax({
-            url: url,
-            data: formData,
-            method: "POST",
-            success: function(response) {
-
-                console.log('RFQ NON EB FORM SUBMIT RESPONSE : ', response);
-
-                if (response.status == true) {
-                   
-                    if (!isAutoSave) {
-                        toastr.success(response.message, "Success");
-                        localStorage.removeItem('policyData');
-
-                        $('.actionBtns').show();
-                        if (rfq_or_qcr == 2) {
-                            $("#openQCR").hide();
-                        }
-                    } else {
-                        $('#rfq_primaryKey').val(response.id);
-                        console.log(response.message, "Success");
-                        showTinyToast()
-                    }
-                    // window.location.reload();
-                } else {
-                    toastr.error(response.message, "Error");
-                    $('.actionBtns').hide();
-                }
-                if (!isAutoSave) {
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    window.location.reload();
-                }
-            },
-            error: function(xhr, status, error) {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                // console.error(xhr.responseText);
-                // console.error(status, error);
-            }
-        })
-    }
-
-    function prepareOverallData() {
-        var proposalKey = "";
-        const overAllData = {};
-        Object.entries(policyConfig).forEach(([proposalNumber, insurers]) => {
-            if (lead_type == 1){
-                proposalKey = `Proposal ${proposalNumber}`;
-            }else{
-                if (proposalNumber == 0){
-                    proposalKey = `${rollover_or_renewal} ${proposalNumber}`;
-                }else{
-                    proposalKey = `Proposal ${proposalNumber}`;
-                }
-            }
-            overAllData[proposalKey] = {
-                qcr: 0,
-                stc: 0,
-                insurers: []
-            };
-
-            const proposalHeader = document.querySelector(`th[data-proposal="${proposalNumber}"]`);
-            if (proposalHeader) {
-                const qcrSelected = proposalHeader.querySelector('.qcrProposal .fa-check-square') !== null;
-                const stcSelected = proposalHeader.querySelector('.sendClientProposal .fa-check-square') !== null;
-                overAllData[proposalKey].qcr = qcrSelected ? 1 : 0;
-                overAllData[proposalKey].stc = stcSelected ? 1 : 0;
-            }
-            // // console.log("Insurers Found", insurers);
-
-            const uniqueInsurers = [];
-            insurers.forEach(insurer => {
-                if (typeof insurer === 'object' && insurer.id) {
-                    let stcInsurerSelected = false;
-                    const insurerHeaders = document.querySelectorAll(`th[data-quote="${insurer.insurerName}"]`);
-                    insurerHeaders.forEach(header => {
-                        const headerProposalCount = header.getAttribute("data-proposal");
-                        if (headerProposalCount == proposalNumber) {
-                            // // console.log("Found the subheader we are searching");
-                            if (header.querySelector('.sendInsurerClientProposal .fa-check-square') !== null) {
-                                stcInsurerSelected = true;
-                            }
-                            // // console.log("STC selected for insurer:", stcInsurerSelected);
-                        }
-                    });
-                    uniqueInsurers.push({
-                        ins_name: insurer.insurerName,
-                        qcr: 1,
-                        stc: rfq_or_qcr == 1 ? 1 : stcInsurerSelected ? 1 : 0,
-                        display_name: insurer.insurerName,
-                        id: insurer.id
-                    });
-                }
-            });
-            // // console.log("Unique Insurers Found", uniqueInsurers);
-            overAllData[proposalKey].insurers = Array.from(uniqueInsurers.values());
-        });
-        // // console.log("overalll data created is ", overAllData);
-        return overAllData;
-    }
-
-
-    function getTextExcludingButton(cell) {
-        return Array.from(cell.childNodes)
-            .filter(node => node.nodeType === Node.TEXT_NODE) // Get only text nodes
-            .map(node => node.textContent.trim()) // Trim unnecessary spaces
-            .join(' ').trim();
-    }
-
-    function tablesToJson() {
-        const allTablesData = [];
-        // Select all tables - adjust the selector if needed (e.g., '.json-table' for specific tables)
-        const tables = document.querySelectorAll('table');
-
-        tables.forEach(table => {
-            var headers = [];
-            const data = [];
-            const tableId = table.id; // Ensure each table has a unique ID
-            // // // console.log('Processing table:', tableId);
-
-            // Get parent headers and subheaders for the current table
-            const parentHeaders = table.querySelectorAll('thead tr:nth-child(1) th');
-            const subHeaders = table.querySelectorAll('thead tr:nth-child(2) th');
-
-            let headerIndex = 0;
-            parentHeaders.forEach(header => {
-                // // console.log("Found header ", header);
-                if (header.innerText.trim().startsWith("Proposal") || header.innerText.trim().startsWith("Existing")) {
-                    var policyNumber = header.getAttribute("data-proposal");
-                    var colspan = parseInt(quotesConfig[policyNumber].length);
-                    // // console.log("Found header true colspan : ", colspan);
-                } else {
-                    var colspan = parseInt(header.getAttribute('colspan')) || 1;
-                }
-                const subHeaderArray = [];
-                // console.log("processing  save function header : ", header);
-                // // // console.log("processing save colspn : ",colspan);
-                for (let i = 0; i < colspan; i++) {
-                    const subheaderHTML = subHeaders[headerIndex].innerHTML;
-                    const subheaderText = subheaderHTML.replace(/<span class="three-dot-menu"[\s\S]*?<\/div>/g, '').trim();
-                    subHeaderArray.push(subheaderText);
-                    headerIndex++;
-                }
-                // // console.log("inside save colspn : ", colspan);
-                const headerHTML = header.innerHTML;
-                const headerText = headerHTML.replace(/<span class="three-dot-menu"[\s\S]*?<\/div>/g, '').trim();
-                // console.log("processing sub header array : ", subHeaderArray);
-                // // console.log("HEader : ", header.innerText == " " ? header.innerText.trim() : headerText);
-                headers.push({
-                    // parentHeader: header.innerText.replace('⋮', '').split('\n')[0].replace(/:.*/, '').trim(),
-                    parentHeader: headerText,
-                    subHeaders: subHeaderArray
-                });
-                // // console.log("processing sub header array : ", headers);
-            });
-
-            // Process each row in the current table
-            const rows = table.querySelectorAll('tbody tr');
-            const rowIdCount = {};
-
-            let rowIdForRemoveFirstIndex = "";
-            rows.forEach(row => {
-                const rowId = row.id;
-                // // console.log("row id : ", rowId);
-                // // console.log("Suggestions :", suggestions);
-                const inputType = suggestions[rowId]?.answer_type || 'text'; // Default to 'text' if undefined
-                const cells = row.querySelectorAll('td');
-                // // // console.log("row id going to submit us ", );
-                const rowData = {
-                    SNO: cells[0] ? getTextExcludingButton(cells[0]) : '',
-                    items: cells[1]?.innerText || '',
-                    row_id: rowId,
-                    data: []
-                };
-                if (tableId == "excess") {
-                    // // console.log("row Trying to set : ", row);
-                    // // console.log("row Trying to set : ", row.outerHTML);
-                    rowData['parentPolicy'] = row.getAttribute("data-excess-row-parent")
-                }
-                // // console.log("Row data foint to submit ", rowData);
-                let dataIndex = 0;
-                if (rowIdCount[rowId] === undefined) {
-                    rowIdCount[rowId] = 0;
-                } else {
-                    rowIdCount[rowId]++;
-                }
-                const occurrence = rowIdCount[rowId];
-                // // console.log("NEw Method : rowIdCount",rowIdCount)
-                // // console.log("NEw Method : occurrence",occurrence)
-
-                let rowspan_row_id = '';
-
-                if (occurrence > 0) {
-                    var headers2 = headers;
-                    headers2 = headers2.filter((header, index) => !(index === 0 && header.parentHeader === "Policy"));
-                    // // console.log("Header 2 ",headers2);
-                    headers2.forEach((header2, TableDataHeaderIndex) => {
-                        header2.subHeaders.forEach(subHeader => {
-                            
-                            if (dataIndex >= cells.length) return; // Prevent out-of-bound errors
-                            const cell = cells[dataIndex];
-                            let content;
-                            // Handle different input types and action cells
-                            if (inputType === "text" && header2.parentHeader === 'Action') {
-                                const qcrInput = cell.querySelector('input[name="qcr"]');
-                                const clientInput = cell.querySelector('input[name="stc"]');
-                                // // console.log("QCR INPUT : ", qcrInput);
-
-                                content = {
-                                    qcr: qcrInput?.checked ? 1 : 0,
-                                    stc: clientInput?.checked ? 1 : 0
-                                };
-                            } else {
-                                const input = cell.querySelector('input, select, textarea');
-                                if (input) {
-                                    // // console.log("Input type:", input.type);
-
-                                    if (input.type === "checkbox") {
-                                        content = input.checked ? "Checked" : "Not Checked"; // Handling checkboxes
-                                        display_content = input.checked ? "Checked" : "Not Checked";
-                                    } else {
-                                        content = input.value; // Handling other input types like text, select, textarea
-                                        display_content = cell.innerText.trim();
-                                        // // console.log("processing sub header array : ", content);
-                                    }
-                                } else {
-                                    content = cell.innerText.trim(); // If no input is found, use the cell's text
-                                    display_content = cell.innerText.trim();
-
-                                }
-                            }
-
-    
-                            rowData.data.push({
-                                parentth: header2.parentHeader,
-                                subth: subHeader,
-                                // value: cell.innerText,
-                                input_value: content,
-                                display_content: display_content,
-                                rowspan: cell.rowSpan
-                            });
-
-                            dataIndex++;
-                        });
-                    });
-                }
-                headers.forEach((header, TableDataHeaderIndex) => {
-
-                    // let headerIndexOffset = occurrence;
-                    // let parentThDataText;
-                    // if (headers[TableDataHeaderIndex + headerIndexOffset]) {
-                    //     parentThDataText = headers[TableDataHeaderIndex + headerIndexOffset].parentHeader;
-                    //     // // console.log("NEw Method : parentThDataText",parentThDataText)
-                    // } else {
-                    //     parentThDataText = header.parentHeader; // Fallback if there are no more headers
-                    // }
-                    // // // console.log(`Row ${rowId} occurrence ${occurrence} using header: `, parentThDataText);
-
-                    header.subHeaders.forEach(subHeader => {
-                        
-                        if (dataIndex >= cells.length) return; // Prevent out-of-bound errors
-                        const cell = cells[dataIndex];
-                        let content;
-                        // Handle different input types and action cells
-                        if (inputType === "text" && header.parentHeader === 'Action') {
-                            const qcrInput = cell.querySelector('input[name="qcr"]');
-                            const clientInput = cell.querySelector('input[name="stc"]');
-                            // // console.log("QCR INPUT : ", qcrInput);
-
-                            content = {
-                                qcr: qcrInput?.checked ? 1 : 0,
-                                stc: clientInput?.checked ? 1 : 0
-                            };
-                        } else {
-                            const input = cell.querySelector('input, select, textarea');
-                            if (input) {
-                                // // console.log("Input type:", input.type);
-
-                                if (input.type === "checkbox") {
-                                    content = input.checked ? "Checked" : "Not Checked"; // Handling checkboxes
-                                    display_content = input.checked ? "Checked" : "Not Checked";
-                                } else {
-                                    content = input.value; // Handling other input types like text, select, textarea
-                                    display_content = cell.innerText.trim();
-                                    // // console.log("processing sub header array : ", content);
-                                }
-                            } else {
-                                content = cell.innerText.trim(); // If no input is found, use the cell's text
-                                display_content = cell.innerText.trim();
-
-                            }
-                        }
-
-                        // let parentThDataText =  header.parentHeader;
-                        // if(rowId ==  rowspan_row_id){
-                        //      parentThDataText = rowspan_row_id == rowId ? headers[TableDataHeaderIndex + 1].parentHeader : header.parentHeader;
-
-                        //      // // console.log('rowspan_row_id parentThDataText', parentThDataText);
-                        //      // // console.log('rowspan_row_id', rowspan_row_id);
-
-                            // rowspan_row_id = rowspan_row_id - 1;
-                            // // // console.log('rowspan_row_id after decrement', rowspan_row_id);
-
-                        // }
-                        // // // console.log("trying to find what this is ",cell);
-                        rowData.data.push({
-                            parentth: header.parentHeader,
-                            subth: subHeader,
-                            // value: cell.innerText,
-                            input_value: content,
-                            display_content: display_content,
-                            rowspan: cell.rowSpan
-                        });
-
-                        dataIndex++;
-                    });
-                });
-
-                data.push(rowData);
-                // // // console.log("processing sub header array : ",content);
-            });
-            tablePolicyName = [...selectedPolicies].find(policy => tableId.startsWith(policy)) || null;
-            // // console.log(selectedPolicies);
-            // // console.log(tablePolicyName);
-            // Get table-specific over_all_column_data (adjust based on your data structure)
-
-
-            allTablesData.push({
-                tableId: tableId,
-                tablePolicy: tablePolicyName,
-                table_data: {
-                    headers: headers,
-                    data: data
-                },
-                // proposal_data: {
-                //     over_all_column_data: tableOverAllData
-                // }
-            });
-        });
-        const tableOverAllData = prepareOverallData() || {};
-        allTablesData.push({
-            proposal_data: {
-                over_all_column_data: tableOverAllData
-            }
-        });
-        // Save all tables' data to localStorage
-        localStorage.setItem('allTablesJsonData', JSON.stringify(allTablesData));
-        // // console.log('All tables data saved:', allTablesData);
-        // toastr.success("RFQ Saved Successfully", "SUCCESS");
-        // If needed, reconstruct tables from JSON (implement jsonToTable accordingly)
-
-        return allTablesData;
-    }
-
-    async function openQCR() {
-
-        if (!isSaved){
-            const proceed = await confirmUnsavedChanges();
-            // if (!proceed) {}
-            // return;
-        }
-        const url = window.location.pathname; // Get the path (e.g., "/nhance/rfq/list/75/1")
-        const segments = url.split("/"); // Split by "/"
-        segments[segments.length - 1] = "2"; // Change the last segment
-        const newUrl = segments.join("/"); // Rebuild the URL
-
-        // // console.log('newUrl', newUrl)
-
-        history.pushState(null, "", newUrl); // Change the URL without reloading
-
-        rfq_or_qcr = 2;
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-        jsonToTables();
-        checkCellValueAndHighlight();
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-        // $('#rfq_qcr_page_title').text('QCR');
-        hideProposalOptionsForChild();
-        showOrHideFieldsBasedOnRFQorQCR();
-        styleTableColumns();
-    }
-
-    function setPolicyConfiguration(overAllColumnData) {
-        let result = {};
-
-        // Iterate over each proposal
-        Object.entries(overAllColumnData).forEach(([proposalKey, proposalData]) => {
-            // Extract proposal number from the key (ensuring it's properly extracted)
-            let match = proposalKey.match(/\d+/); // Extracts the number from "Proposal X"
-            let proposalNumber = "";
-            if (lead_type == 1){
-                proposalNumber = match ? match[0] : undefined;
-            }else{
-                if (rfq_count == 0){
-                    proposalNumber = 0;
-                }else{
-                    // alert(proposalData);
-                    proposalNumber =  match ? match[0] : undefined;
-                }
-            }
-
-            // if (!proposalNumber) return; // Skip if extraction fails
-
-            // Initialize with "Sum Insured"
-            result[proposalNumber] = ["Sum Insured"];
-
-            // Check if insurers exist and filter those with qcr = 1
-            if (Array.isArray(proposalData.insurers)) {
-                proposalData.insurers.forEach(insurer => {
-
-                    result[proposalNumber].push({
-                        id: insurer.id,
-                        version: "",
-                        insurerName: insurer.display_name
-                    });
-
-                });
-            }
-        });
-
-        return result;
-    }
-
-    function setQuotesConfig(overallColumnData) {
-        let quotesConfiguration = {}; // Stores the transformed output
-        let index = 1; // Keeps track of proposal index
-        // // console.log(overallColumnData);
-        Object.keys(overallColumnData).forEach((proposalKey) => {
-
-            let parts = proposalKey.split(" ");
-            let lastNumber = parseInt(parts[parts.length - 1], 10);
-
-            if (lead_type == 1){
-                index = lastNumber;
-            }else{
-                if (rfq_count == 0){
-                    index = 0;
-                }else{
-                    index = lastNumber;
-                }
-            }
-
-            let proposal = overallColumnData[proposalKey];
-            let insurersList = proposal.insurers.map(ins => ins.ins_name); // Extract insurer names
-
-            // Create output format: index { "Sum Insured", ...insurers }
-            quotesConfiguration[index] = ["Sum Insured", ...insurersList];
-
-        });
-
-        return quotesConfiguration;
-    }
-
-    function addSuggestion(rowData) {
-        // // console.log("child table data rowData", rowData);
-        // // console.log("child table data rowData.id", rowData.row_id);
-        // // console.log("child table data child_table_data", child_table_data[rowData.row_id]);
-
-        var table_data = child_table_data[rowData.row_id];
-        
-        table_data.forEach(table => {
-            table.table_row_contents.forEach(row => {
-                const key = Object.keys(row)[0]; // Get the first key in the row object
-                const answerType = row[key].answer_type; // Get the answer_type
-                suggestions[key] = answerType; // Store in suggestions object
-            });
-        }); 
-
-        // // console.log("child table data ", suggestions);
-        // child_table_data[rowData.rowID]
-    }
-
-    function getTotalCount(proposalDataArray) {
-        let proposals = proposalDataArray.proposal_data.over_all_column_data;
-
-        // Object.k(proposals)
-        // console.log("Proposal insurer keuys : ",proposals)
-        var proposalCount = 0;
-        var insurerCount = 0;
-        for (const key in proposals) {
-            if (proposals[key].qcr !== 0) {
-                proposalCount++; // Count proposals where qcr !== 0
-
-                // Only count insurers if the proposal's qcr !== 0
-                insurerCount += proposals[key].insurers 
-                    ? proposals[key].insurers.filter(insurer => insurer.qcr !== 0).length 
-                    : 0;
-            }
-        }
-        return proposalCount + insurerCount;
-    }
-
-
-
-    function jsonToTables() {
-
-        const container = document.getElementById('tablesContainer');
-        container.innerHTML = '';
-        const savedData = JSON.parse(localStorage.getItem('allTablesJsonData'));
-        let lastIndex = savedData.length - 1;
-        var proposalDataArray = savedData[lastIndex];
-
-        // Initialize configurations
-        policyConfig = setPolicyConfiguration(proposalDataArray.proposal_data.over_all_column_data);
-        quotesConfig = setQuotesConfig(proposalDataArray.proposal_data.over_all_column_data);
-        let keys = Object.keys(quotesConfig);
-        let lastKey = keys[keys.length - 1];
-        if (lead_type == 1){
-            proposalCount = lastKey;
-        }else{
-            if (rfq_count == 0){
-                proposalCount = 0;
-            }else{
-                proposalCount = keys.length-1;
-            }
-        }
-        
-        
-        proposalCountForTableINcrease = keys.length;
-        // console.log(proposalCount);
-        // Calculate width increase
-        let increaseBy = rfq_or_qcr == 2 ?
-            getTotalCount(proposalDataArray) * 150 :
-            proposalCountForTableINcrease * 150;
-
-
-            console.log("Quotes COnfig : ",quotesConfig);
-            console.log("policy COnfig :", policyConfig);
-        // // // console.log("trying to find checkbox data  : : : ", increaseBy);
-
-
-        suggestions = {};
-
-        const policyTables = {};
-        let excessTableContainer = null;
-
-        // Process each table entry
-        savedData.forEach((tableEntry, index) => {
-            if (!tableEntry.table_data) return;
-
-            // 1. Create container structure
-            const tableContainer = document.createElement('div');
-            tableContainer.className = 'table-container';
-
-            // 2. Create collapsible bar
-            const collapsibleBar = document.createElement('div');
-            collapsibleBar.className = 'table-collapsible-bar collapsed';
-            collapsibleBar.innerHTML = `
-            ${tableEntry.table_data.headers[1].parentHeader || 'Table'}
-            <span class="collapse-icon">▼</span>
-        `;
-
-            // 3. Create collapsible content area
-            const tableContent = document.createElement('div');
-            tableContent.className = 'table-content collapse';
-            tableContent.style.display = 'none'; // Start collapsed
-
-            // 4. Create the table
-            const table = document.createElement('table');
-            $(table).addClass("table table-bordered mt-3");
-            if (tableEntry.tableId) table.id = tableEntry.tableId;
-
-            // Create header structure
-            const thead = document.createElement('thead');
-            const [headerRow1, headerRow2] = createHeaderRows(tableEntry.table_data.headers, proposalDataArray);
-            thead.append(headerRow1, headerRow2);
-            table.appendChild(thead);
-
-            // Create body
-            const tbody = document.createElement('tbody');
-            var cellCount = 0;
-            tableEntry.table_data.data.forEach((rowData, rowDataIndex) => {
-                const tr = document.createElement('tr');
-                tr.id = rowData.row_id;
-                if (tableEntry.tableId === "excess" && rowData.parentPolicy) {
-                    tr.setAttribute('data-excess-row-parent', rowData.parentPolicy);
-                }
-                
-                // Process each cell
-                rowData.data.forEach((cellData, cellIndex) => {
-                    const td = document.createElement(cellIndex === 0 ? 'td' : 'td');
-
-                    // Handle RowSpan Attribute 
-                    if (cellData.rowspan && cellData.rowspan > 1) {
-                        td.rowSpan = cellData.rowspan;
-                    }
-
-                    // Handle SNO column
-                    if (cellIndex === 0 && tableEntry.tableId) {
-                        td.textContent = rowData.SNO;
-                    }
-                    // Handle Action column
-                    else if (cellData.parentth === 'Action') {
-                        if (table.id != "") {
-                            td.innerHTML = `
-                        <input class="qcr-checkbox" id="qcrCheckbox" name="qcr" type="checkbox" ${cellData.input_value.qcr ? 'checked' : ''}>
-                        <label for="qcrCheckbox">QCR</label>
-                        <input class="client-checkbox" name="stc" type="checkbox" ${cellData.input_value.stc ? 'checked' : ''}>
-                        Client
-                        <button class="btn btn-primary btn-sm" onclick="addRow(event, this)">+</button>
-                        <button class="btn btn-danger btn-sm" onclick="removeRowQCR(event)">-</button>`;
-                        }else {
-                            td.innerHTML = "";
-                        }
-                        // td.contentEditable = true;
-                        // td.classList.add("readonly-select");
-                    }
-                    // Handle regular cells
-                    else {
-                        // td.onclick = () => getAnswer(table.id, tr.id);
-                        td.innerHTML = processCellContent(cellData.input_value, rowData, cellData.display_content);
-                        // // console.log("DEBUG ISSUE : ",cellData.parentth)
-                        if (cellData.parentth.startsWith("Proposal") || cellData.parentth.startsWith("Existing")) {
-
-                            if (lead_type == 1){
-                                td.onclick = () => getAnswer(table.id, tr.id);
-                                if (cellData.subth != "Sum Insured" && cellData.subth != "Liability Limit") {
-                                    td.onclick = () => getAnswer(table.id, tr.id);
-                                    td.classList.add("insurer_proposal");
-                                }
-                            }else{
-                                td.onclick = () => getAnswer(table.id, tr.id);
-                                if (cellData.subth != "Sum Insured" && cellData.subth != "Liability Limit") {
-                                    td.onclick = () => getAnswer(table.id, tr.id);
-                                    td.classList.add("insurer_proposal");
-                                }
-                            }
-
-                            if (cellData.subth == "Sum Insured" && cellData.parentth == "Proposal 1" && table.id == "" && cellCount === 0){
-                                console.log("cell count : ",cellCount)
-                                changedNewSI = cellData.input_value;
-                                console.log("changed new si from jsontotables",changedNewSI);
-                                $("#policySI").val(changedNewSI);
-                                cellCount = cellCount + 1;
-                            }
-                            
-                        }
-                        
-
-                            td.contentEditable = true;
-                        
-                       
-                        if (cellIndex === 0) {
-                            td.contentEditable = false;
-                        }
-                    }
-                    tr.appendChild(td);
-                });
-                tbody.appendChild(tr);
-            });
-            table.appendChild(tbody);
-            selectedPolicies.add(tableEntry.tablePolicy);
-
-            // Set table width
-            const firstTable = document.querySelector('table');
-            const tableWidth = firstTable ? $(firstTable).width() : 1200;
-            $(table).width(tableWidth);
-            $(collapsibleBar).width(tableWidth);
-
-            // Add click handler for collapsible functionality
-            collapsibleBar.addEventListener('click', function() {
-                const isCollapsed = tableContent.style.display === 'none';
-                tableContent.style.display = isCollapsed ? 'block' : 'none';
-                const icon = this.querySelector('.collapse-icon');
-                icon.style.transform = isCollapsed ? 'rotate(0deg)' : 'rotate(-90deg)';
-
-                // Trigger resize if needed
-                setTimeout(() => {
-                    $(window).trigger('resize');
-                }, 10);
-            });
-
-            // Build the structure
-            tableContent.appendChild(table);
-            tableContainer.appendChild(collapsibleBar);
-            tableContainer.appendChild(tableContent);
-
-            // Special handling for excess table
-            if (tableEntry.tableId === "excess") {
-                excessTableContainer = tableContainer;
-            } else {
-                const policyName = tableEntry.tablePolicy;
-                if (!policyTables[policyName]) {
-                    policyTables[policyName] = [];
-                }
-                policyTables[policyName].push(tableContainer);
-            }
-        });
-
-        // Append tables in policy groups
-        Object.entries(policyTables).forEach(([policyName, tables]) => {
-            const policyContainer = document.createElement('div');
-            policyContainer.setAttribute('data-parent-row', policyName);
-
-            tables.forEach(table => {
-                policyContainer.appendChild(table);
-            });
-
-            container.appendChild(policyContainer);
-        });
-
-        // Append excess table last if exists
-        if (excessTableContainer) {
-            container.appendChild(excessTableContainer);
-        }
-
-        // Final initialization
-        restoreProposalHeaders(savedData[savedData.length - 1].proposal_data.over_all_column_data);
-        reattachEventListeners();
-        hideProposalOptionsForChild();
-        increaseTableWidth(increaseBy);
-        contentNonEditableInsurerAdded(proposalDataArray.proposal_data.over_all_column_data);
-        // styleTableColumns();
-        showOrHideFieldsBasedOnRFQorQCR();
-    }
-
-    // Helper function to create header rows
-    function createHeaderRows(headers, proposal_data) {
-
-        const headerRow1 = document.createElement('tr');
-        const headerRow2 = document.createElement('tr');
-        var overallColumnDataProposal = proposal_data.proposal_data.over_all_column_data;
-        var matchedKey = "";
-        var headerName = '';
-        headers.forEach(header => {
-            // Parent header
-            const th1 = document.createElement('th');
-            th1.textContent = header.parentHeader;
-            // console.log("parent header : ",header.parentHeader);
-            if (header.parentHeader.startsWith('Proposal') || header.parentHeader.startsWith("Existing")) {
-                if (lead_type == 1){
-                    headerName = header.parentHeader;
-                }else{
-                    if (rfq_count == 0){
-                        headerName = rollover_or_renewal;
-                    }else{
-                        headerName = header.parentHeader;
-                    }
-
-                }
-                var proposalHTMLNumber = "";
-                // console.log("Header Name : ",header.parentHeader);
-                // alert(headerName);
-                if (lead_type == 1){
-                    // console.log("Header Name lead type 1 : ",header.parentHeader);
-                    matchedKey = Object.keys(overallColumnDataProposal).find(key => headerName == key);
-
-                    if (!matchedKey){
-                        console.log("inside else");
-                        matchedKey = Object.keys(overallColumnDataProposal).find(key => headerName.startsWith(key));
-                    }
-                    // matchedKey = Object.keys(overallColumnDataProposal).find(key => headerName.startsWith(key));
-                    proposalHTMLNumber = header.parentHeader.split(' ')[1];
-                    // console.log('proposalHTMLNumber',proposalHTMLNumber)
-                    
-                }else{
-                    // console.log("Header Name lead type not 1 : ",header.parentHeader);
-
-                    if (rfq_count == 0 && header.parentHeader.startsWith("Proposal")){
-                    // console.log("Header Name lead type not 1 proposal: ",header.parentHeader);
-
-                        var tempHeader = header.parentHeader;
-                        matchedKey = Object.keys(overallColumnDataProposal).find(key => tempHeader == key);
-
-                        if (!matchedKey){
-                            console.log("inside else");
-                            matchedKey = Object.keys(overallColumnDataProposal).find(key => tempHeader.startsWith(key));
-                        }
-                        // matchedKey = Object.keys(overallColumnDataProposal).find(key => tempHeader.startsWith(key));
-                        proposalHTMLNumber = 0;
-                        
-                    }else{
-                        
-                        // console.log("Header Name lead type not 1 noy proposal: ",header.parentHeader);
-
-                        if (header.parentHeader.startsWith("Existing")){
-                            var tempHeader2 = lead_type == 2 ?"Existing Renewal 0":"Existing Roll Over 0";
-                            matchedKey = Object.keys(overallColumnDataProposal).find(key => tempHeader2.startsWith(key));
-                            proposalHTMLNumber = 0;
-
-                        }else if (header.parentHeader.startsWith("Proposal")){
-
-                            matchedKey = Object.keys(overallColumnDataProposal).find(key => headerName == key);
-
-                            if (!matchedKey){
-                                console.log("inside else");
-                                matchedKey = Object.keys(overallColumnDataProposal).find(key => headerName.startsWith(key));
-                            }
-                            proposalHTMLNumber = header.parentHeader.split(' ')[1];
-                        }
-                        
-                        // alert(matchedKey);
-                    }
-                    
-                }
-                
-                
-                if (matchedKey) {
-                    console.log(matchedKey);
-                    // // console.log("something wrong : ", overallColumnDataProposal[matchedKey]);
-                    var headerCheckBoxProperties = overallColumnDataProposal[matchedKey];
-                    // // console.log("something wrong :headerCheckBoxProperties ", headerCheckBoxProperties);
-                }
-
-                // console.log("Header checkbox Properties : ",headerCheckBoxProperties);
-                th1.innerHTML = `
-                ${headerName}
-                    <span class="three-dot-menu" >&#8942;</span>
-                    <div class="dropdown-content">
-                    <button id = "isQCR" onclick = "addOrRemoveIcon(this,event)" class="qcrProposal" style="background-color: rgb(221, 221, 221);">QCR ${headerCheckBoxProperties['qcr'] == 1 ? `<i
-                            class="mdi mdi-checkbox-marked"
-                            style="color: green; margin-left: 8px; "></i> `:"" }</button>
-                        <button id = "isSTC" class="sendClientProposal" onclick = "addOrRemoveIcon(this,event)"
-                        style="background-color: rgb(221, 221, 221);">Send to Client ${headerCheckBoxProperties['stc'] == 1 ? `<i
-                            class="mdi mdi-checkbox-marked"
-                            style="color: green; margin-left: 8px; "></i> `:"" }</button>
-                    <button class = "removeProposal" onclick="removeProposal(${proposalHTMLNumber})">Remove Proposal</button>
-                    <button class = "newInsurer" onclick="addNewQuote(${proposalHTMLNumber})">Add New Insurer</button>
-                    
-                </div>
-            `;
-                th1.colSpan = header.subHeaders.length;
-
-                // // // console.log("insurer data proposal set : ",th1); // See the element's attributes in the // console
-
-            }
-            headerRow1.appendChild(th1);
-            // // // console.log("this is the header : ", header);
-            // Sub headers
-            header.subHeaders.forEach(subHeader => {
-                const th2 = document.createElement('th');
-                if (header.parentHeader.startsWith("Proposal") || header.parentHeader.startsWith("Existing")) {
-                    var insurers = overallColumnDataProposal[matchedKey].insurers;
-                    // console.log("trying to find something :header.parentHeader ", header.parentHeader);
-                    // console.log("trying to find something :insurers ", insurers);
-                    // console.log("trying to find : subHeader",subHeader)
-                    const matchedInsurer = insurers.find(ins => ins.ins_name == subHeader);
-                    
-
-                    if (subHeader != "Sum Insured" && subHeader != "Liability Limit") {
-                        console.log("trying to find something : matchedInsurer", subHeader);
-                        // // console.log("trying to find something :matchedInsurer stc ", matchedInsurer.stc);
-                        // // console.log("trying to find something : ", matchedInsurer.stc);
-
-                        // // console.log("this is the subheader : ", subHeader);
-                        // // console.log("debug 2: ", subHeader, "parent header : ", header.parentHeader);
-                        th2.classList.add("insurer_proposal");
-                        th2.innerHTML = `
-                    ${subHeader}
-                    <span class="three-dot-menu">&#8942;</span>
-                    <div class="dropdown-content">
-                    <button id = "isInsurerSTC" class="sendInsurerClientProposal" onclick = "addOrRemoveIconInsurer(this,event)"
-                        style="background-color: rgb(221, 221, 221);">Send to Client ${matchedInsurer.stc == 1 ? `<i
-                            class="mdi mdi-checkbox-marked"
-                            style="color: green; margin-left: 8px; "></i>`: ""} </button>
-                        <button onclick="changeInsurer(event, ${proposalHTMLNumber}, '${subHeader}')">Change Insurer</button>
-                        <button onclick="removeQuote(event, ${proposalHTMLNumber}, '${subHeader}')">Remove Quote</button>
-                    </div>
-                    `;
-                    } else {
-                        th2.textContent = subHeader;
-                    }
-
-                    if (lead_type == 1){
-                        
-                        th1.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-                        th2.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-
-                    }else{
-                        if (headerName.startsWith("Existing")){
-                            th1.setAttribute('data-proposal',0);
-                            th2.setAttribute('data-proposal',0);
-
-                        }else{
-                            th1.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-                            th2.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-
-                        }
-                       
-                    }
-                    th2.setAttribute("data-quote", subHeader);
-                   
-                    // // // console.log("header insert position ",th1.getAttribute())
-
-                } else {
-                    th2.textContent = subHeader;
-                    th2.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-                    th1.setAttribute('data-proposal', header.parentHeader.split(' ')[1]);
-                }
-
-
-                headerRow2.appendChild(th2);
-            });
-        });
-
-        return [headerRow1, headerRow2];
-    }
-
-    // Helper to process cell content
-    function processCellContent(value, cellData = null, displayValue) {
-
-        if (value.startsWith('Check') || value.startsWith('Not')) {
-
-            if (value == "Checked") {
-                addSuggestion(cellData);
-            }
-            // // // console.log("insude the function value ", value);
-            return `<input type="checkbox" ${value == "Checked" ? "checked" :""} class = "sno-checkbox" /> ${cellData.SNO} ${cellData.SNO == 'Fire' || cellData.SNO == 'Burglary'
-                                ? `<br><button  id = '${cellData.SNO.toUpperCase()}_register' class = "btn btn-primary btn-sm" onclick = "getPolicyInfo('${cellData.SNO}')"  class="policy-link" data-policy-name="${cellData.SNO}" ${value == "Checked" ? "" :"disabled"} >Register</a>`
-                                : ""}`;
-        }
-        if (typeof value === 'string' && value.startsWith('{')) {
-            try {
-                const parsed = JSON.parse(value);
-                return `${displayValue} <input type="hidden" value='${JSON.stringify(parsed)}' />`;
-            } catch {
-                return value;
-            }
-        }
-        return value;
-    }
-
-    // Restore proposal header icons
-    function restoreProposalHeaders(proposalData) {
-        Object.entries(proposalData).forEach(([proposal, data]) => {
-            const proposalNumber = proposal.split(' ')[1];
-            const header = document.querySelector(`th[data-proposal="${proposalNumber}"]`);
-            // // // console.log("header attribute set");
-
-            if (header) {
-                // if (data.qcr) header.querySelector('.qcrProposal').appendChild(createCheckIcon());
-                // if (data.stc) header.querySelector('.sendClientProposal').appendChild(createCheckIcon());
-            }
-        });
-    }
-
-    // Reattach event listeners
-    function reattachEventListeners() {
-        const container = document.getElementById('tablesContainer');
-
-
-        // Three-dot menu handlers
-        document.querySelectorAll('.three-dot-menu').forEach(menu => {
-            menu.addEventListener('click', showDropdown);
-            // // // console.log("event listener called ");
-        });
-
-        // Policy link handlers
-        document.querySelectorAll('.policy-link').forEach(link => {
-            link.addEventListener('click', function(e) {
-                getPolicyInfo(e.target.dataset.policyName);
-                e.preventDefault();
-            });
-        });
-    }
-
-    function createCheckIcon() {
-        const icon = document.createElement('i');
-        icon.className = 'mdi mdi-checkbox-marked';
-        icon.style.color = 'green';
-        icon.style.marginLeft = '8px';
-        return icon;
-    }
-
-    function showOrHideFieldsBasedOnRFQorQCR() {
-        // // console.log("function called rfq or qcr ", rfq_or_qcr);
-
-        if (rfq_or_qcr == 1) {
-            $(".insurer_proposal").attr("contenteditable",false);
-            $(".newInsurer").hide();
-            $("#isQCR").show();
-            $(".qcr-checkbox").show();
-            $("label[for='qcrCheckbox']").show();
-            $("#openQCR").show();
-            $("input#qcrCheckbox").show();
-            $("#addProposal").show();
-            alignTableColumn();
-            $(".qcrProposal").show();
-            $("#saveRFQ").text("Save RFQ");
-            $("#submitMail").text("Send Insurer Mail");
-            $(".rfqbtn").show();
-            $(".qcrbtn").hide();
-            $("#saveRFQ").css("margin-right", "10px");
-            $('#rfq_qcr_page_title').text('RFQ');
-            $(".removeProposal").show();
-
-
-        } else if (rfq_or_qcr == 2) {
-            $(".insurer_proposal").attr("contenteditable",true);
-            $(".newInsurer").show();
-            $("#isQCR").hide();
-            $(".qcr-checkbox").hide();
-            $("label[for='qcrCheckbox']").hide();
-            $("input#qcrCheckbox").hide();
-            $("#addProposal").hide();
-            $(".insurer_proposal").show();
-            $(".qcrProposal").hide();
-            $("#saveRFQ").text("Save QCR");
-            $("#submitMail").text("Send Client Mail");
-            // $(".sno-checkboxes").prop("disabled", true);
-            $("#openQCR").hide();
-            $(".removeProposal").hide();
-            hideNonQCRRows();
-            hideNonQCRColumns();
-            disableCheckbox();
-            restoreOnClickToColumnCells();
-
-            $(".rfqbtn").hide();
-            $(".qcrbtn").show();
-            $("#saveRFQ").css("margin-right", "20px");
-            $('#rfq_qcr_page_title').text('QCR');
-
-        }
-
-        if (rfq_count != 0) {
-            $('.actionBtns').show();
-            if (rfq_or_qcr == 2) {
-                $("#openQCR").hide();
-                $("#submitPlacement").show();
-            } else {
-                $("#submitPlacement").hide();
-            }
-        } else {
-            $('.actionBtns').hide();
-        }
-        makeQuoteAskedColumnNonEditableorEditable();
-    }
-
-    function disableCheckbox() {
-
-        // Select all checkboxes with the class "sno-checkboxes"
-        const checkboxes = document.querySelectorAll('.sno-checkbox');
-        // // // console.log("inside disable ",checkboxes);
-        // Disable all selected checkboxes
-        checkboxes.forEach(checkbox => {
-            checkbox.disabled = true;
-            // // // console.log("inside disable loop",checkbox);
-        });
-    }
-
-    function hideNonQCRColumns() {
-
-        const savedData = JSON.parse(localStorage.getItem('allTablesJsonData'));
-        let lastIndex = savedData.length - 1;
-        var proposalDataArray = savedData[lastIndex];
-        var overallData = proposalDataArray.proposal_data.over_all_column_data;
-        const getProposalsWithQCRZero = (data) => {
-            return Object.keys(data).filter(proposal => data[proposal].qcr === 0);
-        };
-
-        var proposal = getProposalsWithQCRZero(overallData);
-        // // console.log("column to hide : ", proposal);
-        proposal.forEach(function(prop) {
-            // console.log("column prop : ", prop);
-            hideColumn(prop);
-        })
-
-    }
-
-    function hideColumn(columnName) {
-        // // console.log(`Hiding column: ${columnName}`);
-
-        document.querySelectorAll("table").forEach(table => {
-            // 1. Find the main proposal header in the first header row
-            const mainHeaderRow = table.querySelector('thead tr:first-child');
-            let proposalHeader = null;
-            let proposalColspan = 1;
-            let startColumnIndex = 2;
-
-            // Find the header matching the columnName and its position
-            Array.from(mainHeaderRow.children).forEach((th, index) => {
-                if (th.textContent.trim().startsWith(columnName)) {
-                    proposalHeader = th;
-                    proposalColspan = parseInt(th.getAttribute('colspan')) || 1;
-                    // startColumnIndex = index; // Starting index of the proposal header
-                    proposalNumber = parseInt(th.textContent.trim().replace(/\D/g, ""), 10);
-                    return;
-                }
-            });
-
-            if (!proposalHeader) {
-                // // console.log(`Column "${columnName}" not found.`);
+        // Save Risk Location Details and Add Column
+        $("#saveRiskLocation").click(function() {
+
+            let locationName = $("#locationName").val().trim();
+            let locationAddress = $("#locationAddress").val().trim();
+            let construction_type = $("#construction_type").val();
+            let has_basement = $("#has_basement").is(":checked");
+            let basement_utilisation = $("#basement_utilisation").val().trim();
+            let occupancy_risk = $("#occupancy_risk").val();
+            let iib_code = $("#iib_code").val().trim();
+            let business_description = $("#business_description").val().trim();
+
+            if (!locationName || !locationAddress) {
+                alert("Please fill in required fields (Location Name and Address)");
                 return;
             }
 
-            // 2. Hide the main proposal header
-            proposalHeader.style.display = "none";
-            if (lead_type == 1){
-                for (let i = 1; i < proposalNumber; i++) {
-                    startColumnIndex += quotesConfig[i]?.length || 0;
-                }
-            }else{
-                for (let i = 0; i < proposalNumber; i++) {
-                    startColumnIndex += quotesConfig[i]?.length || 0;
-                }
-            }
-
-            // 3. Find and hide all subheaders under this proposal
-            const subHeaderRow = table.querySelector('thead tr:last-child');
-            const subHeaders = Array.from(subHeaderRow.children);
-
-            // Calculate range of subheaders to hide (same colspan as proposal header)
-            const endColumnIndex = startColumnIndex + proposalColspan - 1;
-            // console.log("end col index : ",endColumnIndex);
-
-            for (let i = startColumnIndex; i <= endColumnIndex; i++) {
-                if (subHeaders[i]) subHeaders[i].style.display = "none";
-            }
-
-            // 4. Hide corresponding cells in all data rows
-            table.querySelectorAll('tbody tr').forEach(row => {
-                const cells = Array.from(row.children);
-                for (let i = startColumnIndex; i <= endColumnIndex; i++) {
-                    if (cells[i]) cells[i].style.display = "none";
-                }
-            });
-        });
-    }
-
-    function hideNonQCRRows() {
-        // // console.log("hideNonQCRRows function called");
-        // Select all tables
-        document.querySelectorAll("table").forEach(table => {
-
-            // // console.log("Processing table:", table);
-            // Loop through each row in the table
-            table.querySelectorAll("tr").forEach(row => {
-                // // // console.log("Processing row:", row);
-                // Find the qcr-checkbox in the current row
-                const qcrCheckbox = row.querySelector(".qcr-checkbox");
-                // // console.log("QCR Checkbox:", qcrCheckbox);
-
-                if (qcrCheckbox && !qcrCheckbox.checked) {
-                    // If qcr-checkbox exists and is NOT checked, hide the row
-                    // // console.log("Hiding row:", row);
-                    row.style.display = "none"; // Uncomment this line to hide the row
-                    updateVisisbleSNO(table.id);
-                } else {
-                    // Otherwise, ensure the row is visible
-                    // // // console.log("Showing row:", row);
-                    row.style.display = "";
-                }
-            });
-        });
-    }
-
-    function removeRowQCR(event) {
-        Swal.fire({
-        title: 'Are you sure?',
-        text: "Do you want to remove the row?",
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#d33',
-        cancelButtonColor: '#3085d6',
-        confirmButtonText: 'Yes, remove it!',
-        cancelButtonText: 'Cancel'
-        }).then((result) => {
-            if (result.isConfirmed) {
-                const button = event.target;
-                const row = button.closest('tr');
-                const table = row.closest('table');
-                if (row && row.parentElement.children.length > 1) {
-                    // // console.log("Row Removed");
-                    row.remove();
-                    updateVisisbleSNO(table.id);
-                }
-
-                isFormDataModified = true; // if any value changeing in the table to set true
-            }
-        })
-
-    }
-
-    function updateVisisbleSNO(tableId) {
-        // // console.log(`Updating SNO for table: ${tableId}`);
-
-        const table = document.getElementById(tableId);
-        if (!table) {
-            // // console.log("Table not found!");
-            return;
-        }
-
-        let sno = 1; // Start from 1
-        table.querySelectorAll("tr").forEach(row => {
-            if (row.style.display !== "none") { // Only update visible rows
-                const firstCell = row.querySelector("td:first-child"); // Get SNO cell
-                if (firstCell) {
-                    firstCell.innerHTML = `<td "class="sno-checkbox"> ${sno}</td>`;
-                    sno++; // Increment SNO for the next row
-                }
-                // const snoCell = row.querySelector(".sno"); // Assuming SNO cell has class "sno"
-                // if (snoCell) {
-                //     snoCell.textContent = sno++; // Assign and increment SNO
-                //     // // console.log(`Updated SNO: ${snoCell.textContent}`);
-                // }
-            }
-        });
-    }
-
-    function alignTableColumn() {
-        $(".insurer_proposal").each(function() {
-            let columnIndex = $(this).index(); // Get index of the hidden column
-            let parentHeader = $(this).closest("table").find("tr:first-child th").filter(function() {
-                return $(this).attr("colspan") > 1; // Find headers with colspan > 1
-            });
-
-            // Reduce colspan if the hidden column belongs to this header
-            parentHeader.each(function() {
-                let colspan = parseInt($(this).attr("colspan"), 10);
-                if (colspan > 1) {
-                    $(this).attr("colspan", colspan - 1);
-                }
-            });
-
-            // Hide the column
-            $(this).hide();
-        });
-
-    }
-    function restoreOnClickToColumnCells() {
-        
-        $("table").each(function() {
-            const table = $(this);
-            const tableId = table.attr("id") || "parent"; // Default to "parent" if no ID
-
-            // Find all cells marked with data-onclick-removed
-            table.find("td.insurer_proposal[data-onclick-removed='true']").each(function() {
-                const cell = $(this);
-                const row = cell.closest("tr");
-                const rowId = row.attr("id");
-
-                // Reattach the onclick event
-                cell[0].onclick = () => getAnswer(tableId, rowId);
-
-                // Remove the marker attribute since the event is restored
-                cell.removeAttr("data-onclick-removed");
-
-                // Ensure the cell is editable in QCR mode
-                cell.attr("contenteditable", "true");
-            });
-        });
-    }
-
-    function removeOnClickFromColumnCells(cell) {
-        cell.removeAttr("onclick");
-        cell.off("click");
-        cell[0].onclick = null; // Remove any remaining native listeners
-        cell.attr("data-onclick-removed", "true"); //mark the cell    
-    }
-
-    function makeQuoteAskedColumnNonEditableorEditable() {
-        // alert("Sum Insured");
-        $("table").each(function() {
-            var table = $(this);
-            var subHeaderRow = table.find("tr:nth-child(2)"); // Assuming second row is the sub-header
-
-            var targetColumnIndexes = [];
-            // var targetColumnIndex = -1; // Stores the correct column index
-            var colIndexTracker = []; // Maps visual column index to actual index
-            var visualIndex = 0; // Tracks the visual column position considering rowspan/colspan
-
-            // Step 1: Find the "Sum Insured" column index
-            subHeaderRow.children("th, td").each(function(actualIndex) {
-                colIndexTracker[visualIndex] = actualIndex;
-
-                if ($(this).text().trim() === "Sum Insured" || $(this).text().trim() === "Liability Limit") {
-                    targetColumnIndexes.push(visualIndex);
-                }
-
-                visualIndex += parseInt($(this).attr("colspan") || 1, 10);
-            });
-
-            if (targetColumnIndexes === 0) return; // If "Sum Insured" column is not found, exit
-
-            // Step 2: Make all cells in the found column non-editable, considering rowspan
-            var rowSpans = {}; // Keeps track of rowspans per column
-            table.find("tr").each(function() {
-                var row = $(this);
-                var currentVisualIndex = 0;
-
-                row.children("td, th").each(function(actualIndex) {
-                    while (rowSpans[currentVisualIndex]) {
-                        currentVisualIndex++; // Skip previous row-spanned columns
-                    }
-
-                    var cell = $(this);
-                    var actualColIndex = colIndexTracker[currentVisualIndex];
-
-                    if (targetColumnIndexes.includes(colIndexTracker[currentVisualIndex])) {
-
-                        if (rfq_or_qcr == 2) {
-                            cell.attr("contenteditable", "false");
-                            removeOnClickFromColumnCells(cell);
-                            
-                            if (!cell.text().trim().startsWith("Proposal") && !cell.text().trim().startsWith("Existing")){
-                                cell.addClass("readonly-select");
-                            }
-                        } else if (rfq_or_qcr == 1) {
-                            // cell.attr("contenteditable", "true");
-                        }
-
-                    }
-
-                    var rowspan = parseInt(cell.attr("rowspan") || 1, 10);
-                    if (rowspan > 1) {
-                        for (var i = 0; i < rowspan; i++) {
-                            rowSpans[currentVisualIndex] = (rowSpans[currentVisualIndex] || 0) + 1;
-                        }
-                    }
-
-                    currentVisualIndex++;
-                });
-
-                // Step 3: Reduce rowspan count for next row processing
-                Object.keys(rowSpans).forEach(function(key) {
-                    if (rowSpans[key] > 0) {
-                        rowSpans[key]--;
-                    }
-                });
-            });
-        });
-    }
-
-    function contentNonEditableInsurerAdded(overallcolumnData) {
-        // alert("insurer")
-        let insNames = [];
-        Object.entries(overallcolumnData).forEach(([proposalKey, proposalValue]) => {
-            if (proposalValue.insurers.length > 0) {
-                insNames.push(proposalKey); // Push proposal key if insurers are present
-            }
-        });
-
-        // console.log("Insurer names to make non-editable:", insNames);
-
-        $("table").each(function() {
-            var table = $(this);
-            var mainHeaderRow = table.find("tr:first-child"); // First row as main header
-            var targetColumnIndexes = new Set();
-
-            // Step 1: Create a mapping of visual index to column header text
-            var headerMapping = [];
-            var visualIndex = 0;
-
-            mainHeaderRow.children("th, td").each(function() {
-                var cellText = $(this).text().trim();
-                if (cellText.startsWith("Existing")){
-                    cellText = lead_type == 2 ?"Existing Renewal 0":"Existing Roll Over 0";
-                }
-                var colspan = parseInt($(this).attr("colspan") || 1, 10);
-                // console.log("cellText",cellText);
-                // Store the header text at this visual index
-                for (var i = 0; i < colspan; i++) {
-                    headerMapping[visualIndex + i] = cellText;
-                }
-
-                // Check if this column matches any insurer name
-                if (insNames.some(ins => cellText.startsWith(ins))) {
-                    for (var i = 0; i < colspan; i++) {
-                        targetColumnIndexes.add(visualIndex + i);
-                    }
-                }
-
-                visualIndex += colspan;
-            });
-
-            // // console.log("Target column indexes:", Array.from(targetColumnIndexes));
-
-            if (targetColumnIndexes.size === 0) return; // If no matching column is found, exit
-
-            var rowSpans = {};
-
-            // Step 2: Iterate through rows and set cells as non-editable
-            table.find("tr").each(function(rowIndex) {
-                var row = $(this);
-                var currentVisualIndex = 0;
-
-                row.children("td, th").each(function() {
-                    // Skip cells that are covered by rowspans from previous rows
-                    while (rowSpans[currentVisualIndex] > 0) {
-                        rowSpans[currentVisualIndex]--;
-                        currentVisualIndex++;
-                    }
-
-                    var cell = $(this);
-                    var cellColspan = parseInt(cell.attr("colspan") || 1, 10);
-                    var cellRowspan = parseInt(cell.attr("rowspan") || 1, 10);
-
-                    // Check if any of the columns this cell spans are in our target set
-                    let makeNonEditable = false;
-                    for (let i = 0; i < cellColspan; i++) {
-                        if (targetColumnIndexes.has(currentVisualIndex + i)) {
-                            makeNonEditable = true;
-                            break;
-                        }
-                    }
-
-                    if (makeNonEditable) {
-                        // // console.log('Found Cell : ',cell.text());
-                        cell.attr("contenteditable", "false");
-                        removeOnClickFromColumnCells(cell);
-                    }
-
-                    // Track rowspan for future rows
-                    if (cellRowspan > 1) {
-                        for (var i = 0; i < cellColspan; i++) {
-                            rowSpans[currentVisualIndex + i] = (rowSpans[currentVisualIndex + i] || 0) + (cellRowspan - 1);
-                        }
-                    }
-
-                    // Move to the next visual position
-                    currentVisualIndex += cellColspan;
-                });
-            });
-        });
-    }
-
-    function prependTable(policyJson, policyName) {
-
-        // alert("hi");
-        // // console.log("table to prepened : ", policyJson);
-        let parentDiv = document.querySelector(`div[data-parent-row=${policyName}]`);
-        // let newTable = document.createElement("table");
-
-        if (parentDiv) {
-
-            let tables = Array.from(parentDiv.querySelectorAll("table"));
-
-            tables.forEach(table => {
-                if (table.id.includes("summary")) {
-                    let tableContainer = table.closest(".table-container") || table.parentElement;
-                    if (tableContainer) {
-                        tableContainer.remove(); // Remove the container, including table and collapsible bar
-                    } else {
-                        table.remove(); // Fallback to removing just the table if no container is found
-                    }
-                }
-            });
-
-            policyJson.slice().reverse().forEach(childTable => {
-                generateTable(parentDiv, true, policyName, childTable);
-
-            });
-
-
-            moveSummaryTableToTop(policyName);
-            hideProposalOptionsForChild();
-            showOrHideFieldsBasedOnRFQorQCR();
-            styleTableColumns();
-
-        }
-
-
-    }
-
-    function moveSummaryTableToTop(policyName) {
-        let parentDiv = document.querySelector(`div[data-parent-row="${policyName}"]`);
-        if (!parentDiv) return; // Exit if no such div exists
-
-        // Find all table containers instead of just tables
-        let tableContainers = Array.from(parentDiv.querySelectorAll(".table-container"));
-
-        tableContainers.forEach(container => {
-            // Check if this container holds a table with "summary" in its ID
-            const table = container.querySelector("table");
-            if (table && table.id.includes("summary")) {
-                parentDiv.prepend(container); // Move the entire table-container to the top
-                updateSNO(table.id); // Update SNO for the moved table
-            }
-        });
-    }
-
-
-    // Calculate the total number of visual columns in the table
-    function calculateTotalColumns(table) {
-        const rows = table.querySelectorAll('tr');
-        let maxColumns = 0;
-        rows.forEach((row) => {
-            const cells = row.querySelectorAll('th, td');
-            let currentColumn = 0;
-            cells.forEach((cell) => {
-                const colspan = parseInt(cell.getAttribute('colspan')) || 1;
-                currentColumn += colspan;
-            });
-            if (currentColumn > maxColumns) {
-                maxColumns = currentColumn;
-            }
-        });
-        return maxColumns;
-    }
-
-    function buildTableGrid(table) {
-        const rows = table.querySelectorAll('tr');
-        const totalColumns = calculateTotalColumns(table);
-        const grid = Array.from({ length: rows.length }, () => Array(totalColumns).fill(null));
-        let activeRowSpans = [];
-
-        rows.forEach((row, rowIndex) => {
-            const cells = row.querySelectorAll('th, td');
-            let currentColumnIndex = 0;
-            let newSpans = []; // Collect new spans for the current row
-
-            // Handle active rowspans from previous rows
-            activeRowSpans.forEach((span) => {
-                for (let c = span.startCol; c < span.startCol + span.colspan; c++) {
-                    if (rowIndex < grid.length && c < totalColumns) {
-                        grid[rowIndex][c] = 'span';
-                    }
-                }
-            });
-
-            cells.forEach((cell) => {
-                // Skip hidden columns
-                if (window.getComputedStyle(cell).display === 'none') return;
-
-                // Find the next available column index
-                while (currentColumnIndex < totalColumns && grid[rowIndex][currentColumnIndex] !== null) {
-                    currentColumnIndex++;
-                }
-                if (currentColumnIndex >= totalColumns) return; // Skip if beyond grid
-
-                const colspan = parseInt(cell.getAttribute('colspan')) || 1;
-                const rowspan = parseInt(cell.getAttribute('rowspan')) || 1;
-
-                // Place the cell and mark spanned cells
-                for (let r = rowIndex; r < rowIndex + rowspan; r++) {
-                    for (let c = currentColumnIndex; c < currentColumnIndex + colspan; c++) {
-                        if (r < grid.length && c < totalColumns) {
-                            grid[r][c] = (r === rowIndex && c === currentColumnIndex) ? cell : 'span';
-                        }
-                    }
-                }
-
-                if (rowspan > 1) {
-                    newSpans.push({
-                        startCol: currentColumnIndex,
-                        colspan: colspan,
-                        remainingRows: rowspan - 1
-                    });
-                }
-                currentColumnIndex += colspan;
-            });
-
-            // Decrement remainingRows and filter out expired spans
-            activeRowSpans = activeRowSpans.filter((span) => {
-                span.remainingRows--;
-                return span.remainingRows > 0;
-            });
-
-            // Add new spans after processing current row
-            activeRowSpans.push(...newSpans);
-        });
-
-        return grid;
-    }
-
-
-    function styleTableColumns() {
-        // alert();
-        const tables = document.querySelectorAll('table');
-        const columnColors = {};
-
-        tables.forEach((table) => {
-            const grid = buildTableGrid(table);
-            const totalColumns = grid[0] ? grid[0].length : 0;
-            // // console.log("Table grid:", grid);
-
-            const cellStartingCols = new Map();
-            grid.forEach((row) => {
-                row.forEach((cell, colIndex) => {
-                    if (cell && cell !== 'span' && !cellStartingCols.has(cell)) {
-                        cellStartingCols.set(cell, colIndex);
-                    }
-                });
-            });
-
-            // // console.log("Setting color:", columnColors);
-            cellStartingCols.forEach((startingCol, cell) => {
-                const colspan = parseInt(cell.getAttribute('colspan')) || 1;
+            if (editingLocationIndex === null) {
                 
-                // Assign the same color for the whole column span
-                if (!columnColors[startingCol] && startingCol !== 0 && startingCol !== 1 && startingCol !== 2 && startingCol !== totalColumns - 1) {
-                    columnColors[startingCol] = `hsl(${Math.random() * 360}, 100%, 93%)`;
-                }
+                // Adding new location count
+                riskCount++;
 
-                if (startingCol === 0 || startingCol === 1) {
-                    cell.style.backgroundColor = '#bfe0e2'; // First & second columns
-                } else if (startingCol === totalColumns - 1) {
-                    cell.style.backgroundColor = 'white'; // Third & last column
+                // Store details for this risk location
+                risk_location_details[riskCount] = {
+                    name: locationName,
+                    address: locationAddress,
+                    construction_type: construction_type,
+                    has_basement: has_basement,
+                    basement_utilisation: basement_utilisation,
+                    occupancy_risk: occupancy_risk,
+                    iib_code: iib_code,
+                    business_description: business_description
+                };
+
+                // Create header
+                let header = `
+                    <th class="risk-col" data-risk-id="${riskCount}">
+
+                        <div class="loc-details" style="text-align: center;">
+                            <div style="font-weight: bold;">Risk Location ${riskCount}</div>
+                            <div style="font-size: 11px; color: #666; margin-top: 2px;">
+                                <span class="loc_name" style="display: block;">${locationName}</span>
+                                <span class="loc_address" style="display: block;">${locationAddress}</span>
+                            </div>
+                        </div>
+
+                        <div class="dropdown d-inline-block float-end loc-menu">
+                            <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                                &#x22EE;
+                            </button>
+                            <ul class="dropdown-menu dropdown-menu-end">
+                                <li><a class="dropdown-item edit-location" href="#" data-risk-id="${riskCount}">Edit</a></li>
+                                <li><a class="dropdown-item text-danger remove-location" href="#" data-risk-id="${riskCount}">Remove</a></li>
+                                <li><a class="dropdown-item add-index-value" href="#" data-risk-id="${riskCount}">Add Index Value</a></li>
+                                <li><a class="dropdown-item toggle-collapse" href="#" data-risk-id="${riskCount}" data-type="risk">Collapse</a></li>
+                                <li class="dropdown-item">
+                                    <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-risk-id="${riskCount}" checked>
+                                    <label class="form-check-label">
+                                        QCR
+                                    </label>
+                                </li>
+                                <li class="dropdown-item">
+                                    <input type="checkbox" class="form-check-input me-2 client-check-col" data-risk-id="${riskCount}" checked>
+                                    <label class="form-check-label">
+                                        Client
+                                    </label>
+                                </li>
+                            </ul>
+                        </div>
+                    </th>
+                `;
+
+                // Find index of "Total Sum Insured" column
+                let sumInsuredIndex = $("#policyHeader th").filter(function() {
+                    return $(this).text().trim().toLowerCase().includes("total sum insured");
+                }).index();
+
+                // Insert header before Total Sum Insured
+                $("#policyHeader th").eq(sumInsuredIndex).before(header);
+
+                // --- after you inserted the new header TH into #policyHeader ---
+                var $headerRow = $("#policyHeader");
+                if (!$headerRow.is("tr")) $headerRow = $headerRow.find("tr").first();
+
+                var $newTh = $headerRow.find(`th.risk-col[data-risk-id="${riskCount}"]`).first();
+                if (!$newTh.length) {
+                    console.error("New header not found");
                 } else {
-                    // Assign the same color to the full colspan range
-                    const color = columnColors[startingCol] || '#f0f0f0';
-                    
-                    for (let c = startingCol; c < startingCol + colspan; c++) {
-                        columnColors[c] = color; // Ensure all spanned columns match
-                    }
-                }
-            });
-
-            // Apply colors to all cells in their respective columns
-            grid.forEach((row) => {
-                row.forEach((cell, colIndex) => {
-                    if (cell && cell !== 'span' && columnColors[colIndex]) {
-                        cell.style.backgroundColor = columnColors[colIndex];
-                    }
-                });
-            });
-        });
-    }
-
-
-
-    document.querySelectorAll('.table-collapsible-bar').forEach(bar => {
-        bar.addEventListener('click', function() {
-            // alert("Hekllo");
-            const content = this.nextElementSibling; // The table-content div
-            const isCollapsed = this.classList.contains('collapsed');
-
-            if (isCollapsed) {
-                this.classList.remove('collapsed');
-                content.style.display = 'block';
-            } else {
-                this.classList.add('collapsed');
-                content.style.display = 'none';
-            }
-        });
-    });
-
-    $(document).on('input change', 'table', function (e) {
-        checkCellValueAndHighlight(e);
-    });
-
-    // Also trigger when new rows or tables are added
-    const observer = new MutationObserver(() => {
-        checkCellValueAndHighlight();
-    });
-
-    observer.observe(document.body, { childList: true, subtree: true });
-
-    function checkCellValueAndHighlight(e) {
-
-        // // // console.log("highlight:", e.target);
-        // // // console.log("highlight:", e.target);
-
-        var rowIdCount = {};
-
-        const tables = document.querySelectorAll('table'); // Select all tables
-
-        tables.forEach(table => {
-
-            if (table.id != ""){
-                const headerRows = table.querySelectorAll('thead tr');
-                if (headerRows.length < 2) return; // Ensure there are at least 2 header rows
-
-                const headerRow1 = headerRows[0]; // First header row (main headers)
-                const rows = table.querySelectorAll('tbody tr'); // All body rows
-
-                let startCol = 2; // Start after skipping SNO and items columns
-
-                headerRow1.querySelectorAll('th').forEach((th, index) => {
-                    if (index < 2) return; // Skip SNO and items
-
-                    const colspan = th.getAttribute('colspan') ? parseInt(th.getAttribute('colspan')) : 1;
-                    const rowspan = th.getAttribute('rowspan') ? parseInt(th.getAttribute('rowspan')) : 1;
-                    const compareIndices = [...Array(colspan).keys()].map(i => i + startCol); // Get column indices to compare
-
-                    rows.forEach(row => {
-                        const cells = row.querySelectorAll('td');
-                        compareRange(cells, compareIndices);
+                    // compute visual column index (sum of colspans of preceding THs)
+                    var targetVisualIndex = 0;
+                    $headerRow.children("th").each(function() {
+                        if (this === $newTh[0])
+                            return false; // stop when we reach the inserted header
+                        targetVisualIndex += parseInt($(this).attr("colspan")) || 1;
                     });
 
-                    startCol += colspan; // Move to the next set of columns
-                });
-            }else{
+                    // occupied[col] = how many more rows this visual column is still covered by an earlier rowspan
+                    var occupied = [];
 
-                const headerRows = table.querySelectorAll('thead tr');
-                // // console.log("Header rows in highlight:", headerRows);
-                if (headerRows.length < 2) return; // Ensure there are at least 2 header rows
+                    $("#policyTable tbody tr").each(function() {
+                        var $tr = $(this);
+                        var $tds = $tr.children("td");
+                        var visual = 0;
+                        var inserted = false;
 
-                const headerRow1 = headerRows[0]; // First header row (main headers)
-                const rows = table.querySelectorAll('tbody tr'); // All body rows
+                        for (var i = 0; i < $tds.length; i++) {
+                            // skip visual columns already occupied by rowspans
+                            while (occupied[visual] > 0) visual++;
 
-                let startCol = 2; // Start after skipping SNO and items columns
-                let rowSpanStartCol = 1;
+                            var $td = $tds.eq(i);
 
-                headerRow1.querySelectorAll('th').forEach((th, index) => {
-                    if (index < 2) return; // Skip SNO and items
+                            // get the full inline style string (if any)
+                            var inlineStyle = $td.attr("style");
 
-                    let colspan = th.getAttribute('colspan') ? parseInt(th.getAttribute('colspan')) : 1;
-                    // // console.log('colspan:', colspan);
+                            // get just the background-color (works whether inline or CSS-applied)
+                            var bgColor = $td.css("background-color");
 
-                    const compareIndices = [...Array(colspan).keys()].map(i => i + startCol); // Get column indices to compare
-                    // // console.log("Compare indices:", compareIndices);
+                            var colspan = parseInt($td.attr("colspan")) || 1;
+                            var rowspan = parseInt($td.attr("rowspan")) || 1;
 
-                    let rowIdCount = {}; // Reset rowIdCount for each column group
+                            // if target is exactly at this visual start -> insert before this cell
+                            if (targetVisualIndex === visual) {
+                                $td.before(
+                                    `<td style="background-color:${bgColor}" class="risk-col" data-risk-id="${riskCount}"></td>`);
+                                inserted = true;
+                                break;
+                            }
 
-                    rows.forEach(row => {
-                        const rowId = row.id;
-                        // // console.log("Row ID:", rowId);
+                            // if target falls inside this spanning cell -> insert after this cell
+                            if (targetVisualIndex > visual && targetVisualIndex < visual +
+                                colspan) {
+                                $td.after(`<td style="background-color:${bgColor}" class="risk-col" data-risk-id="${riskCount}"></td>`);
+                                inserted = true;
+                                break;
+                            }
 
-                        if (rowIdCount[rowId] === undefined) {
-                            rowIdCount[rowId] = 0;
-                        } else {
-                            rowIdCount[rowId]++;
+                            // mark columns as occupied by this cell's rowspan
+                            for (var k = 0; k < colspan; k++) {
+                                occupied[visual + k] = rowspan;
+                            }
+
+                            visual += colspan;
                         }
-                        // // console.log("Row ID Count:", rowIdCount[rowId]);
 
-                        let dynamicStartCol = rowIdCount[rowId] > 0 ? rowSpanStartCol : startCol;
-                        // // console.log("Dynamic Start Col:", dynamicStartCol);
+                        if (!inserted) {
+                            // if not inserted yet, append at the end of the row
+                            $tr.append(`<td class="risk-col" data-risk-id="${riskCount}"></td>`);
+                        }
 
-                        const dynamicCompareIndices = [...Array(colspan).keys()].map(i => i + dynamicStartCol);
-                        // // console.log("Dynamic Compare Indices:", dynamicCompareIndices);
-
-                        const cells = row.querySelectorAll('td');
-                        compareRange(cells, dynamicCompareIndices);
+                        // decrease occupied counters for next row
+                        for (var c = 0; c < occupied.length; c++) {
+                            if (occupied[c] > 0) occupied[c]--;
+                        }
                     });
 
-                    startCol += colspan; // Move to the next set of columns
-                    rowSpanStartCol += colspan; // Move to the next set of columns
+                    // restore editability (if desired)
+                    $("#policyTable tbody tr").find("td:not(:first-child)").attr("contenteditable", "true");
+                }
 
+            } else {
 
+                // Editing existing location
+                let riskId = editingLocationIndex;
+                risk_location_details[riskId] = {
+                    name: locationName,
+                    address: locationAddress,
+                    construction_type: construction_type,
+                    has_basement: has_basement,
+                    basement_utilisation: basement_utilisation,
+                    occupancy_risk: occupancy_risk,
+                    iib_code: iib_code,
+                    business_description: business_description
+                };
+
+                // Update header
+                $(`.risk-col[data-risk-id="${riskId}"]`).first().html(`
+
+                        <div class="loc-details" style="text-align: center;">
+                            <div style="font-weight: bold;">Risk Location ${riskId}</div>
+                            <div style="font-size: 11px; color: #666; margin-top: 2px;">
+                                <span class="loc_name" style="display: block;">${locationName}</span>
+                                <span class="loc_address" style="display: block;">${locationAddress}</span>
+                            </div>
+                        </div>
+
+                        <div class="dropdown d-inline-block float-end loc-menu">
+                            <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                                &#x22EE;
+                            </button>
+                            <ul class="dropdown-menu dropdown-menu-end">
+                                <li><a class="dropdown-item edit-location" href="#" data-risk-id="${riskId}">Edit</a></li>
+                                <li><a class="dropdown-item text-danger remove-location" href="#" data-risk-id="${riskId}">Remove</a></li>
+                                <li><a class="dropdown-item toggle-collapse" href="#" data-risk-id="${riskId}" data-type="risk">Collapse</a></li>
+                                <li class="dropdown-item">
+                                    <label class="form-check-label">
+                                        <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-risk-id="${riskCount}" checked >
+                                        QCR
+                                    </label>
+                                </li>
+                                <li class="dropdown-item">
+                                    <label class="form-check-label">
+                                        <input type="checkbox" class="form-check-input me-2 client-check-col" data-risk-id="${riskCount}" checked>
+                                        Client
+                                    </label>
+                                </li>
+                            </ul>
+                        </div>
+                    `);
+            }
+
+            // Clear form and close modal
+            $("#riskLocationForm")[0].reset();
+            editingLocationIndex = null;
+            $('.close').click();
+
+            console.log("Risk Location JSON:", JSON.stringify(risk_location_details, null, 2));
+        });
+
+        // Add Insurer button click - show modal
+        $("#addInsurer").click(function() {
+            // $("#insurerModal").modal('show');
+            $('#insurerSelect2').val('').select2();
+            var myModal = new bootstrap.Modal(document.getElementById('insurerModal'));
+            myModal.show();
+        });
+
+        // Insurer selection from modal
+        $(document).off("click", "#insurer_save").on("click", "#insurer_save", function(e) {
+
+            const $selected = $("#insurerSelect2 option:selected");
+            const insurerId = $selected.data("id");   // from data-id
+            let insurerName = $selected.val();      // from value="..."
+            const insurerText = $selected.text();     // visible text
+
+            console.log("ID:", insurerId);
+            console.log("Value:", insurerName);
+            console.log("Text:", insurerText);
+
+            if(!insurerName){
+                alert('Please select the insurer');
+                return;
+            }
+
+            // if(insurer_details[insurerCount] && insurer_details[insurerCount].id == insurerId && insurer_details[insurerCount].name == insurerName){
+            //     if (confirm('Duplicate insurer found. Do you continue with version control?')) {
+            //         insurerName = insurerName + '-V' + insurerVersionCount;
+            //         insurerVersionCount++;
+            //     }
+            // }
+
+            if (insurer_details[insurerCount] 
+                && insurer_details[insurerCount].id === insurerId 
+                && insurer_details[insurerCount].name === insurerName) {
+
+                if (confirm("Duplicate insurer found. Do you want to continue with version control?")) {
+                    // Initialize version counter if not already set
+                    insurer_details[insurerCount].version = (insurer_details[insurerCount].version || 1) + 1;
+
+                    // Append version suffix
+                    insurerName = insurerName + "-V" + insurer_details[insurerCount].version;
+                }
+            }
+
+            // Case 1: Editing existing insurer
+            if (editingInsurerId !== null) {
+
+                insurer_details[editingInsurerId] = {
+                    id: insurerId,
+                    name: insurerName,
+                };
+
+                // Update header text
+                const $header = $(`.insurer-col[data-insurer-id="${editingInsurerId}"]`);
+                $header.contents().first()[0].textContent = insurerName + " ";
+
+                // Update all rows for this insurer column
+                $("#policyTable tbody tr").each(function() {
+                    const $cell = $(this).find(
+                        `td.insurer-col[data-insurer-id="${editingInsurerId}"]`);
+                    $cell.html("--"); // or keep old value if you prefer
                 });
 
-            }
-            
-        });
+                editingInsurerId = null;
+                $('.close').click();
+                console.log("Insurer Details JSON:", JSON.stringify(insurer_details, null, 2));
 
-        
-    }
-
-    function compareRange(cells, indices) {
-        if (cells.length === 0) return; // Ensure cells exist
-
-        const baseValue = cells[indices[0]]?.textContent.trim(); // Get base value safely
-        // // // console.log("cell index : baseValue",baseValue);
-        indices.forEach(index => {
-
-            // // // console.log("cell index : ",cells[index].textContent.trim());
-            if (!cells[index]) return; // Skip if index is out of bounds
-
-            if (cells[index].textContent.trim() !== baseValue) {
-                cells[index].classList.add('bold'); // Highlight mismatched cells
-            } else {
-                cells[index].classList.remove('bold');
-            }
-        });
-    }
-
-</script>
-
-<!-- Export Excel and Mail Script -->
-<script>
-    var proposalDataForDropDown = {};
-    var user_role_id = <?= get_role_id(); ?>;
-
-    const editorConfig = {
-        buttons: [
-            "bold",
-            "italic",
-            "strikethrough",
-            "|",
-            "superscript",
-            "subscript",
-            "|",
-            "align",
-            "fontsize",
-            "|",
-            "source" // Add the "source" button for editing HTML
-        ],
-        fontsize: ["8px", "10px", "12px", "14px", "16px", "18px", "20px", "22px", "24px"], // Font sizes in pixels
-        showPlaceholder: false,
-        toolbarButtonSize: "small",
-        toolbarAdaptive: false,
-        saveHeightInStorage: true,
-        minHeight: 400,
-        height: 400, // Optional fixed height
-        defaultMode: "1", // Start in WYSIWYG mode
-        enableDragAndDropFileToEditor: true, // Allow file uploads via drag and drop
-        placeholder: "Start typing here...", // Optional placeholder text
-    };
-
-    $(document).ready(function() {
-
-        const path = window.location.pathname; // Get the current URL path
-        const segments = path.split('/'); // Split the path into segments
-        const lead_id = segments[segments.length - 2]; // Get the second last segment (15)
-        const rfq_type = segments[segments.length - 1]; // Get the last segment (2)
-
-        // // console.log('Lead ID:', lead_id);
-        // // console.log('Type:', rfq_type);
-
-        let excel_url = '<?= base_url('leads/exportQCRandRFQ/') ?>' + lead_id + '/' + rfq_type + '/' + 2
-        // // console.log(excel_url, excel_url);
-
-        $('#submitExcel').attr('data-url', excel_url);
-
-        $('#cc').select2({
-            placeholder: 'Select CC Mail',
-        });
-
-        $('#placement_cc').select2({
-            placeholder: 'Select CC Mail',
-        });
-
-        $('#proposals').select2({
-            placeholder: 'Select proposal',
-        });
-
-        $('#placement_to').select2({
-            placeholder: 'Select TO Mail',
-        });
-
-        $('#to').select2({
-            placeholder: 'Select TO Mail',
-        });
-
-        $("textarea.select2-search__field").attr('rows', '1');
-        $("textarea.select2-search__field").css('resize', 'none');
-
-        let placementLeadData = <?= isset($lead_data) && isset($lead_data['proposel_data']) ? json_encode($lead_data['proposel_data']) : 'null'; ?>;
-        // // // console.log('placementLeadData', placementLeadData);
-
-        if (placementLeadData) {
-            placementLeadData = JSON.parse(placementLeadData);
-            let txt = 'The data has already been sent to the insurer ' +
-                placementLeadData.insurer_name +
-                ' and the proposal is ' +
-                placementLeadData.proposel_name + '.';
-            $('#alert_msg').text(txt);
-        } else {
-            $('#alert_msg').text('');
-            // // console.log('placementLeadData is null or undefined.');
-        }
-
-
-        // Initialize the Jodit editor
-        const editor = Jodit.make("#placement_mail_content", editorConfig);
-
-        const editor2 = Jodit.make("#internal_mail_content", editorConfig);
-
-        var placement_date_datePicker = flatpickr("#placement_date", {
-            dateFormat: "d-m-Y",
-            allowInput: false,
-        });
-
-        var payment_date_datePicker = flatpickr("#payment_date", {
-            dateFormat: "d-m-Y",
-            allowInput: false,
-        });
-        
-        var policy_start_date_datePicker = flatpickr("#policy_start_date", {
-            dateFormat: "d-m-Y",
-            allowInput: false,
-        });
-
-        var policy_end_date_datePicker = flatpickr("#policy_end_date", {
-            dateFormat: "d-m-Y",
-            allowInput: false,
-        });
-
-
-    })
-
-    async function checkTheTableDataChanged(redirect_type) {
-
-        if (!isSaved){
-            const proceed = await confirmUnsavedChanges();
-            // if (!proceed) {}
-            // return;
-        }
-
-        if (redirect_type == 1) {
-            //BACK BUTTON
-            window.location.href = "<?= base_url("leads/list") ?>"
-
-        } else if (redirect_type == 2) {
-            //EXCEL EXPORT
-            // let url = $('#submitExcel').data('url');
-            
-            let lead_id = $('#lead_id').val();
-            let url = '<?= base_url('leads/exportQCRandRFQ/') ?>' + lead_id + '/' + rfq_or_qcr + '/' + 2
-
-            window.location.href = url;
-
-        } else if (redirect_type == 3) {
-            //INSURER OR CLIENT MAIL SEND
-            showModal(1);
-
-        } else if (redirect_type == 4) {
-            //INTERNAL MAIL SEND
-            showModal(2);
-
-        } else if (redirect_type == 5) {
-            //PROCCED TO QCR
-            // submitQCRData();
-            let lead_id = $('#lead_id').val();
-            let url = '<?= base_url('rfq/list/') ?>' + lead_id + '/' + 2;
-            window.location.href = url;
-
-        } else if (redirect_type == 6) {
-            //INTERNAL MAIL SEND
-            showModal(3);
-
-        }
-    }
-
-    function showModal(mail_type) {
-
-        if (mail_type == 1) {
-
-            insurerAndClientMailPopUp()
-
-        } else if (mail_type == 2) {
-
-            var myModal = new bootstrap.Modal(document.getElementById('internal_mail_modal'));
-            myModal.show();
-
-            // getMailContent('internal_mail_content');
-
-        } else if (mail_type == 3) {
-
-            placementMailPopUp()
-            // getMailContent('placement_mail_content');
-
-        }
-
-    }
-
-    function insurerAndClientMailPopUp() {
-
-        var url = '';
-        var lead_id = $('#lead_id').val();
-
-        if (rfq_or_qcr == 2) {
-            $('#myCenterModalLabel').text('Client contact to send mail')
-            url = '<?= base_url('leads/list/') ?>' + lead_id;
-        } else {
-            $('#myCenterModalLabel').text('Choose insurer to send mail')
-            url = '<?= base_url('util/getLevelContects') ?>'
-        }
-
-        ajaxRequestForGetMailData(url);
-
-        var myModal = new bootstrap.Modal(document.getElementById('list_model'));
-        myModal.show();
-    }
-
-    function placementMailPopUp() {
-
-        // // console.log(proposalDataForDropDown);
-
-        const selectElement = document.getElementById('proposals');
-
-        // Clear existing options
-        selectElement.innerHTML = '<option value="">Select Proposals</option>';
-
-        // Loop through the proposal data and append options
-        for (const [proposalKey, proposalValue] of Object.entries(proposalDataForDropDown.over_all_column_data)) {
-            proposalValue.insurers.forEach(insurer => {
-                const option = document.createElement('option');
-                option.value = insurer.id;
-                option.setAttribute("data-id", `${proposalKey}-${insurer.display_name}`);
-                option.textContent = `${proposalKey} - ${insurer.display_name}`;
-                selectElement.appendChild(option);
-            });
-        }
-
-        // Show the modal
-        const myModal = new bootstrap.Modal(document.getElementById('placement_mail_modal'));
-        myModal.show();
-    }
-
-    function ajaxRequestForGetMailData(url) {
-
-        // // console.log(url);
-
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-
-        $.ajax({
-            url: url,
-            type: "GET",
-            dataType: 'json',
-            success: function(res) {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                appendInput(res.data)
-            },
-            error: function(xhr, status, error) {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                // console.error(xhr.responseText);
-                // console.error(status, error);
-            }
-        });
-    }
-
-    function appendInput(data) {
-
-        // // console.log(data);
-        var lead_id = $('#lead_id').val();
-        $('#input_for_row').empty();
-        let html = '';
-
-        if (rfq_or_qcr == 2) {
-
-            const url = '<?= base_url('leads/list') ?>?lead_id=' + lead_id;
-
-            html += `
-                <div class="form-group col-md-4">
-                    <label for="contact_mail">Client Contact Mail</label>
-                    <input value="${data.contact_person_email || ''}" type="text" id="contact_mail" class="form-control" placeholder="Contact Mail" readonly>
-                </div>
-            `;
-
-            if (!data.contact_person_email) {
-                html += `
-                    <div class="form-group col-md-4">
-                        <a href="${url}">Click here to update mail ID</a>
-                    </div>
-                `;
+                return;
             }
 
-            if (user_role_id == 1 || user_role_id == 5) {
+            // Case 2: Adding new insurer (existing logic)
+            insurerCount++;
 
-                html += `
-
-                    <div class="form-group col-md-4">
-                        <label for="client_cc">CC </label>
-                        <select class="form-control" id="client_cc" name="client_cc" required multiple>
-                            <?php if (isset($userList)) { ?>
-                                <?php foreach ($userList as $user) { ?>
-                                    <option value="<?= $user['id']; ?>">
-                                        <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                    </option>
-                                <?php } ?>
-                            <?php } ?>
-                        </select>   
-                    </div>
-
-                    <div class="form-group col-md-4">
-                        <label for="client_bcc">BCC </label>
-                        <select class="form-control" id="client_bcc" name="client_bcc" required multiple>
-                            <?php if (isset($userList)) { ?>
-                                <?php foreach ($userList as $user) { ?>
-                                    <option value="<?= $user['id']; ?>">
-                                        <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                    </option>
-                                <?php } ?>
-                            <?php } ?>
-                        </select>   
-                    </div>
-            `;
-
-            }
-
-            html += `
-                <div class="form-group col-md-12">
-                    <label for="mail_subject">Subject</label>
-                    <input type="text" id="mail_subject" class="form-control" value="'<?= isset($subject) ? $subject : " " ?>'" placeholder="Subject">
-                </div>
-            `;
-
-        } else {
-            // Assuming `data.contacts` is an array of contact objects within the main data object
-            const contacts = data || {};
-
-            html = `
-                <div class="form-group col-md-4">
-                    <label for="insurerContact">Insurers</label>
-                    <select id="insurerContact" class="form-control" name="insurerContact[]" multiple>
-                        <option></option>
-            `;
-
-            // Loop through each contact property within the `contacts` object
-            for (const id in contacts) {
-                const contact = contacts[id];
-                html += `
-                    <option value="${contact.id}">${contact.insurer_name} - ${contact.branch_code} - ${contact.contact_person_name} - ${contact.contact_person_email}</option>
-                `;
-            }
-
-            html += `
-                    </select>
-                </div>
-            `;
-
-            html += `
-
-                <div class="form-group col-md-4">
-                    <label for="client_cc">CC </label>
-                    <select class="form-control" id="client_cc" name="client_cc" required multiple>
-                        <?php if (isset($userList)) { ?>
-                            <?php foreach ($userList as $user) { ?>
-                                <option value="<?= $user['id']; ?>">
-                                    <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                </option>
-                            <?php } ?>
-                        <?php } ?>
-                    </select>   
-                </div>
-
-                <div class="form-group col-md-4">
-                    <label for="client_bcc">BCC </label>
-                    <select class="form-control" id="client_bcc" name="client_bcc" required multiple>
-                        <?php if (isset($userList)) { ?>
-                            <?php foreach ($userList as $user) { ?>
-                                <option value="<?= $user['id']; ?>">
-                                    <?= $user['first_name'] . ' - ' . $user['email']; ?>
-                                </option>
-                            <?php } ?>
-                        <?php } ?>
-                    </select>   
-                </div>
-            `;
-
-            html += `
-                <div class="form-group col-md-12">
-                    <label for="mail_subject">Subject</label>
-                    <input value="<?= isset($subject) ? $subject : " " ?>" type="text" id="mail_subject" class="form-control" placeholder="Subject">
-                </div>
-            `;
-
-        }
-
-        html += `
-                    <div class="form-group col-md-12">
-                        <label for="insurer_and_client_mail_content">Mail Content</label>
-                        <textarea id="insurer_and_client_mail_content" class="form-control" name="insurer_and_client_mail_content" rows="3"><?= isset($mail_content) ? $mail_content : " " ?></textarea>
-                    </div>
-                `;
-
-        $('#input_for_row').append(html);
-
-        // Initialize select2 for the dropdown if insurerContact is present
-        if ($('#insurerContact').length) {
-
-            $('#insurerContact').select2({
-                placeholder: 'Select an Insurer',
-            });
-
-            $("textarea.select2-search__field").attr('rows', '1');
-            $("textarea.select2-search__field").css('resize', 'none');
-        }
-
-        // Initialize select2 for the dropdown if Client is present
-        if ($('#client_cc').length) {
-
-            $('#client_cc').select2({
-                placeholder: 'Select an CC',
-            });
-
-            $('#client_bcc').select2({
-                placeholder: 'Select an BCC',
-            });
-
-            $("textarea.select2-search__field").attr('rows', '1');
-            $("textarea.select2-search__field").css('resize', 'none');
-        }
-
-        // Initialize the Jodit editor
-        const editor = Jodit.make("#insurer_and_client_mail_content", editorConfig);
-
-        // getMailContent('insurer_and_client_mail_content');
-
-    }
-
-    function constructURL(url_type) {
-
-        if (url_type == 1) {
-            constructURL_ForInsurerAndClientMailSend()
-        } else if (url_type == 2) {
-            constructURL_ForInternalMailSend()
-        } else if (url_type == 3) {
-
-            Swal.fire({
-                title: "Do you want to place the proposal data?",
-                // text: "Do you want Save this!",
-                icon: "warning",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#d33",
-                confirmButtonText: "Yes, Procced!"
-            }).then((result) => {
-                if (result.isConfirmed) {
-                    constructURL_ForPlacementMailSend()
-                } else {
-                    return false;
-                }
-            });
-        }
-    }
-
-    // Insurer and Client Mail
-    function constructURL_ForInsurerAndClientMailSend() {
-
-        var lead_id = $('#lead_id').val();
-        var mail_content = $('#insurer_and_client_mail_content').val();
-        var subject = $('#mail_subject').val();
-        var bcc = $('#client_bcc').val();
-        var cc = $('#client_cc').val();
-
-        // // console.log('lead_id', lead_id)
-        // // console.log('subject', subject)
-        // // console.log('mail_content', mail_content)
-        // // console.log('bcc', bcc)
-        // // console.log('cc', cc)
-
-        // Convert cc to JSON string
-        cc = cc.map(Number);
-        cc = JSON.stringify(cc);
-
-        // Convert bcc to JSON string
-        bcc = bcc.map(Number);
-        bcc = JSON.stringify(bcc);
-
-        var selectedFiles = [];
-        $('#insurer_or_clinet_mail_attachment .multi_file_attachment:checked').each(function () {
-            selectedFiles.push($(this).val());
-        });
-
-        // Prepare FormData object
-        var formData = new FormData();
-        formData.append('lead_id', lead_id);
-        formData.append('mail_content', mail_content);
-        formData.append('subject', subject);
-        formData.append('cc', cc);
-        formData.append('bcc', bcc);
-        formData.append('selected_attachment_files', JSON.stringify(selectedFiles));
-
-
-        if (rfq_or_qcr == 2) {
-            formData.append('file_type', 'qcr');
-            formData.append('recipient_type', 'client');
-            formData.append('recipient_mail', '');
-        } else {
-            var insurerContact = $('#insurerContact').val();
-            insurerContact = insurerContact.map(Number);
-            formData.append('file_type', 'rfq');
-            formData.append('recipient_type', 'insurer');
-            formData.append('recipient_mail', JSON.stringify(insurerContact));
-        }
-
-        ajaxRequest(formData)
-        // // console.log('formData', formData)
-
-    }
-
-    //Internal Mail
-    function constructURL_ForInternalMailSend() {
-
-        var lead_id = $('#lead_id').val();
-        let to = $('#to').val();
-        let mail_content = $('#internal_mail_content').val();
-        let subject = $('#subject').val();
-        let cc = $('#cc').val();
-
-        // Convert cc to JSON string
-        cc = cc.map(Number);
-        cc = JSON.stringify(cc);
-
-        // Determine file type
-        var file_type = rfq_or_qcr == 2 ? 'qcr' : 'rfq';
-
-        var selectedFiles = [];
-        $('#internal_mail_attachment .multi_file_attachment:checked').each(function () {
-            selectedFiles.push($(this).val());
-        });
-
-
-        // Create FormData
-        var formData = new FormData();
-        formData.append('lead_id', lead_id);
-        formData.append('file_type', file_type);
-        formData.append('recipient_type', 'internal');
-        formData.append('to', to);
-        formData.append('cc', cc);
-        formData.append('subject', subject);
-        formData.append('mail_content', mail_content);
-        formData.append('recipient_mail', ''); // Empty value as per logic
-        formData.append('selected_attachment_files', JSON.stringify(selectedFiles));
-
-
-        ajaxRequest(formData)
-
-    }
-
-    //placement mail
-    function constructURL_ForPlacementMailSend() {
-
-        var lead_id = $('#lead_id').val();
-        let to = $('#placement_to').val();
-        let placement_date = $('#placement_date').val();
-        let payment_date = $('#payment_date').val();
-        let utr_no = $('#utr_no').val();
-        let premium_amount = $('#premium_amount').val();
-        let total_amount = $('#total_amount').val();
-        let cd_amount = $('#cd_amount').val();
-        let subject = $('#placement_subject').val();
-        let mail_content = $('#placement_mail_content').val();
-        let proposal_insurer = $('#proposals option:selected').data('id');
-        let insurer_and_branch = $('#proposals').val();
-        let cc = $('#placement_cc').val();
-        let is_cd = $("#is_cd_switch").is(":checked") ? 1 : 0;
-        let no_of_installment = $('#no_of_installment').val();
-        let is_installment = $("#is_installment_switch").is(":checked") ? 1 : 0;
-        let policy_end_date = $('#policy_end_date').val();
-        let policy_start_date = $('#policy_start_date').val();
-
-
-
-        // Process `to` field
-        to = to.split(',').map(email => email.trim());
-        // cc = cc.map(Number); // or split if it's a string: `cc.split(',').map(email => email.trim())`
-
-
-        var selectedFiles = [];
-        $('#placement_mail_attachment .multi_file_attachment:checked').each(function () {
-            selectedFiles.push($(this).val());
-        });
-
-        let data = [];
-
-        $('#installment_form_row .form-row').each(function () {
-            var lead_id = $('#lead_id').val();
-            let installment_amount = $(this).find('input[name="installment_amount[]"]').val();
-            let payment_date = $(this).find('input[name="payment_date[]"]').val();
-            let utr_no = $(this).find('input[name="utr_no[]"]').val();
-            let id = $(this).find('input[name="installment_primary_key[]"]').val();
-            
-
-
-            console.log('installment_primary_key', id);
-
-            let obj = {
-                lead_id: lead_id,
-                installment_amount: installment_amount,
-                payment_date: payment_date,
-                utr_no: utr_no
+            // Add the insurer details to the JSON
+            insurer_details[insurerCount] = {
+                id: insurerId,
+                name: insurerName,
             };
 
-            if (id != undefined && id != null && id != '') {
-                obj.id = id;
-            }
+            const header = `
+                <th class="insurer-col" data-insurer-id="${insurerCount}" data-insurer-pk="${insurerId}">
+                    ${insurerName}
+                    <div class="dropdown d-inline-block float-end">
+                        <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                            &#x22EE;
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item edit-insurer" href="#" data-insurer-id="${insurerCount}">Edit</a></li>
+                            <li><a class="dropdown-item text-danger remove-insurer" href="#" data-insurer-id="${insurerCount}" data-type="insurer">Remove</a></li>
+                            <li><a class="dropdown-item toggle-collapse" href="#" data-insurer-id="${insurerCount}" data-type="insurer">Collapse</a></li>
+                        </ul>
+                    </div>
+                </th>
+            `;
 
-            data.push(obj);
+            let $actionHeader = $("#policyHeader th").filter(function() {
+                return $(this).text().trim().toLowerCase().includes("action");
+            }).first();
+            if (!$actionHeader.length) $actionHeader = $("#policyHeader th").last();
+
+            $actionHeader.before(header);
+
+            $("#policyTable tbody tr").each(function() {
+                const $row = $(this);
+                const $actionCell = $row.children("td").last();
+                var bgColor = $actionCell.css("background-color");
+                const prevData = $row.children("td.insurer-col").last().html(); // for getting from the last insurer value
+                const prevData2 = $row.children("td.sum_insured").html(); // for getting from the total sum insured
+                const cellHtml =
+                    `<td style="background-color:${bgColor}" class="insurer-col" data-insurer-id="${insurerCount}">${prevData2 != null ? prevData2 : "--"}</td>`;
+                $actionCell.before(cellHtml);
+                $row.find("td:not(:first-child)").attr("contenteditable", "true");
+            });
+
+            $('#insurerSelect2').val('').select2();
+            $('.close').click();
+
+            console.log("Insurer Details JSON:", JSON.stringify(insurer_details, null, 2));
         });
 
+        // Remove Risk Location Column
+        $(document).on("click", ".remove-location", function(e) {
+            e.preventDefault();
+            let riskId = $(this).data('risk-id');
 
-        // Prepare FormData
-        var formData = new FormData();
-        formData.append('lead_id', lead_id);
-        formData.append('file_type', rfq_or_qcr == 2 ? 'qcr' : 'rfq');
-        formData.append('recipient_type', 'placement');
-        formData.append('recipient_mail', JSON.stringify(to));
-        formData.append('cc', JSON.stringify(cc));
-        formData.append('subject', subject);
-        formData.append('proposal_insurer', proposal_insurer);
-        formData.append('insurer_and_branch', insurer_and_branch);
-        formData.append('placement_date', placement_date);
-        formData.append('payment_date', payment_date);
-        formData.append("is_cd",is_cd);
-        formData.append('utr_no', utr_no);
-        formData.append('premium_amount', premium_amount);
-        formData.append('total_amount', total_amount);
-        formData.append('cd_amount', cd_amount);
-        formData.append('mail_content', mail_content);
-        formData.append('selected_attachment_files', JSON.stringify(selectedFiles));
-        formData.append('installments', JSON.stringify(data));
-        formData.append('no_of_installment', no_of_installment);
-        formData.append('is_installment', is_installment);
-        formData.append('policy_end_date', policy_end_date);
-        formData.append('policy_start_date', policy_start_date);
+            if (confirm('Are you sure you want to remove this risk location?')) {
+                $(`.risk-col[data-risk-id="${riskId}"]`).remove();
+                $(`.index-val-col[data-index-value-id="${riskId}"]`).remove();
+                delete risk_location_details[riskId];
 
+                // Update risk count if needed
+                let remainingRisks = Object.keys(risk_location_details).length;
+                if (remainingRisks === 0) {
+                    riskCount = 0;
+                }
+            }
+        });
 
-        ajaxRequest(formData);
+        // Remove Insurer Column
+        $(document).on("click", ".remove-insurer", function(e) {
+            e.preventDefault();
+            let insurerId = $(this).data('insurer-id');
 
-    }
+            if (confirm('Are you sure you want to remove this insurer?')) {
+                $(`.insurer-col[data-insurer-id="${insurerId}"]`).remove();
+                // insurerCount--;
+                delete insurer_details[insurerId];
 
+                // Update insurer count if needed
+                let remainingInsurer = Object.keys(insurer_details).length;
+                if (remainingInsurer === 0) {
+                    insurerCount = 0;
+                }
 
-    function ajaxRequest(formData) {
+                console.log("Insurer Details JSON:", JSON.stringify(insurer_details, null, 2));
 
-        var apiURL = '<?= base_url('leads/sendMail') ?>';
-        // // console.log(apiURL);
+            }
+        });
 
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
+        // Edit Risk Location
+        $(document).on("click", ".edit-location", function(e) {
+            e.preventDefault();
+            let riskId = $(this).data('risk-id');
+            editingLocationIndex = riskId;
 
-        $.ajax({
-            url: apiURL,
-            type: "POST",
-            data: formData,
-            processData: false, // Required for FormData
-            contentType: false, // Required for FormData
-            dataType: 'json',
-            success: function(res) {
+            let details = risk_location_details[riskId];
 
-                console.log('MAIL SEND API RESPONSE : ', res);
+            if (details) {
 
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
+                $("#locationName").val(details.name);
+                $("#locationAddress").val(details.address);
+                $("#construction_type").val(details.construction_type);
+                $("#has_basement").prop("checked", details.has_basement);
 
-                // // console.log(res);
-                if (res.status == 'success' && res.code == 200) {
-                    toastr.success('Mail send Successfully', 'SUCCESS');
-                    if(res.is_placement == true){
-                        clearInterval(intervalId);
-                        console.log('******** Intervel Cleared ********')
-                    }
+                if (details.has_basement) {
+                    $("#basementUtilisationDiv").removeClass("d-none");
+                    $("#basement_utilisation").prop("required", true).val(details.basement_utilisation);
                 } else {
-                    if (res.messgae) {
-                        toastr.error(res.messgae, 'ERROR')
-                    } else {
-                        toastr.error('Mail send failed', 'ERROR')
-                    }
+                    $("#basementUtilisationDiv").addClass("d-none");
+                    $("#basement_utilisation").prop("required", false).val("");
                 }
 
-                $('.close').click()
-            },
-            error: function(xhr, status, error) {
+                $("#occupancy_risk").val(details.occupancy_risk).trigger("change");
+                $("#iib_code").val(details.iib_code);
+                $("#business_description").val(details.business_description);
 
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                console.error(xhr.responseText);
-                console.error(status, error);
+
+                $("#riskLocationModalLabel").text("Edit Risk Location Details");
+                $("#saveRiskLocation").text("Update Location");
+                $("#riskLocationModal").modal("show");
             }
         });
 
-        $('#to').select2({
-            placeholder: 'Select TO Mail',
+        // Handle Edit Insurer
+        $(document).on("click", ".edit-insurer", function(e) {
+            e.preventDefault();
+
+            editingInsurerId = $(this).data("insurer-id");
+            console.log('editingInsurerId : ', editingInsurerId);
+
+            $('#insurerSelect2').val('').select2();
+
+            var myModal = new bootstrap.Modal(document.getElementById('insurerModal'));
+            myModal.show();
         });
-        $('#cc').val('').select2({
-            placeholder: 'Select CC Mail'
-        });
-        // $('#subject').val('');      
-        $('#proposals').val('');
-        $('#placement_to').val('').select2({
-            placeholder: 'Select TO Mail'
-        });
-        $('#placement_cc').val('').select2({
-            placeholder: 'Select CC Mail'
-        });
-        $('#placement_subject').val('');
 
-        $("textarea.select2-search__field").attr('rows', '1');
-        $("textarea.select2-search__field").css('resize', 'none');
-    }
+        // Handle Add index value column 
+        $(document).on("click", ".add-index-value", function(e) {
+            
+            e.preventDefault();
 
-    function objectToQueryString(obj) {
-        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-    }
+            let risk_id = $(this).data("risk-id");
+            console.log('risk_id :', risk_id);
 
-    function getInsurerBranchContacts(input) {
+            // Get clicked th and its index
+            let $th = $(this).closest("th");
+            let colIndex = $th.index(); // column index in the table
+            console.log('colIndex :', colIndex)
 
-        let insurer_and_branch = $(input).val();
-        // // console.log('insurer_and_branch', insurer_and_branch);
+            // Clone the header cell
+            let $newTh = $th.clone(true); 
 
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
+            // Example: change class (remove old, add new)
+            $newTh.removeClass("risk-col").addClass("index-val-col");
 
-        $.ajax({
-            url: '<?= base_url('util/getInsurerBranchContacts/') ?>' + insurer_and_branch,
-            type: "GET",
-            dataType: 'json',
-            success: function(res) {
-                // // console.log(res)
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                if (res.status == false) {
-                    toastr.warning(res.message, 'WARNING')
+            // Remove the data-risk-id attribute
+            $newTh.removeAttr("data-risk-id");
+
+            // update data attributes
+            $newTh.attr("data-index-value-id", risk_id); 
+
+            let locationName = $th.find(".loc-details .loc_name").html() ?? "";
+            let locationAddress = $th.find(".loc-details .loc_address").html() ?? "";
+
+            console.log("locationName", locationName);
+            console.log("locationAddress", locationAddress);
+
+            let header = `
+                <div class="loc-details" style="text-align: center;">
+                    <div class="risk_location_" style="font-weight: bold;">Risk Location ${risk_id}</div>
+                    <div style="font-weight: bold;">( Indexed Value )</div>
+                    <div style="font-size: 11px; color: #666; margin-top: 2px;">
+                        <span class="loc_name" style="display: block;">${locationName}</span>
+                        <span class="loc_address" style="display: block;">${locationAddress}</span>
+                    </div>
+                </div>
+
+                <div class="dropdown d-inline-block float-end loc-menu">
+                    <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                        &#x22EE;
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-end">
+                        <li><a class="dropdown-item text-danger remove-index-value" href="#" data-index-value-id="${risk_id}">Remove</a></li>
+                        <li><a class="dropdown-item toggle-collapse" href="#" data-index-value-id="${risk_id}" data-type="index-value">Collapse</a></li>
+                        <li class="dropdown-item">
+                            <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-index-value-id="${risk_id}" checked>
+                            <label class="form-check-label">
+                                QCR
+                            </label>
+                        </li>
+                        <li class="dropdown-item">
+                            <input type="checkbox" class="form-check-input me-2 client-check-col" data-index-value-id="${risk_id}" checked>
+                            <label class="form-check-label">
+                                Client
+                            </label>
+                        </li>
+                    </ul>
+                </div>
+            `;
+
+            $newTh.html(header);
+
+            $th.after($newTh); // insert after clicked column in header
+
+            // Clone each row's td in this column
+            let skipRows = 0;
+            let baseColIndex = $th.index();
+
+            $("#policyTable tbody tr").each(function() {
+                let colIndex;
+
+                if (skipRows > 0) {
+                    skipRows--; 
+                    colIndex = baseColIndex - 1; // adjust since rowspan already occupied this column
                 } else {
-                    appendInsurerContact(res.data)
+                    colIndex = baseColIndex;
                 }
-            },
-            error: function(xhr, status, error) {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                // console.error(xhr.responseText);
-                // console.error(status, error);
-            }
-        });
-    }
 
-    function appendInsurerContact(data) {
+                let $firstTd = $(this).children("td").eq(0);
+                console.log('$firstTd', $firstTd);
 
-        // // console.log(data)
+                let rowspan = parseInt($firstTd.attr("rowspan") || 1, 10);
+                console.log('rowspan :', rowspan);
 
-        $('#placement_to').empty();
-        $('#placement_to').append($('<option>', {
-            value: '',
-            text: 'Select'
-        }));
+                if (rowspan > 1) {
+                    skipRows = rowspan - 1; // mark how many rows to skip
+                }
 
-        $.each(data, function(index, item) {
-            var option = $('<option>', {
-                value: item.id,
-                text: item.contact_person_email
+                let $td = $(this).children("td").eq(colIndex);
+                console.log('$td', $td);
+
+                if ($td.length) {
+                    let $newTd = $td.clone(false); // false = no event handlers
+
+                    $newTd.removeClass("risk-col").addClass("index-val-col");
+                    $newTd.removeAttr("data-risk-id");
+                    $newTd.attr("data-index-value-id", risk_id);
+
+                    $td.after($newTd);
+                }
             });
-            $('#placement_to').append(option);
-        });
-    }
 
-    $('.close').click(function() {
+            // Hide specific one
+            $(`.add-index-value[data-risk-id="${risk_id}"]`).hide();
+
 
-        $('#to').select2({
-            placeholder: 'Select TO Mail',
         });
 
-        $('#cc').val('').select2({
-            placeholder: 'Select CC Mail'
-        });
-        // $('#subject').val('');      
-        $('#proposals').val('');
-        $('#placement_to').val('').select2({
-            placeholder: 'Select TO Mail'
-        });
-        $('#placement_cc').val('').select2({
-            placeholder: 'Select CC Mail'
-        });
-        $('#placement_subject').val('');
+        // Remove Index value Column
+        $(document).on("click", ".remove-index-value", function(e) {
+            e.preventDefault();
+            let riskId = $(this).data('index-value-id');
+            console.log('riskId :', riskId)
 
-        $("textarea.select2-search__field").attr('rows', '1');
-        $("textarea.select2-search__field").css('resize', 'none');
-    })
-
-
-    function addOrRemoveIconInsurer(element, event) {
-        event.stopPropagation(); // Prevent event bubbling
-
-        // Find the button inside the dropdown (or use `element` directly)
-        const stcButton = element.closest('.dropdown-content') ?
-            element.closest('.dropdown-content').querySelector('.sendInsurerClientProposal') :
-            element;
-
-        // Check if the icon already exists
-        let icon = stcButton.querySelector("i.fa-check-square");
-
-        if (icon) {
-            // Remove the icon if it already exists
-            icon.remove();
-        } else {
-            // Create and append the check icon
-            createIcon(stcButton);
-        }
-    }
-
-    function monitorTableChanges() {
-    console.log("monitoring table changes");
-    const table = document.querySelector("table");
-    if (!table) return;
-
-    const firstRow = table.querySelector("tbody tr");
-    if (!firstRow) return;
-
-    const cells = firstRow.querySelectorAll("td");
-    const headerRow1 = table.querySelector("thead tr:nth-child(1)");
-    const headerRow2 = table.querySelector("thead tr:nth-child(2)");
-    if (!headerRow1 || !headerRow2) return;
-
-    const mainHeaders = headerRow1.querySelectorAll("th");
-    const subHeaders = headerRow2.querySelectorAll("th");
-
-    subHeaders.forEach((subHeader, index) => {
-        const subHeaderText = subHeader.textContent.trim();
-        const mainHeaderText = mainHeaders[index]?.textContent.trim();
-
-        // Check if subheader is "Sum Insured" and main header starts with "Proposal" or "Exis"
-        if (subHeaderText === "Sum Insured" && /^(Proposal|Exis)/i.test(mainHeaderText)) {
-            const proposalValue = subHeader.getAttribute("data-proposal");
-
-            if (index < cells.length) {
-                const cell = cells[index];
-                let previousValue = "";
-
-                cell.addEventListener("focus", function () {
-                    previousValue = this.textContent.trim();
-                });
-
-                cell.addEventListener("blur", function () {
-                    const newValue = this.textContent.trim();
-                    if (newValue !== previousValue) {
-                        tdChanged = true;
-                        changedNewSI = newValue;
-                        $("#policySI").val(newValue);
-                        console.log("new Value proposalValue", changedNewSI);
-                        console.log("proposalValue",proposalValue);
-                        updateAddON(newValue, proposalValue);
-                        console.log("Sum Insured value changed to:", newValue);
-                    }
-                });
+            if (confirm('Are you sure you want to remove this Index value?')) {
+                $(`.index-val-col[data-index-value-id="${riskId}"]`).remove();
+                // Hide specific one
+                $(`.add-index-value[data-risk-id="${riskId}"]`).show();
             }
-        }
-    });
-}
+        });
 
+        // Main policy checkbox toggle
+        $(".policy").on("change", function() {
 
-    function updateAddON(newValue,proposalValue = null) {
-        console.log("Function called");
-        var table = document.getElementById("fire_addOnCoverage");
+            let policy = $(this).val();
+            let policy_color = getRandomLightColor();
 
-        console.log("table : ",table);
-        if (!table) return;
+            if ($(this).is(":checked")) {
 
-        const thead = table.querySelector("thead");
-        const tbody = table.querySelector("tbody");
-
-        if (!thead || !tbody) return;
-
-        const topHeaderCells = thead.rows[0].cells;
-        const subHeaderCells = thead.rows[1].cells;
-
-        let targetIndexes = [];
-
-        // Find indexes of columns with the required headers
-        for (let i = 0; i < topHeaderCells.length; i++) {
-            const topHeaderText = topHeaderCells[i].textContent.trim();
-            const subHeaderText = subHeaderCells[i] ? subHeaderCells[i].textContent.trim() : "";
-
-            const subheaderProposalValue = subHeaderCells[i]?.getAttribute("data-proposal");  
-            console.log("subheaderProposalValue : ",subheaderProposalValue);
-            console.log("proposalValue : ",proposalValue);
-
-            if (proposalValue != "" && proposalValue != null){
-
-                if (subheaderProposalValue !== proposalValue) {
-                    continue;
+                // Add sub-options for Fire policy
+                if (policy === "fire") {
+                    $(this).parent().after(`
+                            <div class="sub-options" id="fireOptions">
+                                <label><input type="checkbox" class="fireSub" value="fire_building" checked> Fire Building</label>
+                                <label><input type="checkbox" class="fireSub" value="fire_content" checked> Fire Content</label>
+                            </div>
+                        `);
                 }
-            }
-            
 
-            if ((topHeaderText.startsWith("Pro") || topHeaderText.startsWith("Exis")) && subHeaderText === "Sum Insured") {
-                targetIndexes.push(i);
-            }
-        }                                                                                                                                                                                                                                                                                                           
+                if (policyData[policy]) {
 
-        // Loop through the first 3 rows of tbody and update the matching cells
-        for (let rowIndex = 0; rowIndex < Math.min(3, tbody.rows.length); rowIndex++) {
-            const row = tbody.rows[rowIndex];
-            targetIndexes.forEach(colIndex => {
-                if (row.cells[colIndex]) {
-                    console.log("Found row to update")
-                    if (['fire_stfi', 'fire_eq'].includes(row.id)) {  
-                        row.cells[colIndex].textContent = newValue;
-                    }
+                    let data = policyData[policy];
+                    let rows = [];
 
-                    if (row.id == "fire_terrorism"){
-                        if (storedPolicyData){
+                    Object.keys(data).forEach(key => {
 
-                            console.log("storedPolicyData : ",storedPolicyData);
-                            var is_terrorism = storedPolicyData.fire.policyDetails.terrorism;
+                        let value = data[key];
+                        console.log('value', value);
+                        console.log('value type', typeof value);
 
-                            console.log("is terrorism",is_terrorism);
-                            if (is_terrorism == "yes"){
-                                row.cells[colIndex].textContent = `Yes, ${newValue}`;
-                            }else{
-                                row.cells[colIndex].textContent = "No"
+                        if (key === "particulars") {
 
+                            let rowId = `row-${policy}`;
+
+                            // Build row with proper number of columns
+                            let row =
+                                `<tr class="policy-details" id="${rowId}" data-policy="${policy}" data-key="${key}" data-index="0">
+                                    <td>${formatHeader(policy)}  <i class="mdi mdi-arrow-collapse-up policy-collapse" data-policy="${policy}" aria-hidden="true"></i></td> 
+                                    <td class="particulars" contenteditable="true" id="${rowId}-particulars">${formatParticulars(value)}</td>`;
+
+                            // Add empty cells for risk locations
+                            for (let i = 0; i < riskCount; i++) {
+                                row += `<td contenteditable="true" class="risk-col"></td>`;
                             }
-                        }else{
-                            row.cells[colIndex].textContent = "No"
+
+                            // Add sum insured cell
+                            row +=
+                                `<td class="sum_insured" contenteditable="true">${data.sum_insured || "50000000"}</td>`;
+
+                            // Add index sum insured cell
+                            row +=
+                                `<td class="index_sum_insured" contenteditable="true">${data.index_sum_insured || "50000000"}</td>`;
+
+                            // Add empty cells for insurers
+                            for (let i = 0; i < insurerCount; i++) {
+                                row += `<td contenteditable="true" class="insurer-col"></td>`;
+                            }
+
+                            // Add QCR column
+                            let qcrId = `qcrCheckbox_${rowId}`;
+                            row += `<td contenteditable="false" class="action"></td>`;
+                            row += `</tr>`;
+
+                            rows.push(row);
+
+                            // $("#policyTable tbody").append(row);
+                            // $(`#${rowId}`).fadeIn();
+                        } else if (Array.isArray(value) && key == "premium") {
+                            value.forEach((item, index) => {
+                                let rowId = `row-${policy}-${key}-${index}`;
+                                let firstCell = index === 0 ?
+                                    `<td rowspan="${value.length}">${formatHeader(key)}</td>` :
+                                    "";
+
+                                let row = `<tr class="policy-details" id="${rowId}" data-policy="${policy}" data-key="${key}" data-index="${index}" data-array-length="${value.length}">
+                                        ${firstCell}
+                                        <td class="particulars" contenteditable="true">${item}</td>`;
+
+                                // Add empty cells for risk locations
+                                for (let i = 0; i < riskCount; i++) {
+                                    row +=
+                                        `<td contenteditable="true" class="risk-col"></td>`;
+                                }
+
+                                // Add sum insured cell
+                                row +=
+                                    `<td class="sum_insured" contenteditable="true"></td>`;
+
+                                // Add index sum insured cell
+                                row +=
+                                    `<td class="index_sum_insured" contenteditable="true"></td>`;
+
+                                // Add empty cells for insurers
+                                for (let i = 0; i < insurerCount; i++) {
+                                    row +=
+                                        `<td contenteditable="true" class="insurer-col"></td>`;
+                                }
+
+                                // Add QCR column
+                                let qcrId = `qcrCheckbox_${rowId}`;
+                                row += `<td contenteditable="false" class="action" ></td>`;
+
+                                row += `</tr>`;
+                                rows.push(row);
+
+                                // $("#policyTable tbody").append(row);
+                                // $(`#${rowId}`).fadeIn();
+                            });
+                        } else if (Array.isArray(value) && key !== "particulars") {
+                            value.forEach((item, index) => {
+                                let rowId = `row-${policy}-${key}-${index}`;
+                                let firstCell = index === 0 ?
+                                    `<td rowspan="${value.length}">${formatHeader(key)}</td>` :
+                                    "";
+
+                                let row = `<tr class="policy-details ${policy}_${key}" id="${rowId}" data-policy="${policy}" data-key="${key}" data-index="${index}" data-array-length="${value.length}">
+                                        ${firstCell}
+                                        <td class="particulars" contenteditable="true">${item.name}</td>`;
+
+                                // Add empty cells for risk locations
+                                for (let i = 0; i < riskCount; i++) {
+                                    row +=
+                                        `<td contenteditable="true" class="risk-col"></td>`;
+                                }
+
+                                // Add sum insured cell
+                                row +=
+                                    `<td class="sum_insured" contenteditable="true">${item.default_answer || "50000000"}</td>`;
+
+                                // Add index sum insured cell
+                                row +=
+                                    `<td class="index_sum_insured" contenteditable="true">${item.default_answer || "50000000"}</td>`;
+
+                                // Add empty cells for insurers
+                                for (let i = 0; i < insurerCount; i++) {
+                                    row +=
+                                        `<td contenteditable="true" class="insurer-col"></td>`;
+                                }
+
+                                // Add QCR column
+                                let qcrId = `qcrCheckbox_${rowId}`;
+                                row += `<td contenteditable="false" class="action">
+                                        <input class="qcr-checkbox" id="${qcrId}" name="qcr" type="checkbox" checked>
+                                        <label for="${qcrId}">QCR</label>
+                                        <input class="client-checkbox" name="stc" type="checkbox" checked> 
+                                        <label> Client </label>
+                                        <button class="btn btn-primary btn-sm btn-add-row">+</button>
+                                    <button class="btn btn-danger btn-sm btn-remove-row">-</button>
+                                    </td>`;
+
+                                row += `</tr>`;
+                                rows.push(row);
+
+                                // $("#policyTable tbody").append(row);
+                                // $(`#${rowId}`).fadeIn();
+                            });
+                        } else if (key === "excess") {
+                            // Normal string/value row
+
+                            let rowId = `row-${policy}-${key}`;
+                            let row = `<tr class="policy-details ${policy}_${key}" id="${rowId}" data-policy="${policy}" data-key="${key}" data-index="0">
+                                    <td rowspan="1" contenteditable="true">${formatHeader(key)}</td>
+                                    <td class="particulars" contenteditable="true">${formatParticulars(value)}</td>`;
+
+                            // Add empty cells for risk locations
+                            for (let i = 0; i < riskCount; i++) {
+                                row += `<td contenteditable="true" class="risk-col"></td>`;
+                            }
+
+                            // Add sum insured cell
+                            row +=
+                                `<td class="sum_insured" contenteditable="true">${data.sum_insured || "50000000"}</td>`;
+
+                            // Add index sum insured cell
+                            row +=
+                                `<td class="index_sum_insured" contenteditable="true">${data.sum_insured || "50000000"}</td>`;
+
+                            // Add empty cells for insurers
+                            for (let i = 0; i < insurerCount; i++) {
+                                row += `<td contenteditable="true" class="insurer-col"></td>`;
+                            }
+
+                            // Add QCR column
+                            let qcrId = `qcrCheckbox_${rowId}`;
+                            row += `<td contenteditable="false" class="action">
+                                    <input class="qcr-checkbox" id="${qcrId}" name="qcr" type="checkbox" checked>
+                                    <label for="${qcrId}">QCR</label>
+                                    <input class="client-checkbox" name="stc" type="checkbox" checked> <label> Client </label>
+                                    <button class="btn btn-primary btn-sm btn-add-row">+</button>
+                                    <button class="btn btn-danger btn-sm btn-remove-row">-</button>
+                                </td>`;
+
+                            row += `</tr>`;
+                            rows.push(row);
+
+                            // $("#policyTable tbody").append(row);
+                            // $(`#${rowId}`).fadeIn();
+
                         }
-                    }
-                }
-            });
-        }
-    }
-
-    function changeTerrorism(newValue){
-
-        storedPolicyData = JSON.parse(localStorage.getItem('policyData'));
-
-        console.log("Stroredpolicy data : ",storedPolicyData);
-
-        console.log("Change terrorism Function Called");
-        var table = document.getElementById("fire_addOnCoverage");
-        if (!table) return;
-
-        const thead = table.querySelector("thead");
-        const tbody = table.querySelector("tbody");
-
-        if (!thead || !tbody) return;
-
-        const topHeaderCells = thead.rows[0].cells;
-        const subHeaderCells = thead.rows[1].cells;
-
-        let targetIndexes = [];
-
-        // Find indexes of columns with the required headers
-        for (let i = 0; i < topHeaderCells.length; i++) {
-            const topHeaderText = topHeaderCells[i].textContent.trim();
-            const subHeaderText = subHeaderCells[i] ? subHeaderCells[i].textContent.trim() : "";
-
-
-            if ((topHeaderText.startsWith("Pro") || topHeaderText.startsWith("Exis")) && subHeaderText === "Sum Insured") {
-                targetIndexes.push(i);
-            }
-        }                                                                                                                                                                                                                                                                                                           
-
-        // Loop through the first 3 rows of tbody and update the matching cells
-        for (let rowIndex = 0; rowIndex < Math.min(3, tbody.rows.length); rowIndex++) {
-            const row = tbody.rows[rowIndex];
-            targetIndexes.forEach(colIndex => {
-                if (row.cells[colIndex]) {
-
-                    if (row.id == "fire_terrorism"){
-                        console.log("Found the row");
-                        if (storedPolicyData){
-
-                            console.log("storedPolicyData : ",storedPolicyData);
-                            var is_terrorism = storedPolicyData.fire.policyDetails.terrorism;
-                            updateAddON(newValue);
-                            if (is_terrorism == "yes"){
-                                row.cells[colIndex].textContent = `Yes, ${newValue}`;
-                            }else{
-                                row.cells[colIndex].textContent = "No"
-
-                            }
-                        }else{
-                            row.cells[colIndex].textContent = "No"
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    document.addEventListener('input', function (e) {
-        if (e.target.matches('td[contenteditable]')) {
-            isSaved = false;
-            // alert("status changed");
-        }
-    });
-
-    async function confirmUnsavedChanges() {
-
-        const result = await Swal.fire({
-        title: 'Unsaved changes',
-        text: 'Please save your changes before continuing.',
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonText: 'Save Now',
-        cancelButtonText: 'Cancel'
-        });
-
-        if (result.isConfirmed) {
-        saveRFQ();
-        return true;
-        }
-
-        return false;
-    }
-
-    $(document).on("input", "#cd_amount, #premium_amount", function() {
-
-        // alert("Function called");
-
-        var cd_amount = parseInt($("#cd_amount").val()) || 0;
-        var premium_amount = parseInt($("#premium_amount").val()) || 0;
-
-        var total_amount = (cd_amount + premium_amount);
-        $("#total_amount").val(total_amount);
-
-
-    });
-
-    $("#is_cd_switch").change(function (){
-        var switch_status = ($("#is_cd_switch").is(":checked")? "on" : "off");
-        console.log("Switch status",switch_status);
-        if (switch_status == "on"){
-
-            $("#cd_amount").show();
-            $("#total_amount").show();
-            $("#cd_amount").closest('.form-group').show();
-            $("#total_amount").closest('.form-group').show();
-
-        }else{
-
-            $("#cd_amount").hide();
-            $("#total_amount").hide();
-            $("#cd_amount").closest('.form-group').hide();
-            $("#total_amount").closest('.form-group').hide();
-
-        }
-    })
-
-    $("#is_installment_switch").change(function (){
-       
-        var switch_status = ($(this).is(":checked")? "on" : "off");
-        console.log("Switch status",switch_status);
-        if (switch_status == "on"){
-            $("#no_of_installment").show();
-            $("#payment_date").hide();
-            $("#utr_no").hide();
-            $("#no_of_installment").closest('.form-group').show();
-            $("#payment_date").closest('.form-group').hide();
-            $("#utr_no").closest('.form-group').hide();
-            let $installmentContainer = $('#installment_form_row');
-            let row_count = $installmentContainer.find('.form-row').length;
-
-            if (row_count == 0 ) { addInstallmentHTML()}
-            // addInstallmentHTML()
-        }else{
-            console.log("inside else")
-
-            let $installmentContainer = $('#installment_form_row');
-            let row_count = $installmentContainer.find('.form-row').length;
-            let remove_count = $("#no_of_installment").val();
-            let lead_id = $('#lead_id').val();
-            console.log("row count",row_count);
-            if (row_count > 0 ) {
-                let ids = $installmentContainer.find('.form-row').slice(-remove_count).find('input[name="installment_primary_key[]"]').map(function() {
-                    return $(this).val();
-                }).get();
-                Swal.fire({
-                    title: "Do you want to remove all the entries?",
-                    icon: "warning",
-                    showCancelButton: true,
-                    confirmButtonColor: "#3085d6",
-                    cancelButtonColor: "#d33",
-                    confirmButtonText: "Yes, Proceed!"
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        let url = '<?= base_url('util/removeInstallments') ?>';
-                        let requestData = { id: ids,'lead_id': lead_id};
-
-                       if (requestData.id.length == 0) {
-
-                            $("#no_of_installment").hide();
-                            $("#payment_date").show();
-                            $("#utr_no").show();
-                            $("#no_of_installment").closest('.form-group').hide();
-                            $("#payment_date").closest('.form-group').show();
-                            $("#utr_no").closest('.form-group').show();
-                            $('#installment_form_row').empty();
-                            $('#no_of_installment').val(""); 
-
-                            return;
-                       }
-
-                        $('.loader').fadeIn();
-                        $('.loader-mask').fadeIn();
-
-                        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-                            console.log('Data fetched successfully:', response);
-
-                            if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
-                                $("#no_of_installment").hide();
-                                $("#payment_date").show();
-                                $("#utr_no").show();
-                                $("#no_of_installment").closest('.form-group').hide();
-                                $("#payment_date").closest('.form-group').show();
-                                $("#utr_no").closest('.form-group').show();
-                                $('#installment_form_row').empty();
-                                $('#no_of_installment').val("");
-                                newhtml = `
-                                <div class="form-group col-md-3">
-                                    <label for="payment_date">Payment Date</label>
-                                    <input type="text" class="form-control payment_date" id="payment_date" name="payment_date" placeholder="DD/MM/YYY">
-                                </div>
-
-                                <div class="form-group col-md-3">
-                                    <label for="utr_no">UTR No.</label>
-                                    <input type="text" class="form-control" id="utr_no" name="utr_no" placeholder="Enter UTR No.">
-                                </div>
-                               `;
-                                 $('#not_installment').append(newhtml);
-                                 $('.payment_date').flatpickr({
-                                    dateFormat: 'd-m-Y',
-                                });
-                            } else {
-                                toastr.error(response.message, 'WARNING');
-                            }
-
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-
-                        }, function(xhr, status, error) {
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-                            console.error('Error fetching data:', error);
-                            console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
-                        });
-                    }else{
-                        // alert("Inside else");
-                        $('#no_of_installment').val(row_count);
-                        // $("#is_installment_switch").bootstrapToggle('on');
-                        // $('#is_installment_switch').val('1').change();
-                        // $('#is_installment_switch').bootstrapToggle('on');
-                        // $('#is_installment_switch').prop('checked', true).trigger('change');
-                        $('#is_installment_switch').trigger('click'); // in some cases, this forces the CSS to update
-
-
-                    }
-                });
-            }
-            
-        }
-    })
-
-    $('#no_of_installment').on('change', function () {
-        let no_of_installments = parseInt($(this).val());
-        let $installmentContainer = $('#installment_form_row');
-        let row_count = $installmentContainer.find('.form-row').length;
-
-        console.log("Form row count:", row_count);
-
-        if (row_count === 1) {
-            // $installmentContainer.empty();
-            for (let index = 0; index < no_of_installments - 1; index++) {
-                addInstallmentHTML();
-            }
-        } else if (no_of_installments === row_count) {
-            console.log('Same row count, no change needed.');
-        } else if (no_of_installments < row_count) {
-
-            // Remove extra rows from the end
-            let remove_count = row_count - no_of_installments;
-            let ids = $installmentContainer.find('.form-row')
-            .slice(-remove_count)
-            .find('input[name="installment_primary_key[]"]')
-            .map(function() {
-                return $(this).val();
-            }).get();
-
-            console.log('ids', ids);
-
-            if (Object.keys(ids).length > 0) {
-                Swal.fire({
-                    title: "Do you want to remove the last " + (remove_count ?? "") + " entries?",
-                    icon: "warning",
-                    showCancelButton: true,
-                    confirmButtonColor: "#3085d6",
-                    cancelButtonColor: "#d33",
-                    confirmButtonText: "Yes, Proceed!"
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        let url = '<?= base_url('util/removeInstallments') ?>';
-                        let requestData = { id: ids };
-
-                        $('.loader').fadeIn();
-                        $('.loader-mask').fadeIn();
-
-                        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-                            console.log('Data fetched successfully:', response);
-
-                            if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
-                                $installmentContainer.find('.form-row').slice(-remove_count).remove();
-                            } else {
-                                toastr.error(response.message, 'WARNING');
-                            }
-
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-
-                        }, function(xhr, status, error) {
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-                            console.error('Error fetching data:', error);
-                            console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
-                        });
-                    }else{
-                        $('#no_of_installment').val(row_count);
-                    }
-                });
-            } else {
-                $installmentContainer.find('.form-row').slice(-remove_count).remove();
-            }
-
-        } else if (no_of_installments > row_count) {
-            // Add extra rows from the end
-            let add_count = no_of_installments - row_count;
-            for (let index = 0; index < add_count; index++) {
-                addInstallmentHTML();
-            }
-        } else {
-            // Add missing rows
-            let add_count = no_of_installments - row_count;
-            for (let index = 0; index < add_count; index++) {
-                addInstallmentHTML();
-            }
-        }
-    });
-
-    function addInstallmentHTML() {
-        let html = `
-            <div class="form-row align-items-end">
-                <div class="form-group col-md-3">
-                    <label for="installment_amount">Installment Amount</label>
-                    <input type="text" class="form-control" name="installment_amount[]" placeholder="Enter Amount">
-                </div>
-
-                <div class="form-group col-md-3">
-                    <label for="payment_date">Payment Date</label>
-                    <input type="text" class="form-control payment_date" name="payment_date[]" placeholder="DD/MM/YYYY">
-                </div>
-
-                <div class="form-group col-md-3">
-                    <label for="utr_no">UTR No.</label>
-                    <input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No.">
-                </div>
-
-                <div class="form-group col-md-2">
-                    <button type="button" class="btn btn-danger remove-installment">X</button>
-                </div>
-            </div>
-        `;
-
-        $('#installment_form_row').append(html);
-
-        $('.payment_date').flatpickr({
-            
-            dateFormat: 'd-m-Y',
-        });
-    }
-
-    $(document).ready(function(){
-        setTimeout(function(){
-            $('.payment_date').flatpickr({
-                dateFormat: 'd-m-Y',
-            });
-        }, 2000)
-
-        // $('#is_installment_switch').bootstrapToggle();
-
-    })
-
-    $(document).on('click', '.remove-installment', function () {
-        let $this = $(this); // Store reference to the clicked element
-        let row_count = $('#installment_form_row .form-row').length;
-        console.log("row_count", row_count);
-
-        let id = $this.closest('.form-row').find('input[name="installment_primary_key[]"]').val() ?? null;
-        console.log("id", id);
-        let ids = id ? [id] : [];
-        console.log("ids", ids);
-
-        if (id != null && row_count > 1) {
-            Swal.fire({
-                title: "Do you want to remove this?",
-                icon: "warning",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#d33",
-                confirmButtonText: "Yes, Proceed!"
-            }).then((result) => {
-                if (result.isConfirmed) {
-                    let url = '<?= base_url('util/removeInstallments') ?>';
-                    let requestData = { id: ids };
-
-                    $('.loader').fadeIn();
-                    $('.loader-mask').fadeIn();
-
-                    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-                        console.log('Data fetched successfully:', response);
-
-                        if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
-
-                            $this.closest('.form-row').remove();
-                            let updated_row_count = $('#installment_form_row .form-row').length;
-                            $('#no_of_installment').val(updated_row_count);
-                            console.log("after remove row_count", updated_row_count);
-                        } else {
-                            toastr.error(response.message, 'WARNING');
-                        }
-
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-
-                    }, function(xhr, status, error) {
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-                        console.error('Error fetching data:', error);
-                        console.error(xhr.responseText);
-                        toastr.error('An error occurred while removing the installment.', 'ERROR');
                     });
+
+                    // Insert all rows at once in correct order
+                    if (rows.length > 0) {
+
+                        let $rows = $(rows.join(""));
+                        insertPolicyRows($rows, policy);
+                        $rows.hide().fadeIn();
+
+                        // 🎨 Add random light color for each <td>
+                        $rows.find("td").each(function () {
+                            $(this).css("background-color", policy_color);
+                        });
+                    }
+                }
+
+            } else {
+                // Remove policy rows and sub-options
+                $(`.policy-details[id^="row-${policy}"]`).fadeOut(function() {
+                    $(this).remove();
+                });
+
+                if (policy === "fire") {
+                    $("#fireOptions").remove();
+                }
+            }
+        });
+        
+        // Handle the policy order
+        function insertPolicyRows(row, policy) {
+            let newPriority = policyOrder[policy] || 999; // default lowest if not found
+            let inserted = false;
+
+            $("#policyTable tbody tr.policy-details").each(function() {
+                let existingPolicy = $(this).data("policy");
+                let existingPriority = policyOrder[existingPolicy] || 999;
+
+                if (newPriority < existingPriority) {
+                    $(this).before(row);
+                    inserted = true;
+                    return false; // break loop
                 }
             });
-        } else {
-            if (row_count > 1) {
-                $this.closest('.form-row').remove();
-                let updated_row_count = $('#installment_form_row .form-row').length;
-                $('#no_of_installment').val(updated_row_count);
-                console.log("after remove row_count", updated_row_count);
-            } else {
-                console.log("Only one row left. Not removing.");
+
+            if (!inserted) {
+                $("#policyTable tbody").append(row); // add at end if no higher priority found
             }
         }
+
+        // Utility: find the group's first row (the row which holds the rowspan cell)
+        function findGroupFirstRow($tr) {
+            return $tr.prevAll().addBack().filter(function() {
+                return $(this).find('td[rowspan], th[rowspan]').length > 0;
+            }).last();
+        }
+
+        // Utility: count rows that belong to the same group (from the first row until the next group header or end)
+        function countGroupRows($firstRow) {
+            if (!$firstRow || $firstRow.length === 0) return 0;
+            let count = 0;
+            let $cur = $firstRow;
+            while ($cur && $cur.length) {
+                // stop if we reach another header row (except the firstRow itself)
+                if ($cur[0] !== $firstRow[0] && $cur.find('td[rowspan], th[rowspan]').length > 0) break;
+                count++;
+                $cur = $cur.next();
+                console.log("$cur", $cur)
+            }
+
+            let excess_id = $firstRow[0].id;
+            console.log("Original ID:", excess_id);
+
+            let parts = excess_id.split('-');
+            console.log("Split parts:", parts);
+
+            let lastPart = parts[parts.length - 1];
+            console.log("Last part:", lastPart);
+
+            if (lastPart == "excess" && count > 2) {
+                count = count - 1;
+            }
+
+            return count;
+        }
+
+        // Update rowspan attribute for the group's header cell
+        function updateRowspanForGroup($anyRowInGroup) {
+            let $firstRow = findGroupFirstRow($anyRowInGroup);
+            console.log('$firstRow :', $firstRow);
+            if (!$firstRow || $firstRow.length === 0) return;
+            let $cell = $firstRow.find('td[rowspan], th[rowspan]').first();
+            console.log("$cell ", $cell)
+            if ($cell.length === 0) return;
+            let cnt = countGroupRows($firstRow);
+            console.log("rowspan cnt", cnt);
+            $cell.attr('rowspan', cnt);
+        }
+
+        // Add row handler (+) using the Action Column
+        $(document).on("click", ".btn-add-row", function(e) {
+            e.preventDefault();
+            let $tr = $(this).closest("tr");
+
+            // clone WITHOUT copying event handlers
+            let $clone = $tr.clone(false);
+
+            // remove any header cell (the rowspan cell) in the cloned row so header isn't duplicated
+            $clone.find('td[rowspan], th[rowspan]').remove();
+
+            // make ids unique in clone (and update labels pointing to them)
+            $clone.find('[id]').each(function() {
+                let $el = $(this);
+                let oldId = $el.attr('id');
+                if (!oldId) return;
+                let newId = oldId + '_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+                $el.attr('id', newId);
+                // update label[s] inside the clone that referenced oldId
+                $clone.find('label[for="' + oldId + '"]').attr('for', newId);
+            });
+
+            // clear editable cells and form fields inside clone
+            $clone.find('[contenteditable]').text();
+            $clone.find('input[type="text"], input[type="number"], textarea').val();
+            $clone.find('select').prop('selectedIndex', 0);
+            $clone.find('input[type="checkbox"], input[type="radio"]').prop('checked', true);
+
+            // insert the clone after current row
+            $tr.after($clone);
+
+            // update rowspan for this group
+            updateRowspanForGroup($tr);
+        });
+
+        // Remove row handler (-) using the Action Column
+        $(document).on("click", ".btn-remove-row", function(e) {
+            e.preventDefault();
+            let $tr = $(this).closest("tr");
+            let $firstRow = findGroupFirstRow($tr);
+            let groupCount = countGroupRows($firstRow);
+
+            if (confirm('Are you sure you want to remove this ROW?')) {
+                // If this row contains the header (rowspan cell)
+                let $headerCell = $tr.find('td[rowspan], th[rowspan]').first();
+
+                if ($headerCell.length > 0) {
+                    // If it's the only row in the group, prevent removal
+                    if (groupCount <= 1) {
+                        alert("Cannot remove the last row of this group.");
+                        return;
+                    }
+
+                    // Move header cell to the next row, then remove the current row
+                    let $next = $tr.next();
+                    if ($next.length === 0) {
+                        alert("Cannot remove header row (no next row to move header to).");
+                        return;
+                    }
+                    let $detachedHeader = $headerCell.detach(); // remove but keep element
+                    // prepend header cell to the next row (so it becomes the group's new first row)
+                    $next.prepend($detachedHeader);
+                    // now remove the original row
+                    $tr.remove();
+
+                    // update rowspan based on the new first row
+                    updateRowspanForGroup($next);
+                } else {
+                    // normal row removal (not a header)
+                    if (groupCount <= 1) {
+                        // safety: if groupCount is 1 and row is not header, still avoid leaving group empty
+                        alert("Cannot remove the last row of this group.");
+                        return;
+                    }
+                    $tr.remove();
+                    // update rowspan referring to the group's header (pass any neighbor row)
+                    updateRowspanForGroup($firstRow);
+                }
+            }
+        });
+
+        // Fire sub-options handling ( Fire content, Fire building ) using the checkbox 
+        $(document).on("change", ".fireSub", function() {
+
+            let data = policyData["fire"];
+            let value = data['risk_split_up']
+            let policy = "fire"
+            console.log(value);
+
+            let bg = "";
+            $('tr.fire_risk_split_up').each(function() {
+                bg = $(this).find('td:first').css('background-color');
+                console.log(bg);
+            });
+            console.log('bg color :', bg);
+
+
+
+            $('.fire_risk_split_up').remove();
+
+            let fireBuilding = $(".fireSub[value='fire_building']");
+            let fireContent = $(".fireSub[value='fire_content']");
+
+            let fireBuildingChecked = fireBuilding.is(":checked");
+            let fireContentChecked = fireContent.is(":checked");
+
+            // Prevent both from being unchecked
+            if (!fireBuildingChecked && !fireContentChecked) {
+                $(this).prop("checked", true);
+                return;
+            }
+
+            let fireParticularsContainer = $("#row-fire-particulars");
+            if (fireParticularsContainer.length > 0) {
+                let content = "";
+
+                if (fireBuildingChecked) {
+                    content += policyData["fire"].particulars.fire_building + "<br><br>";
+                    $('.fire_risk_split_up').remove();
+                    appendBuildingAndContent(value, "Buildings", bg);
+                }
+
+                if (fireContentChecked) {
+                    content += policyData["fire"].particulars.fire_content;
+                    $('.fire_risk_split_up').remove();
+                    appendBuildingAndContent(value, "Contents", bg);
+                }
+
+                if (fireBuildingChecked && fireContentChecked) {
+                    $('.fire_risk_split_up').remove();
+                    appendBuildingAndContent(value, "All", bg);
+                }
+
+                fireParticularsContainer.html(content);
+            }
+        });
+
+        // function for append the Fire sub option rows
+        function appendBuildingAndContent(value, type, bgColor) {
+
+            console.log(value);
+
+            if (type === "Buildings") {
+                value = value.slice(0, 1);
+            } else if (type === "Contents") {
+                value = value.slice(1); // keep all except index 0
+            } else {
+                value = value;
+            }
+
+            let firstTwo = value.slice(0, 2);
+
+            // Get remaining items
+            let remaining = value.slice(2);
+
+            console.log("✅ First 2 items:", firstTwo);
+            console.log("✅ Remaining items:", remaining);
+
+            let row = ""; // ✅ initialize correctly
+
+            value.forEach((item, index) => {
+                let condition = true;
+
+                if (condition) {
+
+                    let policy = "fire";
+                    let key = "risk_split_up";
+                    let rowId = `row-${policy}-${key}-${index}`;
+
+                    let firstCell = index === 0 ? `<td style="background-color:${bgColor}" rowspan="${value.length}">${formatHeader(key)}</td>` : "";
+
+                    row += `<tr class="policy-details fire_risk_split_up" 
+                                    id="${rowId}" 
+                                    data-policy="${policy}" 
+                                    data-key="${key}" 
+                                    data-index="${index}" 
+                                    data-array-length="${value.length}">
+                                    ${firstCell}
+                                    <td style="background-color:${bgColor}" class="particulars" contenteditable="true">${item.name}</td>`;
+
+                    // Empty cells for risk locations
+                    for (let i = 0; i < riskCount; i++) {
+                        row += `<td style="background-color:${bgColor}" contenteditable="true" class="risk-col"></td>`;
+                    }
+
+                    // Sum insured cell
+                    row += `<td style="background-color:${bgColor}" class="sum_insured" contenteditable="true">${item.default_answer}</td>`;
+
+                    // index Sum insured cell
+                    row += `<td style="background-color:${bgColor}" class="index_sum_insured" contenteditable="true">${item.default_answer}</td>`;
+
+                    // Insurer cells
+                    for (let i = 0; i < insurerCount; i++) {
+                        row += `<td style="background-color:${bgColor}" contenteditable="true" class="insurer-col"></td>`;
+                    }
+
+                    // Action column
+                    let qcrId = `qcrCheckbox_${rowId}`;
+                    row += `<td style="background-color:${bgColor}" class="action">
+                                    <input class="qcr-checkbox" id="${qcrId}" name="qcr" type="checkbox" checked>
+                                    <label for="${qcrId}">QCR</label>
+                                    <input class="client-checkbox" name="stc" type="checkbox" checked> <label> Client </label>
+                                    <button class="btn btn-primary btn-sm btn-add-row">+</button>
+                                    <button class="btn btn-danger btn-sm btn-remove-row">-</button>
+                                </td>`;
+
+                    row += `</tr>`;
+                }
+            });
+
+            // ✅ insert rows after #row-fire
+            if (row) {
+                $("#row-fire").after(row);
+            }
+        }
+
+        // Formats particulars (array, object, or string) into an HTML-friendly string
+        function formatParticulars(particulars) {
+            if (Array.isArray(particulars)) {
+                return particulars.join("<br>");
+            } else if (typeof particulars === "object" && particulars !== null) {
+                return Object.values(particulars).join("<br><br>");
+            } else {
+                return particulars || "";
+            }
+        }
+
+        // Converts a string with underscores into a human-readable ( Example: "risk_split_up" → "Risk Split Up" )
+        function formatHeader(str) {
+
+            if (!str) return "";
+
+            // Replace underscores with spaces and capitalize
+            let words = str.replace(/_/g, ' ').split(' ');
+            words = words.map(word => word.charAt(0).toUpperCase() + word.slice(1));
+            return words.join(' ');
+        }
+
+        // Convert labels to snake_case keys
+        function toSnakeCase(str) {
+            return str.toLowerCase().replace(/\s+/g, "_").replace(/-/g, "_");
+        }
+
+        // Builds a JSON object of policies with their active status and selected sub-options
+        function buildPolicyJson() {
+            active_policy_data = {};
+            $("#policyCheckboxes .policy").each(function() {
+                let policy = $(this).val();
+                let isChecked = $(this).is(":checked") ? 1 : 0;
+
+                active_policy_data[policy] = {
+                    active: isChecked,
+                    options: {}
+                };
+
+                // If checked, capture sub-options
+                let subOptions = $(this).closest("label").next(".sub-options").find("input");
+                subOptions.each(function() {
+                    let optionKey = toSnakeCase($(this).val());
+                    active_policy_data[policy].options[optionKey] = $(this).is(":checked") ? 1 : 0;
+                });
+            });
+        }
+
+        // Listen for changes
+        $("#policyCheckboxes").on("change", "input[type=checkbox]", function() {
+            buildPolicyJson();
+            console.log("Updated Policy JSON:", JSON.stringify(active_policy_data, null, 2));
+        });
+
+        // This is for the Action column QCR uncheck and check row wise check
+        $(document).on("change", ".qcr-checkbox", function() {
+            let $row = $(this).closest("td"); // find the same cell
+            if (!$(this).is(":checked")) {
+                $row.find(".client-checkbox").prop("checked", false);
+            } else {
+                $row.find(".client-checkbox").prop("checked", true);
+            }
+        });
+
+        // This function for Risk Location Cloumn show or hide in the QCR 
+        $(document).on("change", ".qcr-check-col", function() {
+            let $menu = $(this).closest(".dropdown-menu");
+
+            // If QCR is unchecked → uncheck Client in the same dropdown
+            if (!$(this).is(":checked")) {
+                $menu.find(".client-check-col").prop("checked", false);
+            } else {
+                $menu.find(".client-check-col").prop("checked", true);
+            }
+        });
+
+        // Basement show/hide 
+        $("#has_basement").on("change", function() {
+            if ($(this).is(":checked")) {
+                $("#basementUtilisationDiv").removeClass("d-none");
+                $("#basementUtilisation").prop("required", true);
+            } else {
+                $("#basementUtilisationDiv").addClass("d-none");
+                $("#basementUtilisation").prop("required", false).val("");
+            }
+        });
+
+        // Occupancy Risk → fill IIB Code
+        $("#occupancy_risk").on("change", function() {
+            let selectedText = $(this).find("option:selected").val();
+            if (selectedText) {
+                $("#iib_code").val(selectedText).prop("required", true);
+            } else {
+                $("#iib_code").val("").prop("required", false);
+            }
+        });
+
+        // Toggle policy rows on clicking the collapse icon
+        $(document).on("click", ".policy-collapse", function() {
+
+            let policy = $(this).data("policy"); // get policy from data attribute
+            console.log('policy', policy);
+            let $iconRow = $(this).closest("tr"); // row containing the clicked icon
+            console.log('iconRow', $iconRow);
+
+
+            // Find all rows of the same policy except the icon row
+            let $policyRows = $(`tr.policy-details[data-policy="${policy}"]`).not($iconRow);
+
+            // Toggle visibility
+            $policyRows.toggle();
+
+            // Optional: change icon to indicate collapse/expand
+            if ($policyRows.is(":visible")) {
+                $(this).removeClass("mdi-arrow-collapse-down").addClass("mdi-arrow-collapse-up");
+            } else {
+                $(this).removeClass("mdi-arrow-collapse-up").addClass("mdi-arrow-collapse-down");
+            }
+        });
+
+        // Sum the location value changes in any risk-col input (contenteditable)
+        $(document).on("input", "#policyTable tbody td.risk-col[contenteditable='true']", function() {
+            let $row = $(this).closest("tr"); // current row
+            let sum = 0;
+
+            // Loop through all risk-col cells in this row
+            $row.find("td.risk-col").each(function() {
+                let val = parseFloat($(this).text().replace(/,/g, '')) ||
+                    0; // remove commas and convert to number
+                sum += val;
+            });
+
+            // Update sum_insured column
+            if (sum != 0) {
+                $row.find("td.sum_insured").text(sum);
+            }
+        });
+
+        // Sum the index-value value changes in any index-val-col input (contenteditable)
+        $(document).on("input", "#policyTable tbody td.index-val-col[contenteditable='true']", function() {
+            let $row = $(this).closest("tr"); // current row
+            let sum = 0;
+
+            // Loop through all index-val-col cells in this row
+            $row.find("td.index-val-col").each(function() {
+                let val = parseFloat($(this).text().replace(/,/g, '')) ||
+                    0; // remove commas and convert to number
+                sum += val;
+            });
+
+            // Update sum_insured column
+            if (sum != 0) {
+                $row.find("td.index_sum_insured").text(sum);
+            }
+        });
+
+        // Handle collapse/expand functionality
+        document.addEventListener('click', function(e) {
+            if (e.target.classList.contains('toggle-collapse')) {
+                e.preventDefault();
+
+                const type = e.target.dataset.type;
+                console.log('type', type)
+                let id = null;
+
+                if(type === 'risk'){
+                    id = e.target.dataset.riskId;
+                }else if(type === 'insurer'){
+                    id = e.target.dataset.insurerId;
+                }else if(type === 'index-value') {
+                    id = e.target.dataset.indexValueId;
+                }
+                console.log('id', id)
+
+
+                // Find the header column
+                let headerCol;
+                if (type === 'risk') {
+                    headerCol = document.querySelector(`th.risk-col[data-risk-id="${id}"]`);
+                } else if(type === 'insurer') {
+                    headerCol = document.querySelector(`th.insurer-col[data-insurer-id="${id}"]`);
+                }else if(type === 'index-value') {
+                    headerCol = document.querySelector(`th.index-val-col[data-index-value-id="${id}"]`);
+                }
+                console.log('headerCol', headerCol)
+
+                let attrName = type === 'risk' ? 'risk-id' : type === 'insurer' ? 'insurer-id' : 'index-value-id';
+                console.log('attrName', attrName);
+
+                if (headerCol) {
+                    const isCollapsed = headerCol.classList.contains('collapsed');
+
+                    if (isCollapsed) {
+                        // Expand
+                        headerCol.classList.remove('collapsed');
+                        e.target.textContent = 'Collapse';
+
+                        // Show corresponding body cells
+                        // const bodyCells = document.querySelectorAll(`td[data-${type === 'risk' ? 'risk' : 'insurer'}-id="${id}"]`);
+                        const bodyCells = document.querySelectorAll(`td[data-${attrName}="${id}"]`);
+                        // console.log('bodyCells', bodyCells);
+                        bodyCells.forEach(cell => {
+                            cell.style.width = '';
+                            cell.style.minWidth = '';
+                            cell.style.maxWidth = '';
+                            cell.style.overflow = '';
+                            cell.style.textIndent = '';
+                        });
+
+                    } else {
+                        // Collapse
+                        headerCol.classList.add('collapsed');
+                        e.target.textContent = 'Expand';
+
+                        // Hide corresponding body cells content
+                        // const bodyCells = document.querySelectorAll(`td[data-${type === 'risk' ? 'risk' : 'insurer'}-id="${id}"]`);
+                        const bodyCells = document.querySelectorAll(`td[data-${attrName}="${id}"]`);
+                        // console.log('bodyCells', bodyCells);
+                        bodyCells.forEach(cell => {
+                            cell.style.width = '40px';
+                            cell.style.minWidth = '40px';
+                            cell.style.maxWidth = '40px';
+                            cell.style.overflow = 'hidden';
+                            cell.style.textIndent = '-9999px';
+                        });
+                    }
+                }
+            }
+        });
+
     });
+    
+    // This document ready function to handle the document init load function
+    $(document).ready(function(){
+
+        $('#insurerSelect2').select2({
+            placeholder: 'Search and select an insurer',
+            allowClear: true,
+        });
+
+    })
+
+    // Function to generate random light color
+    function getRandomLightColor() {
+        // High RGB values = lighter colors
+        let r = Math.floor(200 + Math.random() * 55); // 200–255
+        let g = Math.floor(200 + Math.random() * 55);
+        let b = Math.floor(200 + Math.random() * 55);
+        return `rgb(${r}, ${g}, ${b})`;
+    }
 
 </script>
 
-
 <script>
-    class ExcessHandler {
-        change() {
-            throw new Error("Method 'change()' must be implemented.");
-        }
-    }
 
-    class DefaultExcessHandler extends ExcessHandler {
-        constructor(typeKey) {
-            super();
-            this.typeKey = typeKey;
+    // ----------------- GENERATE JSON FROM TABLE FUNCTIONS ------------------------------------------------------------------------------------
+
+    // Function to convert table to JSON with rowspan information
+    function convertTableToJSON() {
+        const table = document.getElementById('policyTable');
+        if (!table) {
+            throw new Error('Table with ID "policyTable" not found');
         }
 
-        change() {
-            getExcessData(this.typeKey);
+        // Extract risk locations
+        const risk_locations = [];
+        const riskHeaders = table.querySelectorAll('th.risk-col');
+        riskHeaders.forEach(header => {
+
+            const riskId = header.getAttribute('data-risk-id');
+            const nameElement = header.querySelector('.loc_name');
+            const addressElement = header.querySelector('.loc_address');
+            const checkboxStates = getRiskLocationCheckboxStates(header);
+            let details = risk_location_details[riskId];
+
+            risk_locations.push({
+                id: riskId,
+                name: nameElement ? nameElement.textContent.trim() : '',
+                address: addressElement ? addressElement.textContent.trim() : '',
+                construction_type: details.construction_type,
+                has_basement: details.has_basement,
+                basement_utilisation: details.basement_utilisation,
+                occupancy_risk: details.occupancy_risk,
+                iib_code: details.iib_code,
+                business_description: details.business_descript,
+                qcr: checkboxStates.qcr,
+                client: checkboxStates.client
+            });
+
+        });
+
+        // Extract insurers
+        const insurers = [];
+        const insurerHeaders = table.querySelectorAll('th.insurer-col');
+        insurerHeaders.forEach(header => {
+            const insurerId = header.getAttribute('data-insurer-id');
+            const insurerName = header.textContent.trim().split('\n')[0];
+
+            insurers.push({
+                id: insurerId,
+                name: insurerName
+            });
+        });
+
+        // Extract policies
+        const policies = [];
+        const policyRows = table.querySelectorAll('tr[data-policy][data-key="particulars"]');
+
+        policyRows.forEach(row => {
+            
+            const policyId = row.getAttribute('data-policy');
+            const policyName = row.querySelector('td:first-child').textContent.trim();
+            const particulars = row.querySelector('td.particulars').innerHTML.trim();
+            const totalSumInsured = parseFloat(row.querySelector('td.sum_insured').textContent.trim()) || 0;
+            const indexSumInsured = parseFloat(row.querySelector('td.index_sum_insured').textContent.trim()) || 0;
+
+            // Extract policy row data (risk locations and insurers)
+            const policyRowData = extractPolicyRowData(table, policyId, risk_locations, insurers);
+
+            const policy = {
+                id: policyId,
+                name: policyName,
+                particulars: particulars.replace(/<br\s*\/?>/gi, '\n').replace(/<[^>]*>/g, ''),
+                total_sum_insured: totalSumInsured,
+                index_sum_insured: indexSumInsured,
+                risk_locations: policyRowData.risk_locations,
+                insurers: policyRowData.insurers
+            };
+
+
+            // Extract different sections for this policy
+            const sections = extractPolicySections(table, policyId, risk_locations, insurers);
+            Object.assign(policy, sections);
+
+            policies.push(policy);
+        });
+
+        return {
+            risk_locations,
+            insurers,
+            policies,
+            risk_location_details,
+            active_policy_data
+        };
+    }
+
+    function extractPolicySections(table, policyId, risk_locations, insurers) {
+        const sections = {};
+
+        // Find all rows for this policy
+        const policyRows = table.querySelectorAll(`tr[data-policy="${policyId}"]`);
+
+        // Group rows by section type (data-key attribute)
+        const sectionGroups = {};
+        policyRows.forEach(row => {
+            const key = row.getAttribute('data-key');
+            if (key && key !== 'particulars') {
+                if (!sectionGroups[key]) {
+                    sectionGroups[key] = [];
+                }
+                sectionGroups[key].push(row);
+            }
+        });
+
+        // Process each section
+        Object.keys(sectionGroups).forEach(sectionKey => {
+            const rows = sectionGroups[sectionKey];
+
+            if (sectionKey === 'excess') {
+                sections.excess = extractRowData(rows[0], risk_locations, insurers);
+            } else {
+                // const sectionName = convertSectionKey(sectionKey);
+                const sectionName = sectionKey;
+                sections[sectionName] = {
+                    items: rows.map(row => extractRowData(row, risk_locations, insurers)),
+                    rowspan: rows.length > 0 ? getRowspan(rows[0]) : 1,
+                    sectionTitle: getSectionTitle(rows[0])
+                };
+            }
+        });
+
+        return sections;
+    }
+
+    function extractPolicyRowData(table, policyId, risk_locations, insurers) {
+        
+        // console.log("table" , table)
+        // console.log("policyId" , policyId)
+        // console.log("risk_locations" , risk_locations)
+        // console.log("insurers" , insurers)
+
+        // Find the particulars row for this policy
+        const particularsRow = table.querySelector(`tr[data-policy="${policyId}"][data-key="particulars"]`);
+        console.log("particularsRow" , particularsRow)
+
+        if (!particularsRow) {
+            return { risk_locations: {}, insurers: {} };
         }
+
+        const policy_risk_locations = {};
+        const policy_insurers = {};
+
+        // Extract risk location data
+        const riskCells = particularsRow.querySelectorAll('td.risk-col');
+        riskCells.forEach(cell => {
+            const riskId = cell.getAttribute('data-risk-id');
+            // console.log("riskId" , riskId)
+            const value = cell.textContent.trim();
+            
+            policy_risk_locations[riskId] = value;
+        });
+
+        // Extract insurer data
+        const insurerCells = particularsRow.querySelectorAll('td.insurer-col');
+        insurerCells.forEach(cell => {
+            const insurerId = cell.getAttribute('data-insurer-id');
+            // console.log("insurerId" , insurerId)
+
+            const value = cell.textContent.trim();
+            
+            policy_insurers[insurerId] = value;
+        });
+
+        return {
+            risk_locations: policy_risk_locations,
+            insurers: policy_insurers
+        };
     }
 
-    const handlerMap = {
-        blu: new DefaultExcessHandler("blu"),
-        bsu: new DefaultExcessHandler("bsu"),
-        sfsp: new DefaultExcessHandler("sfsp"),
-    };
+    function extractRowData(row, risk_locations, insurers) {
 
-    function modifyExcessTable(policyType) {
-        console.log("Policy Type from register: ", policyType);
-        const handler = handlerMap[policyType];
+        const particularsCell = row.querySelector('td.particulars');
+        const sumInsuredCell = row.querySelector('td.sum_insured');
+        const indexSumInsuredCell = row.querySelector('td.index_sum_insured');
+        const qcrCheckbox = row.querySelector('input.qcr-checkbox');
+        const clientCheckbox = row.querySelector('input.client-checkbox');
 
-        if (handler instanceof ExcessHandler) {
-            handler.change();
-        } else {
-            console.error(`No handler found for policyType: ${policyType}`);
-        }
+        const data = {
+            item: particularsCell ? particularsCell.textContent.trim() : '',
+            sum_insured: sumInsuredCell ? (parseFloat(sumInsuredCell.textContent.trim()) || 0) : 0,
+            index_sum_insured: indexSumInsuredCell ? (parseFloat(indexSumInsuredCell.textContent.trim()) || 0) : 0,
+            risk_locations: {},
+            insurers: {},
+            qcr: qcrCheckbox ? qcrCheckbox.checked : false,
+            client: clientCheckbox ? clientCheckbox.checked : false
+        };
+
+        // Extract risk location values
+        risk_locations.forEach(location => {
+            const riskCell = row.querySelector(`td.risk-col[data-risk-id="${location.id}"]`);
+            data.risk_locations[location.id] = riskCell ? riskCell.textContent.trim() : '';
+        });
+
+        // Extract insurer values
+        insurers.forEach(insurer => {
+            const insurerCell = row.querySelector(`td.insurer-col[data-insurer-id="${insurer.id}"]`);
+            data.insurers[insurer.id] = insurerCell ? insurerCell.textContent.trim() : '';
+        });
+
+        return data;
     }
 
-    function getExcessData(typeKey) {
-        const fire = dynamicExcessJson["excess_fire"][0][typeKey];
-        const burglary = dynamicExcessJson["excess_burglary"]?.[0]?.[typeKey] ?? null;
-        changeExcessTableDynamic(fire, burglary);
+    function getRowspan(row) {
+        const firstCell = row.querySelector('td[rowspan]');
+        return firstCell ? parseInt(firstCell.getAttribute('rowspan')) : 1;
     }
 
-    function changeExcessTableDynamic(fire, burglary = null) {
-        console.log("fire to be changed to: ", fire);
-        setExcessRowValues("fire", fire);
-
-        if (burglary != null) {
-            console.log("Burglary to be changed: ", burglary);
-            setExcessRowValues("burglary", burglary);
-        }
+    function getSectionTitle(row) {
+        const firstCell = row.querySelector('td[rowspan]');
+        return firstCell ? firstCell.textContent.trim() : '';
     }
 
-    function setExcessRowValues(rowId, value) {
-        const table = document.getElementById("excess");
-        if (!table) return;
+    function convertSectionKey(key) {
+        return key.replace(/_([a-z])/g, (match, letter) => letter.toUpperCase());
+    }
 
-        const rows = table.querySelectorAll(`tr[data-excess-row-parent="${rowId}"]`);
-        if (!rows.length) return;
+    // Helper function to get checkbox states from risk location headers
+    function getRiskLocationCheckboxStates(header) {
+        const dropdownCheckboxes = header.querySelectorAll('.dropdown-menu input[type="checkbox"]');
+        return {
+            qcr: dropdownCheckboxes[0] ? dropdownCheckboxes[0].checked : false,
+            client: dropdownCheckboxes[1] ? dropdownCheckboxes[1].checked : false
+        };
+    }
 
-        const headerCells = table.querySelectorAll("thead tr:first-child th");
-        const subHeaderCells = table.querySelectorAll("thead tr:nth-child(2) th");
 
-        rows.forEach(row => {
-            const cells = row.querySelectorAll("td");
-            cells.forEach((cell, index) => {
-                const headerText = headerCells[index]?.textContent?.trim() || "";
-                const subHeaderText = subHeaderCells[index]?.textContent?.trim() || "";
+    // -------------  GENERATE TABLE FROM JSON FUNCTIONS  --------------------------------------------------------------
 
-                if (
-                    (headerText.startsWith("Proposal") || headerText.startsWith("Exi")) &&
-                    subHeaderText.toLowerCase() === "sum insured"
-                ) {
-                    cell.textContent = value;
+
+    // Function to generate table from JSON
+    function generateTableFromJSON(jsonData) {
+        
+        const { risk_locations, insurers, policies, active_policy_data } = jsonData;
+
+        // set the risk locations count
+        riskCount = risk_locations.length;
+
+        // set the insurer count
+        insurerCount = insurers.length;
+
+        // set the location details
+        risk_location_details = jsonData.risk_location_details;
+
+        // function for set policy checkbox
+        setActivePolicyCheckboxesFromJson(active_policy_data);
+
+        let html = `<table id="policyTable" class="table table-bordered">
+            <thead>
+                <tr id="policyHeader">
+                    <th>Policy</th>
+                    <th>Particulars</th>`;
+
+        // Add risk location headers
+        risk_locations.forEach(location => {
+            html += `
+                <th class="risk-col" data-risk-id="${location.id}">
+
+                    <div class="loc-details" style="text-align: center;">
+                        <div style="font-weight: bold;">Risk Location ${location.id}</div>
+                        <div style="font-size: 11px; color: #666; margin-top: 2px;">
+                            <span class="loc_name" style="display: block;">${location.name}</span>
+                            <span class="loc_address" style="display: block;">${location.address}</span>
+                        </div>
+                    </div>
+
+                    <div class="dropdown d-inline-block float-end loc-menu">
+                        <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                            &#x22EE;
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item edit-location" href="#" data-risk-id="${location.id}">Edit</a></li>
+                            <li><a class="dropdown-item text-danger remove-location" href="#" data-risk-id="${location.id}">Remove</a></li>
+                            <li><a class="dropdown-item toggle-collapse" href="#" data-risk-id="${location.id}" data-type="risk">Collapse</a></li>
+                            <li class="dropdown-item">
+                                <label class="form-check-label">
+                                    <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-risk-id="${location.id}" ${location.qcr ? 'checked' : ''}>
+                                    QCR
+                                </label>
+                            </li>
+                            <li class="dropdown-item">
+                                <label class="form-check-label">
+                                    <input type="checkbox" class="form-check-input me-2 client-check-col" data-risk-id="${location.id}" ${location.client ? 'checked' : ''}>
+                                    Client
+                                </label>
+                            </li>
+                        </ul>
+                    </div>
+                </th>
+            `;
+        });
+
+        html += `<th class="sum_insured">Total Sum Insured</th>`;
+
+        html += `
+            <th class="index_sum_insured">
+                Index Sum Insured &nbsp;&nbsp;
+                <div class="dropdown d-inline-block float-end loc-menu">
+                    <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                        &#x22EE;
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-end">
+                        <li class="dropdown-item">
+                            <input type="checkbox" class="form-check-input me-2 qcr-check-col" data-risk-id="${riskCount}" checked>
+                            <label class="form-check-label">
+                                QCR
+                            </label>
+                        </li>
+                        <li class="dropdown-item">
+                            <input type="checkbox" class="form-check-input me-2 client-check-col" data-risk-id="${riskCount}" checked>
+                            <label class="form-check-label">
+                                Client
+                            </label>
+                        </li>
+                    </ul>
+                </div>
+            </th>
+        `;
+
+        // Add insurer headers
+        insurers.forEach(insurer => {
+            html += `
+                    <th class="insurer-col" data-insurer-id="${insurer.id}">
+                        ${insurer.name}
+                        <div class="dropdown d-inline-block float-end">
+                            <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                                ⋮
+                            </button>
+                            <ul class="dropdown-menu dropdown-menu-end">
+                                <li><a class="dropdown-item edit-insurer" href="#" data-insurer-id="${insurer.id}">Edit</a></li>
+                                <li><a class="dropdown-item text-danger remove-insurer" href="#" data-insurer-id="${insurer.id}">Remove</a></li>
+                            </ul>
+                        </div>
+                    </th>`;
+        });
+
+        html += `<th>Action</th>
+                </tr>
+            </thead>
+            <tbody>`;
+
+        // Generate policy rows
+        policies.forEach(policy => {
+
+            // get the random_color
+            let random_color = getRandomLightColor();
+
+            // Main policy row
+            html += generatePolicyRow(policy, risk_locations, insurers, random_color);
+
+            // Generate section rows
+            Object.keys(policy).forEach(key => {
+                if (key !== 'id' && key !== 'name' && key !== 'particulars' && key !== 'total_sum_insured') {
+                    const section = policy[key];
+                    if (key === 'excess') {
+                        html += generateExcessRow(policy.id, section, risk_locations, insurers, random_color);
+                    } else if (section.items) {
+                        html += generateSectionRows(policy.id, key, section, risk_locations, insurers, random_color);
+                    }
                 }
             });
         });
+
+        html += `</tbody></table>`;
+        return html;
     }
 
-    function showTinyToast(){
-        const saveIndicator = document.getElementById('saveIndicator');
-        saveIndicator.classList.add('show');
-        setTimeout(() => {
-            saveIndicator.classList.remove('show');
-        }, 2000);
+    function generatePolicyRow(policy, risk_locations, insurers, random_color) {
+
+        let html =
+            ` <tr class="policy-details" id="row-${policy.id}" data-policy="${policy.id}" data-key="particulars" data-index="0">
+                <td style="background-color:${random_color}">${policy.name} <i class="mdi mdi-arrow-collapse-up policy-collapse" data-policy="${policy.id}" aria-hidden="true"></i></td>
+                <td style="background-color:${random_color}" class="particulars" contenteditable="true" id="row-${policy.id}-particulars">${policy.particulars}</td>`;
+
+        // Risk location cells
+        risk_locations.forEach(location => {
+            html += `<td style="background-color:${random_color}" class="risk-col" data-risk-id="${location.id}" contenteditable="true">${policy.risk_locations?.[location.id] ?? ""}</td>`;
+        });
+
+        html += `<td style="background-color:${random_color}" class="sum_insured" contenteditable="true">${policy.total_sum_insured}</td>`;
+        
+        html += `<td style="background-color:${random_color}" class="index_sum_insured" contenteditable="true">${policy.total_sum_insured}</td>`;
+
+        // Insurer cells
+        insurers.forEach(insurer => {
+            html += `<td style="background-color:${random_color}" class="insurer-col" data-insurer-id="${insurer.id}" contenteditable="true">${policy.insurers?.[insurer.id] ?? '--'}</td>`;
+        });
+
+        html += `<td style="background-color:${random_color}" contenteditable="false" class="action"></td></tr>`;
+        return html;
+    }
+
+    function generateSectionRows(policyId, sectionKey, section, risk_locations, insurers, random_color) {
+        let html = '';
+        const sectionClass = `${policyId}_${sectionKey}`;
+
+        section.items.forEach((item, index) => {
+            const isFirstRow = index === 0;
+            html +=
+                `<tr class="policy-details ${sectionClass}" id="row-${policyId}-${sectionKey}-${index}" data-policy="${policyId}" data-key="${sectionKey}" data-index="${index}" data-array-length="${section.items.length}">`;
+
+            if (isFirstRow) {
+                html += `<td style="background-color:${random_color}" rowspan="${section.rowspan}">${section.sectionTitle}</td>`;
+            }
+
+            html += `<td style="background-color:${random_color}" class="particulars" contenteditable="true">${item.item}</td>`;
+
+            // Risk location cells
+            risk_locations.forEach(location => {
+                const value = item.risk_locations[location.id] || '';
+                html +=
+                    `<td style="background-color:${random_color}" class="risk-col" data-risk-id="${location.id}" contenteditable="true">${value}</td>`;
+            });
+
+            // sum insured
+            html += `<td style="background-color:${random_color}" class="sum_insured" contenteditable="true">${item.sum_insured}</td>`;
+
+            // index sum insured
+            html += `<td style="background-color:${random_color}" class="index_sum_insured" contenteditable="true">${item.sum_insured}</td>`;
+
+            // Insurer cells
+            insurers.forEach(insurer => {
+                const value = item.insurers[insurer.id] || '--';
+                html +=
+                    `<td style="background-color:${random_color}" class="insurer-col" data-insurer-id="${insurer.id}" contenteditable="true">${value}</td>`;
+            });
+
+            html += `<td style="background-color:${random_color}" contenteditable="false" class="action">
+                    <input class="qcr-checkbox" id="qcrCheckbox_row-${policyId}-${sectionKey}-${index}" name="qcr" type="checkbox" ${item.qcr ? 'checked' : ''}>
+                    <label for="qcrCheckbox_row-${policyId}-${sectionKey}-${index}">QCR</label>
+                    <input class="client-checkbox" name="stc" type="checkbox" ${item.client ? 'checked' : ''}> <label> Client </label>
+                    <button class="btn btn-primary btn-sm btn-add-row">+</button>
+                    <button class="btn btn-danger btn-sm btn-remove-row">-</button>
+                </td></tr>`;
+        });
+
+        return html;
+    }
+
+    function generateExcessRow(policyId, excess, risk_locations, insurers, random_color) {
+        let html = `<tr class="policy-details ${policyId}_excess" id="row-${policyId}-excess" data-policy="${policyId}" data-key="excess" data-index="0">
+                <td style="background-color:${random_color}" rowspan="1" contenteditable="true">Excess</td>
+                <td style="background-color:${random_color}" class="particulars" contenteditable="true">${excess.item}</td>`;
+
+        // Risk location cells
+        risk_locations.forEach(location => {
+            const value = excess.risk_locations[location.id] || '';
+            html += `<td style="background-color:${random_color}" class="risk-col" data-risk-id="${location.id}" contenteditable="true">${value}</td>`;
+        });
+
+        // sum insured
+        html += `<td style="background-color:${random_color}" class="sum_insured" contenteditable="true">${excess.sum_insured}</td>`;
+
+        // index sum insured
+        html += `<td style="background-color:${random_color}" class="index_sum_insured" contenteditable="true">${excess.sum_insured}</td>`;
+
+        // Insurer cells
+        insurers.forEach(insurer => {
+            const value = excess.insurers[insurer.id] || '--';
+            html += `<td style="background-color:${random_color}" class="insurer-col" data-insurer-id="${insurer.id}" contenteditable="true">${value}</td>`;
+        });
+
+        html += `<td style="background-color:${random_color}" contenteditable="false" class="action">
+                <input class="qcr-checkbox" id="qcrCheckbox_row-${policyId}-excess" name="qcr" type="checkbox" ${excess.qcr ? 'checked' : ''}>
+                <label for="qcrCheckbox_row-${policyId}-excess">QCR</label>
+                <input class="client-checkbox" name="stc" type="checkbox" ${excess.client ? 'checked' : ''}> <label> Client </label>
+                <button class="btn btn-primary btn-sm btn-add-row">+</button>
+                <button class="btn btn-danger btn-sm btn-remove-row">-</button>
+            </td></tr>`;
+
+        return html;
+    }
+
+    function setActivePolicyCheckboxesFromJson(data) {
+
+        for (let key in data) {
+
+            if (key == "fire" && data['fire'].active === 1) {
+                $('#fire_check_box').parent().after(`
+                        <div class="sub-options" id="fireOptions">
+                            <label><input type="checkbox" class="fireSub" value="fire_building" id="fire_building_check_box" checked> Fire Building</label>
+                            <label><input type="checkbox" class="fireSub" value="fire_content" id="fire_content_check_box" checked> Fire Content</label>
+                        </div>
+                    `);
+            }
+
+            if (data.hasOwnProperty(key)) {
+                // Check top-level checkbox if active
+                if (data[key].active === 1) {
+                    $("#" + key + '_check_box').prop("checked", true);
+                } else {
+                    $("#" + key + '_check_box').prop("checked", false);
+                }
+
+                // Check option checkboxes if value is 1
+                if (data[key].options) {
+                    for (let optionKey in data[key].options) {
+                        if (data[key].options.hasOwnProperty(optionKey)) {
+                            if (data[key].options[optionKey] === 1) {
+                                $("#" + optionKey + '_check_box').prop("checked", true);
+                            } else {
+                                $("#" + optionKey + '_check_box').prop("checked", false);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    // -------------  CALLBACK FOR SAVE AND VIEW FUNCTIONS  --------------------------------------------------------------
+    
+    // save function
+    function getJson() {
+        // Usage example:
+        const jsonData = convertTableToJSON();
+        console.log(JSON.stringify(jsonData, null, 2));
+        localStorage.setItem('insuranceData', JSON.stringify(jsonData));
+
+
+        let url = '<?= base_url('test/saverfq') ?>';
+
+        // Data to send in the AJAX request
+        let requestData = {
+            json: jsonData,
+        };
+
+        // Send AJAX request
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+
+            console.log('Data fetched successfully:', response);
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+        });
+    }
+
+    // view function
+    function generateTableFromLocal() {
+        $('#policyTable').remove();
+        let jsonData = localStorage.getItem('insuranceData');
+        console.log("jsonData", jsonData);
+        jsonData = JSON.parse(jsonData);
+        console.log("jsonData", jsonData);
+
+        // Generate table from JSON
+        const tableHTML = generateTableFromJSON(jsonData);
+        document.getElementById('container').innerHTML = tableHTML;
     }
 
 </script>
 
+<script>
+    $(document).ready(function() {
+        // Define dropdown options for each type
+        const dropdownOptions = {
+            sum_insured: [
+                'Agreed',
+                'Market Value',
+                'Replacement Value',
+                'Book Value',
+                'Reinstatement Value',
+                'Declared Value'
+            ],
+            index_sum_insured: [
+                'Agreed',
+                'Indexed',
+                'Non-Indexed',
+                'Automatic Indexation',
+                'Manual Indexation'
+            ],
+            insurer: [
+                'Agreed',
+                'Company A',
+                'Company B',
+                'Company C',
+                'HDFC ERGO',
+                'ICICI Lombard',
+                'Bajaj Allianz',
+                'New India Assurance',
+                'Oriental Insurance'
+            ]
+        };
+
+        let currentDropdown = null;
+
+        // Function to create dropdown menu
+        function createDropdown($cell, options) {
+            const $dropdown = $('<div class="cell-dropdown"></div>');
+            const currentValue = $cell.text().trim(); // Get current cell value
+            
+            $.each(options, function(index, option) {
+                const $option = $('<div class="cell-dropdown-item"></div>').text(option);
+                
+                // Highlight if this option matches the current cell value
+                if (option === currentValue) {
+                    $option.addClass('selected');
+                }
+                
+                $option.on('click', function(e) {
+                    e.stopPropagation();
+                    selectOption($cell, option);
+                });
+                $dropdown.append($option);
+            });
+            
+            return $dropdown;
+        }
+
+        // Function to select an option
+        function selectOption($cell, value) {
+            $cell.text(value);
+            hideAllDropdowns();
+        }
+
+        // Function to show dropdown
+        function showDropdown($cell) {
+            hideAllDropdowns();
+            
+            // Determine dropdown type based on class
+            let dropdownType;
+            if ($cell.hasClass('sum_insured')) {
+                dropdownType = 'sum_insured';
+            } else if ($cell.hasClass('index_sum_insured')) {
+                dropdownType = 'index_sum_insured';
+            } else if ($cell.hasClass('insurer-col')) {
+                dropdownType = 'insurer';
+            }
+            
+            const options = dropdownOptions[dropdownType];
+            
+            if (options) {
+                const $dropdown = createDropdown($cell, options);
+                $cell.append($dropdown);
+                $dropdown.show();
+                currentDropdown = $dropdown;
+            }
+        }
+
+        // Function to hide all dropdowns
+        function hideAllDropdowns() {
+            $('.cell-dropdown').remove();
+            currentDropdown = null;
+        }
+
+        // Event delegation for dropdown cells (works with dynamically added rows) - ONLY TBODY
+        $(document).on('click', 'tbody .sum_insured, tbody .index_sum_insured, tbody .insurer-col', function(e) {
+            e.stopPropagation();
+            
+            const $cell = $(this);
+            const $row = $cell.closest('tr');
+            
+            // Skip dropdown if row has data-key="particulars"
+            if ($row.attr('data-key') === 'particulars') {
+                return; // Exit without showing dropdown
+            }
+            
+            // If this cell already has a dropdown open, close it
+            if (currentDropdown && currentDropdown.parent().is($cell)) {
+                hideAllDropdowns();
+            } else {
+                showDropdown($cell);
+            }
+        });
+
+        // Close dropdown when clicking outside
+        $(document).on('click', function(e) {
+            if (!$(e.target).closest('tbody .sum_insured, tbody .index_sum_insured, tbody .insurer-col').length) {
+                hideAllDropdowns();
+            }
+        });
+
+        // Prevent dropdown from closing when clicking inside it
+        $(document).on('click', '.cell-dropdown', function(e) {
+            e.stopPropagation();
+        });
+
+    });
+</script>
+
 
 
diff --git a/public/sample_excel/Sample_Member_Data.xlsx b/public/sample_excel/Sample_Member_Data.xlsx
index 3adbcef7..c2d53d90 100644
Binary files a/public/sample_excel/Sample_Member_Data.xlsx and b/public/sample_excel/Sample_Member_Data.xlsx differ
diff --git a/public/sample_excel/Sample_Member_Data_1.xlsx b/public/sample_excel/Sample_Member_Data_1.xlsx
new file mode 100644
index 00000000..3adbcef7
Binary files /dev/null and b/public/sample_excel/Sample_Member_Data_1.xlsx differ