From f25ce7e51fee23206f648051512e4339d4ce5956 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Sat, 27 Sep 2025 12:16:45 +0530
Subject: [PATCH 1/4] CHANGE_thz as per another module

---
 app/Controllers/ThzController.php |   8 +-
 app/Views/layout/header.php       |  25 +--
 app/Views/thz_list.php            |  44 ++---
 app/Views/thz_notes.php           | 307 +++++++++++++++---------------
 4 files changed, 187 insertions(+), 197 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 8a61a1cc..070b01ab 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -137,8 +137,6 @@ class ThzController extends BaseController
     public function ticketList()
     {
 
-        $data['tab_name'] = "Tickets";
-        $data['page_name'] = "Tickets";
         try {
             $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
 
@@ -166,7 +164,8 @@ class ThzController extends BaseController
                 // 3,4 remain person varannum. 
                 $data['client_list'] = $this->clientModel->getCreatedByUserName();
                 $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
-
+                $data['tab_name'] = "Tickets";
+                $data['page_name'] = "Tickets";
                 return $this->loadLayout('thz_list', $data);
             }
 
@@ -361,6 +360,9 @@ class ThzController extends BaseController
             $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
 
             $result['ticket_type']  = $this->thzTypeModel->where('is_active', 1)->findAll();
+            
+            $result['tab_name'] = "Tickets";
+            $result['page_name'] = "Tickets";
 
             return $this->loadLayout('thz_notes', $result);
         }
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 148d73c4..2c987813 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -445,23 +445,16 @@
             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 {
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 7df537c2..cce3adf7 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -16,11 +16,6 @@ table.dataTable tbody td {
     position: absolute;
 }
 
-.highlight {
-    border: 2px solid red; 
-    background-color: #ffe6e6; 
-}
-
 .column-header {
     margin-right: 10px;
 }
@@ -31,8 +26,6 @@ table.dataTable tbody td {
     padding: 0.5rem 1rem;
 }
 
-/* Modeal class */
-
 </style>
 
 <style>
@@ -44,8 +37,6 @@ table.dataTable tbody td {
 
 </style>
 
-
-
 <div class="row" id="ticket_list">
     <div class="col-12">
         <div class="card">
@@ -85,8 +76,8 @@ table.dataTable tbody 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>
@@ -350,17 +341,6 @@ table.dataTable tbody td {
                                         text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                                         className: 'app-btn-primary ',
                                         title: 'Tickets',
-                                        exportOptions: {
-                                          format: {
-                                            body: function (data, row, column, node) {
-                                              // Replace <br> with a space
-                                              data = data.replace(/<br\s*\/?>/gi, " ");
-                                              // Remove any other HTML tags
-                                              data = data.replace(/<[^>]*>?/gm, "");
-                                              return data.trim();
-                                            }
-                                          }
-                                        }
                                     },
                                     {
                                       extend: 'excel',
@@ -428,10 +408,10 @@ table.dataTable tbody td {
         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) {
@@ -440,6 +420,12 @@ table.dataTable tbody td {
           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');
@@ -460,6 +446,12 @@ table.dataTable tbody td {
             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);
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 4da6b2e0..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,13 +14,12 @@
   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;
 }
-textarea {
-            background-color: white !important;
-            border-radius: 0px !important;
-            box-shadow: 0px 0px 0px 0px white !important;
-            border-color: white !important;
-        }
+
 .icon-buttons {
   display: flex;
   gap: 6px;
@@ -77,10 +75,12 @@ textarea {
 .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;
@@ -134,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 font-color-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 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 app-text 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 app-text 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="font-color-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 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 app-text font-color-black text-end " style="font-weight: 500 !important;">
-                                        <?= (!empty($master[0]['status']) && strtolower($master[0]['status']) !== 'null') 
+                                <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="font-color-black"
-                                                    onclick="statusHistory('.$master[0]['thz_id'].')"
                                                     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 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 app-text 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 app-text 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 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  font-color-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 font-color-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>
@@ -299,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 -->
@@ -321,21 +309,24 @@ hr{
                             <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 font-color-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">    
@@ -344,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>
@@ -361,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>
@@ -375,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)) { ?>
@@ -391,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>
@@ -404,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;">  
@@ -451,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;">  
@@ -476,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;">  
@@ -486,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");
 
@@ -509,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");
 
@@ -640,11 +643,11 @@ function statusHistory(thzId) {
                     <table data-custom-table-css="table" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
                         <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">

From ef13c94d0ad4498f57e60399acb6c7da4be518cd Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Sat, 27 Sep 2025 12:21:00 +0530
Subject: [PATCH 2/4] CHANGE_header added

---
 app/Views/layout/header.php | 69 ++++---------------------------------
 1 file changed, 7 insertions(+), 62 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 2c987813..81e90196 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -140,10 +140,6 @@
             min-height: 100vh !important;
         }
 
-        body[data-sidebar-size=condensed] .left-side-menu #sidebar-menu>ul>li>a i{
-            margin :0 px !important;
-        }
-
         body .content-page {
             margin-top: 90px !important;
         }
@@ -215,7 +211,7 @@
             padding: 0 !important;
             height: 90% !important;
             display: flex;
-            flex-flow: column nowrap;
+            flex-flow: column wrap;
         }
 
         /* every <li> inside should be allowed to shrink */
@@ -235,6 +231,7 @@
             min-height: 43px !important;
         }
 
+
         .li-seperate {
             margin: 10px 0px;
         }
@@ -247,15 +244,7 @@
             padding: 8px !important;
             min-height: 43px !important;
         }
-
-        .li-seperate a img
-        {
-            margin-left:4px !important;
-        }
-
-
     </style>
-    
 
     <!-- rightbar -->
     <style>
@@ -290,12 +279,7 @@
         #main_tile,
         #mainMenuTiles {
             font-size: 25px !important;
-            font-weight: 500 !important;
-            color: #000 !important;
-        }
-
-        .chevron-left-dash{
-            color:#000;
+            font-weight: 600 !important;
         }
 
         .nav-link {
@@ -450,6 +434,7 @@
             display: flex;
             align-items: center;
         }
+        
         .secondary-title i {
             font-size: 43px;
         }
@@ -1578,45 +1563,6 @@
         }
     </style>
 
-    <!-- tab swich scrollable -->
-     <style>
-        .tab-wrapper {
-            display: flex;
-            align-items: center;
-            position: relative;
-        }
-
-        /* Make the UL a scrollable flex row */
-        #myTab {
-            display: flex;
-            flex-wrap: nowrap;      /* prevent wrapping */
-            overflow-x: auto;       /* enable horizontal scroll */
-            overflow-y: hidden;
-            white-space: nowrap;    /* keep items on one line */
-            scroll-behavior: smooth;
-            margin: 0;
-            padding: 0 40px;        /* leave space for arrows */
-        }
-
-        /* Hide scrollbars */
-        #myTab::-webkit-scrollbar { display: none; }
-        #myTab { -ms-overflow-style: none; scrollbar-width: none; }
-
-        .scroll-btn {
-            background: #f1f1f1;
-            border: none;
-            cursor: pointer;
-            font-size: 18px;
-            padding: 5px 10px;
-            position: absolute;
-            top: 50%;
-            transform: translateY(-50%);
-            z-index: 10;
-        }
-        .left-btn { left: 0; }
-        .right-btn { right: 0; }
-     </style>
-
 
 
 
@@ -1648,8 +1594,7 @@
 
                     <li class="menu-logo">
                         <a href="<?= base_url('/dashboard/view') ?>">
-                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" 
-                            style="margin-left:2px;" alt="Logo">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo">
                         </a>
                     </li>
 
@@ -1657,7 +1602,7 @@
 
                     <li class="li-seperate" id="dashboard-li">
                         <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive">
-                            <i class="ri-dashboard-line" style="color:black; margin:4px;"></i>
+                            <i class="ri-dashboard-line" style="color:black;"></i>
                             <span style="color: #02a8b5;"> Dashboard </span>
                         </a>
                     </li>
@@ -1667,7 +1612,7 @@
                         <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="20">
+                                    src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
                                 <span> Clients </span>
                             </a>
                         </li>

From 4c25d7e0aadf275160abb87bf225ace184c993ec Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Mon, 29 Sep 2025 09:35:27 +0530
Subject: [PATCH 3/4] CHANGE_Issues

---
 app/Views/drive_file_upload.php               |    6 +-
 app/Views/hr_file_upload.php                  |    4 -
 app/Views/insurer_list.php                    |   17 +-
 app/Views/layout/header.php                   |   24 +-
 app/Views/outstanding_report_list.php         |  108 -
 .../policy_transaction_endorsement_form.php   |  307 +-
 .../policy_transaction_endorsement_list.php   |   79 +-
 .../policy_transaction_inception_form.php     |  131 +-
 .../policy_transaction_inception_list.php     | 3175 ++++++++---------
 app/Views/vehicle_docs.php                    |    6 +-
 10 files changed, 1789 insertions(+), 2068 deletions(-)

diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index 1587afa1..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,7 +46,7 @@
 
             </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&nbsp;</th>
@@ -62,6 +63,7 @@
             </div>
         </div><!-- end col -->
     </div>
+    </div>
 </div>
 
 
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 76bbdc73..dd0c7b33 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -356,11 +356,7 @@
     // for datatable 
     $(document).ready(function() {
         $('#hr_tickets_table').DataTable({
-<<<<<<< HEAD
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
-=======
-            dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" +
->>>>>>> 3e7d3426 (FIX_XL button and Search)
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             buttons: [{
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 9bb6624b..59727f76 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -217,23 +217,8 @@
                             <i class="mdi mdi-magnify datatable-search-icon"></i>
                         </div>`,
                         searchPlaceholder: "Search"
->>>>>>> 3e7d3426 (FIX_XL button and Search)
         },
-        {
-          text: 'ADD',
-          className: 'btn btn-color',
-          action: function() {
-            window.location.href = "<?= base_url("master/insurer/create"); ?>";
-          }
-        }
-      ],
-
-
-      language: {
-        search: "_INPUT_",
-        searchPlaceholder: "Search..."
-      },
-      paging: true,
+        paging: true,
     });
 
   })
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 81e90196..4d7a406e 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -714,7 +714,7 @@
             border-bottom: 2px solid #C3EDEE !important;
             font-weight: 400 !important;
         }
-
+        
         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;
@@ -765,7 +765,7 @@
             background: #FFFFFF !important;
             padding: 12px;
             border-top: 0px solid #fff !important;
-            border-bottom: 2px solid #F5FFFF !important;
+            border-bottom: 2px solid #F0F0F0 !important;
             font-weight: 400 !important;
         }
     </style>
@@ -780,7 +780,7 @@
             border-radius: 13px !important;
             border: none !important;
         }
-
+        
         /* Previous / Next buttons */
         .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link,
         .dataTables_wrapper .dataTables_paginate .page-item.next .page-link {
@@ -1295,7 +1295,8 @@
     <style>
         .card #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;
@@ -1313,7 +1314,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;
@@ -1322,7 +1327,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;
@@ -1331,7 +1337,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;
@@ -1345,7 +1352,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;
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 49d9897a..0242fbf4 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -225,114 +225,6 @@
 
 
 <script>
-<<<<<<< HEAD
-    $(document).ready(function() {
-        $('#collapseOne').on('show.bs.collapse', function() {
-            // When open
-            $('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');
-            $('#filterAccordion').removeAttr("style"); // remove custom bg/border when open
-=======
-$(document).ready(function () {
-    $('#collapseOne').on('show.bs.collapse', function () {
-        // When open
-        $('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');
-        $('#filterAccordion').removeAttr("style"); // remove custom 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"
-        // });
-    });
-});
-
-// Datatable document ready
-$(document).ready(function() {
-
-    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;
-
-                        // 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);
-                    }
-                }
-            ]
-            }
-            ],
-            language: {
-                        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)
->>>>>>> 3e7d3426 (FIX_XL button and Search)
-        });
-
-        $('#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"
-            // });
-        });
-    });
-
-    // Datatable document ready
     $(document).ready(function() {
 
         var ticketsTable = $('#scroll-horizontal-datatable');
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 0ae3c9b7..be01383e 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -201,160 +201,155 @@
 
                         <!-- sales Row -->
                         <div class="row" id="sales_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 class="col-md-12">
+                                                            <div id="accordion_2" class="mb-0">
+                                                                <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Endorsement</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                                                </label>
+                                                                <div class="card mb-1">
+                                                                    <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                                                    <div class="card-body">
+                                                                        <div class="row">
+                                                                            
+                                                                            <div class="form-group col-md-3" id="tpa_endorse_div">
+                                                                                <label for="tpa"> TPA <span id="tpa_danger"class="text-danger"></span></label>
+                                                                                <select class="form-control readonly-select" id="tpa" name="tpa" >
+                                                                                    <option value="" selected>Select TPA</option>
+                                                                                    <?php foreach ($tpa as $value) { ?>
+                                                                                    <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
+                                                                                        <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                                                                    </option>
+                                                                                    <?php } ?>
+                                                                                </select>
+                                                                            </div>
+                                                                            
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">Policy No<span id="base_danger"class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="policy_no" name="policy_no"placeholder="Enter Policy No" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="bp_cgst">D.O.C <span id="base_danger" class="text-danger"></span></label>
+                                                                                <input id="policy_start_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="bp_igst">D.O.E <span id="base_danger" class="text-danger"></span></label>
+                                                                                <input id="policy_end_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">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>
-                                                    
-                                                    <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> -->
-                            </div>
-                        </div>
-
-                        <!-- Premium Details -->
-                                                <div class="row">
+                                                    <!-- Premium Details -->
                                                     <div class="col-md-12">
                                                         <!-- <div class="form-section"> -->
                                                             <div id="accordion_3" class="mb-0">
@@ -531,8 +526,8 @@
                                                             </div>
                                                         <!-- </div> -->
                                                     </div>
-                                                </div>
-                                               
+                                                
+                        </div>                       
                          
 
                     <div class="form-group text-right mt-3 m-b-0" id="submitButton">
@@ -1742,8 +1737,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 d648bf74..1439f2d2 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -296,14 +296,14 @@ table.dataTable thead th {
     <div class="col-12" id="endorsement_list">
         <div class="card">
             <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
-                    <div class="col-6" style="align-self: center;">
-                        <!-- <h4 style="position: relative;">Endorsement List</h4> -->
-                    </div><!-- col-6 -->
-                    <!-- <div class="col-3" id="status_change" style="text-align: right; position: relative;top: 56px; left: 291px;">
+                 <!-- <div class="row" style="margin-bottom:1rem;">
+                   <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Endorsement List</h4>
+                    </div>
+                    <div class="col-3">
                         <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" onclick="hide_list_show_add()">Add</button>
-                    </div> col-3 -->
-                </div><!-- row -->
+                    </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>
@@ -326,19 +326,19 @@ table.dataTable thead th {
                     <tbody>
                         <?php foreach ($endorsement_data_list as $index => $row) { ?>
                             <tr>
-                                <td><?php echo $index + 1; ?></td>
-                                <td><?php echo $issuer[$row['issuer']] ?? ''; ?></td><!-- Issuer -->
-                                <td><?php echo $row['client_short_name']; ?></td><!-- Client -->
-                                <td><?php echo $row['client_branch_name']; ?></td><!-- Branch -->
-                                <td><?php echo $row['insurer_short_name']; ?></td><!-- Insurer -->
-                                <td><?php echo $row['policy_type']; ?></td><!-- Policy -->
-                                <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 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>
@@ -487,22 +487,34 @@ table.dataTable thead th {
         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: '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)'
+            buttons: [            
+                   {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function (e, dt, node, config) {
+                            hide_list_show_add();
                         },
-                    }]
-                }],
+                        attr: { id: 'btnAdd' }
+                    },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Policy-Tranction-Endorsement-List',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
                 language: {
                         search: `
                         <div class="datatable-search-wrapper">
@@ -518,6 +530,7 @@ table.dataTable thead th {
         } else {
             console.error("Table not found.");
         }
+        $('#btnAdd').wrap('<div id="status_change"></div>');
     });
 
     // Date document ready
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index a2867ce6..350f4eef 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,9 +300,10 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                         </div>
                                         </div>
                                     </div>
-                                </div>
+                                
                             </div>
                         </div>
 
@@ -297,16 +317,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 +517,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 +678,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 +714,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 +854,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>
@@ -4086,8 +4115,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 caee48f0..f1c6cfaf 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -1,192 +1,200 @@
 <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 {
+.col-12 {
 
-        max-width: 98% !important;
-    }
+    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;
+}
 
-    .addbtnStyle {
-        margin-left: 20px !important;
-    }
+.addbtnStyle{
+    margin-left: 20px !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 {
-        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>
     .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%;
     }
+
+    #inception_filter{
+        margin-bottom:-20px !important;
+        margin-left:30px !important;
+    }
+
+    #inception_list{
+        margin-left:20px !important;
+    }
+
 </style>
 
-<div class="col-12" id="inception_filter">
-    <div class="card-body">
+<div class="row" id="inception_filter">
+    <div class="col-12">
         <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>
+                        <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-4">
+                                <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">
+                                    <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>";
+                                            if (isset($client) && count($client)) {
+                                                foreach ($client as $key => $value) {
+                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                                }
                                             }
-                                        }
                                         ?>
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <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">
+                                    <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>
+                                            <option value="<?= $value['id']?>"><?= $value['name']?></option>
                                         <?php } ?>
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <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">
+                                    <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>";
+                                            if (isset($policy_types) && count($policy_types)) {
+                                                foreach ($policy_types as $key => $value) {
+                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                                }
                                             }
-                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -196,56 +204,68 @@
                                     <select class="form-control" id="issuer_for_search" name="issuer">
                                         <option value="0">Select Issuer</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 class="form-group col-md-4">
+                                <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">
+                                    <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>";
+                                            if (isset($policy_status) && count($policy_status)) {
+                                                foreach ($policy_status as $key => $value) {
+                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                }
                                             }
-                                        }
                                         ?>
                                     </select>
-                                </div>
+                                </div>  
 
-                                <div class="form-group col-md-4">
+                            </div>
+
+                            <div class="form-row">
+
+
+
+                                <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-4" style="display: none;" id="date_div">
+                                <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 id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
                                 </div>
+
+                                
                             </div>
-                            <div class="form-group text-right m-b-0">
-                                <a href="<?= base_url("/policy_tranction/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 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>
+
                             </div>
                         </div>
                     </div>
@@ -253,111 +273,76 @@
             </div>
         </div>
     </div>
-
 </div>
 
+<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;">
+                        <h4 style="position: relative;">Policy List</h4>
+                    </div>
 
-
-<div class="col-12" id="inception_list">
-    <div class="card">
-        <div class="card-body">
-            <div class="row" style="margin-bottom:1rem;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Policy List </h4>
+                    <div class="col-3" id="status_change" style="text-align: right; position: relative;top: 56px; left: 291px;">
+                        <!-- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" onclick="hide_list_show_add();">Add</button> -->
+                    </div>
                 </div>
-                <div class="table-responsive">
+                <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>
-                                    <div class="column-header">S.No&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Issuer&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Business Type&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">Insurer&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Policy&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Policy No&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Policy Issue Date&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">D.O.C&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">D.O.E&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">No of Insured&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">No of Dependents&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Status&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">User&nbsp;</div>
-                                </th>
-                                <th>
-                                    <div class="column-header">Action</div>
-                                </th>
+                                <th><div class="column-header">S.No.</div></th>
+                                <th><div class="column-header">Issuer</div></th>
+                                <th><div class="column-header">Business Type</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">Insurer</div></th>
+                                <th><div class="column-header">Policy</div></th>
+                                <th><div class="column-header">Policy No</div></th>
+                                <th><div class="column-header">Policy Issue Date</div></th>
+                                <th><div class="column-header">D.O.C</div></th>
+                                <th><div class="column-header">D.O.E</div></th>
+                                <th><div class="column-header">No of Insured</div></th>
+                                <th><div class="column-header">No of Dependents</div></th>
+                                <th><div class="column-header">Status</div></th>
+                                <th><div class="column-header">User</div></th>
+                                <th><div class="column-header">Action</div></th>
                             </tr>
                         </thead>
 
                         <tbody>
-                            <?php foreach ($inception_data_list as $index => $row) { ?>
-                                <tr>
-                                    <td class="text-center"><?php echo $index + 1; ?></td>
-                                    <td><?php echo $issuer[$row['issuer']] ?: 'N/A'; ?></td>
-                                    <td><?php echo $issuing_type[$row['issue_type']] ?: 'N/A'; ?></td>
-                                    <td><?php echo $client_type[$row['client_type']] ?? '-'; ?></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'] ?: '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']) ? '' : 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'] ?: 'N/A'; ?></td>
-                                <td class="right-align-input"><?php echo $row['dependent_count'] ?: 'N/A'; ?></td> -->
-                                    <td class="<?= ($row['emp_count'] !== '' && $row['emp_count'] !== null) ? 'right-align-input' : 'text-center'; ?>">
-                                        <?= ($row['emp_count'] !== '' && $row['emp_count'] !== null) ? $row['emp_count'] : 'N/A'; ?>
-                                    </td>
-                                    <td class="<?= ($row['dependent_count'] !== '' && $row['dependent_count'] !== null) ? 'right-align-input' : 'text-center'; ?>">
-                                        <?= ($row['dependent_count'] !== '' && $row['dependent_count'] !== null) ? $row['dependent_count'] : 'N/A'; ?>
-                                    </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>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="getPolicyTransactionDataForEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
-                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                                </a>
-                                                <a class="dropdown-item delete" data-id="<?= $row['id']; ?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>', <?= $row['policy_type_id'] ?>)">
-                                                    <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
-                                                </a>
-                                            </div>
+                            <?php foreach($inception_data_list as $index => $row){ ?>
+                            <tr>
+                                <td class="text-center"><?php echo $index+1; ?></td>
+                                <td><?php echo $issuer[$row['issuer']]; ?></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'] ?: '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>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" onclick="getPolicyTransactionDataForEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
+                                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                            </a>
+                                            <a class="dropdown-item delete" data-id="<?= $row['id'];?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>', <?= $row['policy_type_id'] ?>)">
+                                                <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                            </a>
                                         </div>
-                                    </td>
-                                </tr>
+                                    </div>
+                                </td>
+                            </tr>
                             <?php } ?>
                         </tbody>
                     </table>
@@ -365,868 +350,645 @@
             </div>
         </div>
     </div><!-- end col -->
+</div>
+<!-- end table row -->
 
 
-    <!-- end table row -->
+<?php include('pt_form_file_upload_tab.php'); ?>
+
+<div class="modal fade" id="file_upload" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-full-width">
+        <div class="modal-content">
 
 
-    <?php include('pt_form_file_upload_tab.php'); ?>
+            <div class="modal-body p-4">
+                <div class="">
 
-    <div class="modal fade" id="file_upload" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-full-width">
-            <div class="modal-content">
+                    <form role="form" class="parsley-examples" action="<?= base_url('util/file_upload') ?>" method="post" id="file_upload_form" enctype="multipart/form-data">
+                        
+                        <div class="form-group">
 
+                            <div id="dynamic-form-container"></div>
 
-                <div class="modal-body p-4">
-                    <div class="">
+                        </div>
 
-                        <form role="form" class="parsley-examples" action="<?= base_url('util/file_upload') ?>" method="post" id="file_upload_form" enctype="multipart/form-data">
-
-                            <div class="form-group">
-
-                                <div id="dynamic-form-container"></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>
-                            </div>
-                        </form>
-                    </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>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
     </div>
-    <script>
-        document.addEventListener("DOMContentLoaded", function() {
-            const table = document.getElementById("tickets-table");
+</div>
+<script>
 
-            function createCustomDropdown(row) {
-                const originalDropdown = row.querySelector('.dropdown-menu');
-                if (!originalDropdown) return null;
+document.addEventListener("DOMContentLoaded", function () {
+    const table = document.getElementById("tickets-table");
+    
+    function createCustomDropdown(row) {
+        const originalDropdown = row.querySelector('.dropdown-menu');
+        if (!originalDropdown) return null;
+        
+        const customDropdown = document.createElement('div');
+        customDropdown.className = 'custom-dropdown-menu';
+        
+        const items = originalDropdown.querySelectorAll('.dropdown-item');
+        items.forEach(item => {
+            const newItem = item.cloneNode(true);
+            newItem.removeAttribute('onclick');
+            customDropdown.appendChild(newItem);
+        });
+        
+        return customDropdown;
+    }
 
-                const customDropdown = document.createElement('div');
-                customDropdown.className = 'custom-dropdown-menu';
+    let activeDropdown = null;
 
-                const items = originalDropdown.querySelectorAll('.dropdown-item');
-                items.forEach(item => {
-                    const newItem = item.cloneNode(true);
-                    newItem.removeAttribute('onclick');
-                    customDropdown.appendChild(newItem);
-                });
+    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 action column
+            if (event.target.closest('td:last-child')) {
+                return;
             }
 
-            let activeDropdown = null;
+            // Close any existing dropdown
+            if (activeDropdown && activeDropdown !== customDropdown) {
+                activeDropdown.style.display = 'none';
+            }
 
-            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 clicks on dropdown items
+        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+            item.addEventListener('click', function(e) {
+                e.preventDefault();
+                e.stopPropagation();
 
-                row.addEventListener("click", function(event) {
-                    // Ignore clicks on the action column
-                    if (event.target.closest('td:last-child')) {
-                        return;
+                const id = this.getAttribute('data-id');
+                
+                // Handle edit button
+                if (this.classList.contains('btnEdit') && id) {
+                    getPolicyTransactionDataForEdit(id);
+                }
+                // Handle delete button
+                else if (this.classList.contains('delete') && id) {
+                    removePolicyTransaction(this, id);
+                }
+                // Handle other links
+                else {
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#' && href !== 'javascript: void(0);') {
+                        window.location.href = href;
                     }
+                }
 
-                    // Close any existing dropdown
-                    if (activeDropdown && activeDropdown !== customDropdown) {
-                        activeDropdown.style.display = 'none';
-                    }
-
-                    const rect = event.target.getBoundingClientRect();
-
-                    customDropdown.style.display = 'block';
-                    customDropdown.style.position = 'fixed';
-                    customDropdown.style.left = `${rect.left}px`;
-                    customDropdown.style.top = `${rect.bottom + 5}px`;
-
-                    activeDropdown = customDropdown;
-                    event.stopPropagation();
-                });
-
-                // Handle clicks on dropdown items
-                customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-                    item.addEventListener('click', function(e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-
-                        const id = this.getAttribute('data-id');
-
-                        // Handle edit button
-                        if (this.classList.contains('btnEdit') && id) {
-                            getPolicyTransactionDataForEdit(id);
-                        }
-                        // Handle delete button
-                        else if (this.classList.contains('delete') && id) {
-                            removePolicyTransaction(this, id);
-                        }
-                        // Handle other links
-                        else {
-                            const href = this.getAttribute('href');
-                            if (href && href !== '#' && href !== 'javascript: void(0);') {
-                                window.location.href = href;
-                            }
-                        }
-
-                        // Close dropdown
-                        if (activeDropdown) {
-                            activeDropdown.style.display = 'none';
-                            activeDropdown = null;
-                        }
-                    }, {
-                        once: true
-                    });
-                });
-            });
-
-            // Close dropdown on outside click
-            document.addEventListener("click", function() {
+                // Close dropdown
                 if (activeDropdown) {
                     activeDropdown.style.display = 'none';
                     activeDropdown = null;
                 }
-            });
+            }, { once: true });
         });
-    </script>
+    });
 
-    <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 vehicle_list = ''; // local variable for storing the client policy list
-        var branch_policy = '';
-        var unit_list = '';
-        var count = 0
+    // Close dropdown on outside click
+    document.addEventListener("click", function() {
+        if (activeDropdown) {
+            activeDropdown.style.display = 'none';
+            activeDropdown = null;
+        }
+    });
+});
+</script>
 
-        //for disable all field if client and client branch is empty
-        $(document).ready(function() {
+<script>
 
-            function checkAndDisableFields() {
-                var clientId = $('#client_id').val();
-                var clientBranchId = $('#client_branch_id').val();
+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 vehicle_list = ''; // local variable for storing the client policy list
+var branch_policy = '';
+var unit_list = '';
+var count = 0
 
-                if (!clientId || !clientBranchId) {
-                    // Disable all input, select, textarea, and button elements, including policy_no and insurer_id
-                    $('#inception_form_id').find(':input, select, textarea, button').not('#client_id, #client_branch_id').prop('disabled', true).addClass('disabled-field');
-                } else {
-                    $('#inception_form_id').find(':input, select, textarea, button').not('#client_id, #client_branch_id').prop('disabled', false).removeClass('disabled-field');
-                }
-            }
+//for disable all field if client and client branch is empty
+$(document).ready(function() {
+    
+    function checkAndDisableFields() {
+        var clientId = $('#client_id').val();
+        var clientBranchId = $('#client_branch_id').val();
 
-            // Check on page load
-            // checkAndDisableFields();
+        if (!clientId || !clientBranchId) {
+            // Disable all input, select, textarea, and button elements, including policy_no and insurer_id
+            $('#inception_form_id').find(':input, select, textarea, button').not('#client_id, #client_branch_id').prop('disabled', true).addClass('disabled-field');
+        } else {
+            $('#inception_form_id').find(':input, select, textarea, button').not('#client_id, #client_branch_id').prop('disabled', false).removeClass('disabled-field');
+        }
+    }
 
-            // // Check whenever these fields are updated
-            // $('#client_id, #client_branch_id').on('change keyup', function() {
-            //     checkAndDisableFields();
-            // });
+    // Check on page load
+    // checkAndDisableFields();
 
-            // Attach event handler to show toastr if user clicks on any disabled field
-            $('#inception_form_id').on('click', '.disabled-field', function(e) {
-                e.preventDefault();
-                toastr.warning('Please select Client and Client Branch before filling out the form.');
-            });
-        });
+    // // Check whenever these fields are updated
+    // $('#client_id, #client_branch_id').on('change keyup', function() {
+    //     checkAndDisableFields();
+    // });
 
-        // select2 document ready
-        $(document).ready(function() {
+    // Attach event handler to show toastr if user clicks on any disabled field
+    $('#inception_form_id').on('click', '.disabled-field', function(e) {
+        e.preventDefault();
+        toastr.warning('Please select Client and Client Branch before filling out the form.');
+    });
+});
 
-            getClientAndBranchAndPolicy()
-            addHTMLInput();
-            addHTMLInputForVehicleFileUpload()
+// select2 document ready
+$(document).ready(function(){
 
-            <?php if (session()->has('create_failed')) : ?>
-                toastr.error('<?= session()->getFlashdata('create_failed') ?>', 'Failed');
-            <?php endif; ?>
+    getClientAndBranchAndPolicy()
+    addHTMLInput();
+    addHTMLInputForVehicleFileUpload()
 
-            <?php if (session()->has('update_failed')) : ?>
-                toastr.error('<?= session()->getFlashdata('update_failed') ?>', 'Failed');
-            <?php endif; ?>
+    <?php if (session()->has('create_failed')) : ?>
+        toastr.error('<?= session()->getFlashdata('create_failed') ?>', 'Failed');
+    <?php endif; ?>
 
-            <?php if (session()->has('create_success')) : ?>
-                toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
-            <?php endif; ?>
+    <?php if (session()->has('update_failed')) : ?>
+        toastr.error('<?= session()->getFlashdata('update_failed') ?>', 'Failed');
+    <?php endif; ?>
 
-            <?php if (session()->has('update_success')) : ?>
-                toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
-            <?php endif; ?>
+    <?php if (session()->has('create_success')) : ?>
+        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+    <?php endif; ?>
+
+    <?php if (session()->has('update_success')) : ?>
+        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+    <?php endif; ?>
 
 
-            $('#client_id').select2();
-            $('#client_branch_id').select2();
-            $('#insurer_branch').select2();
-            $('#tpa').select2();
-            $('#base_policy').select2();
-            $('#source_client_policy_id').select2();
-            $('#sales_generated_by').select2();
-            $('#serviced_by').select2();
-            $('#policy_type_id').select2();
-            $('#ppteam').select2();
-        })
+    $('#client_id').select2();
+    $('#client_branch_id').select2();
+    $('#insurer_branch').select2();
+    $('#tpa').select2();
+    $('#base_policy').select2();
+    $('#source_client_policy_id').select2();
+    $('#sales_generated_by').select2();
+    $('#serviced_by').select2();
+    $('#policy_type_id').select2();
+    $('#ppteam').select2();
+})
 
-        // Datatable document ready
-        $(document).ready(function() {
+// Datatable document ready
+$(document).ready(function() {
 
-            var ticketsTable = $('#tickets-table');
+    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: [
-                    // {
-                    // 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',
-                    //         exportOptions: {
-                    //             columns: ':not(:last-child)'
-                    //         },
-                    //     } ]},
-                    //     {
-                    //         text: 'Add',
-                    //         className: 'buttons-html5 addbtnStyle',
-                    //         action: function (e, dt, node, config) {
-                    //             hide_list_show_add();
-                    //         }
-                    //     }
-                    // ],
-                    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();
-                            }
-                        },
-                        {
-                            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',
-                            }]
+    if (ticketsTable.length) {
+        ticketsTable.DataTable({
+            scrollX: true,
+            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();
                         }
-                    ],
-                    language: {
+                    },
+                    {
+                        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: `
                         <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,
-                });
-            } else {
-                console.error("Table not found.");
+            },
+            paging: true, // Enable pagination
+            pageLength: 25, // Set default number of rows per page (optional)
+            // ordering: false,
+        });
+    } else {
+        console.error("Table not found.");
+    }
+});
+
+// Date document ready
+$(document).ready(function(){
+
+    var today = new Date();
+
+    var opening_date = flatpickr("#opening_date", {
+        dateFormat: "d/m/Y",
+        allowInput: false
+    });
+
+    var policy_start_date = flatpickr("#policy_start_date", {
+        dateFormat: "d/m/Y",
+        defaultDate: today,
+        allowInput: false,
+        onChange: function(selectedDates, dateStr, instance) {
+            var policy_end_date = new Date(selectedDates[0]);
+            policy_end_date.setFullYear(policy_end_date.getFullYear() + 1);
+            policy_end_date.setDate(policy_end_date.getDate() - 1); // Set end date to last day of selected year
+            policy_end_datePicker.setDate(policy_end_date);
+
+            // Calculate renewal date (one month before the end date)
+            var renewal_date = new Date(policy_end_date);
+            // renewal_date.setMonth(renewal_date.getMonth() - 1);
+            renewal_datePicker.setDate(renewal_date);  // Set renewal date
+        }
+    });
+
+    // Calculate the end date (today + 1 year)
+    var closeDate = new Date(today);
+    closeDate.setFullYear(closeDate.getFullYear() + 1);
+    closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of next year
+
+    var policy_end_datePicker = flatpickr("#policy_end_date", {
+        dateFormat: "d/m/Y",
+        defaultDate: closeDate,
+        allowInput: false
+    });
+
+    var renewal_datePicker = flatpickr("#renewal_date", {
+        dateFormat: "d/m/Y",
+        allowInput: false
+    });
+
+    var month = flatpickr("#month", {
+        dateFormat: "M/Y", // Format as month and year
+        allowInput: false, // Disable manual input
+    });
+
+    var policy_issue_date = flatpickr("#policy_issue_date", {
+        dateFormat: "d/m/Y", // Format as day-month-year
+        allowInput: false, // Disable manual input
+        onChange: function(selectedDates, dateStr, instance) {
+            // Get the selected date
+            var selectedDate = new Date(selectedDates[0]);
+
+            // Format the selected date to "M-Y"
+            var formattedMonth = flatpickr.formatDate(selectedDate, "M/Y");
+
+            // Set the value of the #month input
+            month.setDate(formattedMonth);
+        }
+    });
+
+
+
+
+
+})
+
+//--------------------------------------------------------------------------------------------------------
+
+function hide_list_show_add() 
+{       
+    $('#page_title').text('Add Policy')
+    $('#inception_form_id')[0].reset();
+    $('#client_id').val('').change().prop('disabled', false);
+    $('#tpa').val('').change().prop('disabled', false);
+    $('#client_id_for_edit').val('');
+    $('#policy_tranction_primarykey').val('');
+    $('#client_policy_id').val('');
+    $('#client_branch_id').val('').change().prop('disabled', false);
+    $('#insurer_id').val('');
+    $('#cd_ac_no').empty().prop('disabled', false);
+    $('#policy_no').val('').change().prop('disabled', false);
+    $('#source_client_policy_id').val('').prop('disabled', false);
+    $('#policy_end_date').prop('disabled', false);
+    $('#policy_start_date').prop('disabled', false);
+    $('#client_type').prop('disabled', false);
+    $('#policy_type_id').prop('disabled', false);
+
+    $('#invoice_no_div').hide()
+    $('.current_date').hide()
+    $('#invoice_no').attr('required', false)
+
+    $('#pt_onboarding').show()
+    $('#inception_list').hide()
+    $('#inception_filter').hide()
+    $('#policyholdernamediv').hide();
+    $('.branchdiv').show();
+}
+
+function show_list_hide_add() 
+{
+    $('#pt_onboarding').hide()
+    $('#inception_list').show()
+    $('#inception_filter').show();
+    $('#nav_pills').empty()
+    $('#tab_content').empty()
+    count = 0
+}
+
+function getClientAndBranchAndPolicy(appendStatus = true)
+{   
+    $.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;
+                vehicle_list = res.vehicle_data;
+                unit_list = res.unit_data;
+
+                if(appendStatus == true){
+                    appendClients(res.client_data);
+                    appendVehicles(res.vehicle_data);
+                    // appendOwner(client_list)
+                }
+
+            }else{
+                console.log('No data found');
+            }
+
+        },
+        error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+        }
+    });
+}
+
+function appendClients(data, client_id = null) 
+{
+    $('#client_id').empty();
+
+    $('#client_id').append($('<option>', {
+        value: '',
+        text: 'Select Client'
+    }));
+
+    $('#client_id').append($('<option>', {
+        value: 'add_client',
+        text: '+ Add Client'
+    }));
+
+    $.each(data, function(index, item) {
+
+        let client_show_name = item.client_name;
+        if (item.client_type == 2) {
+            client_show_name = item.client_name +  (item.dob ? ('- (' + item.dob + ' )' ) : '') + (item.pan ? ('- ' + item.pan ) : '');
+            // console.log(client_show_name);
+        }
+
+        var option = $('<option>', {
+            value: item.id,
+            text: client_show_name,
+            'data-cn': item.client_name,
+            'data-ct': item.client_type,
+            class: item.client_type == 1 ? 'group' : item.client_type == 2 ? 'individual' : ''
+        });
+
+        if (client_id == item.id) {
+            option.attr('selected', true);
+        }
+
+        $('#client_id').append(option);
+    });
+}
+
+function appendVehicles(data, vehicle_id = null) 
+{
+    $('#vehicle_no').empty();
+
+    $('#vehicle_no').append($('<option>', {
+        value: '',
+        text: 'Select Vehicle'
+    }));
+
+    $('#vehicle_no').append($('<option>', {
+        value: 'add_vehicle',
+        text: '+ Add Vehicle'
+    }));
+
+    $.each(data, function(index, item) {
+        var option = $('<option>', {
+            value: item.id,
+            text: item.vehicle_no ?? item.rc,
+            'data-cid': item.owner,
+            'data-bid': item.branch_id,
+            'data-cty': item.client_type,
+        });
+        if (vehicle_id == item.id) {
+            option.attr('selected', true);
+        }
+        $('#vehicle_no').append(option);
+    });
+}
+
+function appendBranch(data, branch_id = null) 
+{
+
+    $('#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 
+        });
+
+        if (branch_id == item.id) {
+            option.attr('selected', true);
+        }
+
+        $('#client_branch_id').append(option);
+    });
+}
+
+function appendRenewalPolicies(data)
+{
+    console.log('appendRenewalPolicies', data);
+    console.log('appendRenewalPolicies', $('#source_client_policy_id'));
+    
+    $('#source_client_policy_id').empty();
+    $('#source_client_policy_id').append($('<option>', {
+        value: '',
+        text: 'Select Policy',
+    }));
+
+    $.each(data, function(index, item) {
+        var option = $('<option>', {
+            value: item.id,
+            text: item.policy_type + '-' + item.policy_no,
+            'data-insurer' : item.insurer_id,
+            'data-ib' : item.insurer_branch_id,
+            'data-policy' : item.policy_no,
+            'data-cd' : item.cd_ac_no,
+            'data-ps' : item.policy_start_date,
+            'data-pe' : item.policy_end_date,
+            'data-tpa' : item.tpa_id,
+            'data-tpab' : item.tpa_branch_id,
+        });
+        $('#source_client_policy_id').append(option);
+    });
+}
+
+// function getCDAccountNumber(client_id, insurer_id)
+// {   
+//     console.log('getCDAccountNumber')
+
+//     // var client_id = $('#client_id').val()
+//     // var insurer_id = $('#insurer_id').find('option:selected').attr('data-id');
+
+//     console.log('client_id', client_id)
+//     console.log('insurer_id', insurer_id)
+
+//     if(client_id && insurer_id){
+//         $.ajax({
+//             url: '<?= base_url("/util/getCDAccNoByClientAndInsurer/") ?>' + client_id + '/' + insurer_id,
+//             type: "GET",
+//             dataType: 'json',
+//             success: function(res) {
+
+//                 console.log('cd_res', res);
+//                 if(res.status == true){
+//                     // appendCDAccountNumber(res.data[0].cd_ac_no)
+//                     if(res.data[0].cd_ac_no){
+//                         $('#cd_ac_no').val(res.data[0].cd_ac_no)
+//                     }
+//                 }else{
+//                     toastr.warning('The insurer does not has a CD account number');
+//                 }
+
+//             },
+//             error: function(xhr, status, error) {
+//                 console.error(xhr.responseText);
+//                 console.error(status, error);
+//             }
+//         });
+//     } 
+// }
+
+// function appendCDAccountNumber(data)
+// {
+//     console.log('appendCDAccountNumber', data);
+//     console.log('appendCDAccountNumber', $('#cd_ac_no'));
+    
+//     $('#cd_ac_no').empty();
+
+//     $('#cd_ac_no').append($('<option>', {
+//         value: '',
+//         text: 'Select Policy',
+//     }));
+
+//     $('#cd_ac_no').append($('<option>', {
+//         value: 'add_cd',
+//         text: '+ Add CD'
+//     }));
+
+//     $.each(data, function(index, item) {
+//         var option = $('<option>', {
+//             value: item.cd_ac_no,
+//             text: item.cd_ac_no,
+//         });
+//         $('#cd_ac_no').append(option);
+//     });
+// }
+
+// function addCDAccountNumber(input)
+// {
+//     var val = $(input).val();
+//     var client_id = $('#client_id').val();
+//     var insurer_id = $('#insurer_id').val();
+
+//     console.log('addCDAccountNumber', 'addCDAccountNumber');
+//     console.log('client_id', client_id);
+//     console.log('insurer_id', insurer_id);
+
+//     if(client_id == '' || insurer_id == ''){
+//         toastr.warning('Client, Insurer, or both do not exist.');
+//         $(input).val('')
+//         return false;
+//     }
+
+//     if(val == 'add_cd')
+//     {
+//         var myModal = new bootstrap.Modal(document.getElementById('cd_form_modal'));
+//         myModal.show();
+//         $(input).val('')
+//     }
+// }
+
+function getPolicyDetailsByPolicyId(input)
+{  
+    var policy_id = $(input).val()
+
+    if(policy_id){
+
+        $.ajax({
+            url: '<?= base_url("/util/getPolicyDetailsByPolicyId/") ?>' + policy_id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('cd_res', res);
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             }
         });
 
-        // Date document ready
-        $(document).ready(function() {
-
-            var today = new Date();
-
-            var opening_date = flatpickr("#opening_date", {
-                dateFormat: "d/m/Y",
-                allowInput: false
-            });
-
-            var policy_start_date = flatpickr("#policy_start_date", {
-                dateFormat: "d/m/Y",
-                defaultDate: today,
-                allowInput: false,
-                onChange: function(selectedDates, dateStr, instance) {
-                    var policy_end_date = new Date(selectedDates[0]);
-                    policy_end_date.setFullYear(policy_end_date.getFullYear() + 1);
-                    policy_end_date.setDate(policy_end_date.getDate() - 1); // Set end date to last day of selected year
-                    policy_end_datePicker.setDate(policy_end_date);
-
-                    // Calculate renewal date (one month before the end date)
-                    var renewal_date = new Date(policy_end_date);
-                    // renewal_date.setMonth(renewal_date.getMonth() - 1);
-                    renewal_datePicker.setDate(renewal_date); // Set renewal date
-                }
-            });
-
-            // Calculate the end date (today + 1 year)
-            var closeDate = new Date(today);
-            closeDate.setFullYear(closeDate.getFullYear() + 1);
-            closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of next year
-
-            var policy_end_datePicker = flatpickr("#policy_end_date", {
-                dateFormat: "d/m/Y",
-                defaultDate: closeDate,
-                allowInput: false
-            });
-
-            var renewal_datePicker = flatpickr("#renewal_date", {
-                dateFormat: "d/m/Y",
-                allowInput: false
-            });
-
-            var month = flatpickr("#month", {
-                dateFormat: "M/Y", // Format as month and year
-                allowInput: false, // Disable manual input
-            });
-
-            var policy_issue_date = flatpickr("#policy_issue_date", {
-                dateFormat: "d/m/Y", // Format as day-month-year
-                allowInput: false, // Disable manual input
-                onChange: function(selectedDates, dateStr, instance) {
-                    // Get the selected date
-                    var selectedDate = new Date(selectedDates[0]);
-
-                    // Format the selected date to "M-Y"
-                    var formattedMonth = flatpickr.formatDate(selectedDate, "M/Y");
-
-                    // Set the value of the #month input
-                    month.setDate(formattedMonth);
-                }
-            });
-
-
-
-
-
-        })
-
-        //--------------------------------------------------------------------------------------------------------
-
-        function hide_list_show_add() {
-            $('#page_title').text('Add Policy')
-            $('#inception_form_id')[0].reset();
-            $('#client_id').val('').change().prop('disabled', false);
-            $('#tpa').val('').change().prop('disabled', false);
-            $('#client_id_for_edit').val('');
-            $('#policy_tranction_primarykey').val('');
-            $('#client_policy_id').val('');
-            $('#client_branch_id').val('').change().prop('disabled', false);
-            $('#insurer_id').val('');
-            $('#cd_ac_no').empty().prop('disabled', false);
-            $('#policy_no').val('').change().prop('disabled', false);
-            $('#source_client_policy_id').val('').prop('disabled', false);
-            $('#policy_end_date').prop('disabled', false);
-            $('#policy_start_date').prop('disabled', false);
-            $('#client_type').prop('disabled', false);
-            $('#policy_type_id').prop('disabled', false);
-
-            $('#invoice_no_div').hide()
-            $('.current_date').hide()
-            $('#invoice_no').attr('required', false)
-
-            $('#pt_onboarding').show()
-            $('#inception_list').hide()
-            $('#inception_filter').hide()
-            $('#policyholdernamediv').hide();
-            $('.branchdiv').show();
-        }
-
-        function show_list_hide_add() {
-            $('#pt_onboarding').hide()
-            $('#inception_list').show()
-            $('#inception_filter').show();
-            $('#nav_pills').empty()
-            $('#tab_content').empty()
-            count = 0
-        }
-
-        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;
-                        vehicle_list = res.vehicle_data;
-                        unit_list = res.unit_data;
-                        appendClients(res.client_data);
-                        appendVehicles(res.vehicle_data);
-                        appendOwner(client_list)
-                    } else {
-                        console.log('No data found');
-                    }
-                }
-            });
-        }
-
-                // Check on page load
-                // checkAndDisableFields();
-
-                // // Check whenever these fields are updated
-                // $('#client_id, #client_branch_id').on('change keyup', function() {
-                //     checkAndDisableFields();
-                // });
-
-                // Attach event handler to show toastr if user clicks on any disabled field
-                $('#inception_form_id').on('click', '.disabled-field', function(e) {
-                    e.preventDefault();
-                    toastr.warning('Please select Client and Client Branch before filling out the form.');
-                });
-            
-
-            // select2 document ready
-            $(document).ready(function() {
-
-                getClientAndBranchAndPolicy()
-                addHTMLInput();
-                addHTMLInputForVehicleFileUpload()
-
-                <?php if (session()->has('create_failed')) : ?>
-                    toastr.error('<?= session()->getFlashdata('create_failed') ?>', 'Failed');
-                <?php endif; ?>
-
-                <?php if (session()->has('update_failed')) : ?>
-                    toastr.error('<?= session()->getFlashdata('update_failed') ?>', 'Failed');
-                <?php endif; ?>
-
-                <?php if (session()->has('create_success')) : ?>
-                    toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
-                <?php endif; ?>
-
-                <?php if (session()->has('update_success')) : ?>
-                    toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
-                <?php endif; ?>
-
-
-                $('#client_id').select2();
-                $('#client_branch_id').select2();
-                $('#insurer_branch').select2();
-                $('#tpa').select2();
-                $('#base_policy').select2();
-                $('#source_client_policy_id').select2();
-                $('#sales_generated_by').select2();
-                $('#serviced_by').select2();
-                $('#policy_type_id').select2();
-                $('#ppteam').select2();
-            })
-
-            // 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: [{
-                                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',
-                                    exportOptions: {
-                                        columns: ':not(:last-child)'
-                                    },
-                                }]
-                            },
-                            {
-                                text: 'Add',
-                                className: 'buttons-html5 addbtnStyle',
-                                action: function(e, dt, node, config) {
-                                    hide_list_show_add();
-                                }
-                            }
-
-                        ],
-                        language: {
-                            search: "_INPUT_",
-                            searchPlaceholder: "Search..."
-                        },
-                        paging: true, // Enable pagination
-                        pageLength: 25, // Set default number of rows per page (optional)
-                        // ordering: false,
-                    });
-                } else {
-                    console.error("Table not found.");
-                }
-            });
-
-            // Date document ready
-            $(document).ready(function() {
-
-                var today = new Date();
-
-                var opening_date = flatpickr("#opening_date", {
-                    dateFormat: "d/m/Y",
-                    allowInput: false
-                });
-
-                var policy_start_date = flatpickr("#policy_start_date", {
-                    dateFormat: "d/m/Y",
-                    defaultDate: today,
-                    allowInput: false,
-                    onChange: function(selectedDates, dateStr, instance) {
-                        var policy_end_date = new Date(selectedDates[0]);
-                        policy_end_date.setFullYear(policy_end_date.getFullYear() + 1);
-                        policy_end_date.setDate(policy_end_date.getDate() - 1); // Set end date to last day of selected year
-                        policy_end_datePicker.setDate(policy_end_date);
-
-                        // Calculate renewal date (one month before the end date)
-                        var renewal_date = new Date(policy_end_date);
-                        // renewal_date.setMonth(renewal_date.getMonth() - 1);
-                        renewal_datePicker.setDate(renewal_date); // Set renewal date
-                    }
-                });
-
-                // Calculate the end date (today + 1 year)
-                var closeDate = new Date(today);
-                closeDate.setFullYear(closeDate.getFullYear() + 1);
-                closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of next year
-
-                var policy_end_datePicker = flatpickr("#policy_end_date", {
-                    dateFormat: "d/m/Y",
-                    defaultDate: closeDate,
-                    allowInput: false
-                });
-
-                var renewal_datePicker = flatpickr("#renewal_date", {
-                    dateFormat: "d/m/Y",
-                    allowInput: false
-                });
-
-                var month = flatpickr("#month", {
-                    dateFormat: "M/Y", // Format as month and year
-                    allowInput: false, // Disable manual input
-                });
-
-                var policy_issue_date = flatpickr("#policy_issue_date", {
-                    dateFormat: "d/m/Y", // Format as day-month-year
-                    allowInput: false, // Disable manual input
-                    onChange: function(selectedDates, dateStr, instance) {
-                        // Get the selected date
-                        var selectedDate = new Date(selectedDates[0]);
-
-                        // Format the selected date to "M-Y"
-                        var formattedMonth = flatpickr.formatDate(selectedDate, "M/Y");
-
-                        // Set the value of the #month input
-                        month.setDate(formattedMonth);
-                    }
-                });
-
-
-
-
-
-            })
-
-            //--------------------------------------------------------------------------------------------------------
-
-            function hide_list_show_add() {
-                $('#page_title').text('Add Policy')
-                $('#inception_form_id')[0].reset();
-                $('#client_id').val('').change().prop('disabled', false);
-                $('#tpa').val('').change().prop('disabled', false);
-                $('#client_id_for_edit').val('');
-                $('#policy_tranction_primarykey').val('');
-                $('#client_policy_id').val('');
-                $('#client_branch_id').val('').change().prop('disabled', false);
-                $('#insurer_id').val('');
-                $('#cd_ac_no').empty().prop('disabled', false);
-                $('#policy_no').val('').change().prop('disabled', false);
-                $('#source_client_policy_id').val('').prop('disabled', false);
-                $('#policy_end_date').prop('disabled', false);
-                $('#policy_start_date').prop('disabled', false);
-                $('#client_type').prop('disabled', false);
-                $('#policy_type_id').prop('disabled', false);
-
-                $('#invoice_no_div').hide()
-                $('.current_date').hide()
-                $('#invoice_no').attr('required', false)
-
-                $('#pt_onboarding').show()
-                $('#inception_list').hide()
-                $('#inception_filter').hide()
-                $('#policyholdernamediv').hide();
-                $('.branchdiv').show();
-            }
-
-            function show_list_hide_add() {
-                $('#pt_onboarding').hide()
-                $('#inception_list').show()
-                $('#inception_filter').show();
-                $('#nav_pills').empty()
-                $('#tab_content').empty()
-                count = 0
-            }
-
-            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;
-                            vehicle_list = res.vehicle_data;
-                            unit_list = res.unit_data;
-                            appendClients(res.client_data);
-                            appendVehicles(res.vehicle_data);
-                            appendOwner(client_list)
-                        } else {
-                            console.log('No data found');
-                        }
-
-                    },
-                    error: function(xhr, status, error) {
-                        console.error(xhr.responseText);
-                        console.error(status, error);
-                    }
-                });
-            }
-
-            function appendClients(data) {
-                $('#client_id').empty();
-
-                $('#client_id').append($('<option>', {
-                    value: '',
-                    text: 'Select Client'
-                }));
-
-                $('#client_id').append($('<option>', {
-                    value: 'add_client',
-                    text: '+ Add Client'
-                }));
-
-                $.each(data, function(index, item) {
-
-                    let client_show_name = item.client_name;
-                    if (item.client_type == 2) {
-                        client_show_name = item.client_name + (item.dob ? ('- (' + item.dob + ' )') : '') + (item.pan ? ('- ' + item.pan) : '');
-                        // console.log(client_show_name);
-                    }
-
-                    var option = $('<option>', {
-                        value: item.id,
-                        text: client_show_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);
-                });
-            }
-
-            function appendVehicles(data, vehicle_id) {
-                $('#vehicle_no').empty();
-
-                $('#vehicle_no').append($('<option>', {
-                    value: '',
-                    text: 'Select Vehicle'
-                }));
-
-                $('#vehicle_no').append($('<option>', {
-                    value: 'add_vehicle',
-                    text: '+ Add Vehicle'
-                }));
-
-                $.each(data, function(index, item) {
-                    var option = $('<option>', {
-                        value: item.id,
-                        text: item.vehicle_no ?? item.rc,
-                        'data-cid': item.owner,
-                        'data-bid': item.branch_id,
-                        'data-cty': item.client_type,
-                    });
-                    if (vehicle_id == item.id) {
-                        option.attr('selected', true);
-                    }
-                    $('#vehicle_no').append(option);
-                });
-            }
-
-            function appendBranch(data) {
-
-                $('#client_branch_id').empty();
-
-                $('#client_branch_id').append($('<option>', {
-                    value: '',
-                    text: 'Select Branch'
-                }));
-
-                $.each(data, function(index, item) {
-
-                    var option = $('<option>', {
-                        value: item.id,
-                        text: item.branch_name
-                    });
-                    $('#client_branch_id').append(option);
-                });
-            }
-
-            function appendRenewalPolicies(data) {
-                console.log('appendRenewalPolicies', data);
-                console.log('appendRenewalPolicies', $('#source_client_policy_id'));
-
-                $('#source_client_policy_id').empty();
-                $('#source_client_policy_id').append($('<option>', {
-                    value: '',
-                    text: 'Select Policy',
-                }));
-
-                $.each(data, function(index, item) {
-                    var option = $('<option>', {
-                        value: item.id,
-                        text: item.policy_type + '-' + item.policy_no,
-                        'data-insurer': item.insurer_id,
-                        'data-ib': item.insurer_branch_id,
-                        'data-policy': item.policy_no,
-                        'data-cd': item.cd_ac_no,
-                        'data-ps': item.policy_start_date,
-                        'data-pe': item.policy_end_date,
-                        'data-tpa': item.tpa_id,
-                        'data-tpab': item.tpa_branch_id,
-                    });
-                    $('#source_client_policy_id').append(option);
-                });
-            }
-
-            // function getCDAccountNumber(client_id, insurer_id)
-            // {   
-            //     console.log('getCDAccountNumber')
-
-            //     // var client_id = $('#client_id').val()
-            //     // var insurer_id = $('#insurer_id').find('option:selected').attr('data-id');
-
-            //     console.log('client_id', client_id)
-            //     console.log('insurer_id', insurer_id)
-
-            //     if(client_id && insurer_id){
-            //         $.ajax({
-            //             url: '<?= base_url("/util/getCDAccNoByClientAndInsurer/") ?>' + client_id + '/' + insurer_id,
-            //             type: "GET",
-            //             dataType: 'json',
-            //             success: function(res) {
-
-            //                 console.log('cd_res', res);
-            //                 if(res.status == true){
-            //                     // appendCDAccountNumber(res.data[0].cd_ac_no)
-            //                     if(res.data[0].cd_ac_no){
-            //                         $('#cd_ac_no').val(res.data[0].cd_ac_no)
-            //                     }
-            //                 }else{
-            //                     toastr.warning('The insurer does not has a CD account number');
-            //                 }
-
-            //             },
-            //             error: function(xhr, status, error) {
-            //                 console.error(xhr.responseText);
-            //                 console.error(status, error);
-            //             }
-            //         });
-            //     } 
-            // }
-
-            // function appendCDAccountNumber(data)
-            // {
-            //     console.log('appendCDAccountNumber', data);
-            //     console.log('appendCDAccountNumber', $('#cd_ac_no'));
-
-            //     $('#cd_ac_no').empty();
-
-            //     $('#cd_ac_no').append($('<option>', {
-            //         value: '',
-            //         text: 'Select Policy',
-            //     }));
-
-            //     $('#cd_ac_no').append($('<option>', {
-            //         value: 'add_cd',
-            //         text: '+ Add CD'
-            //     }));
-
-            //     $.each(data, function(index, item) {
-            //         var option = $('<option>', {
-            //             value: item.cd_ac_no,
-            //             text: item.cd_ac_no,
-            //         });
-            //         $('#cd_ac_no').append(option);
-            //     });
-            // }
-
-            // function addCDAccountNumber(input)
-            // {
-            //     var val = $(input).val();
-            //     var client_id = $('#client_id').val();
-            //     var insurer_id = $('#insurer_id').val();
-
-            //     console.log('addCDAccountNumber', 'addCDAccountNumber');
-            //     console.log('client_id', client_id);
-            //     console.log('insurer_id', insurer_id);
-
-            //     if(client_id == '' || insurer_id == ''){
-            //         toastr.warning('Client, Insurer, or both do not exist.');
-            //         $(input).val('')
-            //         return false;
-            //     }
-
-            //     if(val == 'add_cd')
-            //     {
-            //         var myModal = new bootstrap.Modal(document.getElementById('cd_form_modal'));
-            //         myModal.show();
-            //         $(input).val('')
-            //     }
-            // }
-
-            function getPolicyDetailsByPolicyId(input) {
-                var policy_id = $(input).val()
-
-                if (policy_id) {
-
-                    $.ajax({
-                        url: '<?= base_url("/util/getPolicyDetailsByPolicyId/") ?>' + policy_id,
-                        type: "GET",
-                        dataType: 'json',
-                        success: function(res) {
-
-                            console.log('cd_res', res);
-
-                        },
-                        error: function(xhr, status, error) {
-                            console.error(xhr.responseText);
-                            console.error(status, error);
-                        }
-                    });
-
-                }
-            }
-
-            function addHTMLInput(data = null) {
-                const container = document.getElementById('dynamic-form-container');
-                const newRow = document.createElement('div');
-                newRow.className = 'form-row dynamic-form-row';
-                newRow.innerHTML = `
+    } 
+}
+
+function addHTMLInput(data = null) 
+{
+    const container = document.getElementById('dynamic-form-container');
+    const newRow = document.createElement('div');
+    newRow.className = 'form-row dynamic-form-row';
+    newRow.innerHTML = `
         <div class="form-group col-md-5">
             <label for="file_name">Document Name<span class="text-danger">*</span></label>
             <input type="text" class="form-control" id="docs_name" name="doc_name[]" placeholder="Enter file name" required>
@@ -1240,163 +1002,172 @@
             <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInput(this)">+</a>
         </div>
     `;
-                container.appendChild(newRow);
+    container.appendChild(newRow);
 
-                if (data !== null && data.db_column_name !== undefined) {
-                    const selectElement = newRow.querySelector('.db-column-name-select');
-                    selectElement.value = data.db_column_name;
-                }
-            }
+    if (data !== null && data.db_column_name !== undefined) {
+        const selectElement = newRow.querySelector('.db-column-name-select');
+        selectElement.value = data.db_column_name;
+    }
+}
 
-            function removeHTMLInput(element) {
-                const container = document.getElementById('dynamic-form-container');
-                const rows = container.querySelectorAll('.dynamic-form-row');
+function removeHTMLInput(element) 
+{
+    const container = document.getElementById('dynamic-form-container');
+    const rows = container.querySelectorAll('.dynamic-form-row');
 
-                if (rows.length > 1) {
-                    const row = element.closest('.dynamic-form-row');
-                    row.remove();
-                }
-            }
+    if (rows.length > 1) {
+        const row = element.closest('.dynamic-form-row');
+        row.remove();
+    } 
+}
 
-            function appendBasePolicyList(data, select = null) {
-                console.log('---------------------------------------------------------------')
-                console.log('first')
-                console.log('---------------------------------------------------------------')
+function appendBasePolicyList(data, select = null) 
+{
+    console.log('---------------------------------------------------------------')
+    console.log('first')
+    console.log('---------------------------------------------------------------')
 
-                $('#base_policy').empty();
-                $('#base_policy').append($('<option>', {
-                    value: '',
-                    text: 'Select Base Policy'
-                }));
+    $('#base_policy').empty();
+    $('#base_policy').append($('<option>', {
+        value: '',
+        text: 'Select Base Policy'
+    }));
 
-                $.each(data, function(index, item) {
+    $.each(data, function(index, item) {
 
-                    const option = $('<option>', {
-                        value: item.id,
-                        text: `${item.policy_type ?? ''} - ${item.policy_no ?? ''}`,
-                        'data-id': item.id
-                    });
+        const option = $('<option>', {
+            value: item.id,
+            text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`,
+            'data-id': item.id 
+        });
 
-                    $('#base_policy').append(option);
-                });
-            }
+        $('#base_policy').append(option);
+    });
+}
 
-            function appendUnits(data) {
-                $('#units').empty()
-                $('#units').append($('<option>', {
-                    value: '',
-                    text: 'Select Unit'
-                }));
+function appendUnits(data)
+{
+    $('#units').empty()
+    $('#units').append($('<option>', {
+        value: '',
+        text: 'Select Unit'
+    }));
+
+    
+
+    $.each(data, function(index, item) {
+
+        var option = $('<option>', {
+            value: item,
+            text: item 
+        });
+
+        if(data.length == 1){
+            option.attr('selected', true);
+        }
+
+        $('#units').append(option);
+    });
+}
+
+function fileupload(input)
+{
+    var myModal = new bootstrap.Modal(document.getElementById('file_upload'));
+        myModal.show();
+}
+
+function logSelectedIds() 
+{
+    var selectedIds = [];
+    $('.row-select:checked').each(function() {
+        selectedIds.push($(this).data('id'));
+    });
+    // console.log('Selected IDs:', selectedIds);
+    return selectedIds;
+
+}
+
+function appendFileTableBody(data) 
+{   
+    console.log(data);
+
+    $('#table_bd').empty();
+
+    $.each(data, function(index, item) {
+        var row = $('<tr>');
+
+        row.append($('<td>').text(index+1));
+        row.append($('<td>').text(item.doc_name));
+        row.append($('<td>').text(item.file_name));
+
+        // var url = "<?= base_url('/downloadGdriveFile'); ?>" + 
+        //   "?client_id=" + item.client_id + 
+        //   "&file_type=policy" + 
+        //   "&file_name=" + item.file_name + 
+        //   "&client_policy_id=" + item.client_policy_id;
+
+        var url = '<?= base_url('download-kyc-docs/') ?>' + item.file_name;
 
 
-
-                $.each(data, function(index, item) {
-
-                    var option = $('<option>', {
-                        value: item,
-                        text: item
-                    });
-
-                    if (data.length == 1) {
-                        option.attr('selected', true);
-                    }
-
-                    $('#units').append(option);
-                });
-            }
-
-            function fileupload(input) {
-                var myModal = new bootstrap.Modal(document.getElementById('file_upload'));
-                myModal.show();
-            }
-
-            function logSelectedIds() {
-                var selectedIds = [];
-                $('.row-select:checked').each(function() {
-                    selectedIds.push($(this).data('id'));
-                });
-                // console.log('Selected IDs:', selectedIds);
-                return selectedIds;
-
-            }
-
-            function appendFileTableBody(data) {
-                console.log(data);
-
-                $('#table_bd').empty();
-
-                $.each(data, function(index, item) {
-                    var row = $('<tr>');
-
-                    row.append($('<td>').text(index + 1));
-                    row.append($('<td>').text(item.doc_name));
-                    row.append($('<td>').text(item.file_name));
-
-                    // var url = "<?= base_url('/downloadGdriveFile'); ?>" + 
-                    //   "?client_id=" + item.client_id + 
-                    //   "&file_type=policy" + 
-                    //   "&file_name=" + item.file_name + 
-                    //   "&client_policy_id=" + item.client_policy_id;
-
-                    var url = '<?= base_url('download-kyc-docs/') ?>' + item.file_name;
+        var link = $('<a>')
+            .attr('href', url)
+            .attr('target', '_blank') // Open in a new tab
+            .attr('style', 'font-size:18px;')
+            .attr('data-id', item.id)
+            .addClass('mdi mdi-download')
 
 
-                    var link = $('<a>')
-                        .attr('href', url)
-                        .attr('target', '_blank') // Open in a new tab
-                        .attr('style', 'font-size:18px;')
-                        .attr('data-id', item.id)
-                        .addClass('mdi mdi-download')
+        // Append the <a> tag inside the <td>
+        row.append($('<td>').append(link));
+        $('#table_bd').append(row);
+    });
+}
 
+function checkInputs() 
+{
+    let isValid = true;
 
-                    // Append the <a> tag inside the <td>
-                    row.append($('<td>').append(link));
-                    $('#table_bd').append(row);
-                });
-            }
+    // Iterate through each dynamic row
+    $('.dynamic-form-row').each(function() {
+        const docNameField = $(this).find('input[name="doc_name[]"]');
+        const fileField = $(this).find('input[name="file[]"]');
+        const docName = docNameField.val().trim();
+        const fileName = fileField.val().trim();
 
-            function checkInputs() {
-                let isValid = true;
+        // Remove previous highlight classes
+        docNameField.removeClass('highlight');
+        fileField.removeClass('highlight');
 
-                // Iterate through each dynamic row
-                $('.dynamic-form-row').each(function() {
-                    const docNameField = $(this).find('input[name="doc_name[]"]');
-                    const fileField = $(this).find('input[name="file[]"]');
-                    const docName = docNameField.val().trim();
-                    const fileName = fileField.val().trim();
+        if (docName === '' && fileName !== '') {
+            toastr.warning('Document Name is required.');
+            docNameField.addClass('highlight');
+            isValid = false;
+        } else if (docName !== '' && fileName === '') {
+            toastr.warning('File is required.');
+            fileField.addClass('highlight');
+            isValid = false;
+        } else if(docName === '' && fileName === '') {
+            toastr.warning('Both Fields is required.');
+            fileField.addClass('highlight');
+            docNameField.addClass('highlight');
+            isValid = false;
+        }
+    });
 
-                    // Remove previous highlight classes
-                    docNameField.removeClass('highlight');
-                    fileField.removeClass('highlight');
+    return isValid;
+}
 
-                    if (docName === '' && fileName !== '') {
-                        toastr.warning('Document Name is required.');
-                        docNameField.addClass('highlight');
-                        isValid = false;
-                    } else if (docName !== '' && fileName === '') {
-                        toastr.warning('File is required.');
-                        fileField.addClass('highlight');
-                        isValid = false;
-                    } else if (docName === '' && fileName === '') {
-                        toastr.warning('Both Fields is required.');
-                        fileField.addClass('highlight');
-                        docNameField.addClass('highlight');
-                        isValid = false;
-                    }
-                });
+function validateForm() 
+{
+    return checkInputs(); // Call checkInputs before form submission
+}
 
-                return isValid;
-            }
-
-            function validateForm() {
-                return checkInputs(); // Call checkInputs before form submission
-            }
-
-            function addHTMLInputForVehicleFileUpload(data = null) {
-                const container = document.getElementById('dynamic-form-container-for-vehicle-file-upload');
-                const newRow = document.createElement('div');
-                newRow.className = 'form-row dynamic-form-row';
-                newRow.innerHTML = `
+function addHTMLInputForVehicleFileUpload(data = null) 
+{
+    const container = document.getElementById('dynamic-form-container-for-vehicle-file-upload');
+    const newRow = document.createElement('div');
+    newRow.className = 'form-row dynamic-form-row';
+    newRow.innerHTML = `
         <div class="form-group col-md-5">
             <label for="file_name">Document Name<span class="text-danger">*</span></label>
             <input type="text" class="form-control" id="docs_name" name="other_docs_name[]" placeholder="Enter file name" required>
@@ -1410,554 +1181,578 @@
             <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInputForVehicleFileUpload(this)">+</a>
         </div>
     `;
-                container.appendChild(newRow);
+    container.appendChild(newRow);
 
-                if (data !== null && data.db_column_name !== undefined) {
-                    const selectElement = newRow.querySelector('.db-column-name-select');
-                    selectElement.value = data.db_column_name;
-                }
-            }
+    if (data !== null && data.db_column_name !== undefined) {
+        const selectElement = newRow.querySelector('.db-column-name-select');
+        selectElement.value = data.db_column_name;
+    }
+}
 
-            function appendVehicleFileTableBody(data) {
-                console.log(data);
+function appendVehicleFileTableBody(data) 
+{   
+    console.log(data);
 
-                // Clear the table body
-                $('#vehicle_table_bd').empty();
+    // Clear the table body
+    $('#vehicle_table_bd').empty();
 
-                $.each(data, function(index, item) {
-                    var row = $('<tr>');
+    $.each(data, function(index, item) {
+        var row = $('<tr>');
 
-                    // Add row number, document name, and file name
-                    row.append($('<td>').text(index + 1));
-                    row.append($('<td>').text(item.other_docs_name));
-                    row.append($('<td>').text(item.file_name));
+        // Add row number, document name, and file name
+        row.append($('<td>').text(index + 1));
+        row.append($('<td>').text(item.other_docs_name));
+        row.append($('<td>').text(item.file_name));
 
-                    // Create the download link
-                    var downloadLink = $('<a>')
-                        .attr('href', '<?= base_url('download-kyc-docs/') ?>' + item.file_name)
-                        .attr('style', 'font-size:18px;')
-                        .attr('data-id', item.id)
-                        .addClass('mdi mdi-download')
-                        .text(' '); // Space after the icon
+        // Create the download link
+        var downloadLink = $('<a>')
+            .attr('href', '<?= base_url('download-kyc-docs/') ?>' + item.file_name)
+            .attr('style', 'font-size:18px;')
+            .attr('data-id', item.id)
+            .addClass('mdi mdi-download')
+            .text(' ');  // Space after the icon
 
-                    // Create the delete link
-                    var deleteLink = $('<a>')
-                        .attr('style', 'font-size:18px;')
-                        .attr('data-id', item.id)
-                        .addClass('mdi mdi-delete')
-                        .text(' '); // Space after the icon
+        // Create the delete link
+        var deleteLink = $('<a>')
+            .attr('style', 'font-size:18px;')
+            .attr('data-id', item.id)
+            .addClass('mdi mdi-delete')
+            .text(' ');  // Space after the icon
 
-                    // Append the download and delete icons inside the same <td>
-                    row.append($('<td>').append(downloadLink));
+        // Append the download and delete icons inside the same <td>
+        row.append($('<td>').append(downloadLink));
 
-                    // Append the row to the table body
-                    $('#vehicle_table_bd').append(row);
-                });
-            }
+        // Append the row to the table body
+        $('#vehicle_table_bd').append(row);
+    });
+}
 
-            function removeHTMLInputForVehicleFileUpload(element) {
-                const container = document.getElementById('dynamic-form-container-for-vehicle-file-upload');
-                const rows = container.querySelectorAll('.dynamic-form-row');
+function removeHTMLInputForVehicleFileUpload(element) 
+{
+    const container = document.getElementById('dynamic-form-container-for-vehicle-file-upload');
+    const rows = container.querySelectorAll('.dynamic-form-row');
 
-                if (rows.length > 1) {
-                    const row = element.closest('.dynamic-form-row');
-                    row.remove();
-                }
-            }
+    if (rows.length > 1) {
+        const row = element.closest('.dynamic-form-row');
+        row.remove();
+    } 
+}
 
-            //--------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------
 
 
-            $(document).ready(function() {
+$(document).ready(function(){
 
-                $('#client_id').change(function() {
+    $('#client_id').change(function(){
 
-                    let client_id = $(this).val();
-                    let client_name = $('#client_id option:selected').data('cn');
-                    let client_type = $('#client_id option:selected').data('ct');
+        let client_id = $(this).val();
+        let client_name = $('#client_id option:selected').data('cn');
+        let client_type = $('#client_id option:selected').data('ct');
 
 
-                    console.log('client_name', client_name);
-                    console.log('client_type', client_type);
-                    console.log('client_id', client_id);
+        console.log('client_name',client_name);
+        console.log('client_type',client_type);
+        console.log('client_id', client_id);
 
-                    $('#policy_holder_name').val(client_name);
+        $('#policy_holder_name').val(client_name);
 
-                    if (client_id == 'add_client') {
+        let status = $('#policy_status').val();
 
-                        if ($('#client_type').val()) {
-                            $('#client_id').val('').change();
+        if(client_id == 'add_client') {
+            
+            // if($('#client_type').val()){
+            //     $('#client_id').val('').change();
 
-                            if ($('#client_type').val() == 2) {
-                                $('#short_name').closest('.form-group').hide();
-                                $('#short_name').removeAttr('required');
-                            } else {
-                                $('#short_name').closest('.form-group').show();
-                                $('#short_name').attr('required', 'required');
-                            }
-
-                            var myModal = new bootstrap.Modal(document.getElementById('upload_enrollment_model'));
-                            myModal.show();
-                        } else {
-                            $('#client_id').val('').change();
-                            toastr.warning('Please select the client type', 'WARNING')
-                        }
-                    }
-
-                    if (branch_list != '') {
-                        // console.log(branch_list[client_id]);
-                        let data = branch_list[client_id];
-                        appendBranch(data);
-                    }
-
-                })
-
-                // $('#client_branch_id').change(function(){
-
-                //     let client_branch_id = $(this).val();
-
-                //     console.log('client_branch_id', client_branch_id);
-                //     console.log('unit_list', unit_list);
-
-
-                //     if(unit_list != '') {
-                //         console.log(unit_list[client_branch_id]);
-                //         let data = unit_list[client_branch_id];
-                //         appendUnits(data);
-                //     }
-
-                // })
-            });
-
-            $('#issue_type').change(function() {
-
-                let value = $(this).val()
-
-                if (value == 1) {
-                    $('#revenue_type').val('');
-                    $('#revenue_type option[value="NA"]').show();
-                    $('#revenue_type option[value="EANR"]').show();
-                    $('#revenue_type option[value="EA"]').hide();
-                }
-
-                if (value == 2) {
-                    $('#revenue_type').val('EA')
-                    $('#renewal').show()
-                    $('#revenue_type option[value="EA"]').show();
-                    $('#revenue_type option[value="NA"]').hide();
-                    $('#revenue_type option[value="EANR"]').hide();
-                    // $('.sded_dates').show()
-                    // $('#source_client_policy_id').attr('required', true)
-                } else {
-                    $('#renewal').hide()
-                    // $('.sded_dates').hide()
-                    // $('#source_client_policy_id').attr('required', false)
-                    $('#policy_start_date').val('');
-                    $('#policy_end_date').val('');
-                    $('#revenue_type').val('');
-                    $('#revenue_type option[value="EA"]').hide();
-                    $('#revenue_type option[value="NA"]').show();
-                    $('#revenue_type option[value="EANR"]').show();
-
-
-                }
-
-                if (value == 3) {
-                    $('.roll_div').show();
-                } else {
-                    $('.roll_div').hide();
-                }
-            })
-
-            $('#invoice_status').change(function() {
-
-                let value = $(this).val()
-
-                if (value == 'generated') {
-                    $('#invoice_no_div').show()
-                    $('#invoice_no').attr('required', true)
-                } else {
-                    $('#invoice_no_div').hide()
-                    $('#invoice_no').attr('required', false)
-
-                }
-            })
-
-            $('#invoice_status_modal').change(function() {
-
-                let value = $(this).val()
-
-                if (value == 'generated') {
-                    $('#invoice_no_div_modal').show()
-                    $('#invoice_no_modal').attr('required', true)
-                } else {
-                    $('#invoice_no_div_modal').hide()
-                    $('#invoice_no_modal').attr('required', false)
-
-                }
-            })
-
-            $("#invoiceForm").submit(function(event) {
-
-                event.preventDefault();
-
-                var isValid = $('#invoiceForm').parsley().validate();
-                if (!isValid) {
-                    console.log('Form is Empty', 'Warning');
-                    return;
-                }
-
-                form_action = '<?= base_url("util/updateInvoiceStatus"); ?>';
-
-                $('.loader').fadeIn();
-                $('.loader-mask').fadeIn();
-
-                var ids = logSelectedIds();
-                // console.log(ids);
-
-                var formData = new FormData($('#invoiceForm')[0]);
-                formData.append('ids', JSON.stringify(ids));
-
-                $.ajax({
-                    data: formData,
-                    url: form_action,
-                    type: "POST",
-                    dataType: 'json',
-                    processData: false,
-                    contentType: false,
-                    success: function(res) {
-
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-
-                        if (res.status == true) {
-                            toastr.success(res.message, 'Success');
-                        } else {
-                            toastr.error(res.message, 'Error');
-                        }
-
-                        window.location.reload();
-                        $('.close').click();
-                    },
-                    error: function(xhr, status, error) {
-                        console.error(xhr.responseText);
-                        console.error(status, error);
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-                    }
-                });
-            });
-
-            $('#cd_ac_no_data').change(function() {
-
-                var cd_ac_no = $(this).val();
-                // console.log(cd_ac_no +'-'+cd_ac_no.length);
-                cd_ac_no = cd_ac_no.trim();
-                // console.log(cd_ac_no +'-'+cd_ac_no.length);
-
-
-                $.ajax({
-                    url: '<?php echo base_url('util/check_cd_ac_no/'); ?>' + cd_ac_no,
-                    type: "GET",
-                    dataType: 'json',
-                    success: function(res) {
-
-                        console.log('CD Account Number Responcce', res)
-                        if (res.status == true) {
-                            toastr.warning(res.message, 'warning');
-                            $('#cd_ac_no_data').val('');
-                        }
-                    },
-                    error: function(xhr, status, error) {
-                        console.error(xhr.responseText);
-                        console.error(status, error);
-                    }
-                });
-
-            })
-
-            // $('#policy_type_id').change(function() {
-
-            // var policy_type_id = $(this).val();
-
-            //     var client_id = $('#client_id').val();
-            //     var client_branch_id = $('#client_branch_id').val();
-
-            //     // if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
-            //     //     $('#tpa').prop('required', false);
-            //     //     $('#tpa_danger').hide()
-            //     // } else {
-            //     //     $('#tpa').prop('required', true);
-            //     //     $('#tpa_danger').show()
-            //     // }
-
-            //     if(policy_type_id == 3 || policy_type_id == 4 || policy_type_id == 5) {
-            //         $('#base_policy_id').show();
-            //     }else{
-            //         $('#base_policy_id').hide();
+            //     if($('#client_type').val() == 2){
+            //         $('#short_name').closest('.form-group').hide();
+            //         $('#short_name').removeAttr('required');
+            //     } else {
+            //         $('#short_name').closest('.form-group').show();
+            //         $('#short_name').attr('required', 'required');
             //     }
 
-            //     if(client_id && client_branch_id){
+            //     var myModal = new bootstrap.Modal(document.getElementById('upload_enrollment_model'));
+            //     myModal.show();
+            // }else{
+            //     $('#client_id').val('').change();
+            //     toastr.warning('Please select the client type', 'WARNING')
+            // }
+            appendClientForm();
 
-            //         var url_for_get_policy_type_list = '<?php echo base_url('util/get_policy_type_for_base_policy/') ?>' + client_id + '/' + client_branch_id;
-            //         $.get(url_for_get_policy_type_list, function(response){
-            //             console.log(response)
-            //             appendBasePolicyList(response.data);
-            //         }).fail(function(xhr, status, error) {
-            //             console.error(xhr.responseText);
-            //             console.error(status, error);
-            //         });
-            //     }
+            $(this).val('').select2();
+            $('#pre_sales_row').hide();
+            $('#sales_row').hide();
+            $('#submitButton').hide();
 
-            //     //------------------------------------------------------------
-
-
-            //     // var selectedOption = this.options[this.selectedIndex];
-
-            //     // var ebp = selectedOption.getAttribute('data-ebp');
-            //     // var etp = selectedOption.getAttribute('data-etp');
-            //     // var iep = selectedOption.getAttribute('data-iep');
-            //     // var itp = selectedOption.getAttribute('data-itp');
-
-            //     // console.log('EBP:', ebp);
-            //     // console.log('ETP:', etp);
-            //     // console.log('IEP:', iep);
-            //     // console.log('ITP:', itp);
-
-            //     // document.getElementById('Standard_bp').value = ebp; 
-            //     // document.getElementById('Standard_tp').value = etp; 
-
-            // })
-
-            $('#issue_type').change(function() {
-
-                let issue_type = $(this).val();
-                let branch_id = $('#client_branch_id').val();
-
-                console.log(branch_id);
-
-                if (policy_list != '' && branch_id != '') {
-                    console.log(policy_list[branch_id]);
-                    let data = policy_list[branch_id];
-                    if (issue_type == 2) {
-                        appendRenewalPolicies(data);
-                    }
-                }
-            });
-
-            //--------------------------------------------------------------------------------------------------------
-
-            function formatDateforpolicy(dateStr) {
-
-                let dateParts = dateStr.split('-');
-                let year = dateParts[0];
-                let month = dateParts[1];
-                let day = dateParts[2];
-
-                var date = day + '-' + month + '-' + year;
-
-                // return `${day}-${month}-${year}`;
-                return date;
-            }
-
-            function onlyNumbers(event) {
-                var charcode;
-                charcode = event.which || event.keyCode;
-                if (charcode >= 48 && charcode <= 57 || charcode == 46) return true;
-                return false;
-            }
-    </script>
-
-
-    <script>
-        $(document).ready(function() {
-            // getURLParams()
-            $('#client_id_for_search').select2();
-            $('#insurer_id_for_search').select2();
-            $('#policy_type_for_search').select2();
-        })
-
-        function fetchEmpolyeeList(event) {
-            event.preventDefault(); // Prevent default action
-
-            var start_date = $('#startDate').val();
-            var end_date = $('#endDate').val();
-            var client_id = $('#client_id_for_search').val();
-            var insurer_id = $('#insurer_id_for_search').val();
-            var policy_type_id = $('#policy_type_for_search').val();
-            var date_type = $('#date_type').val();
-            var issuer = $('#issuer_for_search').val() || 0;
-            var status = $('#policy_status_for_search').val();
-
-            console.log(start_date + '-' + end_date);
-
-            var queryParams = {
-                start_date: start_date,
-                end_date: end_date,
-                client_id: client_id,
-                insurer_id: insurer_id,
-                policy_type_id: policy_type_id,
-                date_type: date_type,
-                issuer: issuer,
-                status: status,
-            };
-
-            console.log(queryParams)
-
-            const queryString = objectToQueryString(queryParams);
-            const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-            console.log(apiURL);
-            window.location.href = apiURL;
-        }
-
-        function objectToQueryString(obj) {
-            return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-        }
-
-        // function getURLParams() 
-        // {
-        //     const url = new URL(window.location.href);
-        //     const params = new URLSearchParams(url.search);
-
-        //     const startDate = params.get('start_date') || 0; // Default to 0 if not found
-        //     const endDate = params.get('end_date') || 0; // Default to 0 if not found
-        //     const client_id = params.get('client_id') || 0; // Default to 0 if not found
-        //     const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
-        //     const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
-        //     const date_type = params.get('date_type') || 0; // Default to 0 if not found
-        //     const issuer = params.get('issuer') || 0; // Default to 0 if not found
-        //     const status = params.get('status') || 0; // Default to 0 if not found
-
-        //     hideDateField(date_type)
-
-        //     // console.log('startDate', startDate)
-        //     // console.log('endDate', endDate)
-        //     // console.log('client_id', client_id)
-        //     // console.log('insurer_id', insurer_id)
-        //     // console.log('policy_type_id', policy_type_id)   
-        //     // console.log('date_type', date_type)
-        //     // console.log('issuer', issuer)
-        //     // console.log('status', status)
-
-        //     // Log the values or use them as needed
-        //     // console.log('Start Date:', startDate);
-        //     // console.log('End Date:', endDate);
-
-        //     if (startDate != 0 && endDate != 0) {
-        //         setTimeout(function(){
-        //             $('#start_date').val(startDate)
-        //             $('#end_date').val(endDate)
-        //             $('#client_id_for_search').val(client_id).change()
-        //             $('#insurer_id_for_search').val(insurer_id).change()
-        //             $('#policy_type_for_search').val(policy_type_id).change()
-        //             $('#date_type').val(date_type)
-        //             $('#issuer_for_search').val(issuer)
-        //             $('#policy_status_for_search').val(status)
-        //         },1000)
-
-        //     }
-
-        // }
-
-        $(function() {
-
-            const url = new URL(window.location.href);
-            const params = new URLSearchParams(url.search);
-
-            // Get start and end dates from URL parameters, or use default values
-            const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD/MM/YYYY');
-            const endDateParam = params.get('end_date') || moment().format('DD/MM/YYYY');
-
-            // Parse the dates to moment objects
-            var start = moment(startDateParam, 'DD/MM/YYYY');
-            var end = moment(endDateParam, 'DD/MM/YYYY');
-
-            // var start = moment().subtract(29, 'days');
-            // var end = moment();
-
-            function cb(start, end) {
-                $('#reportrange').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_for_search').val('0').change();
-                $('#insurer_id_for_search').val('0').change();
-                $('#policy_type_for_search').val('0').change();
-                $('#date_type').val('0');
-                $('#issuer_for_search').val('0');
-                $('#policy_status_for_search').val('0');
-                $('#date_div').hide()
-
-                // Reset the date range picker to default
-                $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-                $('#reportrange').data('daterangepicker').setEndDate(moment());
-                cb(start, end); // Update the displayed date range
-            });
-
-        });
-
-        function hideDateField(input = null) {
-            let val = $('#date_type').val();
-
-            if (input) {
-                val = input;
-            }
-
-            if (val != 0) {
-                $('#date_div').show()
-            } else {
-                $('#date_div').hide()
+        }else{
+            $('#pre_sales_row').show();
+            $('#submitButton').show();
+            if(status == "completed"){
+                $('#sales_row').show();
             }
         }
 
-        function removePolicyTransaction(input, pt_id, policy_type_id) {
+        if(branch_list != '') {
+            // console.log(branch_list[client_id]);
+            let data = branch_list[client_id];
+            appendBranch(data);
+        }
+        
+    })
 
-            let string = "Do you want to delete this transaction?";
-            if (policy_type_id > 7) {
-                string = "Do you want to delete this transaction? Deleting this will also remove the linked CRM policy entry.";
+    // $('#client_branch_id').change(function(){
+
+    //     let client_branch_id = $(this).val();
+        
+    //     console.log('client_branch_id', client_branch_id);
+    //     console.log('unit_list', unit_list);
+
+
+    //     if(unit_list != '') {
+    //         console.log(unit_list[client_branch_id]);
+    //         let data = unit_list[client_branch_id];
+    //         appendUnits(data);
+    //     }
+
+    // })
+});
+
+$('#issue_type').change(function(){
+
+    let value = $(this).val()
+
+    if(value == 1){
+        $('#revenue_type').val('');
+        $('#revenue_type option[value="NA"]').show();
+        $('#revenue_type option[value="EANR"]').show();
+        $('#revenue_type option[value="EA"]').hide();
+    }
+
+    if(value == 2){
+        $('#revenue_type').val('EA')
+        $('#renewal').show()
+        $('#revenue_type option[value="EA"]').show();
+        $('#revenue_type option[value="NA"]').hide();
+        $('#revenue_type option[value="EANR"]').hide();
+        // $('.sded_dates').show()
+        // $('#source_client_policy_id').attr('required', true)
+    }else{
+        $('#renewal').hide()
+        // $('.sded_dates').hide()
+        // $('#source_client_policy_id').attr('required', false)
+        $('#policy_start_date').val('');
+        $('#policy_end_date').val('');
+        $('#revenue_type').val('');
+        $('#revenue_type option[value="EA"]').hide();
+        $('#revenue_type option[value="NA"]').show();
+        $('#revenue_type option[value="EANR"]').show();
+
+
+    }
+
+    if(value == 3){
+        $('.roll_div').show();
+    }else{
+        $('.roll_div').hide();
+    }
+})
+
+$('#invoice_status').change(function(){
+
+    let value = $(this).val()
+
+    if(value == 'generated'){
+        $('#invoice_no_div').show()
+        $('#invoice_no').attr('required', true)
+    }else{
+        $('#invoice_no_div').hide()
+        $('#invoice_no').attr('required', false)
+
+    }
+})
+
+$('#invoice_status_modal').change(function(){
+
+    let value = $(this).val()
+
+    if(value == 'generated'){
+        $('#invoice_no_div_modal').show()
+        $('#invoice_no_modal').attr('required', true)
+    }else{
+        $('#invoice_no_div_modal').hide()
+        $('#invoice_no_modal').attr('required', false)
+
+    }
+})
+
+$("#invoiceForm").submit(function(event) {
+
+    event.preventDefault(); 
+
+    var isValid = $('#invoiceForm').parsley().validate();    
+    if (!isValid) { 
+        console.log('Form is Empty', 'Warning');
+        return ; 
+    }
+
+    form_action = '<?= base_url("util/updateInvoiceStatus"); ?>';
+
+    $('.loader').fadeIn();
+    $('.loader-mask').fadeIn();
+
+    var ids = logSelectedIds();
+    // console.log(ids);
+
+    var formData = new FormData($('#invoiceForm')[0]);
+    formData.append('ids', JSON.stringify(ids));
+
+    $.ajax({
+        data:formData,
+        url: form_action,
+        type: "POST",
+        dataType: 'json',
+        processData: false,
+        contentType: false,
+        success: function(res) {
+
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+
+            if(res.status == true){
+                toastr.success(res.message, 'Success');
+            }else{
+                toastr.error(res.message, 'Error');
             }
 
-            confirmActionSweertAlert(string, "Yes, Proceed!", "No, Cancel").then((confirmed) => {
-                if (confirmed) {
-                    let url = '<?= base_url('policy_tranction/inception/removePolicyTransaction/') ?>' + pt_id;
+            window.location.reload();
+            $('.close').click();
+        },
+        error: function (xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        }
+    });
+});
 
-                    // Include `pt_id` in the AJAX request if necessary
-                    let requestData = {
-                        pt_id: pt_id
-                    };
+$('#cd_ac_no_data').change(function(){
 
-                    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-                        console.log('Data fetched successfully:', response);
+    var cd_ac_no = $(this).val();
+    // console.log(cd_ac_no +'-'+cd_ac_no.length);
+    cd_ac_no = cd_ac_no.trim();
+    // console.log(cd_ac_no +'-'+cd_ac_no.length);
 
-                        if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
-                            window.location.reload();
-                        } else {
-                            toastr.warning(response.message, 'WARNING');
-                        }
-                    }, function(xhr, status, error) {
-                        console.error('Error fetching data:', error);
-                        console.error(xhr.responseText);
-                    });
+
+    $.ajax({
+        url: '<?php echo base_url('util/check_cd_ac_no/');?>'+cd_ac_no,
+        type: "GET",
+        dataType: 'json',
+        success: function (res) {
+
+            console.log('CD Account Number Responcce', res)
+            if(res.status == true){
+                toastr.warning(res.message, 'warning');
+                $('#cd_ac_no_data').val('');
+            }
+        },
+        error: function (xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+        }        
+    });
+
+})
+
+// $('#policy_type_id').change(function() {
+
+// var policy_type_id = $(this).val();
+
+//     var client_id = $('#client_id').val();
+//     var client_branch_id = $('#client_branch_id').val();
+
+//     // if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
+//     //     $('#tpa').prop('required', false);
+//     //     $('#tpa_danger').hide()
+//     // } else {
+//     //     $('#tpa').prop('required', true);
+//     //     $('#tpa_danger').show()
+//     // }
+
+//     if(policy_type_id == 3 || policy_type_id == 4 || policy_type_id == 5) {
+//         $('#base_policy_id').show();
+//     }else{
+//         $('#base_policy_id').hide();
+//     }
+
+//     if(client_id && client_branch_id){
+
+//         var url_for_get_policy_type_list = '<?php echo base_url('util/get_policy_type_for_base_policy/') ?>' + client_id + '/' + client_branch_id;
+//         $.get(url_for_get_policy_type_list, function(response){
+//             console.log(response)
+//             appendBasePolicyList(response.data);
+//         }).fail(function(xhr, status, error) {
+//             console.error(xhr.responseText);
+//             console.error(status, error);
+//         });
+//     }
+
+//     //------------------------------------------------------------
+
+
+//     // var selectedOption = this.options[this.selectedIndex];
+
+//     // var ebp = selectedOption.getAttribute('data-ebp');
+//     // var etp = selectedOption.getAttribute('data-etp');
+//     // var iep = selectedOption.getAttribute('data-iep');
+//     // var itp = selectedOption.getAttribute('data-itp');
+
+//     // console.log('EBP:', ebp);
+//     // console.log('ETP:', etp);
+//     // console.log('IEP:', iep);
+//     // console.log('ITP:', itp);
+
+//     // document.getElementById('Standard_bp').value = ebp; 
+//     // document.getElementById('Standard_tp').value = etp; 
+
+// })
+
+$('#issue_type').change(function(){
+
+    let issue_type = $(this).val();
+    let branch_id = $('#client_branch_id').val();
+
+    console.log(branch_id);
+
+    if(policy_list != '' && branch_id != '') {
+        console.log(policy_list[branch_id]);
+        let data = policy_list[branch_id];
+        if(issue_type == 2)
+        {
+            appendRenewalPolicies(data);
+        }
+    }
+});
+
+//--------------------------------------------------------------------------------------------------------
+
+function formatDateforpolicy(dateStr) 
+{
+
+    let dateParts = dateStr.split('-');
+    let year = dateParts[0];
+    let month = dateParts[1];
+    let day = dateParts[2];
+
+    var date = day + '-' + month + '-' + year;
+
+    // return `${day}-${month}-${year}`;
+    return date;
+}
+
+function onlyNumbers(event) 
+{
+    var charcode;
+    charcode = event.which || event.keyCode;
+    if (charcode >= 48 && charcode <= 57 || charcode == 46) return true;
+    return false;
+}
+
+</script>
+
+
+<script>
+
+$(document).ready(function() {
+    // getURLParams()
+    $('#client_id_for_search').select2();
+    $('#insurer_id_for_search').select2();
+    $('#policy_type_for_search').select2();
+})
+
+function fetchEmpolyeeList(event) 
+{
+    event.preventDefault(); // Prevent default action
+
+    var start_date = $('#startDate').val();
+    var end_date = $('#endDate').val();
+    var client_id = $('#client_id_for_search').val();
+    var insurer_id = $('#insurer_id_for_search').val();
+    var policy_type_id = $('#policy_type_for_search').val();
+    var date_type = $('#date_type').val();
+    var issuer = $('#issuer_for_search').val() || 0;
+    var status = $('#policy_status_for_search').val();
+
+    console.log(start_date + '-' + end_date);
+
+    var queryParams = {
+        start_date: start_date,
+        end_date: end_date,
+        client_id: client_id,
+        insurer_id: insurer_id,
+        policy_type_id: policy_type_id,
+        date_type: date_type,
+        issuer: issuer,
+        status: status,
+    };
+
+    console.log(queryParams)
+
+    const queryString = objectToQueryString(queryParams);
+    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+    console.log(apiURL);
+    window.location.href = apiURL;
+}
+
+function objectToQueryString(obj) 
+{
+    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+}
+
+// function getURLParams() 
+// {
+//     const url = new URL(window.location.href);
+//     const params = new URLSearchParams(url.search);
+
+//     const startDate = params.get('start_date') || 0; // Default to 0 if not found
+//     const endDate = params.get('end_date') || 0; // Default to 0 if not found
+//     const client_id = params.get('client_id') || 0; // Default to 0 if not found
+//     const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+//     const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+//     const date_type = params.get('date_type') || 0; // Default to 0 if not found
+//     const issuer = params.get('issuer') || 0; // Default to 0 if not found
+//     const status = params.get('status') || 0; // Default to 0 if not found
+
+//     hideDateField(date_type)
+
+//     // console.log('startDate', startDate)
+//     // console.log('endDate', endDate)
+//     // console.log('client_id', client_id)
+//     // console.log('insurer_id', insurer_id)
+//     // console.log('policy_type_id', policy_type_id)   
+//     // console.log('date_type', date_type)
+//     // console.log('issuer', issuer)
+//     // console.log('status', status)
+
+//     // Log the values or use them as needed
+//     // console.log('Start Date:', startDate);
+//     // console.log('End Date:', endDate);
+
+//     if (startDate != 0 && endDate != 0) {
+//         setTimeout(function(){
+//             $('#start_date').val(startDate)
+//             $('#end_date').val(endDate)
+//             $('#client_id_for_search').val(client_id).change()
+//             $('#insurer_id_for_search').val(insurer_id).change()
+//             $('#policy_type_for_search').val(policy_type_id).change()
+//             $('#date_type').val(date_type)
+//             $('#issuer_for_search').val(issuer)
+//             $('#policy_status_for_search').val(status)
+//         },1000)
+
+//     }
+
+// }
+
+$(function() {
+
+    const url = new URL(window.location.href);
+    const params = new URLSearchParams(url.search);
+
+    // Get start and end dates from URL parameters, or use default values
+    const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD/MM/YYYY');
+    const endDateParam = params.get('end_date') || moment().format('DD/MM/YYYY');
+
+    // Parse the dates to moment objects
+    var start = moment(startDateParam, 'DD/MM/YYYY');
+    var end = moment(endDateParam, 'DD/MM/YYYY');
+
+    // var start = moment().subtract(29, 'days');
+    // var end = moment();
+
+    function cb(start, end) {
+        $('#reportrange span').html(start.format('D/MM/YYYY') + ' - ' + end.format('D/MM/YYYY'));
+        $('#startDate').val(start.format('DD/MM/YYYY'));
+        $('#endDate').val(end.format('DD/MM/YYYY'));
+    }
+
+    $('#reportrange').daterangepicker({
+        startDate: start,
+        endDate: end,
+        ranges: {
+        'Today': [moment(), moment()],
+        'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+        'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+        'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+        'This Month': [moment().startOf('month'), moment().endOf('month')],
+        'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        }
+    }, cb);
+
+    cb(start, end);
+
+    $('#clear-filters').on('click', function() {
+        // Reset all select dropdowns to the first option
+        $('#client_id_for_search').val('0').change();
+        $('#insurer_id_for_search').val('0').change();
+        $('#policy_type_for_search').val('0').change();
+        $('#date_type').val('0');
+        $('#issuer_for_search').val('0');
+        $('#policy_status_for_search').val('0');
+        $('#date_div').hide()
+
+        // Reset the date range picker to default
+        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+        $('#reportrange').data('daterangepicker').setEndDate(moment());
+        cb(start, end); // Update the displayed date range
+    });
+
+});
+
+function hideDateField(input = null)
+{   
+    let val = $('#date_type').val();
+
+    if(input){
+        val = input;
+    }
+
+    if(val != 0){
+        $('#date_div').show()
+    }else{
+        $('#date_div').hide()
+    }
+}
+
+function removePolicyTransaction(input, pt_id, policy_type_id) {
+
+    let string = "Do you want to delete this transaction?";
+    if(policy_type_id > 7){
+        string = "Do you want to delete this transaction? Deleting this will also remove the linked CRM policy entry.";
+    }
+
+    confirmActionSweertAlert(string, "Yes, Proceed!", "No, Cancel").then((confirmed) => {
+        if (confirmed) {
+            let url = '<?= base_url('policy_tranction/inception/removePolicyTransaction/') ?>' + pt_id;
+
+            // Include `pt_id` in the AJAX request if necessary
+            let requestData = { pt_id: pt_id };
+
+            sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+                console.log('Data fetched successfully:', response);
+
+                if (response.status === true) {
+                    toastr.success(response.message, 'SUCCESS');
+                    window.location.reload();
+                } else {
+                    toastr.warning(response.message, 'WARNING');
                 }
+            }, function(xhr, status, error) {
+                console.error('Error fetching data:', error);
+                console.error(xhr.responseText);
             });
         }
-    </script>
\ No newline at end of file
+    });
+}
+
+</script>
\ No newline at end of file
diff --git a/app/Views/vehicle_docs.php b/app/Views/vehicle_docs.php
index b1d4d5e6..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,7 +46,7 @@
 
             </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&nbsp;</th>
@@ -61,6 +62,7 @@
                 </div>
             </div>
         </div><!-- end col -->
+     </div>
     </div>
 
 </div>

From ac692ae3f959ea479a422aed52c6b9a0677894c1 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Mon, 29 Sep 2025 10:25:46 +0530
Subject: [PATCH 4/4] CHANGE_Perpage And Add label

---
 app/Views/UserList.php                            | 2 +-
 app/Views/bds_tat_wise_report.php                 | 2 +-
 app/Views/business_team_list.php                  | 2 +-
 app/Views/cd_master_list.php                      | 2 +-
 app/Views/client_list.php                         | 4 ++--
 app/Views/dms_search.php                          | 2 +-
 app/Views/endorsement_list.php                    | 2 +-
 app/Views/finance_team_list.php                   | 2 +-
 app/Views/hr_activity_history.php                 | 2 +-
 app/Views/leads_list.php                          | 2 +-
 app/Views/policy_transaction_endorsement_list.php | 2 +-
 app/Views/policy_transaction_inception_list.php   | 2 +-
 app/Views/report_bds.php                          | 2 +-
 app/Views/report_bds_old.php                      | 2 +-
 app/Views/thz_list.php                            | 4 ++--
 app/Views/ticket_feedback_list.php                | 2 +-
 app/Views/ticket_list.php                         | 4 ++--
 app/Views/ticket_mail_template.php                | 2 +-
 app/Views/vehicle_master_list.php                 | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 749747ae..716db9a3 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -886,7 +886,7 @@ table.dataTable tbody td {
                 }
             ],
             paging: true,
-            pageLength: 25,  
+            pageLength: 10,  
             language: {
                 search: `
                     <div class="datatable-search-wrapper">
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index 4581ea1a..8173ee3c 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -109,7 +109,7 @@
                 // ],
                 buttons: [
                     {
-                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Create New Ticket </span>',
+                        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();
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index f12150f2..481268cb 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -393,7 +393,7 @@
                 searchPlaceholder: "Search"
             },
             paging: true,
-            pageLength: 25,
+            pageLength: 10,
             ordering: false
         });
     } else {
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 11773d72..f9ebba28 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -260,7 +260,7 @@ table.dataTable thead th {
                         searchPlaceholder: "Search"
           },
           paging: true,
-          pageLength: 25,
+          pageLength: 10,
           order: [[0, 'desc']]
         //     scrollX: true,
         //     dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 419f9848..8cacb6bc 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -311,8 +311,8 @@ $(document).ready(function()
                 }
             },
             {
-                text: '+ Create New Client',
-                className: 'btn-filter app-btn-primary 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();
                 }
diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php
index a7e4b1a6..6bdd968a 100644
--- a/app/Views/dms_search.php
+++ b/app/Views/dms_search.php
@@ -196,7 +196,7 @@
                     ]
                 }],
                 paging: true,
-                pageLength: 25,
+                pageLength: 10,
                 order: [
                     [0, 'desc']
                 ]
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index de7d908b..cacfab96 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -598,7 +598,7 @@
                 "<'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>',
+                    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();
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index 2c978329..0ec2aed9 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -393,7 +393,7 @@ $(document).ready(function () {
                 searchPlaceholder: "Search"
             },
             paging: true,
-            pageLength: 25,
+            pageLength: 10,
             ordering: false
         });
     } else {
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index 260f0a41..8f52d592 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -106,7 +106,7 @@ $(document).ready(function () {
                 searchPlaceholder: "Search..."
             },
             paging: true,
-            pageLength: 25,
+            pageLength: 10,
             ordering: false,
             buttons: [
                 {
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index e6cee33f..cab5f02b 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -454,7 +454,7 @@ document.addEventListener("DOMContentLoaded", 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/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 1439f2d2..95485df5 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -524,7 +524,7 @@ table.dataTable thead th {
                         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_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index f1c6cfaf..ef7ff681 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -598,7 +598,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/report_bds.php b/app/Views/report_bds.php
index f366b56d..9104d9f5 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -413,7 +413,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,
            "footerCallback": function(row, data, start, end, display) {
                 var api = this.api();
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/thz_list.php b/app/Views/thz_list.php
index cce3adf7..f995f7b7 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -325,7 +325,7 @@ table.dataTable tbody td {
                     "<'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">  Create New Ticket </span>',
+                        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();
@@ -363,7 +363,7 @@ table.dataTable tbody td {
                   searchPlaceholder: "Search"
                 },
                 paging: true,
-                pageLength: 25,
+                pageLength: 10,
                 order: [[0, 'desc']]
             });
         } else {
diff --git a/app/Views/ticket_feedback_list.php b/app/Views/ticket_feedback_list.php
index 23ed8a0b..57ab8b6b 100644
--- a/app/Views/ticket_feedback_list.php
+++ b/app/Views/ticket_feedback_list.php
@@ -145,7 +145,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/ticket_list.php b/app/Views/ticket_list.php
index 8bf25a4f..e1b306e9 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -294,7 +294,7 @@ $(document).ready(function() {
             // ],
             buttons: [
               {
-                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Create New Claim </span>',
+                  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()
@@ -332,7 +332,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/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index f87a91da..d816f2a3 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -273,7 +273,7 @@
                         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/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index ba65a8dc..9d83d62e 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -517,7 +517,7 @@ $(document).ready(function() {
                         searchPlaceholder: "Search"
           },
           paging: true,
-          pageLength: 25,
+          pageLength: 10,
           order: [[0, 'desc']]
          });
 });