diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 780a1edd..a32b6788 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -19,7 +19,7 @@ $routes->get('/logout', 'LoginController::logout');
 $routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse');
 $routes->get('/auth/google', 'LoginController::initiateGoogleOAuth');
 $routes->get('/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
-$routes->get('download-e-card/(:segment)', 'EmployeeController::generateIDCardForEmployee/$1');
+$routes->get('download-e-card/(:any)', 'EmployeeController::generateIDCardForEmployee/$1');
 $routes->get('download-kyc-docs/(:segment)', 'ClientController::downloadKYCDocument/$1');
 
 
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index e3f7b038..7a9e9263 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -783,6 +783,9 @@ class ClientController extends AdminController
 
     public function createClientPolicyPremium()
     {
+
+        // echo json_encode(['key' => $this->request->getPost()]); die;
+
         try {
             $policy_type = $this->request->getPost('policy_type');
             $client_id = $this->request->getPost('client_id');
@@ -793,6 +796,25 @@ class ClientController extends AdminController
                 $client_id =  $client_policy_data['client_id'];
             }
             $policy_grid_id = $this->request->getPost('policy_grid_id');
+            $rack_rate_type = $this->request->getPost('rack_rate_type');
+
+            $self = $this->request->getPost('self') ? 1 : 0;
+            $spouse = $this->request->getPost('spouse')? 1 : 0;
+            $childrens = $this->request->getPost('childrens')? 1 : 0;
+            $parents = $this->request->getPost('parents')? 1 : 0;
+            $parents_in_law = $this->request->getPost('parents-in-law')? 1 : 0;
+            $either_parents_pil = $this->request->getPost('either-parents-pil')? 1 : 0;
+
+            $relation_data['self'] = $self;
+            $relation_data['spouse'] = $spouse;
+            $relation_data['childrens'] = $childrens;
+            $relation_data['parents'] = $parents;
+            $relation_data['parents_in_law'] = $parents_in_law;
+            $relation_data['either_parents_pil'] = $either_parents_pil;
+
+
+            $jsonDataForRelation = json_encode($relation_data);
+
 
             // if($policy_grid_id == 10 || $policy_grid_id == 11){
             //     $premium_type = 1;
@@ -811,6 +833,11 @@ class ClientController extends AdminController
             $data['client_policy_id'] = $client_policy_id;
             $data['policy_grid_id'] = $policy_grid_id;
             $data['premium_type'] = $premium_type;
+            $data['rack_rate_type'] = $rack_rate_type;
+
+            if($rack_rate_type == 1){
+                $data['additional_relationship'] = $jsonDataForRelation;
+            }
 
 
             $premium = [];
@@ -818,7 +845,7 @@ class ClientController extends AdminController
             if ($policy_grid_id == '1' || $policy_grid_id == '2') {
                 $this->policyPremium1Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->set('is_active', 0)->update();
             } else {
-                $this->policyPremium2Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->set('is_active', 0)->update();
+                $this->policyPremium2Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->where('rack_rate_type', $rack_rate_type)->set('is_active', 0)->update();
             }
 
 
@@ -925,6 +952,9 @@ class ClientController extends AdminController
 
 
                 $premium = $this->request->getPost('6_premium[]');
+
+                print_r($premium);
+
                 $sum_insure = $this->request->getPost('6_si');
                 $age_from = $this->request->getPost('6_age_from[]');
                 $age_to = $this->request->getPost('6_age_to[]');
@@ -1135,21 +1165,24 @@ class ClientController extends AdminController
             $self = $policy_terms_data->family_floaters;
         }
 
-        $emp_count = $this->employeeModel->join('client_policy cp', "employees.client_id = cp.client_id")
-        ->join('employee_polices ep', "cp.id = ep.client_policy_id AND employees.id = ep.employee_id")
-        ->where("employees.client_id", $record['client_id'])
-        ->where("employees.emp_status", 'active')
-        ->where("ep.status", 'active')
-        ->where("employees.is_active", 1)
-        ->where("ep.is_active", 1)
+        // $emp_count = $this->employeeModel
+        // ->join('client_policy cp', "employees.client_id = cp.client_id")
+        // ->join('employee_polices ep', "cp.id = ep.client_policy_id AND employees.id = ep.employee_id")
+        // ->where("employees.client_id", $record['client_id'])
+        // ->where("employees.emp_status", 'active')
+        // ->where("ep.status", 'active')
+        // ->where("employees.is_active", 1)
+        // ->where("ep.is_active", 1)
+        // ->countAllResults();
+
+
+        $emp_count = $this->employeePolicyModel
+        ->join('client_policy cp', "cp.id = employee_polices.client_policy_id")
+        ->where("employee_polices.client_policy_id", $client_policy_id)
+        ->where("employee_polices.status", 'active')
+        ->where("employee_polices.is_active", 1)
         ->countAllResults();
 
-
-        // $data = $this->employeePolicyModel->select('employee_polices.id')
-        // ->where('employee_polices.is_active', 1)
-        // ->where('employee_polices.client_policy_id', $client_policy_id)
-        //     ->findAll();
-
         // $emp_count = count($data);
 
         // if($emp_count == 0){
@@ -1184,6 +1217,11 @@ class ClientController extends AdminController
 
             $premiumData = "";
         }
+
+
+
+
+        
         // echo '<pre>';
         // print_r($premiumData); die;
 
@@ -1240,19 +1278,28 @@ class ClientController extends AdminController
                 $premiumDataa = $premiumData;
             }
 
-            // print_r($premiumData);die;
+            // $premium1 = [];
+            // $premium2 = [];
 
-            // print_r($data[0]->policy_type); die;
-            // echo "hello";
-            // return json_encode($premiumData);
+            // foreach ($premiumDataa as $key => $item) {
+            //     if ($item['rack_rate_type'] == 0) {
+            //         $premium1[] = $item;
+            //     } elseif ($item['rack_rate_type'] == 1) {
+            //         $premium2[] = $item;
+            //     }
+            // }
+
+            // print_r($premium1);
+            // print_r($premium2); die;
+
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $resultss, 'premiumData' => json_encode($premiumDataa), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self, 'client_policy_id' => $client_policy_id], 200);
 
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $resultss, 'premiumData' => json_encode($premiumDataa), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
         } else if ($search_term === 'GPA') {
 
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self, 'client_policy_id' => $client_policy_id], 200);
         } else {
 
-            return $this->respond(['status' => false, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
+            return $this->respond(['status' => false, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self, 'client_policy_id' => $client_policy_id], 200);
         }
     }
 
@@ -1962,91 +2009,89 @@ class ClientController extends AdminController
 
 
 
-public function transformArray($data, $mapping) {
+    public function transformArray($data, $mapping)
+    {
 
-    // dd($data);
-    $transformedData = [];
+        // dd($data);
+        $transformedData = [];
+
+        if (!is_array($data)) {
+            return json_encode($transformedData, JSON_PRETTY_PRINT);
+        }
+
+        foreach ($data as $key => $value) {
+            if ($key == 'family_floaters') {
+                $transformedData[$key] = $this->transformFamilyFloaters($value, $data);
+            } else if (array_key_exists($key, $mapping)) {
+                $transformedData[$mapping[$key]] = $value;
+            } else if ($key == 'special_condition_label') {
+
+                foreach ($value as $key => $value) {
+                    $transformedData[$value] = $data['special_condition_input'][$key];
+                }
+            } else if ($key == 'gpa_special_condition_label') {
+
+                foreach ($value as $key => $value) {
+                    $transformedData[$value] = $data['gpa_special_condition_input'][$key];
+                }
+            } else if ($key == 'age_ratio') {
+
+                if (isset($data['sumInsured2'])) {
+
+                    $transformedData['Self'] = "(Min: " . $data['age_ratio']['self']['min'] . ", Max: " . $data['age_ratio']['self']['max'] . ")";
+                }
+            } else {
+                $transformedData[$key] = $value;
+            }
+        }
 
-    if (!is_array($data)) {
         return json_encode($transformedData, JSON_PRETTY_PRINT);
     }
 
-    foreach ($data as $key => $value) {
-        if ($key == 'family_floaters') {
-            $transformedData[$key] = $this->transformFamilyFloaters($value, $data);
-        }else if (array_key_exists($key, $mapping)) {
-            $transformedData[$mapping[$key]] = $value;
-        }else if($key == 'special_condition_label'){
 
-            foreach ($value as $key => $value) {
-                $transformedData[$value] = $data['special_condition_input'][$key];
-            }
+    public function transformFamilyFloaters($familyFloaters, $json)
+    {
+        $result = [];
 
-        }else if($key == 'gpa_special_condition_label'){
+        $min = $json['age_ratio']['self'];
+        $max = $json['age_ratio']['self'];
 
-            foreach ($value as $key => $value) {
-                $transformedData[$value] = $data['gpa_special_condition_input'][$key];
-            }
+        $spouse_min = $json['age_ratio']['spouse'];
+        $spouse_max = $json['age_ratio']['spouse'];
 
-        }else if($key == 'age_ratio'){
+        $child_min = $json['age_ratio']['child'];
+        $child_max = $json['age_ratio']['child'];
 
-            if(isset($data['sumInsured2'])){
+        $elders_min = $json['age_ratio']['elders'];
+        $elders_max = $json['age_ratio']['elders'];
 
-                $transformedData['Self'] = "(Min: " . $data['age_ratio']['self']['min'] . ", Max: " . $data['age_ratio']['self']['max'] . ")";
-            }
-
-
-        }else {
-            $transformedData[$key] = $value;
-        }
-    }
-
-    return json_encode($transformedData, JSON_PRETTY_PRINT);
-}
-
-
-public function transformFamilyFloaters($familyFloaters, $json) {
-    $result = [];
-
-    $min = $json['age_ratio']['self'];
-    $max = $json['age_ratio']['self'];
-
-    $spouse_min = $json['age_ratio']['spouse'];
-    $spouse_max = $json['age_ratio']['spouse'];
-
-    $child_min = $json['age_ratio']['child'];
-    $child_max = $json['age_ratio']['child'];
-
-    $elders_min = $json['age_ratio']['elders'];
-    $elders_max = $json['age_ratio']['elders'];
-
-    foreach ($familyFloaters as $key => $value) {
-        if ($value !== 0) {
-            switch ($key) {
-                case 'self':
-                    $result[] = "Self (Min: {$min['min']}, Max: {$max['max']})";
-                    break;
-                case 'spouse':
-                    $result[] = "Spouse (Min: {$spouse_min['min']}, Max: {$spouse_max['max']})";
-                    break;
-                case 'childrens':
-                    $result[] = "Children(s) - $value  (Min: {$child_min['min']}, Max: {$child_max['max']})";
-                    break;
-                case 'parents':
-                    $result[] = "Parent(s) - $value (Min: {$elders_min['min']}, Max: {$elders_max['max']})";
-                    break;
-                case 'parents-in-law':
-                    $result[] = "Parents-in-Law - $value  (Min: {$elders_min['min']}, Max: {$elders_max['max']})";
-                    break;
-                case 'either-parents-pil':
-                    $result[] = "Either Parents Nor Parents-in-Law - $value  (elders_min: {$elders_min['min']}, Max: {$elders_max['max']})";
-                    break;
+        foreach ($familyFloaters as $key => $value) {
+            if ($value !== 0) {
+                switch ($key) {
+                    case 'self':
+                        $result[] = "Self (Min: {$min['min']}, Max: {$max['max']})";
+                        break;
+                    case 'spouse':
+                        $result[] = "Spouse (Min: {$spouse_min['min']}, Max: {$spouse_max['max']})";
+                        break;
+                    case 'childrens':
+                        $result[] = "Children(s) - $value  (Min: {$child_min['min']}, Max: {$child_max['max']})";
+                        break;
+                    case 'parents':
+                        $result[] = "Parent(s) - $value (Min: {$elders_min['min']}, Max: {$elders_max['max']})";
+                        break;
+                    case 'parents-in-law':
+                        $result[] = "Parents-in-Law - $value  (Min: {$elders_min['min']}, Max: {$elders_max['max']})";
+                        break;
+                    case 'either-parents-pil':
+                        $result[] = "Either Parents Nor Parents-in-Law - $value  (elders_min: {$elders_min['min']}, Max: {$elders_max['max']})";
+                        break;
+                }
             }
         }
-    }
 
-    return implode(", ", $result);
-}
+        return implode(", ", $result);
+    }
 
 
 
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 69f19725..9ea04893 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -578,6 +578,7 @@ class EmpDataServiceController extends BaseController
         $file = $this->batchFileModel->where('id', $file_id)->first();
         $client_id = $file['client_id'];
         $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
         $batch_code = $file['batch_code'];
 
 
@@ -626,6 +627,7 @@ class EmpDataServiceController extends BaseController
             ->join('employees', 'employees.id = employee_polices.employee_id')
             ->where('employee_polices.client_policy_id', $client_policy_id)
             ->where('employees.client_id', $client_id)
+            ->where('employees.client_branch_id', $client_branch_id)
             ->where("employee_polices.{$id} IS NULL OR employee_polices.{$id} = ''")
             ->findAll();
 
@@ -976,6 +978,7 @@ class EmpDataServiceController extends BaseController
 
         $client_id = $file['client_id'];
         $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
         $insurer_or_tpa = $file['insurer_or_tpa'];
         $status = $file['status'];
         $batch_code = $file['batch_code'];
@@ -1031,6 +1034,7 @@ class EmpDataServiceController extends BaseController
             $query->join('employees', 'employees.id = employee_polices.employee_id');
             $query->where('employee_polices.client_policy_id', $client_policy_id);
             $query->where('employees.client_id', $client_id);
+            $query->where('employees.client_branch_id', $client_branch_id);
             $query->where('employees.name', $name);
             $query->where('employees.emp_code', $emp_code);
             if ($file['insurer_or_tpa'] == 'tpa') {
@@ -1103,6 +1107,7 @@ class EmpDataServiceController extends BaseController
                 'employeeIds' => $emp_policy_ids,
                 'client_id' => $client_id,
                 'client_policy_id' => $client_policy_id,
+                'client_branch_id' => $client_branch_id,
                 'count' => $emp_count,
                 'event' => $file['event_type'],
                 'policy_name' => $policy_name['policy_name'],
@@ -1116,6 +1121,7 @@ class EmpDataServiceController extends BaseController
                 'employeeIds' => $emp_policy_ids,
                 'client_id' => $client_id,
                 'client_policy_id' => $client_policy_id,
+                'client_branch_id' => $client_branch_id,
                 'count' => $emp_count,
                 'event' => $file['event_type'],
                 'policy_name' => $policy_name['policy_name'],
@@ -1152,6 +1158,7 @@ class EmpDataServiceController extends BaseController
 
         $client_id = $import_data['client_id'];
         $client_policy_id = $import_data['client_policy_id'];
+        $client_branch_id = $import_data['client_branch_id'];
         $file = $import_data['file'];
 
         $data = $this->readExcelToArray($file);
@@ -1181,6 +1188,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employee_polices.uhid', $uhid)
                     ->where('employees.emp_code', $emp_code)
                     ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
@@ -1211,10 +1219,6 @@ class EmpDataServiceController extends BaseController
             return 2;
         }
 
-        // if($empty_emp_tpa_uh_ids != $count){
-
-        //     return 3;
-        // }
 
         if ($empty_id_count == 0) {
 
@@ -1265,6 +1269,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employees', 'employees.id = employee_polices.employee_id')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employee_polices.uhid', $uhid)
                     ->where('employees.emp_code', $emp_code)
                     ->where('employees.is_active', 1)
@@ -1280,6 +1285,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                     ->where('employees.emp_code', $emp_code)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employee_polices.uhid', $uhid)
                     ->get()
@@ -1319,6 +1325,7 @@ class EmpDataServiceController extends BaseController
 
         $client_id = $import_data['client_id'];
         $client_policy_id = $import_data['client_policy_id'];
+        $client_branch_id = $import_data['client_branch_id'];
         $file = $import_data['file'];
 
         $data = $this->readExcelToArray($file);
@@ -1352,6 +1359,7 @@ class EmpDataServiceController extends BaseController
                     ->where('employees.emp_code', $emp_code)
                     ->where('employees.name', $emp_name)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('emp_endorsement.actions', 'si')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
@@ -1449,6 +1457,7 @@ class EmpDataServiceController extends BaseController
                     ->where('employees.emp_code', $emp_code)
                     ->where('employees.name', $emp_name)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employee_polices.is_active', 1)
                     ->first();
@@ -1478,6 +1487,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employees', 'employees.id = employee_polices.employee_id')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employees.name', $emp_name)
                     ->where('employees.emp_code', $emp_code)
                     ->where('employee_polices.is_active', 1)
@@ -1500,6 +1510,7 @@ class EmpDataServiceController extends BaseController
             'employeeIds' => $employeeIds,
             'client_id' => $client_id,
             'client_policy_id' => $client_policy_id,
+            'client_branch_id' => $client_branch_id,
             'count' => $count,
             'event' => $import_data['event_type'],
             'policy_name' => $policy_name['policy_name'],
@@ -1517,6 +1528,7 @@ class EmpDataServiceController extends BaseController
 
         $client_id = $import_data['client_id'];
         $client_policy_id = $import_data['client_policy_id'];
+        $client_branch_id = $import_data['client_branch_id'];
         $file = $import_data['file'];
 
 
@@ -1554,6 +1566,7 @@ class EmpDataServiceController extends BaseController
                     ->where('employees.emp_code', $emp_code)
                     ->where('employees.name', $emp_name)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('emp_endorsement.actions', 'd')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
@@ -1644,6 +1657,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employees', 'employees.id = employee_polices.employee_id')
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employees.name', $emp_name)
                     ->where('employees.emp_code', $emp_code)
                     ->where('employee_polices.is_active', 1)
@@ -1674,6 +1688,7 @@ class EmpDataServiceController extends BaseController
                     ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                     ->where('emp_endorsement.emp_code', $emp_code)
                     ->where('employees.client_id', $client_id)
+                    ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employee_polices.client_policy_id', $client_policy_id)
                     ->where('emp_endorsement.name', $emp_name)
                     ->where('emp_endorsement.field_name', 'emp_status')
@@ -1712,6 +1727,7 @@ class EmpDataServiceController extends BaseController
         $depositeData = [
             'employeeIds' => $employeeIds,
             'client_id' => $client_id,
+            'client_branch_id' => $client_branch_id,
             'client_policy_id' => $client_policy_id,
             'count' => $count,
             'event' => $import_data['event_type'],
@@ -2239,9 +2255,10 @@ class EmpDataServiceController extends BaseController
     public function getDataByFileId($file_id, $status = 'success'){
 
        $data = $this->batchFileModel
-        ->select('batch_files.*, clients.client_name, clients.short_name, policies.name as policy_name')
+        ->select('batch_files.*, clients.client_name, clients.short_name, policies.name as policy_name, client_branch.branch_name')
         ->join('clients', 'clients.id = batch_files.client_id')
         ->join('client_policy', 'client_policy.id = batch_files.client_policy_id')
+        ->join('client_branch', 'client_branch.id = batch_files.client_branch_id')
         ->join('policies', 'policies.id = client_policy.policy_id')
         ->where('batch_files.id', $file_id)
         ->first();
@@ -2249,12 +2266,12 @@ class EmpDataServiceController extends BaseController
 
         if($status == 'success'){
 
-            $msg_txt = $data['short_name'] . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa'];
+            $msg_txt = $data['client_name'] . '( ' . $data['branch_name'] . ' )' . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa'];
             $msg_title = 'File Upload Success';
 
         }else if ($status == 'failure'){
 
-            $msg_txt = $data['short_name'] . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa'];
+            $msg_txt = $data['client_name'] . '( ' . $data['branch_name'] . ' )' . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa'];
             $msg_title = 'File Upload Failure';
         }
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index f6a0dc8f..77a14554 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -76,7 +76,13 @@ class EmployeeController extends AdminController
         $data['status'] = ['draft' => 'Draft', 'active' => 'Active', 'inactive' => 'In-Active', 'expired' => 'Expired'];
         if (count($this->request->getGet())) {
             $filterData = $this->request->getGet();
-            $data['employees'] = $this->employeePolicyModel->getEmployeePolicy(client_id: $filterData['client_id'], policy_id: $filterData['policy_id'], status: $filterData['status']);
+            $data['employees'] = $this->employeePolicyModel->getEmployeePolicy(
+                client_id: $filterData['client_id'], 
+                policy_id: $filterData['policy_id'], 
+                status: $filterData['status'], 
+                branch_id: $filterData['branch_id']
+            );
+
             $data['getData'] = $filterData;
         }
 
@@ -89,6 +95,8 @@ class EmployeeController extends AdminController
         //echo $this->request->isAJAX();die();
         $result = $this->clientModel->clientsWithPolicies();
 
+        // dd($result);
+
         // print_r($result);die();
         if (!count($result)) {
             return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'no data found'], 200);
@@ -190,10 +198,11 @@ class EmployeeController extends AdminController
 
             $client_id = $this->request->getPost('client_id');
             $policy_id = $this->request->getPost('policy_id');
+            $branch_id = $this->request->getPost('branch_id');
             $action = $this->request->getPost('upload-action-type');
             $status = 'inprogress';
 
-            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action]); //here field policy_id have client_policy_id and not policy id from policy master
+            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id]); //here field policy_id have client_policy_id and not policy id from policy master
             $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]);
 
             //start validation process
@@ -232,6 +241,7 @@ class EmployeeController extends AdminController
                                 'up.first_name',
                                 'pm.name as policy_name',
                                 'c.short_name',
+                                'cb.branch_name',
                                 'cp.id as client_policy_id',
                                 '(SELECT COUNT(*)
                                   FROM employees e
@@ -244,6 +254,7 @@ class EmployeeController extends AdminController
                             ])
                             ->join('user_profiles up', 'files.created_by = up.id')
                             ->join('client_policy cp', 'files.policy_id = cp.id', 'left')
+                            ->join('client_branch cb', 'files.client_branch_id = cb.id', 'left')
                             ->join('policies pm', 'cp.policy_id = pm.id', 'left')
                             ->join('clients c', 'files.client_id = c.id and files.client_id = cp.client_id', 'left')
                             ->where('files.created_by', get_session_userid())
@@ -251,8 +262,9 @@ class EmployeeController extends AdminController
                             ->findAll();
         // dd($data['fileList']);
 
-        $data['batch_list'] = $this->batchFileModel->select('batch_files.*, policies.name as policy_name, clients.short_name as client_short_name')
+        $data['batch_list'] = $this->batchFileModel->select('batch_files.*, policies.name as policy_name, clients.short_name as client_short_name, client_branch.branch_name')
             ->join('client_policy', 'client_policy.id = batch_files.client_policy_id')
+            ->join('client_branch', 'client_branch.id = batch_files.client_branch_id')
             ->join('policies', 'policies.id = client_policy.policy_id')
             ->join('clients', 'clients.id = client_policy.client_id')
             ->orderBy('batch_files.id', 'desc')
@@ -351,17 +363,23 @@ class EmployeeController extends AdminController
 
         $client_id = $this->request->getPost('client_id');
         $client_policy_id = $this->request->getPost('client_policy_id');
+        $client_branch_id = $this->request->getPost('client_branch_id');
         $insurer_or_tpa = $this->request->getPost('insurer_or_tpa');
         $event_type = $this->request->getPost('event_type');
         $actions = $this->request->getPost('action_type');
 
         $client_data = $this->clientModel->where('id', $client_id)->first();
-        $policy_name = $this->clientPolicyModel->select('policies.name')->join('policies', 'policies.id = client_policy.policy_id')->where('client_policy.id', $client_policy_id)->first();
-        $file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $policy_name['name']);
+        $policy_name_and_branch_name = $this->clientPolicyModel->select('policies.name, client_branch.branch_code')
+                            ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
+                            ->join('policies', 'policies.id = client_policy.policy_id')
+                            ->where('client_policy.id', $client_policy_id)
+                            ->first();
+        $file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $policy_name_and_branch_name['name'], $policy_name_and_branch_name['branch_code']);
 
         $batch_data = [
             'client_id' => $client_id,
             'client_policy_id' => $client_policy_id,
+            'client_branch_id' => $client_branch_id,
             'insurer_or_tpa' => $insurer_or_tpa,
             'event_type' => $event_type,
             'actions' => $actions,
@@ -544,8 +562,13 @@ class EmployeeController extends AdminController
         $data['status'] = ['pending' => 'Pending', 'inprogress' => 'In-Progress', 'complete' => 'Complete'];
         if (count($this->request->getGet())) {
             $filterData = $this->request->getGet();
-            $data['employees'] = $this->employeePolicyModel->getEmployeeEndorsementList(client_id: $filterData['client_id'], policy_id: $filterData['policy_id'], status: $filterData['status']);
-            $data['getData'] = $filterData;
+            $data['employees'] = $this->employeePolicyModel->getEmployeeEndorsementList(
+                client_id: $filterData['client_id'],
+                policy_id: $filterData['policy_id'],
+                status: $filterData['status'],
+                branch_id: $filterData['branch_id']
+            );
+                        $data['getData'] = $filterData;
             // echo "<pre>";
             // print_r($data); die;
         }
@@ -854,8 +877,9 @@ class EmployeeController extends AdminController
     }
 
 
-    public function generateIDCardForEmployee($rand_string)
-    {
+    public function generateIDCardForEmployee($rand_string, $people = 0)
+    {    
+        // dd($rand_string, $people);
 
         try {
 
@@ -883,9 +907,13 @@ class EmployeeController extends AdminController
             $client_policy_id = $get_emp_code_and_client_policy_id['client_policy_id'];
             $emp_code = $get_emp_code_and_client_policy_id['emp_code'];
 
-            // $data['data'] = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code);
+
             $data = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code);
             
+            if($people == 0){
+               $data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code);
+            }
+
             // dd($data);
 
             $template_data_path =  WRITEPATH . 'e_card_template/';
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 6e6bb123..63a240d1 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -229,12 +229,13 @@ class EmployeeServiceController extends AdminController
                         $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $format_error['error'];
                     }
                 }
-
+                // Kint::dump($is_mandatory);
                 //allowed values check
-                if($is_mandatory === true && isset($allowed_values) && is_array($allowed_values))
+                if(($is_mandatory === true && isset($allowed_values) && is_array($allowed_values)) || (is_array($is_mandatory) && (isset($allowed_values) && is_array($allowed_values))))
                 {
-                    
-                    if(!in_array(strtolower(trim($col)),$allowed_values))
+                    // print_r($allowed_values);
+                    // dd($col);
+                    if(!in_array((trim($col)),$allowed_values))
                     {
                         array_push($result['error_summary'],3); 
                         $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
@@ -263,9 +264,9 @@ class EmployeeServiceController extends AdminController
                     
                 }
 
-            }
-
-        }
+            }//col foreach
+            // break;
+        }//row foreach
 
          if(isset($result['error_summary']) && count($result['error_summary']))
                 {
@@ -349,6 +350,14 @@ class EmployeeServiceController extends AdminController
         $relationship = $this->general_relationships;
 
         $employee_data_group_by_family = data_group_by_family($excel_data);
+
+         $is_self_available_in_policy_terms = false;
+        if($policy_details['policy_type_id'] == 3) // GMC parents
+        {
+            $temp = $policy_terms['family_floaters'];
+            $temp = is_array($temp) ? $temp : (is_object($temp) ? (array)$temp : []);
+            $is_self_available_in_policy_terms = isset($temp['self']) ? true : false;
+        }
         // dd($employee_data_group_by_family);
             foreach ($employee_data_group_by_family as $emp_id => $family) 
             {
@@ -356,7 +365,7 @@ class EmployeeServiceController extends AdminController
                 //if action is DA then get all familiy members,transfrom them into excel array, addd data source as db or excel
                 if($file['action'] == 'dependent_addition')
                 {
-                    $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active']);
+                    $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
                     // dd(($existing_famility_details));
                     //transsform familiy details from db columns to exxcel row with column indexs for checking remaining functionalitites
                     $existing_famility_details = transform_db_data_to_excel($existing_famility_details,$file);
@@ -370,7 +379,7 @@ class EmployeeServiceController extends AdminController
 
                 if($file['action'] == 'inception' || $file['action'] == 'addition' || $file['action'] == 'dependent_addition')
                 {
-                    $res = name_dup_check_within_family($family,$file['action']);
+                    $res = name_dup_check_within_family($family,$file['action']);//in both file data & DB data
                     // dd($res);
                     if(count($res))
                     {
@@ -383,7 +392,7 @@ class EmployeeServiceController extends AdminController
                 }
 
                 //check self availbale in uploaded file
-                if(($file['action'] == 'inception' || $file['action'] == 'addition') && ($policy_details['policy_type_id'] == 3 && $policy_details['base_policy'] == null)) // 3 is GMC parents dep addon)
+                if(($file['action'] == 'inception' || $file['action'] == 'addition') && ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms)) // 3 is GMC parents dep addon)
                 {
                     // dd('file check');
                     $res = check_self_available_in_family($family,$file['action']);
@@ -395,10 +404,10 @@ class EmployeeServiceController extends AdminController
                     }
                 }
 
-                //check self avaialbe where self data is not available either same policy (i.e.) gMC parents
-                if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && $policy_details['base_policy'] == null)) // 3 is GMC parents as base policy not as dep addon)
+                //check self avaialbe  either same policy DB level(i.e.) gMC parents
+                if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && !$is_self_available_in_policy_terms)) // 3 is GMC parents as base policy not as dep addon)
                 {
-                   $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],emp_status: ['active'],policy_status:['active']);
+                   $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
                    // dd($self_details);
                     if(!count($self_details))
                     {
@@ -559,7 +568,7 @@ class EmployeeServiceController extends AdminController
                         //if action is DA then get all familiy members,transfrom them into excel array, addd data source as db or excel
                         if($file['action'] == 'dependent_addition')
                         {
-                            $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active']);
+                            $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active'],client_branch_id: [ $file['client_branch_id'] ]);
                             // dd($existing_famility_details);
                             //transsform familiy details from db columns to exxcel row with column indexs for checking remaining functionalitites
                             $existing_famility_details = transform_db_data_to_excel($existing_famility_details,$file);
@@ -669,7 +678,7 @@ class EmployeeServiceController extends AdminController
               break;
             }
             // echo '<br>START- ' . $row[2];
-            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first();
+            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->where('client_branch_id',$file['client_branch_id'])->first();
 
             $existing_endorsements = $this->empEndorsementModel->where('actions','d')
                                                      ->where('table_name','employees')
@@ -759,7 +768,7 @@ class EmployeeServiceController extends AdminController
             $field_value = ($field_name == 'dob' ? change_date_format($row[4],'d-M-Y','Y-m-d') : $row[4] );
 
 
-            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first();
+            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->where('client_branch_id',$file['client_branch_id'])->first();
             $existing_endorsements = $this->empEndorsementModel->where('actions','c')
                                                      ->where('table_name','employees')
                                                      ->where('endorsement_id is null')
@@ -819,7 +828,7 @@ class EmployeeServiceController extends AdminController
               break;
             }
             // echo '<br>START- ' . $row[2];
-            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first();
+            $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->where('client_branch_id',$file['client_branch_id'])->first();
             $employee_policy = $this->employeePolicyModel->where('employee_id',$employee['id'])->where('client_policy_id',$file['policy_id'])->first();
 
             $existing_endorsements = $this->empEndorsementModel->where('actions','si')
@@ -870,7 +879,7 @@ class EmployeeServiceController extends AdminController
             if($file['id'] == null || $value['temp']['source'] == 'excel' || (($file['action'] == 'dependent_addition' && in_array($value['temp']['source'],[10,11]) && ($slab_details['slab_rates'][0]['premium_type'] == 1 && strtolower($value['relationship']) == 'self') || ($slab_details['slab_rates'][0]['premium_type'] == 1 || $slab_details['slab_rates'][0]['premium_type'] == null)))) //insert data come from excel and from db i.e. ( $file['id'] == null for enrollment data)
             {
                     
-                    $employee = $this->employeeModel->checkExistingEmp($value);
+                    $employee = $this->employeeModel->checkExistingEmp($value,$file['client_branch_id']);
                     $policy_data = $value['policy_details'];
                     $temp = $value['temp'];
                     unset($value['policy_details']);
@@ -895,6 +904,7 @@ class EmployeeServiceController extends AdminController
                         $value['updated_by'] = $file['created_by'];
                         $value['id'] = $employee[0]['id'];
                         $value['emp_status'] = 'active';
+                        $value['client_branch_id'] = $file['client_branch_id'];
                         $log_message = 'Update Employee - '.$employee[0]['name'].'('.$employee[0]['emp_code'].') with PK '.$employee[0]['id'];
                         // $this->myLogger->logme('error',('Update - ' . $employee[0]['id'].' - '. $employee[0]['emp_code'] .' - '.$employee[0]['name']));
                     }
@@ -902,6 +912,7 @@ class EmployeeServiceController extends AdminController
                     {
                         $value['emp_status'] = 'active';
                         $value['created_by'] = $file['created_by'];
+                        $value['client_branch_id'] = $file['client_branch_id'];
                         $log_message = 'Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK ';
                         // $this->myLogger->logme('error',('Insert - ' .  $value['emp_code'] .' - '. $value['name']));
                     }
@@ -946,7 +957,7 @@ class EmployeeServiceController extends AdminController
     // $employee -> holds existing emp model obj and $policy_data holds new policy changes as array
     public function employeesSIEnhanceProcessWhileOnbboard(array $employee,array $policy_data,array $file)
     {
-        $employee = $this->employeeModel->where('emp_code', $employee['emp_code'])->where('name',$employee['name'])->where('client_id',$employee['client_id'])->where('is_active',1)->first();
+        $employee = $this->employeeModel->where('emp_code', $employee['emp_code'])->where('name',$employee['name'])->where('client_id',$employee['client_id'])->where('client_branch_id',$file['client_id'])->where('is_active',1)->first();
         
         $employee_policy = $this->employeePolicyModel->where('employee_id',$employee['id'])->where('client_policy_id',$file['policy_id'])->first();
             // dd($employee_policy);
@@ -1108,10 +1119,11 @@ class EmployeeServiceController extends AdminController
  public function getFileMetaDataByFileId($file_id, $status = 'success'){
 
        $data = $this->fileModel
-        ->select('files.*, clients.client_name, clients.short_name, policies.name as policy_name')
+        ->select('files.*, clients.client_name, clients.short_name, policies.name as policy_name,client_branch.branch_code')
         ->join('clients', 'clients.id = files.client_id')
         ->join('client_policy', 'client_policy.id = files.policy_id')
         ->join('policies', 'policies.id = client_policy.policy_id')
+        ->join('client_branch', 'client_branch.id = files.client_branch_id')
         ->where('files.id', $file_id)
         ->first();
 
@@ -1124,7 +1136,7 @@ class EmployeeServiceController extends AdminController
                 $msg_title = 'File Upload Failure';
             }
 
-        $msg_txt = $data['client_name'] . ' - ' . $data['policy_name'] . ' - ' . ucfirst($data['action']);
+        $msg_txt = $data['client_name'] . ' ('.$data['branch_code'].') - ' . $data['policy_name'] . ' - ' . ucfirst($data['action']);
         $user_id = $data['created_by'];
         $url = 'employee/upload';
 
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 7b26d8cb..793ddb76 100644
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -175,7 +175,16 @@ class JobWorker extends AdminController
                 }
                 
                 $payload = is_array($payload) ? $payload : [];
-                $response = $jobHandler($payload,$job->id);
+                try
+                {
+                    $response = $jobHandler($payload,$job->id);
+                }
+                catch(\Exception $e)
+                {
+                    $job_status = self::STATUS_FAILED;
+                    $runtime = $runtime === null ?  microtime(true) - $start : $runtime;
+                    $response = ['file_name' => $e->getFile(),'error' => $e->getMessage(),'line_no' => $e->getLine(),'info' => $e->getTraceAsString()];
+                }
 
                 $runtime = microtime(true) - $start;
                 $job_status = self::STATUS_DONE;
diff --git a/app/Controllers/PendingActionsController.php b/app/Controllers/PendingActionsController.php
index 2e4bb8e8..c7764902 100644
--- a/app/Controllers/PendingActionsController.php
+++ b/app/Controllers/PendingActionsController.php
@@ -95,17 +95,20 @@ class PendingActionsController extends AdminController
                 cp.policy_status, 
                 cp.open_for_enrollment, 
                 cp.inception_type, 
+                cb.id as branch_id, 
+                cb.branch_name, 
                 COUNT(ep.id) AS employee_policy_count
             ');
         $builder->join('employee_polices ep', 'cp.id = ep.client_policy_id AND ep.is_active = 1', 'left');
         $builder->join('clients', 'cp.client_id = clients.id');
+        $builder->join('client_branch cb', 'cb.id = cp.client_branch_id');
         $builder->join('policies', 'cp.policy_id = policies.id');
         $builder->where('cp.is_active', 1);
         $builder->where('cp.open_for_enrollment', 1);
         $builder->where('cp.is_addon', 1);
         $builder->where('cp.policy_status', 1);
         $builder->where('cp.inception_type', 1);
-        $builder->whereIn('cp.policy_type_id', [1, 2, 30]);
+        $builder->whereIn('cp.policy_type_id', [1, 2, 3]);
         $builder->groupBy('cp.id, cp.client_id, cp.policy_id, cp.policy_type_id, cp.is_addon, cp.policy_status, cp.open_for_enrollment');
         $builder->having('employee_policy_count = 0 OR employee_policy_count IS NULL');
 
@@ -147,6 +150,8 @@ class PendingActionsController extends AdminController
 
                     clients.client_name as client_name, 
                     clients.id as client_id, 
+                    client_branch.id as branch_id,
+                    client_branch.branch_name,
                     emp_endorsement.id, 
                     emp_endorsement.pk, 
                     emp_endorsement.endorsement_id, 
@@ -159,20 +164,23 @@ class PendingActionsController extends AdminController
                     employees.name as ename
                 ')
         ->join('employees', 'emp_endorsement.pk = employees.id AND employees.is_active = 1 AND employees.emp_status = \'active\'')
-            ->join('clients', 'employees.client_id = clients.id AND clients.is_active = 1', 'left')
-            ->where([
+        ->join('clients', 'employees.client_id = clients.id AND clients.is_active = 1', 'left')
+        ->join('client_branch', 'client_branch.id = employees.client_branch_id', 'left')
+        ->where([
                 'emp_endorsement.actions' => 'c',
                 'emp_endorsement.is_active' => 1,
                 'emp_endorsement.status' => 'pending',
                 'emp_endorsement.endorsement_id' => null
             ])
-            ->groupBy('emp_endorsement.pk, emp_endorsement.emp_code, emp_endorsement.table_name, emp_endorsement.actions, emp_endorsement.name');
+        ->groupBy('emp_endorsement.pk, emp_endorsement.emp_code, emp_endorsement.table_name, emp_endorsement.actions, emp_endorsement.name');
 
         // Main query builder
         $builder = $this->db->table('clients');
         $builder->select("
                 subquery.client_name, 
                 subquery.client_id, 
+                subquery.branch_name, 
+                subquery.branch_id,
                 COUNT(subquery.id) AS subquery_count,
                 ($subQueryExport) AS batch_export_count,
                 ($subQueryImport) AS batch_import_count
@@ -223,6 +231,8 @@ class PendingActionsController extends AdminController
         ->select('
                     clients.client_name as client_name, 
                     clients.id as client_id, 
+                    client_branch.id as branch_id,
+                    client_branch.branch_name,
                     client_policy.id as client_policy_id, 
                     policies.name as policy_name, 
                     policies.id as pid, 
@@ -239,6 +249,7 @@ class PendingActionsController extends AdminController
         ->join('employee_polices', 'emp_endorsement.pk = employee_polices.id AND employee_polices.is_active = 1 AND employee_polices.status = \'active\'')
             ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id AND client_policy.is_active = 1 AND client_policy.policy_status = 1')
             ->join('clients', 'client_policy.client_id = clients.id AND clients.is_active = 1')
+            ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
             ->join('policies', 'client_policy.policy_id = policies.id AND policies.is_active = 1')
             ->where([
                 'emp_endorsement.actions' => 'si',
@@ -256,6 +267,8 @@ class PendingActionsController extends AdminController
                 subquery.client_id, 
                 subquery.client_policy_id, 
                 subquery.policy_name, 
+                subquery.branch_name, 
+                subquery.branch_id,
                 COUNT(subquery.id) AS subquery_count,
                 ($subQueryExport) AS batch_export_count,
                 ($subQueryImport) AS batch_import_count
@@ -304,8 +317,10 @@ class PendingActionsController extends AdminController
         // Build the subquery
         $subqueryBuilder = $this->db->table('emp_endorsement')
         ->select('
-                    clients.client_name as client_name, 
                     clients.id as client_id, 
+                    clients.client_name as client_name, 
+                    client_branch.id as branch_id,
+                    client_branch.branch_name,
                     client_policy.id as client_policy_id, 
                     policies.name as policy_name, 
                     policies.id as pid, 
@@ -317,10 +332,12 @@ class PendingActionsController extends AdminController
                     emp_endorsement.actions, 
                     emp_endorsement.name, 
                     emp_endorsement.status
+                    
                 ')
         ->join('employee_polices', 'emp_endorsement.pk = employee_polices.id AND employee_polices.is_active = 1 AND employee_polices.status = \'active\' AND emp_endorsement.table_name = \'employee_polices\'', 'left')
         ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id AND client_policy.is_active = 1 AND client_policy.policy_status = 1', 'left')
         ->join('clients', 'client_policy.client_id = clients.id AND clients.is_active = 1', 'left')
+        ->join('client_branch', 'client_branch.id = client_policy.client_branch_id', 'left')
         ->join('policies', 'client_policy.policy_id = policies.id AND policies.is_active = 1', 'left')
         ->where([
             'emp_endorsement.actions' => 'd',
@@ -339,6 +356,8 @@ class PendingActionsController extends AdminController
                 subquery.client_id, 
                 subquery.client_policy_id, 
                 subquery.policy_name, 
+                subquery.branch_name, 
+                subquery.branch_id, 
                 COUNT(subquery.id) AS subquery_count,
                 ($subQueryExport) AS batch_export_count,
                 ($subQueryImport) AS batch_import_count
@@ -389,10 +408,12 @@ class PendingActionsController extends AdminController
         ->select('c.short_name')
         ->select('p.name as policy_name')
         ->select('ep.uhid')
+        ->select('cb.branch_name, cb.id as branch_id')
         ->select("($subQueryExport) AS batch_export_count", false)
         ->select("($subQueryImport) AS batch_import_count", false)
         ->join('client_policy cp', 'ep.client_policy_id = cp.id AND cp.is_active = 1 AND cp.policy_status = 1')
         ->join('clients c', 'c.id = cp.client_id')
+        ->join('client_branch cb', 'cb.id = cp.client_branch_id')
         ->join('policies p', 'p.id = cp.policy_id')
         ->where('ep.uhid IS NULL')
         ->where('ep.status', 'active')
@@ -439,13 +460,16 @@ class PendingActionsController extends AdminController
                 clients.short_name, 
                 clients.client_name, 
                 policies.name as policy_name, 
-                clients.id as client_id
+                clients.id as client_id,
+                client_branch.id as branch_id,
+                client_branch.branch_name
             ');
         $builder->select("($subQueryExport) AS batch_export_count", false);
         $builder->select("($subQueryImport) AS batch_import_count", false);
 
         $builder->join('client_policy', 'employee_polices.client_policy_id = client_policy.id AND client_policy.is_active = 1 AND client_policy.policy_status = 1');
         $builder->join('clients', 'clients.id = client_policy.client_id');
+        $builder->join('client_branch', 'client_branch.id = client_policy.client_branch_id');
         $builder->join('policies', 'policies.id = client_policy.policy_id');
         $builder->where('employee_polices.tpa_id', null);
         $builder->where('employee_polices.uhid IS NOT NULL');
diff --git a/app/Helpers/excel_import_export_helper.php b/app/Helpers/excel_import_export_helper.php
index 5c29ce41..c7cec62d 100644
--- a/app/Helpers/excel_import_export_helper.php
+++ b/app/Helpers/excel_import_export_helper.php
@@ -359,7 +359,7 @@ if (!function_exists('read_excel_file_to_array')) {
 
 
 if (! function_exists('generate_filename')) {
-    function generate_filename($client_short_name, $event_type, $actions, $insurer_or_tpa, $policy_name) {
+    function generate_filename($client_short_name, $event_type, $actions, $insurer_or_tpa, $policy_name, $branch_code) {
 
         $evenTypeLabel = '';
         if($event_type == 'inception'){
@@ -387,9 +387,10 @@ if (! function_exists('generate_filename')) {
         $currentDateTime = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
         $formattedDateTime = $currentDateTime->format('d-m-Y_H-i-s');
         $policy_name = str_replace(' ', '_', $policy_name);
+        $branch_code = isset($branch_code) ? str_replace(' ', '_', $branch_code) : '_';
 
         // Generate file name
-        $file_name = $client_short_name. '_' . $policy_name . '_' . $insurer_or_tpa_lable . $actions . $evenTypeLabel . '_' . $formattedDateTime . '.xlsx';
+        $file_name = $client_short_name. '_' . $branch_code . '_' . $policy_name . '_' . $insurer_or_tpa_lable . $actions . $evenTypeLabel . '_' . $formattedDateTime . '.xlsx';
         return $file_name;
     }
 }
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index e4561843..ecef10e8 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -405,7 +405,7 @@ if (!function_exists('name_and_empid_check_in_db'))
 
         foreach ($family_data as $rkey => $row) 
         {
-            if(isset($row['temp']) && $row['temp']['source'] != 'db')
+            if(($current_action == 'inception' || $current_action == 'addition') || ($current_action == 'dependent_addition' && (isset($row['temp']) && $row['temp']['source'] != 'db')))
             {
                 $res = $employeeModel
                         ->join('client_policy cp',"employees.client_id = cp.client_id")
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index 5a1ea319..2dbcb1ce 100644
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -188,6 +188,7 @@ if (!function_exists('get_base64_image')) {
 if (!function_exists('format_indian_number')) {
     function format_indian_number($number) {
          // Round the number to two decimal places
+    $number = isset($number) ? $number : 0;
     $number = round($number, 2);
 
     // Split the number into integer and decimal parts
diff --git a/app/Models/BatchFileModel.php b/app/Models/BatchFileModel.php
index 1d2b4a0d..df644790 100644
--- a/app/Models/BatchFileModel.php
+++ b/app/Models/BatchFileModel.php
@@ -24,6 +24,7 @@ class BatchFileModel extends Model
         "amount",
         "status",
         "error_data",
+        "client_branch_id",
     ];
 
           // Callbacks
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index 193b9b71..35beeb4c 100644
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use CodeIgniter\Model;
 use App\Models\ClientPolicyModel;
+use App\Models\ClientBranchModel;
 
 class ClientModel extends Model
 {
@@ -41,7 +42,8 @@ class ClientModel extends Model
 
             foreach ($clients as &$client) {
                 $clientPolicyModel = new ClientPolicyModel();
-                $clientPolicies = $clientPolicyModel->select(['client_policy.id','p.name','pt.policy_type'])
+                $clientPolicies = $clientPolicyModel->select(['client_branch.id as branch_id','client_branch.branch_name','client_branch.branch_code', 'client_branch.client_id', 'client_policy.id as client_policy_id','p.name','pt.policy_type',])
+                                  ->join('client_branch', 'client_branch.id = client_policy.client_branch_id') 
                                   ->join('policies p', 'p.id = client_policy.policy_id') 
                                   ->join('policy_type pt','client_policy.policy_type_id = pt.id')
                                   ->where('client_policy.client_id',$client['id'])
@@ -50,6 +52,13 @@ class ClientModel extends Model
                                   ->findAll();
 
                 $client['policies'] = $clientPolicies; 
+
+                $clientBranchModel = new ClientBranchModel();
+                $clientBranchs = $clientBranchModel->select(['client_branch.id','client_branch.branch_name','client_branch.branch_code', 'client_branch.client_id'])
+                                  ->where('client_branch.client_id',$client['id'])
+                                  ->findAll();
+
+                $client['branchs'] = $clientBranchs; 
             }
             //print_r(($clients));die();
             return $clients;
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index 7ec30755..b9a78696 100644
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -37,7 +37,8 @@ class EmployeeModel extends Model
         "is_active",
         "file_id",
         "is_addon_value",
-        "is_createdby_hr"
+        "is_createdby_hr",
+        "client_branch_id"
     ];
 
       // Callbacks
@@ -76,7 +77,7 @@ class EmployeeModel extends Model
 
 
     // for emp onboard process do not change
-    public function checkExistingEmp($arr)
+    public function checkExistingEmp($arr,$client_branch_id)
     {
 
            if($arr['temp']['emp_id'] == null)
@@ -84,9 +85,12 @@ class EmployeeModel extends Model
            return $this->where('emp_code',$arr['emp_code'])
                        ->where('name',$arr['name'])
                        ->where('client_id',$arr['client_id'])
+                       ->where('client_branch_id',$client_branch_id)
                        ->where('is_active',1)
                        ->where('gender',$arr['gender'])
                        ->where('dob',$arr['dob'])
+                       ->where('is_active',1)
+                       ->where('emp_status','active')
                        ->find();
           }
           else
@@ -96,9 +100,9 @@ class EmployeeModel extends Model
     }
 
 
-    public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [])
+    public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [],array $client_branch_id = [])
     {
-        $result =  $this->select(['employees.id as emp_id', 'employees.client_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policies.name as policy_name','client_policy.is_addon'])
+        $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policies.name as policy_name','client_policy.is_addon'])
                         ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                         ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
                         ->join('policies', 'policies.id = client_policy.policy_id')
@@ -116,6 +120,9 @@ class EmployeeModel extends Model
                         })
                         ->when(count($emp_status), function($query) use ($emp_status){
                             return $query->whereIn('employees.emp_status', $emp_status);
+                        })
+                         ->when(count($client_branch_id), function($query) use ($client_branch_id){
+                            return $query->whereIn('employees.client_branch_id', $client_branch_id);
                         })
                         ->when(count($relationship), function($query) use ($relationship){
                             return $query->whereIn('employees.relationship', $relationship);
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 217e2013..2e7bcf23 100644
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -76,7 +76,7 @@ class EmployeePolicyModel extends Model
     }
 
 // -----------------------------------------------------------------------------------------------------
-   public function getEmployeePolicy($client_id,$policy_id,$status)
+   public function getEmployeePolicy($client_id,$policy_id,$status, $branch_id)
    {
         $result =  $this->select(['employee_polices.*','pm.name as policy_name','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active','emp.mobile as mobile'])
                         ->join('employees emp', 'employee_polices.employee_id = emp.id') 
@@ -88,6 +88,7 @@ class EmployeePolicyModel extends Model
                         ->join('tpa_branch tpab', 'cp.tpa_branch_id = tpab.id') //tpab - tpa brach
                         ->join('clients cm', 'cp.client_id = cm.id') //cm - client master
                         ->where('emp.client_id',$client_id)
+                        ->where('emp.client_branch_id',$branch_id)
                         ->where('employee_polices.is_active',1)
                         ->where('emp.is_active',1)
                         ->where('employee_polices.client_policy_id',$policy_id)
@@ -119,6 +120,7 @@ class EmployeePolicyModel extends Model
     public function getInceptionEmployeeDataForExportExcel($ref_data)
     {   
         $client_policy_id = $ref_data['client_policy_id'];
+        $client_branch_id = $ref_data['client_branch_id'];
         $insurer_or_tpa = $ref_data['insurer_or_tpa'];
         $event = $ref_data['event_type'];
 
@@ -173,7 +175,8 @@ class EmployeePolicyModel extends Model
             ) as batch_data ON employee_polices.id = batch_data.emp_policy_id
             WHERE employee_polices.client_policy_id = '{$client_policy_id}'
                 AND (employee_polices.{$id} IS NULL OR employee_polices.{$id} = '')
-                AND employee_polices.is_active = 1";
+                AND employee_polices.is_active = 1
+                AND employees.client_branch_id = '{$client_branch_id}'";
 
             // Get the result set
             $query = $this->db->query($sql);
@@ -187,6 +190,7 @@ class EmployeePolicyModel extends Model
 
             $client_id = $ref_data['client_id'];
             $client_policy_id = $ref_data['client_policy_id'];
+            $client_branch_id = $ref_data['client_branch_id'];
             $insurer_or_tpa = $ref_data['insurer_or_tpa'];
 
             $sql = "
@@ -235,6 +239,7 @@ class EmployeePolicyModel extends Model
                     AND batch_data.bl IS NULL
                     AND employees.client_id = '{$client_id}'
                     AND employee_polices.client_policy_id = '{$client_policy_id}'
+                    AND employees.client_branch_id = '{$client_branch_id}'
                     AND emp_endorsement.actions = 'c'
                     AND (emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')";
 
@@ -254,6 +259,7 @@ class EmployeePolicyModel extends Model
 
             $client_id = $ref_data['client_id'];
             $client_policy_id = $ref_data['client_policy_id'];
+            $client_branch_id = $ref_data['client_branch_id'];
             $insurer_or_tpa = $ref_data['insurer_or_tpa'];
 
             $query = $this->db->query("
@@ -344,6 +350,7 @@ class EmployeePolicyModel extends Model
                         batch_data.bf IS NULL 
                         AND batch_data.bl IS NULL 
                         AND employee_polices.client_policy_id = '{$client_policy_id}'
+                        AND employees.client_branch_id = '{$client_policy_id}'
                         AND employee_polices.is_active = '1'
                         AND (a.endorsement_id IS NULL OR a.endorsement_id = '') 
                         AND a.field_name = 'si_enhancement_date'
@@ -361,10 +368,11 @@ class EmployeePolicyModel extends Model
 
             $client_id = $ref_data['client_id'];
             $client_policy_id = $ref_data['client_policy_id'];
+            $client_branch_id = $ref_data['client_branch_id'];
             $insurer_or_tpa = $ref_data['insurer_or_tpa'];
 
             $query = $this->db->query("
-            SELECT 
+            SELECT DISTINCT
                 a.id as endorsement_primarykey,
                 employee_polices.id as primaryKey, 
                 employees.name AS emp_name,
@@ -435,6 +443,7 @@ class EmployeePolicyModel extends Model
                 batch_data.bf IS NULL
                 AND batch_data.bl IS NULL
                 AND employee_polices.client_policy_id = {$client_policy_id}
+                AND employees.client_branch_id = {$client_branch_id}
                 AND employee_polices.is_active = 1
                 AND (a.endorsement_id IS NULL OR a.endorsement_id = '') AND a.field_name = 'status'
         ");
@@ -592,7 +601,7 @@ class EmployeePolicyModel extends Model
     }
 
 
-    public function getEmployeeEndorsementList($client_id, $policy_id, $status)
+    public function getEmployeeEndorsementList($client_id, $policy_id, $status, $branch_id)
     {   
         $query1 = $this->db->table('emp_endorsement e');
         $query1->select('
@@ -609,14 +618,16 @@ class EmployeePolicyModel extends Model
                     insurers.short_name as insurer_short_name
                 ');
                 $query1->distinct();
-                $query1->join('employee_polices ep', 'ep.id = e.pk', 'left');
-                $query1->join('employees', 'employees.id = ep.employee_id', 'left');
-                $query1->join('client_policy', 'client_policy.id = ep.client_policy_id', 'left');
-                $query1->join('policies', 'policies.id = client_policy.policy_id', 'left');
-                $query1->join('insurers', 'insurers.id = policies.insurer_id', 'left');
+                $query1->join('employee_polices ep', 'ep.id = e.pk');
+                $query1->join('employees', 'employees.id = ep.employee_id');
+                $query1->join('client_policy', 'client_policy.id = ep.client_policy_id');
+                $query1->join('client_branch', 'client_branch.id = employees.client_branch_id');
+                $query1->join('policies', 'policies.id = client_policy.policy_id');
+                $query1->join('insurers', 'insurers.id = policies.insurer_id');
                 $query1->whereIn('e.actions', ['c']);
-                $query1->where('ep.client_policy_id', $client_id);
-                $query1->where('employees.client_id', $policy_id);
+                $query1->where('ep.client_policy_id', $policy_id);
+                $query1->where('employees.client_id', $client_id);
+                $query1->where('employees.client_branch_id', $branch_id);
                 if($status != 0 && !empty($status)){
 
                     $query1->where('e.status', $status);
@@ -640,14 +651,16 @@ class EmployeePolicyModel extends Model
                     policies.name as policy_name,
                     insurers.short_name as insurer_short_name
                 ');
-                $query2->join('employee_polices ep', 'ep.id = e.pk', 'left');
-                $query2->join('employees', 'employees.id = ep.employee_id', 'left');
-                $query2->join('client_policy', 'client_policy.id = ep.client_policy_id', 'left');
-                $query2->join('policies', 'policies.id = client_policy.policy_id', 'left');
-                $query2->join('insurers', 'insurers.id = policies.insurer_id', 'left');
+                $query2->join('employee_polices ep', 'ep.id = e.pk');
+                $query2->join('employees', 'employees.id = ep.employee_id');
+                $query2->join('client_policy', 'client_policy.id = ep.client_policy_id');
+                $query2->join('client_branch', 'client_branch.id = employees.client_branch_id');
+                $query2->join('policies', 'policies.id = client_policy.policy_id');
+                $query2->join('insurers', 'insurers.id = policies.insurer_id');
                 $query2->whereIn('e.actions', ['si', 'd']);
-                $query2->where('ep.client_policy_id', $client_id);
+                $query2->where('ep.client_policy_id', $policy_id);
                 $query2->where('employees.client_id', $policy_id);
+                $query1->where('employees.client_branch_id', $branch_id);
                 if($status != 0 && !empty($status)){
 
                     $query2->where('e.status', $status);
@@ -769,6 +782,72 @@ class EmployeePolicyModel extends Model
     
        return $result;
 
+    }    
+    
+    
+    public function getECardSingleData($rand_string, $emp_code){
+
+        $result = $this->db->table('employees e')
+        ->select('e.id, 
+                    e.name, e.mobile, 
+                    e.relationship, 
+                    e.relationship_code, 
+                    e.emp_code, 
+                    e.email_personal, 
+                    e.email_corporate, 
+                    e.gender, 
+                    e.dob, 
+                    e.doj, 
+                    e.band,
+                    TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age,
+                    (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ') AS self,
+
+
+                    ep.tpa_id, 
+                    ep.uhid,
+                    ep.policy_end_date,
+
+                    clients.client_name, 
+                    clients.short_name AS client_short_name,
+
+                    cp.policy_start_date,
+                    cp.policy_no,
+
+                    policies.name AS policy_name,
+
+                    insurers.name AS insurer_name, 
+                    insurers.short_name AS insurer_short_name,
+                    insurers.insurer_logo,
+
+                    insurer_branch.branch_name,                    
+                    insurer_branch.branch_code,                    
+                    insurer_branch.city as insurer_branch_city,                    
+
+                    tpa.name AS tpa_name, 
+                    tpa.tpa_logo AS tpa_logo, 
+                    tpa.front_card, 
+                    tpa.back_card, 
+                    tpa.short_name AS tpa_short_name'
+                )
+
+        ->join('employee_polices ep', 'ep.employee_id = e.id')
+        ->join('client_policy cp', 'cp.id = ep.client_policy_id')
+        ->join('clients', 'clients.id = cp.client_id')
+        ->join('policies', 'policies.id = cp.policy_id')
+        ->join('insurers', 'insurers.id = cp.insurer_id')
+        ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id')
+        ->join('tpa', 'tpa.id = cp.tpa_id')
+        ->where("ep.tpa_id IS NOT NULL AND ep.tpa_id <> ''")
+        ->where('e.emp_status', 'active')
+        ->where('e.is_active', '1')
+        ->where('ep.status', 'active')
+        ->where('ep.is_active', '1')
+        ->where('ep.rand_string', $rand_string)
+        ->get()
+        ->getResultArray();
+    
+       return $result;
+
     }
     
 
diff --git a/app/Models/FileModel.php b/app/Models/FileModel.php
index aefbb419..51f397ec 100644
--- a/app/Models/FileModel.php
+++ b/app/Models/FileModel.php
@@ -17,7 +17,8 @@ class FileModel extends Model
         "reason",
         "action",
         "client_id",
-        "policy_id"
+        "policy_id",
+        "client_branch_id",
     ];
 
 
diff --git a/app/Models/MessageModel.php b/app/Models/MessageModel.php
index eac21cbe..6f2256a3 100644
--- a/app/Models/MessageModel.php
+++ b/app/Models/MessageModel.php
@@ -69,6 +69,7 @@ class MessageModel extends Model
         $builder->orWhere('messages.role_id', $roleId);
         $builder->orWhere('messages.team_id', $teamId);
         $builder->groupEnd();
+        $builder->orderBy('id', 'desc');
 
         $query = $builder->get();
         return $query->getResult();
diff --git a/app/Models/PolicyPremium2Model.php b/app/Models/PolicyPremium2Model.php
index a03ca381..b302a53c 100644
--- a/app/Models/PolicyPremium2Model.php
+++ b/app/Models/PolicyPremium2Model.php
@@ -25,6 +25,8 @@ class PolicyPremium2Model extends Model
         'is_active',  
         'premium_type',  
         'relationship',  
+        'additional_relationship',  
+        'rack_rate_type',  
         
     ];
 
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index 9e73bbd1..04b52ec6 100644
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -25,6 +25,7 @@
                             <th class="font-weight-medium">Batch <br> Code</th>
                             <th class="font-weight-medium">File Name</th>
                             <th class="font-weight-medium">Client</th>
+                            <th class="font-weight-medium">Client <br> Branch</th>
                             <th class="font-weight-medium">Client Policy</th>
                             <th class="font-weight-medium">Event <br>  Type</th>
                             <th class="font-weight-medium">Insurer/ <br> TPA</th>
@@ -50,6 +51,7 @@
                                 <?php echo strlen($file['file_name']) > 5 ? substr($file['file_name'], 0, 10) . "..." : $file['file_name'] ?>
                             </td>
                             <td><?php echo $file['client_short_name'] ?></td>
+                            <td><?php echo $file['branch_name'] ?></td>
                             <td><?php echo $file['policy_name'] ?></td>
                             <td><?php echo $file['event_type'] ?></td>
                             <td><?php echo $file['insurer_or_tpa'] ?></td>
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index fb1adc40..bb261f17 100644
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -5,7 +5,7 @@
                 <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
 
-                        <h4 class="header-title" style="position: relative;">Client Deposit -
+                        <h4 style="position: relative;">Client Deposit -
                             <?php echo $clientName[0]['client_name'];?></h4>
 
                     </div>
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index f53b7c16..6893b31c 100644
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -51,7 +51,7 @@
                             <div class="form-group col-md-4">
                                 <label for="kyc_docs">File<span
                                         class="text-danger">*</span></label>
-                                <input class="form-control" type="file" name="file_name" multiple="true" id="kyc_docs_file" required>
+                                        <input class="form-control" type="file" name="file_name" multiple="true" id="kyc_docs_file" required accept=".pdf, .jpeg, .jpg, .png">
                             </div>
                             <!-- <div class="form-group col-md-4 align-self-end"> -->
                             <div class="form-group col-md-4" style="margin-top: 42px;">
@@ -100,6 +100,7 @@
     $(document).ready(function(){
 
         kycPrimaryKey  = $('#kyc_PrimaryKey').val();
+
         $('#others').hide()
         $('#other_docs_table').hide();
 
@@ -176,10 +177,10 @@
                         $('#name_'+item.kyc_doc_type_id).html(item.file_name);
                         $('#form_'+item.kyc_doc_type_id).hide();
 
-                        console.log('step 1')
+                        // console.log('step 1')
 
                             if(item.file_name != null && item.file_name != ""){
-                                console.log('step 2')
+                                // console.log('step 2')
 
                                 $('#download_'+item.kyc_doc_type_id).show();
                                 $('#download_' + item.kyc_doc_type_id).attr('href', '<?= base_url('download-kyc-docs/') ?>' + item.file_name);
@@ -187,14 +188,14 @@
 
                             }
                             else{
-                                console.log('step 3')
+                                // console.log('step 3')
 
                                 $('#download_'+item.kyc_doc_type_id).hide();
                                 $('#download_' + item.kyc_doc_type_id).attr('href', '#');
                                 $('#delete_'+item.kyc_doc_type_id).hide();
 
                             }
-                            console.log('step 4')
+                            // console.log('step 4')
 
                     });
 
@@ -217,6 +218,9 @@
 
             $('.loader').fadeIn();
             $('.loader-mask').fadeIn();
+
+
+
             $.ajax({
                 url: '<?= base_url("client/kyc/list/"); ?>' + '<?= isset($client['entity_type_id']) ? $client['entity_type_id'] : '' ?>',
                 type: "GET",
@@ -224,6 +228,7 @@
                 processData: false,
                 contentType: false,
                 success: function (res) {
+
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
@@ -270,9 +275,20 @@
             var table = '';
             var data  = <?= isset($client_kyc) ? json_encode($client_kyc) : '[]' ?>;
 
-            console.log(data)
+            // console.log('other documents data', data)
+
+
             $('#other_docs tr').remove();
+
+           var other_docs_count = 0;
+
             $.each(data, function(index, item) {
+
+                if(item.other_docs_name != ""){
+
+                    other_docs_count++;
+                }
+
                 if(item.kyc_doc_type_id == '0'){
                     table += `
                     <tr id="kyc-${item.id}">
@@ -288,6 +304,11 @@
                 }
             });
             $('#other_docs').append(table);
+
+            if(other_docs_count > 0){
+                $('#others').show()
+                $('#other_docs_table').show();
+            }
             
 
             $.each(data, function(index, item) {
@@ -299,19 +320,17 @@
                     $('#name_'+item.kyc_doc_type_id).html(item.file_name);
                     $('#form_'+item.kyc_doc_type_id).hide();
 
-                    console.log('step 1')
+                    // console.log('step 1')
 
                     if(item.file_name != null && item.file_name != ""){
-                        console.log('step 2')
+                        // console.log('step 2')
 
                         $('#download_'+item.kyc_doc_type_id).show();
                         $('#download_' + item.kyc_doc_type_id).attr('href', '<?= base_url('download-kyc-docs/') ?>' + item.file_name);
                         $('#delete_'+item.kyc_doc_type_id).show();
-
-
                     }
                     else{
-                        console.log('step 3')
+                        // console.log('step 3')
 
                         $('#download_'+item.kyc_doc_type_id).hide();
                         $('#download_' + item.kyc_doc_type_id).attr('href', '#');
@@ -319,7 +338,7 @@
 
 
                     }
-                    console.log('step 4')
+                    // console.log('step 4')
 
                 }, 1000);
 
@@ -369,7 +388,7 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                 }, 1000);
-                    console.log(res);
+                    // console.log(res);
                     $('#kyc_form').trigger('reset');
                     if(res){
                         setTimeout(function() {
@@ -380,23 +399,36 @@
                         }, 500);
                     }
 
+                    var other_docs_count = 0;
+
                     $('#other_docs tr').remove();
                     $.each(res.data, function(index, item) {
-                        console.log("Current item:", item);
+
+                        if(item.other_docs_name != ""){
+
+                           other_docs_count++;
+                        }
+
+                        // console.log("Current item:", item);
                         if (item.kyc_doc_type_id == '0') {
-                            console.log("Appending item:", item);
+                            // console.log("Appending item:", item);
                             var rowHtml = `
                                 <tr id="kyc-${item.id}">
                                     <td>${item.other_docs_name}</td>
                                     <td>${item.file_name}</td>
                                     <td>
                                          <i data-id="${item.id}" class="mdi mdi-delete btnKycOtherDelete" style="font-size:18px;"></i>
-                                         <a href = "<?= base_url('download-kyc-docs/') ?>${item.file_name}" data-id="${item.id}" class="fa fa-download" style="font-size:18px; display: none" download></a>
+                                         <a href = "<?= base_url('download-kyc-docs/') ?>${item.file_name}" data-id="${item.id}" class="fa fa-download" style="font-size:18px;" download></a>
                                     </td>
                                 </tr>
                             `;
                         }
                         $('#other_docs').append(rowHtml);
+
+                        if(other_docs_count > 0){
+                            $('#others').show()
+                            $('#other_docs_table').show();
+                        }
                     });
                 },
                 error: function(xhr, status, error) {
@@ -431,8 +463,8 @@
 
                 var kyc_id = $(this).attr('data-id');
                 $.get('<?php echo base_url('client/kyc/delete/');?>'+kyc_id, function (data) {
-                    console.log('kyc-'+ kyc_id)
-                    console.log(data)
+                    // console.log('kyc-'+ kyc_id)
+                    // console.log(data)
                     if(data){
                         $('#form_'+kyc_id).show();
                         $('#name_'+kyc_id).hide();
@@ -458,7 +490,7 @@
 
                 var kyc_id = $(this).attr('data-id');
                 $.get('<?php echo base_url('util/kyc-other-docs-delete/');?>'+kyc_id, function (data) {
-                    console.log('kyc-'+ kyc_id)
+                    // console.log('kyc-'+ kyc_id)
                     if(data){
                         $('#kyc-'+ kyc_id).remove();
                     }
@@ -468,30 +500,4 @@
     });
 
      
-    function validateForm() {
-        var isValid = true;
-        
-
-        $('#kyc_form input, #kyc_form select').each(function() {
-            if ($(this).is('input[type="text"]') || $(this).is('select')) {
-                if ($.trim($(this).val()) == '') {
-                    console.log('Please fill in all fields');
-                    isValid = false;
-                    return false; 
-                }
-            }
-            
-            if ($(this).is('input[type="file"]')) {
-                var fileInput = $(this)[0];
-                if (fileInput.files.length === 0) {
-                    console.log('Please select an image file');
-                    isValid = false;
-                    return false; 
-                }
-            }
-        });
-
-        return isValid;
-    }
-
 </script>
\ No newline at end of file
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index bb6e8294..bb844432 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -2,8 +2,7 @@
 
 
     <div class="row float-right" style="padding-bottom: 10px; position: relative;right: 13px;">
-        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm"><span
-                class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
+        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
     </div>
 
     <div class="table-responsive" id="table_list">
@@ -30,9 +29,7 @@
             <div class="card-body">
 
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                    <button type="button" id="btnPolicyBack"
-                        class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list"
-                            aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>
+                    <button type="button" id="btnPolicyBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>
                 </div>
 
                 <hr>
@@ -42,34 +39,31 @@
                     <input type="hidden" name="PrimaryKey" id="policy_PrimaryKey" />
                     <input type="hidden" id="policy_form_action" />
                     <input type="hidden" name="policy_type_id" id="policy_type_id" />
-                    <input type="hidden" name="client_id" id="client_id_policy"
-                        value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
+                    <input type="hidden" name="client_id" id="client_id_policy" value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
                     <div class="form-group">
 
                         <div class="form-row">
-                            
+
                             <div class="form-group col-md-4">
-                                <label for="client_branch">Client Branch<span
-                                        class="text-danger">*</span></label>
+                                <label for="client_branch">Client Branch<span class="text-danger">*</span></label>
                                 <select class="form-control" id="client_branch" name="client_branch_id">
                                     <option value="" selected>Select Client Branch</option>
                                 </select>
                             </div>
-                             
-                            
+
+
                             <div class="form-group col-md-4">
                                 <label for="email"> Policy Type<span class="text-danger">*</span></label>
                                 <select class="form-control" id="policy_type" name="is_addon" required>
                                     <option value="0">Select Policy Type</option>
                                     <?php foreach ($policy_type as $key => $value) { ?>
-                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                        <option value="<?= $key ?>"><?= $value ?></option>
                                     <?php } ?>
                                 </select>
                             </div>
 
                             <div class="form-group col-md-4" id="base_policy_id" style="display: none;">
-                                <label for="addon_policy">Base Policy<span id="base_danger"
-                                        class="text-danger">*</span></label>
+                                <label for="addon_policy">Base Policy<span id="base_danger" class="text-danger">*</span></label>
                                 <select class="form-control" id="base_policy" name="base_policy">
                                     <option value="" selected>Select Base Policy</option>
                                 </select>
@@ -83,8 +77,8 @@
                                 <select class="form-control" id="insurer" name="insurer" required>
                                     <option value="">Select Insurer</option>
                                     <?php foreach ($insurer as $value) { ?>
-                                    <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>">
-                                        <?= $value['insurer_name'] . '-' . $value['branch_code'] ?></option>
+                                        <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>">
+                                            <?= $value['insurer_name'] . '-' . $value['branch_code'] ?></option>
                                     <?php } ?>
                                 </select>
                             </div>
@@ -99,8 +93,8 @@
                                 <select class="form-control" id="tpa" name="tpa" required>
                                     <option value="">Select TPA</option>
                                     <?php foreach ($tpa as $value) { ?>
-                                    <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
-                                        <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?></option>
+                                        <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
+                                            <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?></option>
                                     <?php } ?>
                                 </select>
                             </div>
@@ -109,24 +103,19 @@
                         <div class="form-row" id="second" style="display: none;">
                             <div class="form-group col-md-3">
                                 <label for="policy_no">Policy No<span class="text-danger">*</span></label>
-                                <input value="" type="text" class="form-control" placeholder="Enter Policy Number "
-                                    name="policy_no" id="policy_no" required>
+                                <input value="" type="text" class="form-control" placeholder="Enter Policy Number " name="policy_no" id="policy_no" required>
                             </div>
                             <div class="form-group col-md-3">
-                                <label for="policy_start_date">Policy Start Date<span
-                                        class="text-danger">*</span></label>
-                                <input value="" type="text" class="form-control" placeholder="Enter Start Date "
-                                    name="policy_start_date" id="start_date" required>
+                                <label for="policy_start_date">Policy Start Date<span class="text-danger">*</span></label>
+                                <input value="" type="text" class="form-control" placeholder="Enter Start Date " name="policy_start_date" id="start_date" required>
                             </div>
                             <div class="form-group col-md-3">
                                 <label for="policy_end_date">Policy End Date<span class="text-danger">*</span></label>
-                                <input value="" type="text" class="form-control" placeholder="Enter End Date "
-                                    name="policy_end_date" id="end_date" required>
+                                <input value="" type="text" class="form-control" placeholder="Enter End Date " name="policy_end_date" id="end_date" required>
                             </div>
                             <div class="form-group col-md-3" id="policy_status_field">
                                 <label for="policy_status">Policy Status</label>
-                                <input value="" type="text" class="form-control" placeholder="Policy Status"
-                                    id="policy_status" readonly>
+                                <input value="" type="text" class="form-control" placeholder="Policy Status" id="policy_status" readonly>
                             </div>
                         </div>
 
@@ -146,10 +135,8 @@
                     </div>
 
                     <div class="form-group text-right m-b-0">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                            id="btnSubmit">Submit</button>
-                        <button type="button" class="btn btn-secondary waves-effect btnBack"
-                            id="btnBack">Cancel</button>
+                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                        <button type="button" class="btn btn-secondary waves-effect btnBack" id="btnBack">Cancel</button>
                     </div>
                 </form>
             </div>
@@ -163,104 +150,104 @@
 <?php include('policy_gpa_terms.php'); ?>
 
 <script>
-var policy_PrimaryKey = $('#client_id_policy').val();
-var policy_client = $('#policy_PrimaryKey').val();
+    var policy_PrimaryKey = $('#client_id_policy').val();
+    var policy_client = $('#policy_PrimaryKey').val();
 
-$(document).ready(function() {
-    // Initialize select2
-    $("#insurer").select2();
-    $("#policy").select2();
-    $("#tpa").select2();
-    $("#base_policy").select2();
-    $("#client_branch").select2();
-});
-
-$(document).ready(function() {
-
-    $('#policy_status_field').hide()
-
-    // Get today's date
-    var today = new Date();
-
-    // Initialize Flatpickr for the start date with today's date
-    var startDatePicker = flatpickr("#start_date", {
-        dateFormat: "d-m-Y",
-        defaultDate: today,
-        allowInput: false,
-        onChange: function(selectedDates, dateStr, instance) {
-            var endDate = new Date(selectedDates[0]);
-            endDate.setFullYear(endDate.getFullYear() + 1);
-            endDate.setDate(endDate.getDate() - 1); // Set end date to last day of selected year
-            endDatePicker.setDate(endDate);
-        }
+    $(document).ready(function() {
+        // Initialize select2
+        $("#insurer").select2();
+        $("#policy").select2();
+        $("#tpa").select2();
+        $("#base_policy").select2();
+        $("#client_branch").select2();
     });
 
-    // Calculate the end date (today + 1 year)
-    var endDate = new Date(today);
-    endDate.setFullYear(endDate.getFullYear() + 1);
-    endDate.setDate(endDate.getDate() - 1); // Set end date to last day of next year
+    $(document).ready(function() {
 
-    // Initialize Flatpickr for the end date with the calculated end date
-    var endDatePicker = flatpickr("#end_date", {
-        dateFormat: "d-m-Y",
-        defaultDate: endDate,
-        allowInput: false
-    });
+        $('#policy_status_field').hide()
 
-    $('#add_form').hide();
-    $('.btnBack').hide();
+        // Get today's date
+        var today = new Date();
 
-
-    if (policy_PrimaryKey !== '') {
-        var policyTable = '';
-        var data = <?= isset($client_policy) ? json_encode($client_policy) : '[]' ?>;
-        // console.log('client_policy_data',data)
-        data.forEach(function(item) {
-            console.log(item.open_for_enrollment);
-            var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
-            var patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
-            var subject = item.policy_type_name;
-
-            if (patternGMC.test(subject)) {
-                search_term = 'GMC';
-            } else if (patternGPA.test(subject)) {
-                search_term = 'GPA';
-            } else {
-                search_term = subject; // Set default value if neither 'GMC' nor 'GPA' exists
+        // Initialize Flatpickr for the start date with today's date
+        var startDatePicker = flatpickr("#start_date", {
+            dateFormat: "d-m-Y",
+            defaultDate: today,
+            allowInput: false,
+            onChange: function(selectedDates, dateStr, instance) {
+                var endDate = new Date(selectedDates[0]);
+                endDate.setFullYear(endDate.getFullYear() + 1);
+                endDate.setDate(endDate.getDate() - 1); // Set end date to last day of selected year
+                endDatePicker.setDate(endDate);
             }
-            // console.log('search_term :', search_term)
+        });
 
-            var enrollmentStatus = '';
-            if (item.inception_type == 1) {
+        // Calculate the end date (today + 1 year)
+        var endDate = new Date(today);
+        endDate.setFullYear(endDate.getFullYear() + 1);
+        endDate.setDate(endDate.getDate() - 1); // Set end date to last day of next year
 
-                enrollmentStatus = 'N/A'
+        // Initialize Flatpickr for the end date with the calculated end date
+        var endDatePicker = flatpickr("#end_date", {
+            dateFormat: "d-m-Y",
+            defaultDate: endDate,
+            allowInput: false
+        });
 
-            } else if (item.inception_type == 2) {
-
-                if (item.open_for_enrollment == 1) {
-
-                    enrollmentStatus = '<a href="#" data-id="' + item.id + '" id="' + item.policy_id +
-                        '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrollment">Open</a>'
+        $('#add_form').hide();
+        $('.btnBack').hide();
 
 
-                } else if (item.open_for_enrollment == 0) {
+        if (policy_PrimaryKey !== '') {
+            var policyTable = '';
+            var data = <?= isset($client_policy) ? json_encode($client_policy) : '[]' ?>;
+            // console.log('client_policy_data',data)
+            data.forEach(function(item) {
+                // console.log(item.open_for_enrollment);
+                var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
+                var patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
+                var subject = item.policy_type_name;
 
-                    enrollmentStatus =
-                        '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment"  data-id="' +
-                        item.id + '" id="' + item.policy_id + '" class="btnOpenEnroll">Closed</a>'
+                if (patternGMC.test(subject)) {
+                    search_term = 'GMC';
+                } else if (patternGPA.test(subject)) {
+                    search_term = 'GPA';
+                } else {
+                    search_term = subject; // Set default value if neither 'GMC' nor 'GPA' exists
+                }
+                // console.log('search_term :', search_term)
+
+                var enrollmentStatus = '';
+                if (item.inception_type == 1) {
+
+                    enrollmentStatus = 'N/A'
+
+                } else if (item.inception_type == 2) {
+
+                    if (item.open_for_enrollment == 1) {
+
+                        enrollmentStatus = '<a href="#" data-id="' + item.id + '" id="' + item.policy_id +
+                            '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrollment">Open</a>'
+
+
+                    } else if (item.open_for_enrollment == 0) {
+
+                        enrollmentStatus =
+                            '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment"  data-id="' +
+                            item.id + '" id="' + item.policy_id + '" class="btnOpenEnroll">Closed</a>'
+
+                    }
 
                 }
 
-            }
+                var tpaValue = 'TPA Unavailable';
 
-            var tpaValue = 'TPA Unavailable';
-
-            if (item.tpa_short && item.tpa_branch_code) {
-                tpaValue = item.tpa_short + '-' + item.tpa_branch_code;
-            }
+                if (item.tpa_short && item.tpa_branch_code) {
+                    tpaValue = item.tpa_short + '-' + item.tpa_branch_code;
+                }
 
 
-            policyTable += `
+                policyTable += `
                     <tr>
                         <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
                         <td>${item.policy_name}  (${item.policy_type_name})</td>
@@ -280,207 +267,209 @@ $(document).ready(function() {
                         </td>
                     </tr>
                 `;
+            });
+
+            $('#policy_table').append(policyTable);
+        }
+
+
+        $('#table-client-policy').DataTable({
+            paging: true,
+            searching: false
         });
 
-        $('#policy_table').append(policyTable);
-    }
-
-
-    $('#table-client-policy').DataTable({
-        paging: true,
-        searching: false
     });
 
- });
+
+    $('.btnAdd').click(function() {
+
+        // fetchClientPolicyList()
+        fetchClientBranch()
+
+        $('#policy_form')[0].reset();
+        $('#add_form').show();
+        $('#table_list').hide();
+        $('.btnBack').show();
+        $('.btnAdd').hide();
+        $('#insurer').val('').change();
+        $('#tpa').val('').change();
+        $('#policy_no').val('').change();
+        $('#start_date').val('').change();
+        $('#end_date').val('').change();
+        $('#policy').html('<option value="" selected>Select Policy</option>').change();
+        $('#policy_form_action').val('<?= base_url("client/policy/create"); ?>');
+        $('#policy_status_field').hide()
+        $('#base_policy_id').hide();
 
 
-$('.btnAdd').click(function() {
-
-    // fetchClientPolicyList()
-    fetchClientBranch()
-
-    $('#policy_form')[0].reset();
-    $('#add_form').show();
-    $('#table_list').hide();
-    $('.btnBack').show();
-    $('.btnAdd').hide();
-    $('#insurer').val('').change();
-    $('#tpa').val('').change();
-    $('#policy_no').val('').change();
-    $('#start_date').val('').change();
-    $('#end_date').val('').change();
-    $('#policy').html('<option value="" selected>Select Policy</option>').change();
-    $('#policy_form_action').val('<?= base_url("client/policy/create"); ?>');
-    $('#policy_status_field').hide()
-    $('#base_policy_id').hide();
+        $('#first').hide();
+        $('#second').hide();
+        $('#third').hide();
+        $('#base_policy_id').hide();
+        $('#base_policy').prop('required', false);
 
 
-    $('#first').hide();
-    $('#second').hide();
-    $('#third').hide();
-    $('#base_policy_id').hide();
-    $('#base_policy').prop('required', false);
+    })
 
 
-})
+    $('.btnBack').click(function() {
 
-
-$('.btnBack').click(function() {
-    $('#policy_form')[0].reset();
-    $('#add_form').hide();
-    $('#table_list').show();
-    $('.btnBack').hide();
-    $('.btnAdd').show();
-    $('#insurer').val('').change();
-    $('#tpa').val('').change();
-    $('#policy_no').val('').change();
-    $('#start_date').val('').change();
-    $('#end_date').val('').change();
-    $('#policy').html('<option value="" selected>Select Policy</option>');
-    $('#base_policy_id').hide();
-    $('#client_branch').val('').change();
-})
-
-
-/******** for form submit using AJAX *******/
-$("#policy_form").submit(function(event) {
-
-    event.preventDefault();
-
-    policy_PrimaryKey = $('#client_id_policy').val();
-    policy_client = $('#policy_PrimaryKey').val();
-
-    var policyDataId = $('#policy').children('option:selected').attr('data-id');
-    var basePolicyDataId = $('#base_policy').children('option:selected').attr('data-id');
-
-    console.log('policyDataId', policyDataId);
-    console.log('basePolicyDataId', basePolicyDataId);
-
-    if (policy_PrimaryKey === '' && policy_client === '') {
-        toastr.error('Client is required', 'Error');
-        $('#insurer').val('');
-        $('#tpa').val('');
+        $('#policy_form')[0].reset();
+        $('#add_form').hide();
+        $('#table_list').show();
+        $('.btnBack').hide();
+        $('.btnAdd').show();
+        $('#insurer').val('').change();
+        $('#tpa').val('').change();
+        $('#policy_no').val('').change();
+        $('#start_date').val('').change();
+        $('#end_date').val('').change();
         $('#policy').html('<option value="" selected>Select Policy</option>');
-        return;
-    }
+        $('#base_policy_id').hide();
+        $('#client_branch').val('').change();
 
-    if (basePolicyDataId == policyDataId) {
+    })
 
-        toastr.warning('The policy cannot be the same as the base policy.', 'Warning');
-        return;
-    }
 
-    if (basePolicyDataId == 3 || basePolicyDataId == 2) {
+    /******** for form submit using AJAX *******/
+    $("#policy_form").submit(function(event) {
 
-        if (policyDataId == 1) {
+        event.preventDefault();
 
-            toastr.warning('The GPA policy cannot be Select.', 'Warning');
+        policy_PrimaryKey = $('#client_id_policy').val();
+        policy_client = $('#policy_PrimaryKey').val();
+
+        var policyDataId = $('#policy').children('option:selected').attr('data-id');
+        var basePolicyDataId = $('#base_policy').children('option:selected').attr('data-id');
+
+        // console.log('policyDataId', policyDataId);
+        // console.log('basePolicyDataId', basePolicyDataId);
+
+        if (policy_PrimaryKey === '' && policy_client === '') {
+            toastr.error('Client is required', 'Error');
+            $('#insurer').val('');
+            $('#tpa').val('');
+            $('#policy').html('<option value="" selected>Select Policy</option>');
             return;
         }
 
-    }
+        if (basePolicyDataId == policyDataId) {
 
-    var isValid = $('#policy_form').parsley().validate();
-    if (!isValid) {
-        console.log('Form is Empty', 'Warning');
-        return;
-    }
+            toastr.warning('The policy cannot be the same as the base policy.', 'Warning');
+            return;
+        }
 
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        if (basePolicyDataId == 3 || basePolicyDataId == 2) {
 
-    var formData = new FormData($('#policy_form')[0]);
-    var policy_form_action = $('#policy_form_action').val();
+            if (policyDataId == 1) {
 
-    $.ajax({
-        data: formData,
-        url: policy_form_action,
-        type: "POST",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(res) {
-
-            console.log(res);
-            $('#policy_form')[0].reset();
-            if (res.status === false) {
-                toastr.error('Policy Dose Not Create', 'Error');
+                toastr.warning('The GPA policy cannot be Select.', 'Warning');
                 return;
             }
 
-            if(res.staus === 'policy_exist'){
+        }
 
-                toastr.error('Policy already exist in the branch', 'Error');
-            }
+        var isValid = $('#policy_form').parsley().validate();
+        if (!isValid) {
+            console.log('Form is Empty', 'Warning');
+            return;
+        }
 
-            if (res) {
-                setTimeout(function() {
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
 
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    $('#add_form').hide();
-                    $('#table_list').show();
-                    $('.btnBack').hide();
-                    $('.btnAdd').show();
-                    var message = (policy_PrimaryKey === '') ?
-                        'Policy Created successfully' : 'Policy Updated Successfully';
-                    toastr.success(message, 'Success');
-                }, 1000);
-            }
+        var formData = new FormData($('#policy_form')[0]);
+        var policy_form_action = $('#policy_form_action').val();
 
+        $.ajax({
+            data: formData,
+            url: policy_form_action,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
 
-            $('#policy_table tr').remove();
-            var policyTable = '';
-            $.each(res.data, function(index, item) {
-
-                var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
-                var patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
-                var subject = item.policy_type_name;
-
-                if (patternGMC.test(subject)) {
-                    search_term = 'GMC';
-                } else if (patternGPA.test(subject)) {
-                    search_term = 'GPA';
-                } else {
-                    search_term =
-                        subject; // Set default value if neither 'GMC' nor 'GPA' exists
+                console.log(res);
+                $('#policy_form')[0].reset();
+                if (res.status === false) {
+                    toastr.error('Policy Dose Not Create', 'Error');
+                    return;
                 }
 
-                // console.log('search_term :', search_term)
+                if (res.staus === 'policy_exist') {
 
-                var enrollmentStatus = '';
-                if (item.inception_type == 1) {
+                    toastr.error('Policy already exist in the branch', 'Error');
+                }
 
-                    enrollmentStatus = 'N/A'
+                if (res) {
+                    setTimeout(function() {
 
-                } else if (item.inception_type == 2) {
-
-                    if (item.open_for_enrollment == 1) {
-
-                        enrollmentStatus =
-                            '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
-                            item.id + '" id="' + item.policy_id +
-                            '" class="btnOpenEnroll">Open</a>'
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        $('#add_form').hide();
+                        $('#table_list').show();
+                        $('.btnBack').hide();
+                        $('.btnAdd').show();
+                        var message = (policy_PrimaryKey === '') ?
+                            'Policy Created successfully' : 'Policy Updated Successfully';
+                        toastr.success(message, 'Success');
+                    }, 1000);
+                }
 
 
-                    } else if (item.open_for_enrollment == 0) {
+                $('#policy_table tr').remove();
+                var policyTable = '';
+                $.each(res.data, function(index, item) {
 
-                        enrollmentStatus =
-                            '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
-                            item.id + '" id="' + item.policy_id +
-                            '" class="btnOpenEnroll">Closed</a>'
+                    var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
+                    var patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
+                    var subject = item.policy_type_name;
+
+                    if (patternGMC.test(subject)) {
+                        search_term = 'GMC';
+                    } else if (patternGPA.test(subject)) {
+                        search_term = 'GPA';
+                    } else {
+                        search_term =
+                            subject; // Set default value if neither 'GMC' nor 'GPA' exists
+                    }
+
+                    // console.log('search_term :', search_term)
+
+                    var enrollmentStatus = '';
+                    if (item.inception_type == 1) {
+
+                        enrollmentStatus = 'N/A'
+
+                    } else if (item.inception_type == 2) {
+
+                        if (item.open_for_enrollment == 1) {
+
+                            enrollmentStatus =
+                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
+                                item.id + '" id="' + item.policy_id +
+                                '" class="btnOpenEnroll">Open</a>'
+
+
+                        } else if (item.open_for_enrollment == 0) {
+
+                            enrollmentStatus =
+                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
+                                item.id + '" id="' + item.policy_id +
+                                '" class="btnOpenEnroll">Closed</a>'
+
+                        }
 
                     }
 
-                }
+                    var tpaValue = 'TPA Unavailable';
 
-                var tpaValue = 'TPA Unavailable';
+                    if (item.tpa_short && item.tpa_branch_code) {
+                        tpaValue = item.tpa_short + '-' + item.tpa_branch_code;
+                    }
 
-                if (item.tpa_short && item.tpa_branch_code) {
-                    tpaValue = item.tpa_short + '-' + item.tpa_branch_code;
-                }
-
-                policyTable += `
+                    policyTable += `
                         <tr>
                             <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
                             <td>${item.policy_name}  (${item.policy_type_name})</td>
@@ -500,1066 +489,357 @@ $("#policy_form").submit(function(event) {
                             </td>
                         </tr>
                     `;
-            });
-            $('#policy_table').append(policyTable);
-
-            $('#insurer').val('');
-            $('#tpa').val('');
-            $('#policy_no').val('');
-            $('#start_date').val('');
-            $('#end_date').val('');
-            $('#policy').html('<option value="" selected>Select Policy</option>');
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-            setTimeout(function() {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                if (xhr.status === 404) {
-                    console.log('Resource not found', 'Warning');
-                } else if (xhr.status === 500) {
-                    console.log('Internal server error', 'Warning');
-                } else {
-                    console.log('Unknown error occurred', 'Warning');
-                }
-            }, 1000);
-        }
-    });
-
-});
-
-$(document).ready(function() {
-    /********* To get th POLICY base on Insurer *******/
-    $('#insurer').change(function() {
-        var id = $(this).val();
-        var parts = id.split('-');
-        var secondPart = parts[1];
-        var url = "<?= base_url("util/police-by-insurer/") ?>" + secondPart;
-
-        var selectedOption = $('#base_policy').find(':selected');
-        var base_policy_data_id = selectedOption.data('id');
-        console.log('base_policy_data_id', base_policy_data_id);
-
-
-        $.get(url, function(res) {
-            // res = JSON.parse(res)// 
-            // console.log(res)
-            var OptionsHTML = '';
-            OptionsHTML += '<option value="" selected>Select Policy</option>';
-            $policy_type_value = $('#policy_type').val();
-            $.each(res.data, function(index, item) {
-
-                if ($policy_type_value == 3) {
-
-                    if (base_policy_data_id == 3) {
-
-                        if (item.policy_type_id == 5) {
-
-                            OptionsHTML += '<option data-id="' + item.policy_type_id +
-                                '" value="' +
-                                item.id +
-                                '">' + item.name + '( ' + item.policy_type +
-                                ' )</option>';
-                        }
+                });
+                $('#policy_table').append(policyTable);
 
+                $('#insurer').val('');
+                $('#tpa').val('');
+                $('#policy_no').val('');
+                $('#start_date').val('');
+                $('#end_date').val('');
+                $('#policy').html('<option value="" selected>Select Policy</option>');
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                setTimeout(function() {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    if (xhr.status === 404) {
+                        console.log('Resource not found', 'Warning');
+                    } else if (xhr.status === 500) {
+                        console.log('Internal server error', 'Warning');
                     } else {
+                        console.log('Unknown error occurred', 'Warning');
+                    }
+                }, 1000);
+            }
+        });
 
-                        if (item.policy_type_id == 5 || item.policy_type_id == 3) {
+    });
 
+    $(document).ready(function() {
+        /********* To get the POLICY base on Insurer *******/
+        $('#insurer').change(function() {
+            var id = $(this).val();
+            var parts = id.split('-');
+            var secondPart = parts[1];
+            var url = "<?= base_url("util/police-by-insurer/") ?>" + secondPart;
+
+            var selectedOption = $('#base_policy').find(':selected');
+            var base_policy_data_id = selectedOption.data('id');
+            console.log('base_policy_data_id', base_policy_data_id);
+
+
+            $.get(url, function(res) {
+                // res = JSON.parse(res)// 
+                // console.log(res)
+                var OptionsHTML = '';
+                OptionsHTML += '<option value="" selected>Select Policy</option>';
+                $policy_type_value = $('#policy_type').val();
+                $.each(res.data, function(index, item) {
+
+                    if ($policy_type_value == 3) {
+
+                        if (base_policy_data_id == 3) {
+
+                            if (item.policy_type_id == 5) {
+
+                                OptionsHTML += '<option data-id="' + item.policy_type_id +
+                                    '" value="' +
+                                    item.id +
+                                    '">' + item.name + '( ' + item.policy_type +
+                                    ' )</option>';
+                            }
+
+                        } else {
+
+                            if (item.policy_type_id == 5 || item.policy_type_id == 3) {
+
+                                OptionsHTML += '<option data-id="' + item.policy_type_id +
+                                    '" value="' +
+                                    item.id +
+                                    '">' + item.name + '( ' + item.policy_type +
+                                    ' )</option>';
+                            }
+
+                        }
+
+
+                    } else if ($policy_type_value == 2) {
+                        if (item.policy_type_id == 4 || item.policy_type_id == 5) {
                             OptionsHTML += '<option data-id="' + item.policy_type_id +
                                 '" value="' +
-                                item.id +
-                                '">' + item.name + '( ' + item.policy_type +
-                                ' )</option>';
-                        }
-
-                    }
-
-
-                } else if ($policy_type_value == 2) {
-                    if (item.policy_type_id == 4 || item.policy_type_id == 5) {
-                        OptionsHTML += '<option data-id="' + item.policy_type_id +
-                            '" value="' +
-                            item.id +
-                            '">' + item.name + '( ' + item.policy_type + ' )</option>';
-                    }
-                } else if ($policy_type_value == 1) {
-
-                    if (item.policy_type_id == 1 || item.policy_type_id == 2 || item
-                        .policy_type_id == 3) {
-
-                        OptionsHTML += '<option data-id="' + item.policy_type_id +
-                            '" value="' +
-                            item.id +
-                            '">' + item.name + '( ' + item.policy_type + ' )</option>';
-                    }
-                } else {
-
-                    OptionsHTML += '<option data-id="' + item.policy_type_id +
-                        '" value="' +
-                        item.id +
-                        '">' + item.name + '( ' + item.policy_type + ' )</option>';
-                }
-            });
-
-            $('#policy').html(OptionsHTML);
-        }).fail(function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-        });
-    });
-});
-
-$(document).ready(function() {
-    /********* set the Policy_Type_id for Form Submit  *******/
-    $('#policy').change(function() {
-
-        var id = $(this).val();
-        var dataId = $(this).children('option:selected').attr('data-id');
-        console.log('id', id)
-        $('#policy_type_id').val(dataId);
-
-        if (dataId == 1) {
-            $('#tpa').prop('required', false);
-            $('#tpa_danger').hide()
-        } else {
-            $('#tpa').prop('required', true);
-            $('#tpa_danger').show()
-        }
-
-
-        var base_policy_dataId = $('#base_policy').children('option:selected').attr('data-id');
-
-
-        // $('#base_policy option').each(function() {
-        //     var val = $(this).val();
-        //     if (val == id) {
-        //         $(this)
-        //     .hide(); // Hide the option if its value matches the selected value of #policy
-        //     } else {
-        //         $(this).show(); // Show all other options
-        //     }
-        // });
-
-        // if(dataId == 1){
-        //     appendPolicyFormFields(1);
-        // }else if (dataId >= 1){
-        //     appendPolicyFormFields(2);
-        // }
-
-        if ($('#policy_type').val() == 1) {
-
-            console.log('step 1')
-
-            if (dataId == 3) {
-
-                console.log('step 2')
-
-                var displayStatus = $('#base_policy_id').css('display');
-                $('#base_policy_id').show();
-                $('#base_danger').hide();
-                // $('#base_policy').prop('required', true);
-
-                if (displayStatus === 'none') {
-                    console.log('step 2.1')
-
-                    $('#base_policy').val('').change();
-                }
-
-                // $('#base_policy').find('option[data-id="3"]').hide();
-
-            } else {
-
-                console.log('step 3')
-
-                var displayStatus = $('#base_policy_id').css('display');
-                $('#base_policy_id').hide();
-                $('#base_danger').show();
-                // $('#base_policy').prop('required', false);
-
-                if (displayStatus === 'none') {
-                    console.log('step 3.1')
-
-                    $('#base_policy').val('').change();
-                }
-            }
-        }
-
-    });
-});
-
-// get the client policy data for edit
-$('body').on('click', '.btnPolicyEdit', function() {
-
-    var policy_form_action = '';
-    var policy_id = $(this).attr('data-id');
-
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    fetchClientBranch()
-
-    $.ajax({
-        url: '<?= base_url("client/policy/list/") ?>' + policy_id,
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
-
-            console.log('client_policy_res', res)
-
-            setTimeout(function() {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-            }, 1000);
-
-            $('#policy_form_action').val('<?= base_url("client/policy/edit"); ?>');
-
-            if (res.status === false) {
-                toastr.error(res.status);
-                return;
-            }
-
-            $('#add_form').show();
-            $('#table_list').hide();
-            $('.btnBack').show();
-            $('.btnAdd').hide();
-
-            $('#insurer').val(res.data.insurer_branch_id + '-' + res.data.insurer_id).change();
-            var tpaValue = '';
-
-            if (res.data.tpa_branch_id && res.data.tpa_id) {
-                tpaValue = res.data.tpa_branch_id + '-' + res.data.tpa_id;
-            }
-
-            $('#tpa').val(tpaValue).change();
-            // $('#policy').val(res.data.policy_id).change();
-            $('#policy_type').val(res.data.is_addon).change();
-            $('#base_policy').val(res.data.base_policy);
-            $('#client_branch').val(res.data.client_branch_id).change();
-
-            $('#policy_type_id').val(res.data.policy_type_id);
-            $('#policy_PrimaryKey').val(res.data.id);
-            $('#policy_no').val(res.data.policy_no);
-            $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date));
-            $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date));
-            $('#policy_status').val(checkDateStatus(res.data.policy_end_date));
-            $('#policy_status_field').show();
-
-            if (res.data.inception_type == 2) {
-                $('#inception_type').prop('checked', true);
-            } else {
-                $('#inception_type').prop('checked', false);
-            }
-
-
-            if (res.data.is_addon != '1' && res.data.is_addon != '0') {
-                $('#base_policy_id').show();
-                $('#base_policy').prop('required', true);
-                $('#first').show();
-                $('#second').show();
-                $('#third').show();
-            } else if (res.data.is_addon == '0') {
-                $('#first').hide();
-                $('#second').hide();
-                $('#third').hide();
-                $('#base_policy_id').hide();
-                $('#base_policy').prop('required', false);
-            } else if (res.data.is_addon == '1') {
-                $('#first').show();
-                $('#second').show();
-                $('#third').show();
-                $('#base_policy_id').hide();
-                $('#base_policy').prop('required', false);
-            }
-
-
-            if (res.data.is_addon == 1 && res.data.base_policy > 0) {
-
-                // $("#insurer").next(".select2-container").css({
-                //     'pointer-events': 'none',
-                // });
-                // $('#select2-insurer-container').css({
-                //     'background-color': '#ebebe0',
-                // });
-
-                // $("#tpa").next(".select2-container").css({
-                //     'pointer-events': 'none',
-                // });
-                // $('#select2-tpa-container').css({
-                //     'background-color': '#ebebe0',
-                // });
-
-            }
-
-
-            if (res.data.is_addon == 2 || res.data.is_addon == 3) {
-
-                $("#insurer").next(".select2-container").css({
-                    'pointer-events': 'none',
-                });
-                $('#select2-insurer-container').css({
-                    'background-color': '#ebebe0',
-                });
-
-                $("#tpa").next(".select2-container").css({
-                    'pointer-events': 'none',
-                });
-                $('#select2-tpa-container').css({
-                    'background-color': '#ebebe0',
-                });
-
-            } else {
-
-                $("#insurer").next(".select2-container").css({
-                    'pointer-events': 'auto',
-                });
-                $('#select2-insurer-container').css({
-                    'background-color': 'transparent',
-                });
-
-                $("#tpa").next(".select2-container").css({
-                    'pointer-events': 'auto',
-                });
-                $('#select2-tpa-container').css({
-                    'background-color': 'transparent',
-                });
-            }
-
-            var policeOptionHTML = '';
-            $.each(res.policy, function(index, item) {
-                policeOptionHTML += '<option data-id="' + item.policy_type_id +
-                    '" value="' + item.id + '" ' + (res.data.policy_id === item.id ?
-                        'selected="selected"' : '') + '>' + item.name + '</option>';
-            });
-            $('#policy').html(policeOptionHTML);
-
-            var OptionsHTML = '';
-            OptionsHTML += '<option value="" selected>Select Base Policy</option>';
-            $.each(res.client_policy_list, function(index, item) {
-
-                if(item.client_branch_id == res.data.client_branch_id){
-
-                    OptionsHTML += '<option data-id="' + item.policy_type_id +
-                        '" value="' + item.id + '" ' + (res.data.base_policy === item.id ?
-                            'selected="selected"' : '') + '>' + item.name + '( ' + item
-                        .policy_type + ' )</option>';
-
-                }
-
-            });
-            $('#base_policy').html(OptionsHTML);
-
-            setTimeout(function() {
-                $('#policy').val(res.data.policy_id).change();
-                $('#base_policy').val(res.data.base_policy);
-                $('#base_policy').change();
-            }, 3000);
-
-
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-            setTimeout(function() {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                console.log('Something Wrong!', 'warning');
-            }, 1000);
-        }
-    });
-});
-
-$('body').on('click', '.btnOpenEnroll', function() {
-
-    Swal.fire({
-        title: "Are you sure?",
-        text: "You need to approve this!",
-        icon: "info",
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        confirmButtonText: "Yes",
-    }).then((result) => {
-
-
-        if (result.isConfirmed) {
-
-            var client_policy_id = $(this).attr('data-id');
-            var policy_id = $(this).attr('id');
-            var client_id = $('#client_id_policy').val()
-
-            console.log('client_policy_id', client_policy_id)
-            console.log('policy_id', policy_id)
-            console.log('client_id', client_id)
-
-            if (client_policy_id) {
-                $('.loader').fadeIn();
-                $('.loader-mask').fadeIn();
-            }
-
-            $.ajax({
-                url: '<?php echo base_url('util/update-policy-status'); ?>',
-                type: 'GET',
-                data: {
-                    client_policy_id: client_policy_id,
-                },
-                success: function(res) {
-
-                    console.log(res.client_policy_data);
-
-                    if (res) {
-                        if (res.open_for_enrollment) {
-                            var json_decode = JSON.parse(res.open_for_enrollment);
-                            var open_for_enrollment = json_decode.open_for_enrollment;
-                            var client_policy_id = json_decode.client_policy_id;
-
-                            if (open_for_enrollment == 1) {
-
-                                $('.btnOpenEnroll').each(function(index, element) {
-                                    if ($(element).data('id') == client_policy_id) {
-                                        $(element).html(
-                                            '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
-                                            res.client_policy_data.id +
-                                            '" id="' + res.client_policy_data
-                                            .policy_id +
-                                            '" class="btnOpenEnroll">Open</a>');
-                                    }
-                                });
-
-                            } else {
-
-                                $('.btnOpenEnroll').each(function(index, element) {
-                                    if ($(element).data('id') == client_policy_id) {
-                                        $(element).html(
-                                            '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
-                                            res.client_policy_data.id +
-                                            '" id="' + res.client_policy_data
-                                            .policy_id +
-                                            '" class="btnOpenEnroll">Closed</a>'
-                                            );
-                                    }
-                                });
-                            }
-
-                        }
-                        setTimeout(function() {
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-                            if (res.status === true) {
-                                toastr.success(res.message, 'Success');
-
-                            } else if (res.status === false) {
-                                toastr.warning(res.message, 'Warning');
-                            }
-                        }, 1000);
-                    }
-                },
-                error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    setTimeout(function() {
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-                        if (xhr.status === 404) {
-                            console.log('Resource not found', 'Warning');
-                        } else if (xhr.status === 500) {
-                            console.log('Internal server error', 'Warning');
-                        } else {
-                            console.log('Unknown error occurred', 'Warning');
-                        }
-                    }, 1000);
-                }
-            });
-
-        }
-
-    });
-
-});
-
-
-function appendPolicyFormFields(policy_type, data = false) {
-
-    var html = '';
-    var container = document.getElementById('policy_fields');
-
-    if (policy_type == 2) {
-
-        $('#GMC').remove();
-        $('#GPA').remove();
-
-        html = `                  
-            <div id="GMC">
-
-                <div class="form-row">
-                    <div class="form-group col-md-3">
-                        <label for="earned_premium_date">Earned Premium Date<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? rearrangeDateFormat(data.earned_premium_date)  : ''}" type="date" class="form-control" placeholder="Enter Earned Premium Date " name="earned_premium_date" id="earned_premium_date" required>
-                    </div>
-                    <div class="form-group col-md-3">
-                        <label for="earned_premium_amount">Earned Premium<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.earned_premium_amount : ''}" type="text" class="form-control" placeholder="Enter Earned Premium " name="earned_premium_amount" id="earned_premium_amount" required>
-                    </div>
-                    <div class="form-group col-md-3">
-                        <label for="claims_incurred_date">Claims Incurred Date<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? rearrangeDateFormat(data.claims_incurred_date) : ''}" type="date" class="form-control" placeholder="Enter Claims Incurred Date " name="claims_incurred_date" id="claims_incurred_date" required>
-                    </div>
-                    <div class="form-group col-md-3">
-                        <label for="claims_incurred_amount">Claims Incurred<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.claims_incurred_amount : ''}" type="text" class="form-control" placeholder="Enter Claims Incurred " name="claims_incurred_amount" id="claims_incurred_amount" required>
-                    </div>
-                </div>
-
-                <div class="form-row">
-                    <div class="form-group col-md-3">
-                        <label for="no_of_employees">No of Employees<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.no_of_employees : ''}" type="text" class="form-control" placeholder="Enter No of Employees" name="no_of_employees" id="no_of_employees" required>
-                    </div>
-                    <div class="form-group col-md-3">
-                        <label for="no_of_lives">No of Lives<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.no_of_lives : ''}" type="text" class="form-control" placeholder="Enter No of Lives " name="no_of_lives" id="no_of_lives" required>
-                    </div>
-                    <div class="form-group col-md-3">
-                        <label for="no_lives_at_inception">No Lives at Inception<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.no_lives_at_inception : ''}" type="text" class="form-control" placeholder="Enter No Lives at Inception " name="no_lives_at_inception" id="no_lives_at_inception" required>
-                    </div>
-                </div>
-
-                <hr>
-
-                <div class="form-row">
-                    <div class="form-group col-md-4">
-                        <label for="premium_paid_at_inception">Premium paid at Inception<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.premium_paid_at_inception : ''}" type="text" class="form-control" placeholder="Enter Premium paid at Inception" name="premium_paid_at_inception" id="premium_paid_at_inception" required>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="incurred_claims_ratio">Incurred Claims Ratio<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.incurred_claims_ratio : '0'}" type="text" class="form-control" placeholder="Enter Claims Ratio" name="incurred_claims_ratio" id="incurred_claims_ratio" readonly required>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="policy_status">Policy Status<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.policy_status : ''}" type="text" class="form-control" placeholder="Enter Policy Status " name="policy_status" id="policy_status" required>
-                    </div>
-                </div>
-            </div>`;
-    } else if (policy_type == 1) {
-
-        $('#GMC').remove();
-        $('#GPA').remove();
-
-        html = `
-                <div class="form-row" id="GPA">
-                    <div class="form-group col-md-4">
-                        <label for="no_of_employees">No of Employees<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.no_of_employees : ''}" type="text" class="form-control" placeholder="Enter No of Employees" name="no_of_employees" id="no_of_employees" required>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="policy_status">Policy Status<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.policy_status : ''}" type="text" class="form-control" placeholder="Enter Policy Status " name="policy_status" id="policy_status" required>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="claims_experience_for_last_3_years">Claims Experience for Last 3 Years<span class="text-danger">*</span></label>
-                        <input value="${data !== false && data !== undefined && data !== '' ? data.claims_experience_for_last_3_years : ''}" type="text" class="form-control" placeholder="Enter Claims Experience for Last 3 Years " name="claims_experience_for_last_3_years" id="claims_experience_for_last_3_years" required>
-                    </div>
-                </div>`;
-    }
-
-    container.insertAdjacentHTML('beforeend', html);
-
-    if (policy_type == 2) {
-        //Configure Flatpicker for the earned_premium_date datepicker.
-        flatpickr("#earned_premium_date", {
-            dateFormat: "d-m-Y",
-            defaultDate: "today",
-            allowInput: false,
-        });
-
-        //Configure Flatpicker for the claims_incurred_date datepicker.
-        flatpickr("#claims_incurred_date", {
-            dateFormat: "d-m-Y",
-            defaultDate: "today",
-            allowInput: false
-        });
-    }
-
-    $('#earned_premium_amount').keyup(function() {
-
-        var PA = parseFloat($(this).val());
-        var CA = parseFloat($('#claims_incurred_amount').val());
-        // console.log('earned_premium_amount',PA)
-        // console.log('claims_incurred_amount',CA)
-
-        if (!isNaN(PA) && !isNaN(CA) && CA !== 0) {
-            var incurredClaimRatio = CA / PA;
-            // console.log(incurredClaimRatio)
-            $('#incurred_claims_ratio').val(incurredClaimRatio.toFixed(2));
-        } else {
-            $('#incurred_claims_ratio').val('0');
-        }
-    });
-
-
-    $('#claims_incurred_amount').keyup(function() {
-
-        var CA = $(this).val()
-        var PA = $('#earned_premium_amount').val()
-        // console.log('earned_premium_amount',PA)
-        // console.log('claims_incurred_amount',CA)
-
-        if (!isNaN(PA) && !isNaN(CA) && CA !== 0) {
-            var incurredClaimRatio = CA / PA;
-            // console.log(incurredClaimRatio)
-            $('#incurred_claims_ratio').val(incurredClaimRatio.toFixed(2));
-        } else {
-            $('#incurred_claims_ratio').val('0');
-        }
-
-    })
-
-}
-
-
-//for date convert to indian formate like this 'yyyy-mm-dd' to this 'dd-mm-yyyy'
-function rearrangeDateFormat(inputDate) {
-
-    if (inputDate !== null) {
-        var dateComponents = inputDate.split("-");
-        var rearrangedDate = dateComponents[2] + "-" + dateComponents[1] + "-" + dateComponents[0];
-        return rearrangedDate;
-    } else {
-        return '00-00-0000';
-    }
-}
-
-function checkDateStatus(inputDate, bg = false) {
-
-    var givenDate = new Date(inputDate);
-    var currentDate = new Date();
-
-    if (bg != false) {
-        if (givenDate < currentDate) {
-            return `<span class="badge badge-danger">Expired</span>`;
-        } else {
-            return `<span class="badge badge-success">Active</span>`;
-        }
-    } else {
-        if (givenDate < currentDate) {
-            return `Expired`;
-        } else {
-            return `Active`;
-        }
-    }
-
-}
-
-const numberWords = {
-    0: "Zero",
-    1: "One",
-    2: "Two",
-    3: "Three",
-    4: "Four",
-    5: "Five",
-    6: "Six",
-    7: "Seven",
-    8: "Eight",
-    9: "Nine",
-    10: "Ten",
-    11: "Eleven",
-    12: "Twelve",
-    13: "Thirteen",
-    14: "Fourteen",
-    15: "Fifteen",
-    16: "Sixteen",
-    17: "Seventeen",
-    18: "Eighteen",
-    19: "Nineteen",
-    20: "Twenty",
-    30: "Thirty",
-    40: "Forty",
-    50: "Fifty",
-    60: "Sixty",
-    70: "Seventy",
-    80: "Eighty",
-    90: "Ninety"
-};
-
-function convertNumberToWords(number) {
-    if (number === 0) {
-        return numberWords[number];
-    }
-
-    let word = '';
-
-    if (number >= 10000000) {
-        word += convertNumberToWords(Math.floor(number / 10000000)) + " Crore ";
-        number %= 10000000;
-    }
-
-    if (number >= 100000) {
-        word += convertNumberToWords(Math.floor(number / 100000)) + " Lakh ";
-        number %= 100000;
-    }
-
-    if (number >= 1000) {
-        word += convertNumberToWords(Math.floor(number / 1000)) + " Thousand ";
-        number %= 1000;
-    }
-
-    if (number >= 100) {
-        word += convertNumberToWords(Math.floor(number / 100)) + " Hundred ";
-        number %= 100;
-    }
-
-    if (number > 0) {
-        if (word !== '') {
-            word += "and ";
-        }
-        if (number <= 20) {
-            word += numberWords[number];
-        } else {
-            word += numberWords[Math.floor(number / 10) * 10] + " " + numberWords[number % 10];
-        }
-    }
-    return word.trim();
-}
-
-function convertCommaNumberToWords(input) {
-    let number;
-    if (input instanceof HTMLElement) {
-        const inputValue = input.value;
-        number = parseInt(inputValue.replace(/,/g, ''), 10);
-        var convert_word_value = convertNumberToWords(number);
-
-        if (input.nextElementSibling !== null) {
-            input.nextElementSibling.textContent = convert_word_value;
-        }
-    } else {
-        number = parseInt(input.replace(/,/g, ''), 10);
-    }
-    var convert_word_value = convertNumberToWords(number);
-
-    return convert_word_value;
-}
-
-function onlyNumbers(event) {
-    var charcode;
-    charcode = event.which || event.keyCode;
-    if (charcode >= 48 && charcode <= 57) return true;
-    return false;
-}
-
-
-function formatNumber(input, maxLength) {
-
-    // console.log("input", input);
-    maxLength = 16;
-    let value = input.value.replace(/\D/g, ''); // Remove non-numeric characters
-
-    // Limit the number of digits
-    value = value.slice(0, maxLength);
-
-    // Format the number with commas using Indian numbering system
-    value = Number(value).toLocaleString('en-IN');
-    input.value = value;
-
-    basicPayMultiple(input)
-    if (input.id == 'gpa_si') {
-        gpaSumInsureMultiplier();
-    }
-    convertCommaNumberToWords(input);
-
-    if (input.id == 'gpa_sum_si') {
-        gpaSumInsureMultiplier(input);
-    }
-
-    if (input.id == 'gpa_sum_si2') {
-        gpaSumInsureMultiplier(input);
-    }
-
-    // if(input.id == 'basic_pay'){
-    //     var inputNumber = input.value;
-    //     if (inputNumber) {
-    //         var result = convertCommaNumberToWords(inputNumber);
-    //         $("#gpa_basic_pay_number_word").text(result);
-    //     } else {
-    //         $("#gpa_basic_pay_number_word").text("");
-    //     }
-    // }else if(input.id == 'basic_gpa_si'){
-    //     var inputNumber = input.value;
-    //     if (inputNumber) {
-    //         var result = convertCommaNumberToWords(inputNumber);
-    //         $("#basic_gpa_si_number_word").text(result);
-    //     } else {
-    //         $("#basic_gpa_si_number_word").text("");
-    //     }
-    // }else if(input.id == 'basic_gpa_premium'){
-    //     var inputNumber = input.value;
-    //     if (inputNumber) {
-    //         var result = convertCommaNumberToWords(inputNumber);
-    //         $("#basic_gpa_premium_number_word").text(result);
-    //     } else {
-    //         $("#basic_gpa_premium_number_word").text("");
-    //     }
-    // }else if(input.id == 'gpa_si'){
-    //     var inputNumber = input.value;
-    //     if (inputNumber) {
-    //         var result = convertCommaNumberToWords(inputNumber);
-    //         $("#gpa_sum_si_number_word").text(result);
-    //     } else {
-    //         $("#gpa_sum_si_number_word").text("");
-    //     }
-    // }else if(input.id == 'gpa_premium'){
-    //     var inputNumber = input.value;
-    //     if (inputNumber) {
-    //         var result = convertCommaNumberToWords(inputNumber);
-    //         $("#gpa_sum_premium_number_word").text(result);
-    //     } else {
-    //         $("#gpa_sum_premium_number_word").text("");
-    //     }
-    // }
-
-    return;
-    // }
-
-}
-
-
-function removeClientPolicy(element) {
-    console.log(element);
-}
-
-
-$('#policy_type').change(function() {
-
-    $('#insurer').val('').change();
-    $('#tpa').val('').change();
-    $('#policy_no').val('');
-    $('#start_date').val('');
-    $('#end_date').val('');
-    $('#base_policy').val('').change();
-
-
-    if ($(this).val() == 2 || $(this).val() == 3) {
-
-        $("#insurer").next(".select2-container").css({
-            'pointer-events': 'none',
-        });
-        $('#select2-insurer-container').css({
-            'background-color': '#ebebe0',
-        });
-
-        $("#tpa").next(".select2-container").css({
-            'pointer-events': 'none',
-        });
-        $('#select2-tpa-container').css({
-            'background-color': '#ebebe0',
-        });
-
-        var baseDanger = $('#base_danger');
-        if (baseDanger.css('display') === 'none') {
-            baseDanger.show();
-        }
-
-    } else {
-
-        $("#insurer").next(".select2-container").css({
-            'pointer-events': 'auto',
-        });
-        $('#select2-insurer-container').css({
-            'background-color': 'transparent',
-        });
-
-        $("#tpa").next(".select2-container").css({
-            'pointer-events': 'auto',
-        });
-        $('#select2-tpa-container').css({
-            'background-color': 'transparent',
-        });
-    }
-
-
-
-    if ($(this).val() == 3) {
-        toastr.warning('Please Change the Policy Terms after Submit the Policy!', 'INFO');
-    }
-
-    if ($(this).val() != '1' && $(this).val() != '0') {
-
-        $('#base_policy_id').show();
-        $('#base_policy').prop('required', true);
-        $('#first').show();
-        $('#second').show();
-        $('#third').show();
-
-    } else if ($(this).val() == '0') {
-
-        $('#first').hide();
-        $('#second').hide();
-        $('#third').hide();
-        $('#base_policy_id').hide();
-        $('#base_policy').prop('required', false);
-
-
-    } else if ($(this).val() == '1') {
-
-        $('#first').show();
-        $('#second').show();
-        $('#third').show();
-        $('#base_policy_id').hide();
-        $('#base_policy').prop('required', false);
-    }
-})
-
-
-function fetchClientPolicyList() {
-
-    var client_id = $('#client_id_policy').val()
-    var client_branch_id = $('#client_branch').val()
-
-    console.log('client_branch_id', client_branch_id)
-
-    $.ajax({
-        url: '<?= base_url("util/featch-client-policy-list/") ?>' + client_id,
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
-
-            console.log('one', res)
-
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-
-            if (res.status === false) {
-                toastr.error(res.status);
-                return;
-            }
-
-            var OptionsHTML = '';
-            OptionsHTML += '<option value="" selected>Select Base Policy</option>';
-            $.each(res.data, function(index, item) {
-
-                console.log('item.client_branch_id', item.client_branch_id)
-
-
-                if(item.client_branch_id == client_branch_id){
-
-                    if ($('#policy_type').val() == 1) {
-
-                        if (item.policy_type_id == 1 || item.policy_type_id == 2) {
-                            console.log('if 2')
-                            OptionsHTML += '<option data-id="' + item.policy_type_id + '" value="' +
                                 item.id +
                                 '">' + item.name + '( ' + item.policy_type + ' )</option>';
                         }
+                    } else if ($policy_type_value == 1) {
 
+                        if (item.policy_type_id == 1 || item.policy_type_id == 2 || item
+                            .policy_type_id == 3) {
+
+                            OptionsHTML += '<option data-id="' + item.policy_type_id +
+                                '" value="' +
+                                item.id +
+                                '">' + item.name + '( ' + item.policy_type + ' )</option>';
+                        }
                     } else {
-                        OptionsHTML += '<option data-id="' + item.policy_type_id + '" value="' + item
-                            .id +
+
+                        OptionsHTML += '<option data-id="' + item.policy_type_id +
+                            '" value="' +
+                            item.id +
                             '">' + item.name + '( ' + item.policy_type + ' )</option>';
                     }
+                });
 
-                }
+                $('#policy').html(OptionsHTML);
+            }).fail(function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             });
-            $('#base_policy').html(OptionsHTML);
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-            setTimeout(function() {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                console.log('Something Wrong!', 'warning');
-            }, 1000);
-        }
+        });
     });
 
-}
+    $(document).ready(function() {
+        /********* set the Policy_Type_id for Form Submit  *******/
+        $('#policy').change(function() {
 
-var dataId = 0;
-$(document).ready(function() {
+            var id = $(this).val();
+            var dataId = $(this).children('option:selected').attr('data-id');
+            // console.log('id', id)
+            $('#policy_type_id').val(dataId);
 
-    $('#base_policy').change(function() {
+            if (dataId == 1) {
+                $('#tpa').prop('required', false);
+                $('#tpa_danger').hide()
+            } else {
+                $('#tpa').prop('required', true);
+                $('#tpa_danger').show()
+            }
 
-        var client_policy_id = $(this).val()
-        var policy_type = $('#policy_type').val()
-        console.log(client_policy_id);
 
-        dataId = $('#policy').children('option:selected').attr('data-id');
-        console.log('dataId', dataId)
+            var base_policy_dataId = $('#base_policy').children('option:selected').attr('data-id');
 
-        base_policy_data_id = $(this).children('option:selected').attr('data-id');
-        console.log('base_policy_data_id', base_policy_data_id);
 
-        var queryParams = {
-            client_policy_id: client_policy_id,
-            policy_type: policy_type,
-        };
+            // $('#base_policy option').each(function() {
+            //     var val = $(this).val();
+            //     if (val == id) {
+            //         $(this)
+            //     .hide(); // Hide the option if its value matches the selected value of #policy
+            //     } else {
+            //         $(this).show(); // Show all other options
+            //     }
+            // });
 
-        const queryString = objectToQueryString(queryParams);
-        // var uri = '<?= base_url('util/fetch-policy-for-policy-type') ?>?' + queryString
-        var uri = '<?= base_url('client/policy/list/') ?>' + client_policy_id
-        // console.log('uri', uri)
-        // console.log('queryString', queryString)
+
+            if ($('#policy_type').val() == 1) {
+
+                // console.log('step 1')
+
+                if (dataId == 3) {
+
+                    // console.log('step 2')
+
+                    var displayStatus = $('#base_policy_id').css('display');
+                    $('#base_policy_id').show();
+                    $('#base_danger').hide();
+                    // $('#base_policy').prop('required', true);
+
+                    if (displayStatus === 'none') {
+                        // console.log('step 2.1')
+
+                        $('#base_policy').val('').change();
+                    }
+
+                    // $('#base_policy').find('option[data-id="3"]').hide();
+
+                } else {
+
+                    // console.log('step 3')
+
+                    var displayStatus = $('#base_policy_id').css('display');
+                    $('#base_policy_id').hide();
+                    $('#base_danger').show();
+                    // $('#base_policy').prop('required', false);
+
+                    if (displayStatus === 'none') {
+                        // console.log('step 3.1')
+
+                        $('#base_policy').val('').change();
+                    }
+                }
+            }
+
+        });
+    });
+
+    // get the client policy data for edit
+    $('body').on('click', '.btnPolicyEdit', function() {
+
+        var policy_form_action = '';
+        var policy_id = $(this).attr('data-id');
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
 
+        fetchClientBranch()
+
         $.ajax({
-            url: uri,
+            url: '<?= base_url("client/policy/list/") ?>' + policy_id,
             type: "GET",
             dataType: 'json',
-            processData: false,
-            contentType: false,
             success: function(res) {
 
-                console.log(res)
+                console.log('client_policy_res', res)
 
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                }, 500);
+                }, 1000);
 
-                $('#insurer').val(res.data.insurer_branch_id + '-' + res.data.insurer_id)
-                    .change();
-                $('#tpa').val(res.data.tpa_branch_id + '-' + res.data.tpa_id).change();
-                $('#policy_no').val(res.data.policy_no).change();
-                $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date))
-                    .change();
-                $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date)).change();
+                $('#policy_form_action').val('<?= base_url("client/policy/edit"); ?>');
+
+                if (res.status === false) {
+                    toastr.error(res.status);
+                    return;
+                }
+
+                $('#add_form').show();
+                $('#table_list').hide();
+                $('.btnBack').show();
+                $('.btnAdd').hide();
+
+                $('#insurer').val(res.data.insurer_branch_id + '-' + res.data.insurer_id).change();
+                var tpaValue = '';
+
+                if (res.data.tpa_branch_id && res.data.tpa_id) {
+                    tpaValue = res.data.tpa_branch_id + '-' + res.data.tpa_id;
+                }
+
+                $('#tpa').val(tpaValue).change();
+                // $('#policy').val(res.data.policy_id).change();
+                $('#policy_type').val(res.data.is_addon).change();
+                $('#base_policy').val(res.data.base_policy);
+                $('#client_branch').val(res.data.client_branch_id).change();
+
+                $('#policy_type_id').val(res.data.policy_type_id);
+                $('#policy_PrimaryKey').val(res.data.id);
+                $('#policy_no').val(res.data.policy_no);
+                $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date));
+                $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date));
+                $('#policy_status').val(checkDateStatus(res.data.policy_end_date));
+                $('#policy_status_field').show();
+
+                if (res.data.inception_type == 2) {
+                    $('#inception_type').prop('checked', true);
+                } else {
+                    $('#inception_type').prop('checked', false);
+                }
+
+
+                if (res.data.is_addon != '1' && res.data.is_addon != '0') {
+                    $('#base_policy_id').show();
+                    $('#base_policy').prop('required', true);
+                    $('#first').show();
+                    $('#second').show();
+                    $('#third').show();
+                } else if (res.data.is_addon == '0') {
+                    $('#first').hide();
+                    $('#second').hide();
+                    $('#third').hide();
+                    $('#base_policy_id').hide();
+                    $('#base_policy').prop('required', false);
+                } else if (res.data.is_addon == '1') {
+                    $('#first').show();
+                    $('#second').show();
+                    $('#third').show();
+                    $('#base_policy_id').hide();
+                    $('#base_policy').prop('required', false);
+                }
+
+
+                if (res.data.is_addon == 1 && res.data.base_policy > 0) {
+
+                    // $("#insurer").next(".select2-container").css({
+                    //     'pointer-events': 'none',
+                    // });
+                    // $('#select2-insurer-container').css({
+                    //     'background-color': '#ebebe0',
+                    // });
+
+                    // $("#tpa").next(".select2-container").css({
+                    //     'pointer-events': 'none',
+                    // });
+                    // $('#select2-tpa-container').css({
+                    //     'background-color': '#ebebe0',
+                    // });
+
+                }
+
+
+                if (res.data.is_addon == 2 || res.data.is_addon == 3) {
+
+                    $("#insurer").next(".select2-container").css({
+                        'pointer-events': 'none',
+                    });
+                    $('#select2-insurer-container').css({
+                        'background-color': '#ebebe0',
+                    });
+
+                    $("#tpa").next(".select2-container").css({
+                        'pointer-events': 'none',
+                    });
+                    $('#select2-tpa-container').css({
+                        'background-color': '#ebebe0',
+                    });
+
+                } else {
+
+                    $("#insurer").next(".select2-container").css({
+                        'pointer-events': 'auto',
+                    });
+                    $('#select2-insurer-container').css({
+                        'background-color': 'transparent',
+                    });
+
+                    $("#tpa").next(".select2-container").css({
+                        'pointer-events': 'auto',
+                    });
+                    $('#select2-tpa-container').css({
+                        'background-color': 'transparent',
+                    });
+                }
 
                 var policeOptionHTML = '';
-                $policy_type_value = $('#policy_type').val();
                 $.each(res.policy, function(index, item) {
-
-                    console.log(item);
-
                     policeOptionHTML += '<option data-id="' + item.policy_type_id +
-                        '" value="' + item.id + '" ' + (res.data.policy_id === item
-                            .id ?
-                            'selected="selected"' : '') + '>' + item.name +
-                        '</option>';
-
+                        '" value="' + item.id + '" ' + (res.data.policy_id === item.id ?
+                            'selected="selected"' : '') + '>' + item.name + '</option>';
                 });
-
                 $('#policy').html(policeOptionHTML);
 
-                if (dataId == 3 || policy_type == 1) {
+                var OptionsHTML = '';
+                OptionsHTML += '<option value="" selected>Select Base Policy</option>';
+                $.each(res.client_policy_list, function(index, item) {
 
-                    console.log('step 1')
+                    if (item.client_branch_id == res.data.client_branch_id) {
+
+                        OptionsHTML += '<option data-id="' + item.policy_type_id +
+                            '" value="' + item.id + '" ' + (res.data.base_policy === item.id ?
+                                'selected="selected"' : '') + '>' + item.name + '( ' + item
+                            .policy_type + ' )</option>';
+
+                    }
+
+                });
+                $('#base_policy').html(OptionsHTML);
+
+                setTimeout(function() {
+                    $('#policy').val(res.data.policy_id).change();
+                    $('#base_policy').val(res.data.base_policy);
+                    $('#base_policy').change();
+                }, 3000);
 
-                    setTimeout(function() {
-                        console.log('step 2')
-                        var $option = $('#policy').find('option[data-id="3"]');
-                        if ($option.length > 0) {
-                            console.log('step 3')
-                            $option.prop('selected', true).change();
-                        } else {
-                            console.log('step 4');
-                            toastr.warning(
-                                'The insurer does not have a GMC-Parents policy.',
-                                'Warning');
-                        }
-                    }, 1500);
-                }
 
             },
             error: function(xhr, status, error) {
@@ -1569,85 +849,642 @@ $(document).ready(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     console.log('Something Wrong!', 'warning');
-                }, 500);
+                }, 1000);
             }
         });
+    });
+
+    $('body').on('click', '.btnOpenEnroll', function() {
+
+        Swal.fire({
+            title: "Are you sure?",
+            text: "You need to approve this!",
+            icon: "info",
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            confirmButtonText: "Yes",
+        }).then((result) => {
+
+
+            if (result.isConfirmed) {
+
+                var client_policy_id = $(this).attr('data-id');
+                var policy_id = $(this).attr('id');
+                var client_id = $('#client_id_policy').val()
+
+                if (client_policy_id) {
+                    $('.loader').fadeIn();
+                    $('.loader-mask').fadeIn();
+                }
+
+                $.ajax({
+                    url: '<?php echo base_url('util/update-policy-status'); ?>',
+                    type: 'GET',
+                    data: {
+                        client_policy_id: client_policy_id,
+                    },
+                    success: function(res) {
+
+                        if (res) {
+                            if (res.open_for_enrollment) {
+                                var json_decode = JSON.parse(res.open_for_enrollment);
+                                var open_for_enrollment = json_decode.open_for_enrollment;
+                                var client_policy_id = json_decode.client_policy_id;
+
+                                if (open_for_enrollment == 1) {
+
+                                    $('.btnOpenEnroll').each(function(index, element) {
+                                        if ($(element).data('id') == client_policy_id) {
+                                            $(element).html(
+                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
+                                                res.client_policy_data.id +
+                                                '" id="' + res.client_policy_data
+                                                .policy_id +
+                                                '" class="btnOpenEnroll">Open</a>');
+                                        }
+                                    });
+
+                                } else {
+
+                                    $('.btnOpenEnroll').each(function(index, element) {
+                                        if ($(element).data('id') == client_policy_id) {
+                                            $(element).html(
+                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
+                                                res.client_policy_data.id +
+                                                '" id="' + res.client_policy_data
+                                                .policy_id +
+                                                '" class="btnOpenEnroll">Closed</a>'
+                                            );
+                                        }
+                                    });
+                                }
+
+                            }
+                            setTimeout(function() {
+                                $('.loader').fadeOut();
+                                $('.loader-mask').delay(350).fadeOut('slow');
+                                if (res.status === true) {
+                                    toastr.success(res.message, 'Success');
+
+                                } else if (res.status === false) {
+                                    toastr.warning(res.message, 'Warning');
+                                }
+                            }, 1000);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.error(xhr.responseText);
+                        setTimeout(function() {
+                            $('.loader').fadeOut();
+                            $('.loader-mask').delay(350).fadeOut('slow');
+                            if (xhr.status === 404) {
+                                console.log('Resource not found', 'Warning');
+                            } else if (xhr.status === 500) {
+                                console.log('Internal server error', 'Warning');
+                            } else {
+                                console.log('Unknown error occurred', 'Warning');
+                            }
+                        }, 1000);
+                    }
+                });
+
+            }
+
+        });
 
     });
-})
-
-function objectToQueryString(obj) {
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
 
 
-function fetchClientBranch() {
-    
-    console.log('function called');
+    //for date convert to indian formate like this 'yyyy-mm-dd' to this 'dd-mm-yyyy'
+    function rearrangeDateFormat(inputDate) {
 
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    var client_id = 0;
-
-    if ($('#client_id_policy').val() != "") {
-        client_id = $('#client_id_policy').val();
-    } else if ($('#policy_PrimaryKey').val() != "") {
-        client_id = $('#policy_PrimaryKey').val();
+        if (inputDate !== null) {
+            var dateComponents = inputDate.split("-");
+            var rearrangedDate = dateComponents[2] + "-" + dateComponents[1] + "-" + dateComponents[0];
+            return rearrangedDate;
+        } else {
+            return '00-00-0000';
+        }
     }
 
-    $.ajax({
-        url: "<?= base_url('util/get-client-branch/') ?>" + client_id,
-        type: "GET",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(res) {
+    function checkDateStatus(inputDate, bg = false) {
 
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
+        var givenDate = new Date(inputDate);
+        var currentDate = new Date();
 
-            console.log(res);
-            console.log(res.data.length);
+        if (bg != false) {
+            if (givenDate < currentDate) {
+                return `<span class="badge badge-danger">Expired</span>`;
+            } else {
+                return `<span class="badge badge-success">Active</span>`;
+            }
+        } else {
+            if (givenDate < currentDate) {
+                return `Expired`;
+            } else {
+                return `Active`;
+            }
+        }
 
-            if(res.data.length == 0){
-                toastr.warning('The client does not have any branches.', 'warning');
-                return ;
+    }
+
+    const numberWords = {
+        0: "Zero",
+        1: "One",
+        2: "Two",
+        3: "Three",
+        4: "Four",
+        5: "Five",
+        6: "Six",
+        7: "Seven",
+        8: "Eight",
+        9: "Nine",
+        10: "Ten",
+        11: "Eleven",
+        12: "Twelve",
+        13: "Thirteen",
+        14: "Fourteen",
+        15: "Fifteen",
+        16: "Sixteen",
+        17: "Seventeen",
+        18: "Eighteen",
+        19: "Nineteen",
+        20: "Twenty",
+        30: "Thirty",
+        40: "Forty",
+        50: "Fifty",
+        60: "Sixty",
+        70: "Seventy",
+        80: "Eighty",
+        90: "Ninety"
+    };
+
+    function convertNumberToWords(number) {
+        if (number === 0) {
+            return numberWords[number];
+        }
+
+        let word = '';
+
+        if (number >= 10000000) {
+            word += convertNumberToWords(Math.floor(number / 10000000)) + " Crore ";
+            number %= 10000000;
+        }
+
+        if (number >= 100000) {
+            word += convertNumberToWords(Math.floor(number / 100000)) + " Lakh ";
+            number %= 100000;
+        }
+
+        if (number >= 1000) {
+            word += convertNumberToWords(Math.floor(number / 1000)) + " Thousand ";
+            number %= 1000;
+        }
+
+        if (number >= 100) {
+            word += convertNumberToWords(Math.floor(number / 100)) + " Hundred ";
+            number %= 100;
+        }
+
+        if (number > 0) {
+            if (word !== '') {
+                word += "and ";
+            }
+            if (number <= 20) {
+                word += numberWords[number];
+            } else {
+                word += numberWords[Math.floor(number / 10) * 10] + " " + numberWords[number % 10];
+            }
+        }
+        return word.trim();
+    }
+
+    function convertCommaNumberToWords(input) {
+        let number;
+        if (input instanceof HTMLElement) {
+            const inputValue = input.value;
+            number = parseInt(inputValue.replace(/,/g, ''), 10);
+            var convert_word_value = convertNumberToWords(number);
+
+            if (input.nextElementSibling !== null) {
+                input.nextElementSibling.textContent = convert_word_value;
+            }
+        } else {
+            number = parseInt(input.replace(/,/g, ''), 10);
+        }
+        var convert_word_value = convertNumberToWords(number);
+
+        return convert_word_value;
+    }
+
+    function onlyNumbers(event) {
+        var charcode;
+        charcode = event.which || event.keyCode;
+        if (charcode >= 48 && charcode <= 57) return true;
+        return false;
+    }
+
+
+    function formatNumber(input, maxLength) {
+
+        // console.log("input", input);
+        maxLength = 16;
+        let value = input.value.replace(/\D/g, ''); // Remove non-numeric characters
+
+        // Limit the number of digits
+        value = value.slice(0, maxLength);
+
+        // Format the number with commas using Indian numbering system
+        value = Number(value).toLocaleString('en-IN');
+        input.value = value;
+
+        basicPayMultiple(input)
+        if (input.id == 'gpa_si') {
+            gpaSumInsureMultiplier();
+        }
+        convertCommaNumberToWords(input);
+
+        if (input.id == 'gpa_sum_si') {
+            gpaSumInsureMultiplier(input);
+        }
+
+        if (input.id == 'gpa_sum_si2') {
+            gpaSumInsureMultiplier(input);
+        }
+
+        // if(input.id == 'basic_pay'){
+        //     var inputNumber = input.value;
+        //     if (inputNumber) {
+        //         var result = convertCommaNumberToWords(inputNumber);
+        //         $("#gpa_basic_pay_number_word").text(result);
+        //     } else {
+        //         $("#gpa_basic_pay_number_word").text("");
+        //     }
+        // }else if(input.id == 'basic_gpa_si'){
+        //     var inputNumber = input.value;
+        //     if (inputNumber) {
+        //         var result = convertCommaNumberToWords(inputNumber);
+        //         $("#basic_gpa_si_number_word").text(result);
+        //     } else {
+        //         $("#basic_gpa_si_number_word").text("");
+        //     }
+        // }else if(input.id == 'basic_gpa_premium'){
+        //     var inputNumber = input.value;
+        //     if (inputNumber) {
+        //         var result = convertCommaNumberToWords(inputNumber);
+        //         $("#basic_gpa_premium_number_word").text(result);
+        //     } else {
+        //         $("#basic_gpa_premium_number_word").text("");
+        //     }
+        // }else if(input.id == 'gpa_si'){
+        //     var inputNumber = input.value;
+        //     if (inputNumber) {
+        //         var result = convertCommaNumberToWords(inputNumber);
+        //         $("#gpa_sum_si_number_word").text(result);
+        //     } else {
+        //         $("#gpa_sum_si_number_word").text("");
+        //     }
+        // }else if(input.id == 'gpa_premium'){
+        //     var inputNumber = input.value;
+        //     if (inputNumber) {
+        //         var result = convertCommaNumberToWords(inputNumber);
+        //         $("#gpa_sum_premium_number_word").text(result);
+        //     } else {
+        //         $("#gpa_sum_premium_number_word").text("");
+        //     }
+        // }
+
+        return;
+        // }
+
+    }
+
+
+    function removeClientPolicy(element) {
+        // console.log(element);
+    }
+
+
+    $('#policy_type').change(function() {
+
+        $('#insurer').val('').change();
+        $('#tpa').val('').change();
+        $('#policy_no').val('');
+        $('#start_date').val('');
+        $('#end_date').val('');
+        $('#base_policy').val('').change();
+
+
+        if ($(this).val() == 2 || $(this).val() == 3) {
+
+            $("#insurer").next(".select2-container").css({
+                'pointer-events': 'none',
+            });
+            $('#select2-insurer-container').css({
+                'background-color': '#ebebe0',
+            });
+
+            $("#tpa").next(".select2-container").css({
+                'pointer-events': 'none',
+            });
+            $('#select2-tpa-container').css({
+                'background-color': '#ebebe0',
+            });
+
+            var baseDanger = $('#base_danger');
+            if (baseDanger.css('display') === 'none') {
+                baseDanger.show();
             }
 
-            appendClientBranch(res.data)
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
+        } else {
+
+            $("#insurer").next(".select2-container").css({
+                'pointer-events': 'auto',
+            });
+            $('#select2-insurer-container').css({
+                'background-color': 'transparent',
+            });
+
+            $("#tpa").next(".select2-container").css({
+                'pointer-events': 'auto',
+            });
+            $('#select2-tpa-container').css({
+                'background-color': 'transparent',
+            });
         }
-    });
-}
 
 
-function appendClientBranch(data){
 
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name
+        if ($(this).val() == 3) {
+            toastr.warning('Please Change the Policy Terms after Submit the Policy!', 'INFO');
+        }
+
+        if ($(this).val() != '1' && $(this).val() != '0') {
+
+            $('#base_policy_id').show();
+            $('#base_policy').prop('required', true);
+            $('#first').show();
+            $('#second').show();
+            $('#third').show();
+
+        } else if ($(this).val() == '0') {
+
+            $('#first').hide();
+            $('#second').hide();
+            $('#third').hide();
+            $('#base_policy_id').hide();
+            $('#base_policy').prop('required', false);
+
+
+        } else if ($(this).val() == '1') {
+
+            $('#first').show();
+            $('#second').show();
+            $('#third').show();
+            $('#base_policy_id').hide();
+            $('#base_policy').prop('required', false);
+        }
+    })
+
+
+    function fetchClientPolicyList() {
+
+        var client_id = $('#client_id_policy').val()
+        var client_branch_id = $('#client_branch').val()
+
+        // console.log('client_branch_id', client_branch_id)
+
+        $.ajax({
+            url: '<?= base_url("util/featch-client-policy-list/") ?>' + client_id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('one', res)
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if (res.status === false) {
+                    toastr.error(res.status);
+                    return;
+                }
+
+                var OptionsHTML = '';
+                OptionsHTML += '<option value="" selected>Select Base Policy</option>';
+                $.each(res.data, function(index, item) {
+
+                    // console.log('item.client_branch_id', item.client_branch_id)
+
+
+                    if (item.client_branch_id == client_branch_id) {
+
+                        if ($('#policy_type').val() == 1) {
+
+                            if (item.policy_type_id == 1 || item.policy_type_id == 2) {
+                                // console.log('if 2')
+                                OptionsHTML += '<option data-id="' + item.policy_type_id + '" value="' +
+                                    item.id +
+                                    '">' + item.name + '( ' + item.policy_type + ' )</option>';
+                            }
+
+                        } else {
+                            OptionsHTML += '<option data-id="' + item.policy_type_id + '" value="' + item
+                                .id +
+                                '">' + item.name + '( ' + item.policy_type + ' )</option>';
+                        }
+
+                    }
+                });
+                $('#base_policy').html(OptionsHTML);
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                setTimeout(function() {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    console.log('Something Wrong!', 'warning');
+                }, 1000);
+            }
         });
 
-        $('#client_branch').append(option);
-    });
+    }
 
-}
+    var dataId = 0;
+    $(document).ready(function() {
 
-$(document).ready(function(){
+        $('#base_policy').change(function() {
 
-    $("#client_branch").on('change', function() {
-        console.log('fetchClientPolicyList change')
-        fetchClientPolicyList();
-    });
+            var client_policy_id = $(this).val()
+            var policy_type = $('#policy_type').val()
+            // console.log(client_policy_id);
 
-})
+            dataId = $('#policy').children('option:selected').attr('data-id');
+            // console.log('dataId', dataId)
+
+            base_policy_data_id = $(this).children('option:selected').attr('data-id');
+            // console.log('base_policy_data_id', base_policy_data_id);
+
+            var queryParams = {
+                client_policy_id: client_policy_id,
+                policy_type: policy_type,
+            };
+
+            const queryString = objectToQueryString(queryParams);
+            // var uri = '<?= base_url('util/fetch-policy-for-policy-type') ?>?' + queryString
+            var uri = '<?= base_url('client/policy/list/') ?>' + client_policy_id
+            // console.log('uri', uri)
+            // console.log('queryString', queryString)
+
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+
+            $.ajax({
+                url: uri,
+                type: "GET",
+                dataType: 'json',
+                processData: false,
+                contentType: false,
+                success: function(res) {
+
+                    console.log(res)
+
+                    setTimeout(function() {
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                    }, 500);
+
+                    $('#insurer').val(res.data.insurer_branch_id + '-' + res.data.insurer_id)
+                        .change();
+                    $('#tpa').val(res.data.tpa_branch_id + '-' + res.data.tpa_id).change();
+                    $('#policy_no').val(res.data.policy_no).change();
+                    $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date))
+                        .change();
+                    $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date)).change();
+
+                    var policeOptionHTML = '';
+                    $policy_type_value = $('#policy_type').val();
+                    $.each(res.policy, function(index, item) {
+
+                        // console.log(item);
+
+                        policeOptionHTML += '<option data-id="' + item.policy_type_id +
+                            '" value="' + item.id + '" ' + (res.data.policy_id === item
+                                .id ?
+                                'selected="selected"' : '') + '>' + item.name +
+                            '</option>';
+
+                    });
+
+                    $('#policy').html(policeOptionHTML);
+
+                    if (dataId == 3 || policy_type == 1) {
+
+                        // console.log('step 1')
+
+                        setTimeout(function() {
+                            // console.log('step 2')
+                            var $option = $('#policy').find('option[data-id="3"]');
+                            if ($option.length > 0) {
+                                // console.log('step 3')
+                                $option.prop('selected', true).change();
+                            } else {
+                                // console.log('step 4');
+                                toastr.warning(
+                                    'The insurer does not have a GMC-Parents policy.',
+                                    'Warning');
+                            }
+                        }, 1500);
+                    }
+
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                    setTimeout(function() {
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        console.log('Something Wrong!', 'warning');
+                    }, 500);
+                }
+            });
+
+        });
+    })
+
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
 
 
+    function fetchClientBranch() {
+
+        console.log('function called');
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var client_id = 0;
+
+        if ($('#client_id_policy').val() != "") {
+            client_id = $('#client_id_policy').val();
+        } else if ($('#policy_PrimaryKey').val() != "") {
+            client_id = $('#policy_PrimaryKey').val();
+        }
+
+        $.ajax({
+            url: "<?= base_url('util/get-client-branch/') ?>" + client_id,
+            type: "GET",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                console.log(res);
+                // console.log(res.data.length);
+
+                if (res.data.length == 0) {
+                    toastr.warning('The client does not have any branches.', 'warning');
+                    return;
+                }
+
+                appendClientBranch(res.data)
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    }
+
+
+    function appendClientBranch(data) {
+
+        $('#client_branch').empty();
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+
+            $('#client_branch').append(option);
+        });
+
+    }
+
+    $(document).ready(function() {
+
+        $("#client_branch").on('change', function() {
+            // console.log('fetchClientPolicyList change')
+            fetchClientPolicyList();
+        });
+
+    })
 </script>
\ No newline at end of file
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php
index 22db6b78..479260a6 100644
--- a/app/Views/employee_list.php
+++ b/app/Views/employee_list.php
@@ -29,6 +29,15 @@ table.dataTable tbody td {
                                     <option value="0">Select</option>
                                 </select>
                             </div>
+
+
+                            <div class="form-group col-md-4">
+                                <label>Branch</label> <br />
+                                <select name="branch_id" class="form-control" id="branch_id">
+                                    <option value="0">Select</option>
+                                </select>
+                            </div>
+
                             
                             <div class="form-group col-md-4">
                                 <label>Policy</label> <br />
@@ -80,6 +89,7 @@ $(document).ready(function() {
     // Initialize select2
     $("#clients").select2();
     $("#policies").select2();
+    $("#branch_id").select2();
 
     // if ($('.select2-selection__arrow').length > 0) {
     //     $('.select2-selection__arrow').removeClass('select2-selection__arrow').addClass('fa fa-chevron-down');
@@ -88,7 +98,12 @@ $(document).ready(function() {
 
 // Declare a global variable to store API response data
 var clientPolicies = [];
+var clientPoliciesWithBranch = {
+    policies: []
+};
 var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
+var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
+
 
 
 $(document).ready(function() {
@@ -107,7 +122,7 @@ function fetchClientPolicies() {
     $('#loader').show();
     var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
     console.log('fetchClientPolicies');
-    console.log(apiURL);
+    // console.log(apiURL);
     $.ajax({
         url: apiURL,
         method: 'GET',
@@ -122,17 +137,42 @@ function fetchClientPolicies() {
             if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                 try {
                     clientPolicies = (response.data);
-                    console.log('1',clientPolicies);
+
+                    response.data.forEach(policy => {
+                        // console.log('policies', policy.policies);
+                        policy.policies.forEach(p => {
+                            clientPoliciesWithBranch.policies.push(p);
+                        });
+                    });
+
+                    // console.log('1',clientPolicies);
                     appendClients(clientPolicies);
                     
                     //this function for reselect the policy
                     setTimeout(function() {
                         if (client_id != 0 ) {
                             var foundPolicies = clientPolicies.find(function(item) {
-                                console.log(typeof item.id)
+                                // console.log(typeof item.id)
                                 return item.id == client_id;
                             });
-                            appendPolicies(foundPolicies.policies);
+                            appendBranch(foundPolicies.branchs);
+                        }
+                    }, 500); 
+                    
+                    setTimeout(function() {
+                        if (client_branch_id != 0 ) {
+
+                            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                                // console.log('item', item);
+                                return item.branch_id === client_branch_id;
+                            });
+
+                            if (foundPolicies) {
+                                // console.log('foundPolicies', foundPolicies);
+                                appendPolicies(foundPolicies);
+                            } else {
+                                console.log('No policies found for the selected client');
+                            }
                         }
                     }, 500);
                     //end
@@ -170,6 +210,26 @@ function appendClients(data) {
 }
 
 
+function appendBranch(data) {
+
+    $('#branch_id').empty();
+    $('#branch_id').append($('<option>', {
+        value: '0',
+        text: 'Select'
+    }));
+    $.each(data, function(index, item) {
+        var option = $('<option>', {
+            value: item.id,
+            text: item.branch_name 
+        });
+        if (client_branch_id == item.id) {
+            option.attr('selected', true);
+        }
+        $('#branch_id').append(option);
+    });
+}
+
+
 function appendPolicies(data) {
 
     $('#policies').empty();
@@ -179,13 +239,13 @@ function appendPolicies(data) {
     }));
 
     var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0'?>;
-    console.log(PolicyID)
+    // console.log(PolicyID)
     $.each(data, function(index, item) {
         var option = $('<option>', {
-            value: item.id,
+            value: item.client_policy_id,
             text: item.name + ' - ' + item.policy_type
         });
-        if (PolicyID == item.id) {
+        if (PolicyID == item.client_policy_id) {
             option.attr('selected', true);
         }
         $('#policies').append(option);
@@ -195,20 +255,56 @@ function appendPolicies(data) {
 $(document).ready(function() {
     
     $('#clients').on('change', function() {
+
+        $('#policies').empty();
+        $('#policies').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+
         var selectedClient = $(this).val();
-        console.log('selectedClient', selectedClient);
+        // console.log('selectedClient', selectedClient);
         // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
 
         // Check if the selected option exists in apiData
         var foundPolicies = clientPolicies.find(function(item) {
             return item.id === selectedClient;
         });
-        console.log(foundPolicies.policies);
-        appendPolicies(foundPolicies.policies);
+        // console.log(foundPolicies.branchs);
+        appendBranch(foundPolicies.branchs);
     });
 });
 
 
+$(document).ready(function() {
+
+    $('#branch_id').on('change', function() {
+        
+        var selectedClient = $(this).val();
+
+        // console.log('selectedBranch', selectedClient);
+        // console.log('clientPolicies', clientPoliciesWithBranch);
+
+        var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+            // console.log('item', item);
+            return item.branch_id === selectedClient;
+        });
+
+
+        if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
+
+            appendPolicies(foundPolicies);
+            toastr.warning('No policies found for the selected client branch.');
+
+        } else {
+
+            // console.log('foundPolicies', foundPolicies);
+            appendPolicies(foundPolicies);
+        }
+    });
+
+});
+
 // Function to convert object to query parameters
 function objectToQueryString(obj) {
     return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
@@ -221,8 +317,9 @@ function fetchEmpolyeeList(event) {
     var client_id = $('#clients').val();
     var policy_id = $('#policies').val();
     var status = $('#status2').val();
+    var branch_id = $('#branch_id').val();
 
-    console.log(client_id + '-' + policy_id);
+    // console.log(client_id + '-' + policy_id);
     if (client_id == '0' || policy_id == '0') {
         alert('Please select values in both dropdowns.');
         return;
@@ -232,12 +329,13 @@ function fetchEmpolyeeList(event) {
 
         client_id: client_id,
         policy_id: policy_id,
+        branch_id: branch_id,
         status   : status,
     };
 
     const queryString = objectToQueryString(queryParams);
     const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
+    // console.log(apiURL);
     window.location.href = apiURL;
 
 
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 552fed54..9ead16f7 100644
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -36,6 +36,13 @@ option:disabled {
                                             </select>
                                         </div>
 
+                                        <div class="form-group col-md-4">
+                                            <label>Branch</label> <br />
+                                            <select name="branch_id" class="form-control" id="branch_id">
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
+
                                         <div class="form-group col-md-4">
                                             <label>Policy</label> <br />
                                             <select name="policy_id" class="form-control" id="policy_id" onchange="checkPolicyTermsAndRackRatesHasDefiend(event)">
@@ -43,6 +50,10 @@ option:disabled {
                                             </select>
                                         </div>
 
+                                    </div>
+
+                                    <div class="form-row">
+
                                         <div class="form-group col-md-4">
                                             <label>Event</label> <br />
                                             <select name="upload-action-type" class="form-control"
@@ -166,24 +177,28 @@ $(document).ready(function() {
     // Initialize select2
     $("#client_id").select2();
     $("#policy_id").select2();
+    $("#branch_id").select2();
 
 });
 
 // Declare a global variable to store API response data
 var clientPolicies = [];
-
+var clientPoliciesWithBranch = {
+    policies: []
+};
 var client_id_param = 0;
+var client_branch_id_param = 0;
 var client_policy_param = 0;
 
 $(document).ready(function() {
 
-    console.log("document loaded");
+    // console.log("document loaded");
     //fetchClientPolicies();
     //for modal pop up
     $('#file-err-modal').on('show.bs.modal', function(event) {
         // console.log(event.relatedTarget);
         var myVal = $(event.relatedTarget).data('err');
-        console.log(myVal);
+        // console.log(myVal);
         var loader =
             '<div style="text-align: center;"><img src="<?php echo base_url()?>public/assets/images/simple_loader.gif" height="50px" width="50px" ></div>';
         $('#file-err-modal').find(".modal-body").html(loader);
@@ -196,7 +211,7 @@ $(document).ready(function() {
     //for form submit
     $("#emp-upload-form").submit(function(event) {
         event.preventDefault(); // Prevent default form submission
-        console.log('submit called');
+        // console.log('submit called');
 
 
         var isValid = $('#emp-upload-form').parsley().validate();
@@ -207,7 +222,7 @@ $(document).ready(function() {
 
         var action_item = $('#upload-action-type').val();
         var policy_id = $('#policy_id').val();
-        console.log('action_item - ' + action_item);
+        // console.log('action_item - ' + action_item);
         if (action_item != 'correction' && policy_id == "") {
             // $('#policy_id').attr('required', true);
             // $('#policy_id').prop('title', 'plz choose policy');
@@ -226,10 +241,10 @@ $(document).ready(function() {
         // Create FormData object
         var formData = new FormData($(this)[0]);
         for (var pair of formData.entries()) {
-            console.log(pair[0] + ', ' + pair[1]);
+            // console.log(pair[0] + ', ' + pair[1]);
         }
 
-        console.log(formData);
+        // console.log(formData);
         $('#emp_form_submit_button').prop('disabled', true);
         $('#emp_form_submit_button').html(
             '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> Loading...'
@@ -248,7 +263,7 @@ $(document).ready(function() {
             success: function(response) {
                 // Request successful, handle response
                 $('#policy_id').attr('required', false);
-                console.log(response);
+                // console.log(response);
                 if (response.code === 200 && response.dataStatus === true && response
                     .data !== "") {
                     toastr.success(
@@ -298,11 +313,12 @@ $(window).on("load", function() {
     // Get the value of 'client_id' and 'client_policy_id'
      client_id_param = params.get('client_id');
      client_policy_param = params.get('client_policy_id');
+     client_branch_id_param = params.get('client_branch_id');
      inception_param = params.get('actions');
 
-    console.log('client_id:', client_id_param);
-    console.log('client_policy_id:', client_policy_param);
-    console.log('inception_param:', inception_param);
+    // console.log('client_id:', client_id_param);
+    // console.log('client_policy_id:', client_policy_param);
+    // console.log('inception_param:', inception_param);
 
     if(inception_param != null){
         $('#upload-action-type').val('inception').change()
@@ -324,8 +340,8 @@ $(window).on("load", function() {
 function fetchClientPolicies() {
     $('#loader').show();
     var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
-    console.log('fetchClientPolicies');
-    console.log(apiURL);
+    // console.log('fetchClientPolicies');
+    // console.log(apiURL);
     $.ajax({
         url: apiURL,
         method: 'GET',
@@ -334,27 +350,55 @@ function fetchClientPolicies() {
             "X-Requested-With": "XMLHttpRequest"
         },
         success: function(response) {
-            // console.log(response.code);
+
+            // console.log(response);
             // console.log(response.dataStatus);
             // console.log(response.data);
             if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                 try {
-                    clientPolicies = (response.data);
+                    clientPolicies = (response.data)                    
                     // console.log(clientPolicies);
+
+                    response.data.forEach(policy => {
+                        // console.log('policies', policy.policies);
+                        policy.policies.forEach(p => {
+                            clientPoliciesWithBranch.policies.push(p);
+                        });
+                    });
+
+                    // console.log(clientPoliciesWithBranch);
+
                     appendClients(clientPolicies);
 
 
-                    //this function for reselect the policy
                     setTimeout(function() {
                         if (client_id_param != null ) {
                             var foundPolicies = clientPolicies.find(function(item) {
-                                console.log(typeof item.id)
+                                // console.log(typeof item.id)
                                 return item.id == client_id_param;
                             });
-                            appendPolicies(foundPolicies.policies);
+                            appendBranch(foundPolicies.branchs);
                         }
                     }, 500);
-                    //end
+
+
+                    setTimeout(function() {
+                        if (client_branch_id_param != null ) {
+                            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                                // console.log('item', item);
+                                return item.branch_id === client_branch_id_param;
+                            });
+
+
+                            if (foundPolicies) {
+                                // console.log('foundPolicies', foundPolicies);
+                                appendPolicies(foundPolicies);
+                            } else {
+                                console.log('No policies found for the selected client');
+                            }
+                        }
+                    }, 500);
+
 
                 } catch (error) {
                     console.error('Error parsing API response data:', error);
@@ -377,8 +421,8 @@ function fetchClientPolicies() {
 function fetchFileError(file_id) {
     $('#loader').show();
     var apiURL = '<?php echo base_url();?>' + 'util/get-file-error/' + file_id;
-    console.log('fetchFileError');
-    console.log(apiURL);
+    // console.log('fetchFileError');
+    // console.log(apiURL);
     $.ajax({
         url: apiURL,
         method: 'GET',
@@ -390,7 +434,7 @@ function fetchFileError(file_id) {
             $(this).find(".modal-body").html("");
             if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                 try {
-                    console.log((JSON.parse(response.data)));
+                    // console.log((JSON.parse(response.data)));
                     var file_error_data = (JSON.parse(response.data));
                     var file_error_html = "";
 
@@ -515,7 +559,7 @@ function fetchFileError(file_id) {
 
 function appendClients(data) {
 
-    console.log('client_id_param', client_id_param)
+    // console.log('client_id_param', client_id_param)
 
     $.each(data, function(index, item) {
         var option = $('<option>', {
@@ -530,44 +574,108 @@ function appendClients(data) {
 }
 
 
-function appendPolicies(data) {
+function appendBranch(data) {
 
-    $('#policy_id').empty();
-    $('#policy_id').append($('<option>', {
+    $('#branch_id').empty();
+    $('#branch_id').append($('<option>', {
         value: '0',
         text: 'Select'
     }));
     $.each(data, function(index, item) {
         var option = $('<option>', {
             value: item.id,
+            text: item.branch_name 
+        });
+        if (client_branch_id_param == item.id) {
+            option.attr('selected', true);
+        }
+        $('#branch_id').append(option);
+    });
+}
+
+
+function appendPolicies(data) {
+
+    // console.log(data)
+
+    $('#policy_id').empty();
+    
+    $('#policy_id').append($('<option>', {
+        value: '0',
+        text: 'Select',
+        selected: true
+    }));
+
+    $.each(data, function(index, item) {
+
+        // console.log(item)
+
+        var option = $('<option>', {
+            value: item.client_policy_id,
             text: item.name + ' - ' + item.policy_type
         });
-        if (client_policy_param == item.id) {
+        if (client_policy_param == item.client_policy_id) {
             option.attr('selected', true);
         }
         $('#policy_id').append(option);
     });
+
 }
 
 $(document).ready(function() {
 
     $('#client_id').on('change', function() {
+
+        $('#policy_id').empty();
+
+        $('#policy_id').append($('<option>', {
+            value: '',
+            text: 'Select'
+        }));
+
         var selectedClient = $(this).val();
 
-        console.log('selectedClient', selectedClient);
+        // console.log('selectedClient', selectedClient);
         // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
 
         // Check if the selected option exists in apiData
         var foundPolicies = clientPolicies.find(function(item) {
             return item.id === selectedClient;
         });
-        console.log(foundPolicies.policies);
-        appendPolicies(foundPolicies.policies);
+        console.log('foundPolicies.branchs', foundPolicies.branchs);
+        appendBranch(foundPolicies.branchs);
 
     });
 
 });
 
+$(document).ready(function() {
+
+    $('#branch_id').on('change', function() {
+        var selectedClient = $(this).val();
+
+        // console.log('selectedBranch', selectedClient);
+        // console.log('clientPolicies', clientPoliciesWithBranch);
+
+        var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+            // console.log('item', item);
+            return item.branch_id === selectedClient;
+        });
+
+
+        if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
+            
+            appendPolicies(foundPolicies);
+            toastr.warning('No policies found for the selected client branch.');
+
+        } else {
+            // console.log('foundPolicies', foundPolicies);
+            appendPolicies(foundPolicies);
+        }
+    });
+
+});
+
 // Function to convert object to query parameters
 function objectToQueryString(obj) {
     return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
@@ -579,7 +687,7 @@ function fetchEmpolyeeList(event) {
 
     var client_id = $('#client_id').val();
     var policy_id = $('#policy_id').val();
-    console.log(client_id + '-' + policy_id);
+    // console.log(client_id + '-' + policy_id);
     if (client_id == '0' || policy_id == '0') {
         toastr.warning('Please select values in both dropdowns.');
         return;
@@ -592,7 +700,7 @@ function fetchEmpolyeeList(event) {
 
     const queryString = objectToQueryString(queryParams);
     const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
+    // console.log(apiURL);
     window.location.href = apiURL;
 
 
@@ -641,7 +749,7 @@ $('#excel_download').click(function() {
         // If href attribute is not set, show an error message
         toastr.warning('Please select an Action to download a sample Excel.', 'Warning');
     } else {
-        console.log('Download action triggered.');
+        // console.log('Download action triggered.');
     }
 });
 
@@ -657,15 +765,15 @@ $('#fetch_enrolled_data').click(function()
 
     var policy_id = $('#policy_id').val();
     var uri = '<?= base_url('util/init-Emp-onboard/') ?>' + policy_id;
-    console.log(policy_id);
-    console.log(uri);
+    // console.log(policy_id);
+    // console.log(uri);
     $('#fetch_btn').attr('href', uri);
 
     $('#emp_data').empty();
     var client_id = $('#client_id').val();
     var policy_id = $('#policy_id').val();
     var action = $('#upload-action-type').val();
-    console.log(client_id + '-' + policy_id);
+    // console.log(client_id + '-' + policy_id);
     if (client_id == '0' || policy_id == '0') {
         toastr.warning('please select the client and policy for this uploaing event', 'warning')
         $('#full-width-modal').modal('hide');
@@ -678,14 +786,14 @@ $('#fetch_enrolled_data').click(function()
         action: action
     };
 
-    console.log('queryParams', queryParams)
+    // console.log('queryParams', queryParams)
     const queryString = objectToQueryString(queryParams);
-    console.log('queryString', queryString)
+    // console.log('queryString', queryString)
 
     $('.loader').fadeIn();
     $('.loader-mask').fadeIn();
     var uri = '<?= base_url('util/featch-emp-list')?>?' + queryString
-    console.log(uri)
+    // console.log(uri)
 
     $.ajax({
         url: uri,
@@ -699,7 +807,7 @@ $('#fetch_enrolled_data').click(function()
         contentType: false,
         success: function(res) {
 
-            console.log(res);
+            // console.log(res);
 
             if (res) {
                 setTimeout(function() {
@@ -729,13 +837,13 @@ $(document).ready(function() {
     $('#policy_id').change(function(){
 
         var selectedpolicy = $(this).val();
-        console.log('selectedpolicy',selectedpolicy)
+        // console.log('selectedpolicy',selectedpolicy)
         $('#upload-action-type').val('').change();
         $('#file_upload').hide();
         $('#excel_download').removeAttr('href');
 
         var apiURL = '<?php echo base_url();?>' + 'util/fetch-emp-count/' + selectedpolicy;
-            console.log(apiURL);
+            // console.log(apiURL);
             $.ajax({
                 url: apiURL,
                 method: 'GET',
@@ -745,11 +853,11 @@ $(document).ready(function() {
                 },
                 success: function(response) {
 
-                    console.log('responce data emp_count', response);
+                    // console.log('responce data emp_count', response);
 
                     if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                         try {
-                        console.log(response.emp_count.length)
+                        // console.log(response.emp_count.length)
                             if(response.emp_count > 0){
 
                                 var select = document.getElementById("upload-action-type");
@@ -800,11 +908,13 @@ $(document).ready(function() {
 
 function checkPolicyTermsAndRackRatesHasDefiend(event)
 {
-    console.log(event.target.id);
+    // console.log(event.target.id);
     var policy_id = (event.target.value);
-    console.log('checkPolicyTermsAndRackRatesHasDefiend called ' + policy_id);
+    // console.log('checkPolicyTermsAndRackRatesHasDefiend called ' + policy_id);
+    if(policy_id != 0 && policy_id != " " && policy_id != undefined)
+    {
     var apiURL = '<?php echo base_url();?>' + 'util/has_policy_config_completed/' + policy_id;
-            console.log(apiURL);
+            // console.log(apiURL);
 
             $('.loader').fadeIn();
             $('.loader-mask').fadeIn();
@@ -824,7 +934,7 @@ function checkPolicyTermsAndRackRatesHasDefiend(event)
                     $('.loader-mask').delay(350).fadeOut('slow');
                 }, 1000);
 
-                    console.log('check policy responce', response);
+                    // console.log('check policy responce', response);
 
                     if (response.code === 200 && response.dataStatus === true && response.message !== null) {
                         toastr.error(response.message, 'Error');
@@ -848,11 +958,12 @@ function checkPolicyTermsAndRackRatesHasDefiend(event)
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                 }, 1000);
-                    toastr.error('Something went wrong! Try Later', 'Error');
+                    // toastr.error('Something went wrong! Try Later', 'Error');
                     console.error('Error fetching data from checkPolicyTermsAndRackRatesHasDefiend API:', error);
                     return false;
                 }
             });
+        }
 
 }
 
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index d10d042f..4fa12d55 100644
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -1,18 +1,17 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
-
-.btn .btn-secondary .buttons-csv .buttons-html5 .my_class{
-    position: relative;
-    left: 79px;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
+    .btn .btn-secondary .buttons-csv .buttons-html5 .my_class {
+        position: relative;
+        left: 79px;
+    }
 </style>
 
 <div class="row">
@@ -20,8 +19,7 @@ table.dataTable tbody td {
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
                 <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
+                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
                         <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                     </a>
                 </h5>
@@ -36,6 +34,14 @@ table.dataTable tbody td {
                                 </select>
                             </div>
 
+
+                            <div class="form-group col-md-4">
+                                <label>Branch</label> <br />
+                                <select name="branch_id" class="form-control" id="branch_id">
+                                    <option value="0">Select</option>
+                                </select>
+                            </div>
+
                             <div class="form-group col-md-4">
                                 <label>Policy</label> <br />
                                 <select class="form-control" id="policies">
@@ -47,11 +53,10 @@ table.dataTable tbody td {
                                 <label>Status</label> <br />
                                 <select class="form-control" id="status1">
                                     <option value="0">Select</option>
-                                    <?php foreach($status as $key => $value) { ?>
-                                    <option value="<?= $key ?>"
-                                        <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
-                                        <?= $value ?>
-                                    </option>
+                                    <?php foreach ($status as $key => $value) { ?>
+                                        <option value="<?= $key ?>" <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
+                                            <?= $value ?>
+                                        </option>
                                     <?php } ?>
                                 </select>
                             </div>
@@ -59,9 +64,7 @@ table.dataTable tbody td {
                         </div>
                         <div class="row">
                             <div class="col-12" style="text-align: right;">
-                                <a href="<?= base_url("employee/endorsement-list"); ?>"
-                                    class="btn btn-primary waves-effect waves-light" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                                <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
                             </div>
                         </div>
                         <!-- </div> -->
@@ -84,8 +87,7 @@ table.dataTable tbody td {
                     </div>
 
                 </div>
-                <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
+                <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
                             <th class="font-weight-medium">SNO</th>
@@ -101,47 +103,45 @@ table.dataTable tbody td {
                     </thead>
 
                     <tbody class="font-12">
-                        <?php 
-                        if(isset($employees))
-                        {
-                        foreach ($employees as $key => $employee) { ?>
+                        <?php
+                        if (isset($employees)) {
+                            foreach ($employees as $key => $employee) { ?>
 
-                        <tr>
-                            <td><b><?php echo ($key + 1)?></b></td>
-                            <td><?php echo $employee['name']?>( <?php echo $employee['emp_code']?> )</td>
-                            <td><?php echo isset($employee['policy_name']) ? $employee['policy_name'] : '' ?></td>
-                            <td><?php echo $employee['endorsement_id']?></td>
-                            <td><?php echo isset($employee['insurer_short_name']) ? $employee['insurer_short_name'] : '' ?>
-                            </td>
-                            <td><?php echo $employee['remarks']?></td>
-                            <td>
-                                <?php 
-                                if ($employee['actions'] == 'c') { 
-                                    echo 'Correction'; 
-                                } elseif ($employee['actions'] == 'si') {
-                                    echo 'SI Enhancement'; 
-                                } elseif ($employee['actions'] == 'd') {
-                                    echo 'Deletion'; 
-                                }
-                                ?>
-                            </td>
-                            <td>
-                                <?php 
-                                if ($employee['status'] == 'pending') { 
-                                    echo '<span class="badge badge-danger">' . $employee['status'] . '</span>';
-                                } elseif ($employee['status'] == 'inprogress') {
-                                    echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
-                                } elseif ($employee['status'] == 'complete') {
-                                    echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
-                                }
-                                ?>
-                            </td>
-                            <td class="text-center"><a href="#" data-id="<?php echo $employee['id']?>"
-                                    class="fa fa-eye emp_data_model" aria-hidden="true" data-toggle="modal"
-                                    data-target="#centermodal"></a>
-                            </td>
-                        </tr>
-                        <?php }}?>
+                                <tr>
+                                    <td><b><?php echo ($key + 1) ?></b></td>
+                                    <td><?php echo $employee['name'] ?>( <?php echo $employee['emp_code'] ?> )</td>
+                                    <td><?php echo isset($employee['policy_name']) ? $employee['policy_name'] : '' ?></td>
+                                    <td><?php echo $employee['endorsement_id'] ?></td>
+                                    <td><?php echo isset($employee['insurer_short_name']) ? $employee['insurer_short_name'] : '' ?>
+                                    </td>
+                                    <td><?php echo $employee['remarks'] ?></td>
+                                    <td>
+                                        <?php
+                                        if ($employee['actions'] == 'c') {
+                                            echo 'Correction';
+                                        } elseif ($employee['actions'] == 'si') {
+                                            echo 'SI Enhancement';
+                                        } elseif ($employee['actions'] == 'd') {
+                                            echo 'Deletion';
+                                        }
+                                        ?>
+                                    </td>
+                                    <td>
+                                        <?php
+                                        if ($employee['status'] == 'pending') {
+                                            echo '<span class="badge badge-danger">' . $employee['status'] . '</span>';
+                                        } elseif ($employee['status'] == 'inprogress') {
+                                            echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
+                                        } elseif ($employee['status'] == 'complete') {
+                                            echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
+                                        }
+                                        ?>
+                                    </td>
+                                    <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" class="fa fa-eye emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
+                                    </td>
+                                </tr>
+                        <?php }
+                        } ?>
 
                     </tbody>
                 </table>
@@ -153,7 +153,7 @@ table.dataTable tbody td {
 
 
 <!-- Center modal content -->
-<div class="modal fade" id="centermodal" tabindex="-1" role="dialog"  aria-hidden="true" aria-modal="true" data-backdrop="static">
+<div class="modal fade" id="centermodal" tabindex="-1" role="dialog" aria-hidden="true" aria-modal="true" data-backdrop="static">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header" style="background-color: gainsboro;">
@@ -179,351 +179,436 @@ table.dataTable tbody td {
 
 
 <script>
+    $(document).ready(function() {
+        // Initialize select2
+        $("#clients").select2();
+        $("#policies").select2();
+        $("#branch_id").select2();
+    });
 
-$(document).ready(function() {
-    // Initialize select2
-    $("#clients").select2();
-    $("#policies").select2();
-});
+    // Declare a global variable to store API response data
+    var clientPolicies = [];
+    var clientPoliciesWithBranch = {
+        policies: []
+    };
+    var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
+    var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
 
-// Declare a global variable to store API response data
-var clientPolicies = [];
-var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
-
-$(window).on("load", function() {
-    console.log("window loaded");
-    fetchClientPolicies();
-});
+    $(window).on("load", function() {
+        console.log("window loaded");
+        fetchClientPolicies();
+    });
 
 
-function fetchClientPolicies() {
+    function fetchClientPolicies() {
 
-    $('#loader').show();
-    var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
-    console.log('fetchClientPolicies');
-    console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "Content-Type": "application/json",
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            // console.log(response.code);
-            // console.log(response.dataStatus);
-            // console.log(response.data);
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    clientPolicies = (response.data);
-                    console.log(clientPolicies);
-                    appendClients(clientPolicies);
+        $('#loader').show();
+        var apiURL = '<?php echo base_url(); ?>' + 'util/clients-with-policies';
+        console.log('fetchClientPolicies');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                // console.log(response.code);
+                // console.log(response.dataStatus);
+                // console.log(response.data);
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    try {
+                        clientPolicies = (response.data);
 
-                    //this function for reselect policy
-                    setTimeout(function() {
-                        if (client_id) {
-                            var foundPolicies = clientPolicies.find(function(item) {
-                                console.log(typeof item.id)
-                                return item.id == client_id;
+
+                        response.data.forEach(policy => {
+                            // console.log('policies', policy.policies);
+                            policy.policies.forEach(p => {
+                                clientPoliciesWithBranch.policies.push(p);
                             });
-                            appendPolicies(foundPolicies.policies);
-                        }
-                    }, 500);
-                    //end
+                        });
 
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                        // console.log(clientPolicies);
+                        appendClients(clientPolicies);
+
+                        setTimeout(function() {
+                            if (client_id) {
+                                var foundPolicies = clientPolicies.find(function(item) {
+                                    // console.log(typeof item.id)
+                                    return item.id == client_id;
+                                });
+                                appendBranch(foundPolicies.branchs);
+                            }
+                        }, 500);
+
+                        setTimeout(function() {
+                            if (client_branch_id) {
+
+                                var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                                    // console.log('item', item);
+                                    return item.branch_id === client_branch_id;
+                                });
+
+                                if (foundPolicies) {
+                                    // console.log('foundPolicies', foundPolicies);
+                                    appendPolicies(foundPolicies);
+                                } else {
+                                    console.log('No policies found for the selected client');
+                                }
+                            }
+                        }, 500);
+
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
+                    }
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
-
-    $('#loader').hide();
-}
-
-
-function appendClients(data) {
-
-    var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name
         });
-        if (clientID == item.id) {
-            option.attr('selected', true);
-        }
-        $('#clients').append(option);
-    });
-}
 
-
-function appendPolicies(data) {
-
-    $('#policies').empty();
-    $('#policies').append($('<option>', {
-        value: '0',
-        text: 'Select'
-    }));
-
-    var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0'?>;
-    console.log(PolicyID)
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.name
-        });
-        if (PolicyID == item.id) {
-            option.attr('selected', true);
-        }
-        $('#policies').append(option);
-    });
-}
-
-$(document).ready(function() {
-
-    $('#clients').on('change', function() {
-        var selectedClient = $(this).val();
-        console.log(selectedClient);
-        // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
-
-        // Check if the selected option exists in apiData
-        var foundPolicies = clientPolicies.find(function(item) {
-            return item.id === selectedClient;
-        });
-        console.log(foundPolicies.policies);
-        appendPolicies(foundPolicies.policies);
-    });
-
-});
-
-// Function to convert object to query parameters
-function objectToQueryString(obj) {
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function fetchEmpolyeeList(event) {
-    event.preventDefault(); // Prevent default action
-
-    var client_id = $('#clients').val();
-    var policy_id = $('#policies').val();
-    var status = $('#status1').val();
-    console.log(client_id + '-' + policy_id);
-    if (client_id == '0' || policy_id == '0') {
-        alert('Please select values in both dropdowns.');
-        return;
+        $('#loader').hide();
     }
 
-    var queryParams = {
-        client_id: client_id,
-        policy_id: policy_id,
-        status: status,
-    };
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
+    function appendClients(data) {
 
-}
-
-document.getElementById('toggleIcon').addEventListener('click', function() {
-    var icon = document.getElementById('icon');
-    icon.classList.toggle('mdi-chevron-down');
-    icon.classList.toggle('mdi-chevron-up');
-});
+        var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name
+            });
+            if (clientID == item.id) {
+                option.attr('selected', true);
+            }
+            $('#clients').append(option);
+        });
+    }
 
 
-$('.emp_data_model').click(function() {
-    var myVal = $(this).data('id');
-    console.log(myVal);
-    fetchEmpEndorsementData(myVal)
+    function appendBranch(data) {
 
-});
+        $('#branch_id').empty();
+        $('#branch_id').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            if (client_branch_id == item.id) {
+                option.attr('selected', true);
+            }
+            $('#branch_id').append(option);
+        });
+    }
 
 
-function fetchEmpEndorsementData(id) {
+    function appendPolicies(data) {
 
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        $('#policies').empty();
+        $('#policies').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
 
-    var apiURL = '<?php echo base_url();?>' + 'util/get-emp-endorsement/' + id;
-    console.log('fetchEmpEndorsementData');
-    console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "Content-Type": "application/json",
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            console.log(response);
-            if (response.code === 200 && response.dataStatus === true) {
-                try {
-                    endorsementData = (response.data);
-                    endorsementData2 = (response.data2);
+        var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0' ?>;
+        // console.log(PolicyID)
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.client_policy_id,
+                text: item.name
+            });
+            if (PolicyID == item.client_policy_id) {
+                option.attr('selected', true);
+            }
+            $('#policies').append(option);
+        });
+    }
 
-                    e_actions = endorsementData2[0]['actions'];
+    $(document).ready(function() {
+
+        $('#clients').on('change', function() {
+
+            $('#policies').empty();
+            $('#policies').append($('<option>', {
+                value: '0',
+                text: 'Select'
+            }));
+
+            var selectedClient = $(this).val();
+            // console.log(selectedClient);
+            // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
+
+            // Check if the selected option exists in apiData
+            var foundPolicies = clientPolicies.find(function(item) {
+                return item.id === selectedClient;
+            });
+            // console.log(foundPolicies.branchs);
+            appendBranch(foundPolicies.branchs);
+        });
+
+    });
+
+    $(document).ready(function() {
+
+        $('#branch_id').on('change', function() {
+
+            var selectedClient = $(this).val();
+
+            // console.log('selectedBranch', selectedClient);
+            // console.log('clientPolicies', clientPoliciesWithBranch);
+
+            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                // console.log('item', item);
+                return item.branch_id === selectedClient;
+            });
 
 
-                    var heading = "";
-                    if (endorsementData2[0]['actions'] == 'si') {
-                        heading = ' - ' + 'SI Enhancement';
-                        heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
-                    } else if (endorsementData2[0]['actions'] == 'd') {
-                        heading = ' - ' + 'Deletion';
-                        heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
-                    } else if (endorsementData2[0]['actions'] == 'c') {
-                        heading = ' - ' + 'Correction';
-                        heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
-                    } 
+            if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
 
-                    $('#heading').html(heading);
-                    
-                    $('#table_data').empty();
-                    $('#table_head_data').empty();
+                appendPolicies(foundPolicies);
+                toastr.warning('No policies found for the selected client branch.');
 
-                    
-                    if(e_actions == 'd'){
+            } else {
+                
+                // console.log('foundPolicies', foundPolicies);
+                appendPolicies(foundPolicies);
+            }
+        });
 
-                        $.each(endorsementData, function(index, item) {
-                            var tableHtml = `
+    });
+
+    // Function to convert object to query parameters
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
+
+        var client_id = $('#clients').val();
+        var policy_id = $('#policies').val();
+        var status = $('#status1').val();
+        var branch_id = $('#branch_id').val();
+        // console.log(client_id + '-' + policy_id);
+        if (client_id == '0' || policy_id == '0') {
+            alert('Please select values in both dropdowns.');
+            return;
+        }
+
+        var queryParams = {
+            client_id: client_id,
+            policy_id: policy_id,
+            branch_id: branch_id,
+            status: status,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        // console.log(apiURL);
+        window.location.href = apiURL;
+
+    }
+
+    document.getElementById('toggleIcon').addEventListener('click', function() {
+        var icon = document.getElementById('icon');
+        icon.classList.toggle('mdi-chevron-down');
+        icon.classList.toggle('mdi-chevron-up');
+    });
+
+
+    $('.emp_data_model').click(function() {
+        var myVal = $(this).data('id');
+        // console.log(myVal);
+        fetchEmpEndorsementData(myVal)
+
+    });
+
+
+    function fetchEmpEndorsementData(id) {
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var apiURL = '<?php echo base_url(); ?>' + 'util/get-emp-endorsement/' + id;
+        console.log('fetchEmpEndorsementData');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                // console.log(response);
+                if (response.code === 200 && response.dataStatus === true) {
+                    try {
+                        endorsementData = (response.data);
+                        endorsementData2 = (response.data2);
+
+                        e_actions = endorsementData2[0]['actions'];
+
+
+                        var heading = "";
+                        if (endorsementData2[0]['actions'] == 'si') {
+                            heading = ' - ' + 'SI Enhancement';
+                            heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
+                        } else if (endorsementData2[0]['actions'] == 'd') {
+                            heading = ' - ' + 'Deletion';
+                            heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
+                        } else if (endorsementData2[0]['actions'] == 'c') {
+                            heading = ' - ' + 'Correction';
+                            heading += ' - ' + (endorsementData2[0]['endorsement_id'] !== null ? endorsementData2[0]['endorsement_id'] : endorsementData2[0]['status']);
+                        }
+
+                        $('#heading').html(heading);
+
+                        $('#table_data').empty();
+                        $('#table_head_data').empty();
+
+
+                        if (e_actions == 'd') {
+
+                            $.each(endorsementData, function(index, item) {
+                                var tableHtml = `
                                 <tr>
                                     <td>${item.field_name}</td>
                                     <td>${formatNumberToIndianLocale(item.data, item.field_name, e_actions)}</td>
                                 </tr>
                             `;
-                            $('#table_data').append(tableHtml);
-                        });
-                            
+                                $('#table_data').append(tableHtml);
+                            });
 
-                
-                    } else {
 
-                        var table_head = `
+
+                        } else {
+
+                            var table_head = `
                            <tr>
                                 <th class="font-weight-medium"></th>
                                 <th class="font-weight-medium">Old Value</th>
                                 <th class="font-weight-medium">New Value</th>
                             </tr>
                         `;
-                        $('#table_head_data').append(table_head);
+                            $('#table_head_data').append(table_head);
 
-                        $.each(endorsementData, function(index, item) {
-                            var tableHtml = `
+                            $.each(endorsementData, function(index, item) {
+                                var tableHtml = `
                                 <tr>
                                     <td>${item.field_name}</td>
                                     <td>${formatNumberToIndianLocale(item.old_value, item.field_name)}</td>
                                     <td>${formatNumberToIndianLocale(item.new_value, item.field_name, e_actions)}</td>
                                 </tr>
                             `;
-                            $('#table_data').append(tableHtml);
-                        });
+                                $('#table_data').append(tableHtml);
+                            });
 
+                        }
+
+
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
                     }
-
-
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
+        });
 
-    setTimeout(function() {
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    }, 200);
-}
+        setTimeout(function() {
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        }, 200);
+    }
 
-function formatNumberToIndianLocale(value, field_name, action) {
+    function formatNumberToIndianLocale(value, field_name, action) {
 
-    // Check if the value is a valid number (either as a number or as a string)
-    if (!isNaN(value) && !isNaN(parseFloat(value)) && field_name != 'No of Days') {
+        // Check if the value is a valid number (either as a number or as a string)
+        if (!isNaN(value) && !isNaN(parseFloat(value)) && field_name != 'No of Days') {
 
-        // Convert the value to a number and format it using Indian English locale
-        var return_val = parseFloat(value).toLocaleString('en-IN');
+            // Convert the value to a number and format it using Indian English locale
+            var return_val = parseFloat(value).toLocaleString('en-IN');
 
-        if(field_name == 'Period of non coverage'){
+            if (field_name == 'Period of non coverage') {
 
-            return value + ' days';
-        }
+                return value + ' days';
+            }
 
-        if(field_name == 'Total Amount'){
-            
-            return '₹ ' + return_val + ' ( To be Refunded )';
-        }
-        
-        if(field_name == 'Total'){
-            
-            if(action == 'd'){
+            if (field_name == 'Total Amount') {
 
                 return '₹ ' + return_val + ' ( To be Refunded )';
-
-            }else if(action == 'si'){
-
-                return '₹ ' + return_val + ' ( To be paid )';
             }
 
+            if (field_name == 'Total') {
+
+                if (action == 'd') {
+
+                    return '₹ ' + return_val + ' ( To be Refunded )';
+
+                } else if (action == 'si') {
+
+                    return '₹ ' + return_val + ' ( To be paid )';
+                }
+
+            }
+
+            return '₹ ' + return_val;
+
+        } else {
+            // Return the original value if it's not a valid number
+            return value;
         }
-
-        return '₹ ' + return_val;
-
-    } else {
-        // Return the original value if it's not a valid number
-        return value;
     }
-}
 
-$('.close').click(function(){
+    $('.close').click(function() {
 
-    $('#table_data').empty();
-})
+        $('#table_data').empty();
+    })
 
-$(document).ready(function(){
+    $(document).ready(function() {
 
-$('#tickets-table').DataTable({
-dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-    "<'row'<'col-sm-12'tr>>" + 
-    "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
-    "buttons": [{
-        "extend": 'csv',
-        "text": 'CSV',
-        "title": 'Endorsement-List',
-        "className": 'my_class',
-        "exportOptions": {
-            "columns": ':not(:last-child)'
-        },
-    }],
-    "initComplete": function(settings, json) {
-        $('.my_class').css({
-            "position": "relative",
-            "left": "79px"
+        $('#tickets-table').DataTable({
+            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+            "buttons": [{
+                "extend": 'csv',
+                "text": 'CSV',
+                "title": 'Endorsement-List',
+                "className": 'my_class',
+                "exportOptions": {
+                    "columns": ':not(:last-child)'
+                },
+            }],
+            "initComplete": function(settings, json) {
+                $('.my_class').css({
+                    "position": "relative",
+                    "left": "79px"
+                });
+            },
+            language: {
+                search: "_INPUT_",
+                searchPlaceholder: "Search..."
+            },
+            paging: true,
+            // pagingType: 'full_numbers'
         });
-    },
-    language: {
-    search: "_INPUT_",
-    searchPlaceholder: "Search..."
-},
-paging: true ,
-// pagingType: 'full_numbers'
-});
-
-});
 
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index b657273b..5c3504af 100644
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -25,6 +25,7 @@
                         <th class="font-weight-medium">SNO</th>
                         <th class="font-weight-medium">File name</th>
                         <th class="font-weight-medium">Client</th>
+                        <th class="font-weight-medium">Client Branch</th>
                         <th class="font-weight-medium">Policy</th>
                         <th class="font-weight-medium">Event</th>
                         <th class="font-weight-medium">User/Time</th>
@@ -47,6 +48,7 @@
                         <td><b><?php echo ($key + 1)?></b></td>
                         <td><?php echo $file['file_name']?></td>
                         <td><?php echo $file['short_name']?></td>
+                        <td><?php echo $file['branch_name']?></td>
                         <td><?php echo $file['policy_name']?></td>
                         <td><?php echo $file['action']?></td>
                         <td><?php echo fancy_date_time_format($file['created_at']).' by <strong>'.$file['first_name'].'</strong>'?>
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index 020c46d4..48cc73a1 100644
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -23,13 +23,24 @@
                                             </select>
                                         </div>
 
+                                        <div class="form-group col-md-4">
+                                            <label>Branch</label> <br />
+                                            <select name="client_branch_id" class="form-control" id="client_branch_id" required>
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
+
                                         <div class="form-group col-md-4">
                                             <label>Policy<span class="text-danger" id="policy_danger">*</span></label> <br />
-                                            <select name="client_policy_id" class="form-control" id="policy" required>
+                                            <select name="client_policy_id" class="form-control" id="policy" onchange="checkPolicyTermsAndRackRatesHasDefiend(event)" required>
                                                 <option value="">Select</option>
                                             </select>
                                         </div>
 
+                                    </div>
+
+                                    <div class="form-row">
+
                                         <div class="form-group col-md-4">
                                             <label>Insurer/TPA Data<span class="text-danger">*</span></label> <br />
                                             <select name="insurer_or_tpa" class="form-control" id="insurer_or_tpa" required>
@@ -43,9 +54,6 @@
                                                 ?>
                                             </select>
                                         </div>
-                                    </div>
-
-                                    <div class="form-row">
 
                                         <div class="form-group col-md-4">
                                             <label>Action<span class="text-danger">*</span></label> <br />
@@ -121,13 +129,18 @@
         // Initialize select2
         $("#client").select2();
         $("#policy").select2();
+        $("#client_branch_id").select2();
     });
 
 
     // Declare a global variable to store API response data
     var clientPolicies = [];
+    var clientPoliciesWithBranch2 = {
+        policies: []
+    };
 
     var client_id_param2 = 0;
+    var client_branch_id_param2 = 0;
     var client_policy_param2 = 0;
 
     $(document).ready(function() {
@@ -161,7 +174,7 @@
             // Create FormData object
             var formData = new FormData($(this)[0]);
             for (var pair of formData.entries()) {
-                console.log(pair[0] + ', ' + pair[1]);
+                // console.log(pair[0] + ', ' + pair[1]);
             }
 
             $('.loader').fadeIn();
@@ -175,7 +188,7 @@
                 contentType: false, // Let jQuery handle the content type
                 success: function(response) {
 
-                    console.log(response);
+                    // console.log(response);
                     if (response.code === 200 && response.status === true) {
 
                         $('.loader').fadeOut();
@@ -193,7 +206,7 @@
 
                     } else {
                         console.error('Something went wrong!');
-                        toastr.error('Something went wrong! Try later', 'Error');
+                        // toastr.error('Something went wrong! Try later', 'Error');
                         // window.location.reload(true);
                     }
                 },
@@ -203,7 +216,7 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     $("#import_export_excel_form")[0].reset()
-                    toastr.error('Something went wrong! Try later', 'Error');
+                    // toastr.error('Something went wrong! Try later', 'Error');
                     // window.location.reload(true);
                 }
             });
@@ -231,17 +244,18 @@
         // Get the value of 'client_id' and 'client_policy_id'
         client_id_param2 = params.get('client_id');
         client_policy_param2 = params.get('client_policy_id');
+        client_branch_id_param2 = params.get('client_branch_id');
         actions = params.get('actions');
         insurer_or_tpa = params.get('insurer_or_tpa');
         event = params.get('event');
 
 
 
-        console.log('client_id2:', client_id_param2);
-        console.log('client_policy_id2:', client_policy_param2);
-        console.log('actions:', actions);
-        console.log('insurer_or_tpa:', insurer_or_tpa);
-        console.log('event:', event);
+        // console.log('client_id2:', client_id_param2);
+        // console.log('client_policy_id2:', client_policy_param2);
+        // console.log('actions:', actions);
+        // console.log('insurer_or_tpa:', insurer_or_tpa);
+        // console.log('event:', event);
 
 
 
@@ -252,7 +266,7 @@
             $('#insurer_or_tpa').val(insurer_or_tpa).change()
 
             var selectedValue = actions;
-            console.log(selectedValue);
+            // console.log(selectedValue);
 
             if (selectedValue == '') {
                 $('#import_excel_btn').hide();
@@ -292,20 +306,46 @@
                 if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                     try {
                         clientPolicies = (response.data);
-                        console.log(clientPolicies);
+                        // console.log(clientPolicies);
+
+
+                        response.data.forEach(policy => {
+                            // console.log('policies', policy.policies);
+                            policy.policies.forEach(p => {
+                                clientPoliciesWithBranch2.policies.push(p);
+                            });
+                        });
+
+
                         appendClients2(clientPolicies);
 
-                        //this function for reselect the policy
                         setTimeout(function() {
-                            if (client_id_param2 != null) {
+                            if (client_branch_id_param2 != null) {
                                 var foundPolicies = clientPolicies.find(function(item) {
-                                    console.log(typeof item.id)
+                                    // console.log(typeof item.id)
                                     return item.id == client_id_param2;
                                 });
-                                appendPolicies2(foundPolicies.policies);
+                                appendBranch2(foundPolicies.branchs);
+                            }
+                        }, 500); 
+                        
+                        setTimeout(function() {
+                            if (client_id_param2 != null) {
+
+                                var foundPolicies = clientPoliciesWithBranch2.policies.filter(function(item) {
+                                    // console.log('item', item);
+                                    return item.branch_id === client_branch_id_param2;
+                                });
+
+
+                                if (foundPolicies) {
+                                    // console.log('foundPolicies', foundPolicies);
+                                    appendPolicies2(foundPolicies);
+                                } else {
+                                    console.log('No policies found for the selected client');
+                                }
                             }
                         }, 500);
-                        //end
 
                     } catch (error) {
                         console.error('Error parsing API response data:', error);
@@ -313,7 +353,7 @@
                 } else if (response.code === 404 && response.dataStatus === false) {
                     console.error('no data found', response);
                 } else {
-                    console.error('Something went wrong!');
+                    // console.error('Something went wrong!');
                 }
             },
             error: function(xhr, status, error) {
@@ -327,7 +367,7 @@
 
     function appendClients2(data) {
 
-        console.log('client_id_param2', client_id_param2)
+        // console.log('client_id_param2', client_id_param2)
 
         $.each(data, function(index, item) {
             var option = $('<option>', {
@@ -342,6 +382,28 @@
     }
 
 
+    function appendBranch2(data) {
+
+        // console.log(data)
+
+        $('#client_branch_id').empty();
+        $('#client_branch_id').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name 
+            });
+            if (client_branch_id_param2 == item.id) {
+                option.attr('selected', true);
+            }
+            $('#client_branch_id').append(option);
+        });
+    }
+
+
     function appendPolicies2(data) {
 
         $('#policy').empty();
@@ -352,10 +414,10 @@
 
         $.each(data, function(index, item) {
             var option = $('<option>', {
-                value: item.id,
+                value: item.client_policy_id,
                 text: item.name + ' - ' + item.policy_type
             });
-            if (client_policy_param2 == item.id) {
+            if (client_policy_param2 == item.client_policy_id) {
                 option.attr('selected', true);
             }
             $('#policy').append(option);
@@ -365,16 +427,54 @@
     $(document).ready(function() {
 
         $('#client').on('change', function() {
+
+            $('#policy').empty();
+            $('#policy').append($('<option>', {
+                value: '0',
+                text: 'Select'
+            }));
+
             var selectedClient = $(this).val();
-            console.log(selectedClient);
+            // console.log(selectedClient);
             // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
 
             // Check if the selected option exists in apiData
             var foundPolicies = clientPolicies.find(function(item) {
                 return item.id === selectedClient;
             });
-            console.log(foundPolicies.policies);
-            appendPolicies2(foundPolicies.policies);
+            // console.log(foundPolicies.branchs);
+            appendBranch2(foundPolicies.branchs);
+
+        });
+
+    });
+
+    $(document).ready(function() {
+
+        $('#client_branch_id').on('change', function() {
+
+            var selectedClient = $(this).val();
+
+            // console.log('selectedBranch', selectedClient);
+            // console.log('clientPolicies', clientPoliciesWithBranch2);
+
+            var foundPolicies = clientPoliciesWithBranch2.policies.filter(function(item) {
+                return item.branch_id === selectedClient;
+            });
+
+        
+
+
+            if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
+
+                appendPolicies2(foundPolicies);
+                toastr.warning('No policies found for the selected client branch.');
+
+            } else {
+
+                // console.log('foundPolicies', foundPolicies);
+                appendPolicies2(foundPolicies);
+            }
         });
 
     });
@@ -389,7 +489,7 @@
 
         var client_id = $('#client').val();
         var policy_id = $('#policy').val();
-        console.log(client_id + '-' + policy_id);
+        // console.log(client_id + '-' + policy_id);
         if (client_id == '0' || policy_id == '0') {
             alert('Please select values in both dropdowns.');
             return;
@@ -402,7 +502,7 @@
 
         const queryString = objectToQueryString2(queryParams);
         const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-        console.log(apiURL);
+        // console.log(apiURL);
         window.location.href = apiURL;
 
 
@@ -414,7 +514,7 @@
     $('#action_type').change(function() {
 
         var selectedValue = $(this).val();
-        console.log(selectedValue);
+        // console.log(selectedValue);
 
         if (selectedValue == '') {
             $('#import_excel_btn').hide();
@@ -444,7 +544,7 @@
 
         $('#event_type').change(function() {
             var selectedVal = $(this).val();
-            console.log(selectedVal);
+            // console.log(selectedVal);
 
             if (selectedVal === 'correction') {
                 $('#policy').prop('required', false);
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 962befdb..114184f7 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -48,9 +48,9 @@
         </div>
 
         <!-- Pending Action Header -->
-        <h6 class="font-weight-medium px-3 m-0 py-2 font-13 text-uppercase bg-light fixed-header">
+        <h6 class="font-weight-medium px-3 m-0 py-2 font-13 bg-light fixed-header">
             <i class="mdi mdi-format-list-checks font-22"></i>
-            <span class="header-title">Pending Action</span>
+            <span class="header-title">TO DOs</span>
         </h6>
         <div class="scrollable-content">
             <ul class="list-unstyled" id="messages-list-2">
@@ -164,7 +164,7 @@
                     //  });
 
 
-                    console.log('responce', response)
+                    //console.log('responce', response)
 
                     let messagesList = $('#messages-list');
                     messagesList.empty();
@@ -260,11 +260,11 @@
 
         $('#messages-list').on('click', 'li', function(event) {
 
-            console.log('messages-list click li')
+            //console.log('messages-list click li')
 
             if ($(event.target).closest('.rm_msg').length > 0) {
 
-                console.log('.rm_msg')
+                //console.log('.rm_msg')
 
                 let messageId = $(this).data('id');
                 let url = $(this).data('url');
@@ -276,11 +276,11 @@
 
             } else if ($(event.target).closest('.redirect_page').length > 0) {
 
-                console.log('redirect_page')
+                //console.log('redirect_page')
 
                 let messageId = $(this).data('id');
                 let url = $(this).data('url');
-                console.log('url : ', url)
+                //console.log('url : ', url)
                 acknowledgeMessage(messageId);
 
                 window.location.href = '<?= base_url() ?>' + url;
@@ -291,7 +291,7 @@
 
         fetchMessages();
 
-        setInterval(fetchMessages, 10000); // Fetch messages every minute
+        setInterval(fetchMessages, 10000); // Fetch messages every ten seconds
     });
 
     $(document).ready(function() {
@@ -304,7 +304,7 @@
                 method: 'GET',
                 success: function(response) {
 
-                    console.log(response);
+                    //console.log(response);
 
                     if (response.length == 0) {
 
@@ -325,13 +325,14 @@
                         var queryParams = {
                             client_id: item.client_id,
                             client_policy_id: item.client_policy_id,
+                            client_branch_id: item.branch_id,
                             actions: 'inception'
                         };
 
                         const queryString = objectToQueryString(queryParams);
 
                         var url = 'employee/upload?' + queryString
-                        //console.log(url)
+                        ////console.log(url)
 
 
                         var toast_body_css = 'background : #bfd7eb !important;';
@@ -339,9 +340,17 @@
                         var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                         var toast_status_word = 'Info';
 
-                        var toast_body_data = item.client_name + ' - ' + item.policy_name;
+                        if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                        //console.log(toast_body_data);
+                            //console.log(item.branch_name)
+                            item.branch_name += ' branch';
+                        }
+
+                        ////console.log(item.branch_name);
+
+                        var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+
+                        ////console.log(toast_body_data);
 
                         var html = ` <li data-id="" data-url="${url}">
                                         <div class="p-3">
@@ -376,6 +385,7 @@
 
                             var queryParams = {
                                 client_id: item.client_id,
+                                client_branch_id: item.branch_id,
                                 event: 'correction',
                                 actions: 'export',
                                 insurer_or_tpa: 'tpa',
@@ -384,7 +394,7 @@
                             const queryString = objectToQueryString(queryParams);
 
                             var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                            //console.log(url)
+                            ////console.log(url)
 
 
                             var toast_body_css = 'background : #bfd7eb !important;';
@@ -392,15 +402,25 @@
                             var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                             var toast_status_word = 'Info';
 
-                            var title = 'Correction Export Pending';
+                            var title = 'Correction Pending';
 
-                            if (item.batch_export_count > 0) {
 
-                                title = 'Correction Import Pending';
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+
                             }
 
-                            var toast_body_data = item.client_name;
-                            //console.log(toast_body_data);
+                            ////console.log(item.branch_name);
+
+                            // if (item.batch_export_count > 0) {
+
+                            //     title = 'Correction Import Pending';
+                            // }
+
+                            var toast_body_data = item.client_name + ' - ' + item.branch_name;
+                            ////console.log(toast_body_data);
 
                             var html = ` <li data-id="" data-url="${url}">
                                 <div class="p-3">
@@ -439,6 +459,7 @@
 
                                 client_id: item.client_id,
                                 client_policy_id: item.client_policy_id,
+                                client_branch_id: item.branch_id,
                                 event: 'deletion',
                                 actions: 'export',
                                 insurer_or_tpa: 'tpa',
@@ -448,22 +469,32 @@
                             const queryString = objectToQueryString(queryParams);
 
                             var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                            //console.log(url)
+                            ////console.log(url)
 
 
                             var toast_body_css = 'background : #bfd7eb !important;';
                             var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
                             var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                             var toast_status_word = 'Info';
-                            var title = 'Deletion Export Pending';
+                            var title = 'Deletion Pending';
 
-                            if (item.batch_export_count > 0) {
 
-                                title = 'Deletion Import Pending';
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+
                             }
 
-                            var toast_body_data = item.client_name + ' - ' + item.policy_name;
-                            //console.log(toast_body_data);
+                            ////console.log(item.branch_name);
+
+                            // if (item.batch_export_count > 0) {
+
+                            //     title = 'Deletion Import Pending';
+                            // }
+
+                            var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                            ////console.log(toast_body_data);
 
                             var html = ` <li data-id="" data-url="${url}">
                                             <div class="p-3">
@@ -501,6 +532,7 @@
                             var queryParams = {
                                 client_id: item.client_id,
                                 client_policy_id: item.client_policy_id,
+                                client_branch_id: item.branch_id,
                                 event: 'si_enhancement',
                                 actions: 'export',
                                 insurer_or_tpa: 'tpa',
@@ -509,22 +541,32 @@
                             const queryString = objectToQueryString(queryParams);
 
                             var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                            //console.log(url)
+                            ////console.log(url)
 
 
                             var toast_body_css = 'background : #bfd7eb !important;';
                             var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
                             var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                             var toast_status_word = 'Info';
-                            var title = 'SI Enhancement Export Pending';
+                            var title = 'SI Enhancement Pending';
 
-                            if (item.batch_export_count > 0) {
 
-                                title = 'SI Enhancement Import Pending';
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+
                             }
 
-                            var toast_body_data = item.client_name + ' - ' + item.policy_name;
-                            //console.log(toast_body_data);
+                            ////console.log(item.branch_name);
+
+                            // if (item.batch_export_count > 0) {
+
+                            //     title = 'SI Enhancement Import Pending';
+                            // }
+
+                            var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                            ////console.log(toast_body_data);
 
                             var html = ` <li data-id="" data-url="${url}">
                                         <div class="p-3">
@@ -562,6 +604,7 @@
                             var queryParams = {
                                 client_id: item.client_id,
                                 client_policy_id: item.client_policy_id,
+                                client_branch_id: item.branch_id,
                                 event: 'inception',
                                 insurer_or_tpa: 'tpa',
                                 actions: 'export',
@@ -570,22 +613,31 @@
                             const queryString = objectToQueryString(queryParams);
 
                             var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                            //console.log(url)
+                            ////console.log(url)
 
 
                             var toast_body_css = 'background : #bfd7eb !important;';
                             var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
                             var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                             var toast_status_word = 'Info';
-                            var title = 'TPA Export Pending';
+                            var title = 'TPA Pending';
 
-                            if (item.batch_export_count > 0) {
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                                title = 'TPA Import Pending';
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+                                
                             }
 
-                            var toast_body_data = item.client_name + ' - ' + item.policy_name;
-                            //console.log(toast_body_data);
+                            ////console.log(item.branch_name);
+
+                            // if (item.batch_export_count > 0) {
+
+                            //     title = 'TPA Import Pending';
+                            // }
+
+                            var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                            ////console.log(toast_body_data);
 
                             var html = ` <li data-id="" data-url="${url}">
                                         <div class="p-3">
@@ -623,6 +675,7 @@
 
                                 client_id: item.client_id,
                                 client_policy_id: item.client_policy_id,
+                                client_branch_id: item.branch_id,
                                 event: 'inception',
                                 insurer_or_tpa: 'insurer',
                                 actions: 'export',
@@ -631,21 +684,31 @@
                             const queryString = objectToQueryString(queryParams);
 
                             var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                            //console.log(url)
+                            ////console.log(url)
 
                             var toast_body_css = 'background : #bfd7eb !important;';
                             var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
                             var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
                             var toast_status_word = 'Info';
-                            var title = 'Insurer Export Pending';
+                            var title = 'Insurer Pending';
 
-                            if (item.batch_export_count > 0) {
 
-                                title = 'Insurer Import Pending';
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+
                             }
 
-                            var toast_body_data = item.client_name + ' - ' + item.policy_name;
-                            //console.log(toast_body_data);
+                            ////console.log(item.branch_name);
+
+                            // if (item.batch_export_count > 0) {
+
+                            //     title = 'Insurer Import Pending';
+                            // }
+
+                            var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                            ////console.log(toast_body_data);
 
                             var html = ` <li data-id="" data-url="${url}">
                                         <div class="p-3">
@@ -690,11 +753,11 @@
 
         $('#messages-list-2').on('click', 'li', function(event) {
 
-            console.log('messages-list-2 click li')
+            //console.log('messages-list-2 click li')
 
             if ($(event.target).closest('.rm_msg').length > 0) {
 
-                console.log('.rm_msg')
+                //console.log('.rm_msg')
 
                 $(this).delay(300).fadeOut('slow', function() {
                     $(this).remove();
@@ -702,10 +765,10 @@
 
             } else if ($(event.target).closest('.redirect_page').length > 0) {
 
-                console.log('redirect_page')
+                //console.log('redirect_page')
 
                 let url = $(this).data('url');
-                console.log('url : ', url);
+                //console.log('url : ', url);
 
                 window.location.href = '<?= base_url() ?>' + url;
             }
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 9e514a8a..9cc606ba 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -589,7 +589,8 @@
                         $currentUrl = base_url();
                         $parsedUrl = parse_url($currentUrl);
                         $baseUrl = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . '/';
-                        $redirectUrl = $baseUrl . 'Ticketing/staff/login?' . http_build_query(['token' => $sessionData]);
+                        $hashedEmail = hash('sha256', $sessionData->email);
+                        $redirectUrl = $baseUrl . getenv('hepldeskURL') .'/staff/login?' . http_build_query(['token' => $hashedEmail]);
                         ?>
                         <a href="<?php echo $redirectUrl; ?>" target="_blank">
                             <i class="mdi mdi-lifebuoy"></i>
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 9482c63b..c96b1c69 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -1,56 +1,164 @@
+<?php include('policy_grid_excel.php')?>
+
 <!--  Modal content for the Large example -->
 <div class="modal fade" id="bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel"
     aria-hidden="true" aria-modal="true" data-backdrop="static" style="padding-right: 15px">
     <div class="modal-dialog modal-full-width">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myLargeModalLabel">Policy Premium <span id="nameOfThePolicy"></span></h4>
+                <h4 class="modal-title" id="myLargeModalLabel">Rack Rate <span id="nameOfThePolicy"></span></h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
 
+                <input type="hidden" id="policy_terms_count">
+
                 <div class="text-center" id="no_data"></div>
 
-                <form role="form" class="parsley-examples" method="post" id="GridForm" enctype="multipart/form-data">
-                    <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
-                    <input type="hidden" name="client_id" id="Client_id"
-                        value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
-                    <input type="hidden" name="client_policy_id" id="client_policy_id" />
-                    <input type="hidden" id="grid_emp_count" />
-                    <div class="form-group">
+                <ul class="nav nav-pills navtab-bg">
+                    <li class="nav-item">
+                        <a href="#primary_rack_rate_tab" data-toggle="tab" aria-expanded="false"
+                            class="nav-link px-3 py-2 active" id="rack_rate_one">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block">Rack Rate</span>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#secondary_rack_rate_tab" data-toggle="tab" aria-expanded="true"
+                            class="nav-link px-3 py-2" id="rack_rate_two">
+                            <span class="mr-1"><i class="fa fa-file"></i></span>
+                            <span class="d-none d-sm-inline-block">Additional Rack Rate</span>
+                        </a>
+                    </li>
+                </ul>
 
-                        <div class="form-row" id="rac_rate_dropdown">
-                            <div class="form-group col-md-6">
-                                <label for="emp_code">Policy Premium Type<span class="text-danger">*</span></label>
-                                <select class="form-control" id="grid" name="policy_grid_id"
-                                    onchange="addGridHTML(event)" required>
-                                </select>
-                            </div>
+                <div class="tab-content">
 
-                            <div class="form-group col-md-4" style="position: relative; left: 45px; display:none" id="premium_type">
-                                <label for="css"> Premium Calculation </label>
-                                <div style="display: flex; align-items: center;">
-                                    <input type="radio" id="individual" name="premium_type" value="2">
-                                    <label for="individual" style="position: relative;top: 5px;left: 5px;"> Individual </label>&nbsp;
-                                    <input type="radio" id="single" name="premium_type" value="1">
-                                    <label for="single" style="position: relative;top: 5px;left: 5px;"> Single Insurance </label>
+                    <div class="tab-pane fade active show" id="primary_rack_rate_tab">
+
+                        <form role="form" class="parsley-examples" method="post" id="GridForm"
+                            enctype="multipart/form-data">
+                            <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+                            <input type="hidden" name="client_id" id="Client_id"
+                                value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
+                            <input type="hidden" name="client_policy_id" id="client_policy_id" />
+                            <input type="hidden" name="rack_rate_type" id="rack_rate_type" value="0" />
+                            <input type="hidden" id="grid_emp_count" />
+                            <div class="form-group">
+
+                                <div class="form-row" id="rac_rate_dropdown">
+                                    <div class="form-group col-md-6">
+                                        <label for="emp_code">Policy Premium Type<span
+                                                class="text-danger">*</span></label>
+                                        <select class="form-control" id="grid" name="policy_grid_id"
+                                            onchange="addGridHTML(event)" required>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4"
+                                        style="position: relative; left: 45px; display:none" id="premium_type">
+                                        <label for="css"> Premium Calculation </label>
+                                        <div style="display: flex; align-items: center;">
+                                            <input type="radio" id="individual" name="premium_type" value="2">
+                                            <label for="individual" style="position: relative;top: 5px;left: 5px;">
+                                                Individual </label>&nbsp;
+                                            <input type="radio" id="single" name="premium_type" value="1">
+                                            <label for="single" style="position: relative;top: 5px;left: 5px;"> Single
+                                                Insurance </label>
+                                        </div>
+                                    </div>
                                 </div>
+                                <a href="#" id='copyfromexcel'>Copy from excel</a>
+                                <hr>
+
+                                <div class="form-row" id="grid_content_input" style="display: true;">
+                                </div>
+
+
+                                <div class="form-row" id="grid_content_from_excel" style="display: none;">
+
+                                    <p>Paste excel data here: <a href="#" type="button" onclick="copyHeaders(0)">Copy Excel Headers</a></p>
+                                    <textarea class="form-control excel_textarea" id="copied_excel_data" name="copied_excel_data" style="width:100%;height:200px;" oninput="generateTable(0)"></textarea><br>
+                                    <hr>
+                                    <div class="excel_table_class" id="excel_table" style="display: none;"></div>
+
+                                </div>
+
                             </div>
 
-                        </div>
-
-                        <hr>
-
-                        <div class="form-row" id="grid_content_input">
-                        </div>
+                            <div class="form-group text-right m-b-0" id="hide_smbt_btn">
+                                <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                                    id="btnGridSubmit_2">Submit</button>
+                            </div>
+                        </form>
 
                     </div>
 
-                    <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                            id="btnGridSubmit_2">Submit</button>
+                    <div class="tab-pane fade" id="secondary_rack_rate_tab">
+
+                        <form role="form" class="parsley-examples" method="post" id="AdditionalGridForm"
+                            enctype="multipart/form-data">
+                            <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+                            <input type="hidden" name="client_id" id="Client_id"
+                                value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
+                            <input type="hidden" name="client_policy_id" id="client_policy_id_2" />
+                            <input type="hidden" name="rack_rate_type" id="rack_rate_type" value="1" />
+                            <div class="form-group">
+
+                                <div class="form-row" id="rac_rate_dropdown">
+                                    <div class="form-group col-md-6">
+                                        <label for="emp_code">Policy Premium Type<span
+                                                class="text-danger">*</span></label>
+                                        <select data-secondary="1" class="form-control" id="additional_grid"
+                                            name="policy_grid_id" onchange="addGridHTML(event)" required>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4"
+                                        style="position: relative; left: 45px; display:none"
+                                        id="additional_rack_rate_premium_type">
+                                        <label for="css"> Premium Calculation </label>
+                                        <div style="display: flex; align-items: center;">
+                                            <input type="radio" id="individual_2" name="premium_type" value="2">
+                                            <label for="individual" style="position: relative;top: 5px;left: 5px;">
+                                                Individual </label>&nbsp;
+                                            <input type="radio" id="single_2" name="premium_type" value="1">
+                                            <label for="single" style="position: relative;top: 5px;left: 5px;"> Single
+                                                Insurance </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row" id="relationship">
+                                </div> <br>
+
+                                <a href="#" id='copyfromexcelforadditional'>Copy from excel</a>
+
+                                <hr>
+
+                                <div class="form-row" id="additional_grid_content_input" style="display: true;">
+                                </div>
+
+                                <div class="form-row" id="additional_grid_content_from_excel" style="display: none;">
+
+                                    <p>Paste excel data here: <a href="#" type="button" onclick="copyHeaders(1)">Copy Excel Headers</a></p>
+                                    <textarea class="form-control excel_textarea" id="additional_copied_excel_data" name="additional_copied_excel_data" style="width:100%;height:200px;" oninput="generateTable(1)"></textarea><br>
+                                    <hr>
+                                    <div class="excel_table_class" id="additional_excel_table" style="display: none;"></div>
+
+                                </div>
+
+                            </div>
+
+                            <div class="form-group text-right m-b-0" id="secondary_rack_rate_btn_grp">
+                                <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                                    id="additional_rack_rate_submit_btn">Submit</button>
+                            </div>
+                        </form>
+
                     </div>
-                </form>
+                </div>
+
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
@@ -61,23 +169,100 @@
 var policy_grid_id = $('#client_id').val();
 var grid_html = '';
 
-// $('#gmc_remove').hide();
 $('#btnGridSubmit').hide();
 
 $('.close').click(function() {
 
+    $('#grid_content_input').show();
+    $('#grid_content_from_excel').hide();
+
+    if ($('#copyfromexcel').text() == "Manual entry") {
+        $('#copyfromexcel').text("Copy from excel")
+    } else {
+        $('#copyfromexcel').text("Copy from excel");
+    }
+
+
+    $('#additional_grid_content_input').show();
+    $('#additional_grid_content_from_excel').hide();
+
+    if ($('#copyfromexcelforadditional').text() == "Manual entry") {
+        $('#copyfromexcelforadditional').text("Copy from excel")
+    } else {
+        $('#copyfromexcelforadditional').text("Copy from excel");
+    }
+
+
     for (var i = 1; i <= 13; i++) {
         $('#grid_' + i).remove();
+        $('#add_grid_' + i).remove();
+        $('#removeChild_' + i).remove();
     }
 });
 
+$('#copyfromexcel').click(function() {
+    
+    // alert('called');
+    // $('#copyfromexcel').toggle();
+    // $("#copied_excel_data").val(result.exampleMessage);
+    $('#copied_excel_data').val("");
+    if ($(this).text() == "Copy from excel") {
+        $(this).text("Manual entry")
 
-function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = false) {
+    } else {
+        $(this).text("Copy from excel");
+    }
 
-    $('#grid_content_input').empty();
+    $('#grid_content_input').toggle();
+    $('#grid_content_from_excel').toggle();
+
+
+
+});
+
+$('#copyfromexcelforadditional').click(function() {
+    
+    if ($(this).text() == "Copy from excel") {
+        $(this).text("Manual entry")
+
+    } else {
+        $(this).text("Copy from excel");
+    }
+
+    $('#additional_grid_content_input').toggle();
+    $('#additional_grid_content_from_excel').toggle();
+
+
+
+});
+
+function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = false, rr_type = false) {
+
+
+    var secondaryValue = $(event.target).data('secondary');
+    console.log('secondaryValue', secondaryValue)
+    console.log(rr_type);
+
+    if (!secondaryValue) {
+        secondaryValue = rr_type
+    }
+
+    console.log('secondaryValue', secondaryValue)
 
 
     var grid_container = document.getElementById('grid_content_input');
+    var additional_grid_container = document.getElementById('additional_grid_content_input');
+
+    var id_var = 'grid_'
+    if (secondaryValue == 1 || rr_type == 1) {
+        grid_container = additional_grid_container;
+        $('#additional_grid_content_input').empty();
+        var id_var = 'add_grid_'
+
+    } else {
+        $('#grid_content_input').empty();
+    }
+
     var dataIdValue = ''
     if (event === false) {
         var dataIdValue = ui_type
@@ -88,14 +273,15 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         // console.log('dataIdValue', dataIdValue)
     }
 
+    console.log(grid_container)
 
     if (dataIdValue == '1') {
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `              
-        <div class="form-row" id="grid_1">
+        <div class="form-row" id="${id_var}1">
             <input value="1" type="hidden"  name="policy_type">
 
             <div class="form-group col-md-4">
@@ -135,7 +321,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
                         <div class="form-group col-md-4" style="position: absolute;left: 870px;">
                             <button style="margin-top: 44px;position: relative;right: 0px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton()">x</button>
-                            <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more2" onclick="appendGridtHtml('1')">+</button>
+                            <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more2" onclick="appendGridtHtml('1', ${secondaryValue})">+</button>
                         </div>
                     </div>
 
@@ -163,7 +349,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                         </div>
                         <div class="form-group col-md-4" style="position: relative;right: 6px;">
                                 <button style="margin-top: 44px;position: relative;right: 0px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton()">x</button>
-                                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml('1')">+</button>
+                                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml('1', ${secondaryValue})">+</button>
                         </div>
                     </div>
                     <div id="si_or_bp_sum_insure_child"></div>
@@ -213,11 +399,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
     } else if (dataIdValue == '2') {
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_2" style="width:84%">   
+        <div class="form-row" id="${id_var}2" style="width:84%">   
             <input value="1" type="hidden"  name="policy_type">
             <div class="form-group col-md-6">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
@@ -235,11 +421,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_3" style="width:84%">   
+        <div class="form-row" id="${id_var}3" style="width:84%">   
             <div class="form-group col-md-5">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="3_si[]" id="3_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -252,7 +438,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0, 3)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(3)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(3, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
@@ -260,10 +446,10 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
         grid_html = `
-        <div class="form-row" id="grid_4" style="width:84%">   
+        <div class="form-row" id="${id_var}4" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="4_si" id="4_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -285,7 +471,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,4)">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(4)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(4, ${secondaryValue})">+</button>
                 </div>
             </div>
         </div>`;
@@ -294,11 +480,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_5" style="width:84%">   
+        <div class="form-row" id="${id_var}5" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="5_si[]" id="5_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -319,7 +505,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,5)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(5)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(5, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
@@ -327,11 +513,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_6" style="width:84%">   
+        <div class="form-row" id="${id_var}6" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="6_si" id="6_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -353,7 +539,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,6)">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(6)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(6, ${secondaryValue})">+</button>
                 </div>
             </div>
         </div>`;
@@ -362,11 +548,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_7" style="width:84%">   
+        <div class="form-row" id="${id_var}7" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="7_si[]" id="7_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -387,7 +573,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,7)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(7)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(7, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
@@ -395,13 +581,13 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
 
         grid_html = `
 
-        <div class="form-row" id="grid_8" style="width:84%">   
+        <div class="form-row" id="${id_var}8" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="8_si[]" id="8_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -418,18 +604,18 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,8)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(8)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(8, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
     } else if (dataIdValue == '9') {
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_2" style="width:84%">   
+        <div class="form-row" id="${id_var}9" style="width:84%">   
             <input value="1" type="hidden"  name="policy_type">
             <div class="form-group col-md-6">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
@@ -447,11 +633,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
-        <div class="form-row" id="grid_10" style="width:84%">   
+        <div class="form-row" id="${id_var}10" style="width:84%">   
             <div class="form-group col-md-3">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="10_si[]" id="10_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -472,19 +658,19 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,10)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(10)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(10, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
     } else if (dataIdValue == '11') {
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
 
-        <div class="form-row" id="grid_11" style="width:84%">   
+        <div class="form-row" id="${id_var}11" style="width:84%">   
             <div class="form-group col-md-2">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="11_si[]" id="11_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -506,19 +692,19 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,11)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(11)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(11, ${secondaryValue})">+</button>
             </div>
         </div>`;
 
     } else if (dataIdValue == '12') {
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
 
-            <div class="form-row" id="grid_12" style="width:84%">   
+            <div class="form-row" id="${id_var}12" style="width:84%">   
                 <div class="form-group col-md-2">
                     <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                     <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="12_si[]" id="12_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -544,19 +730,19 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,12)">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(12)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(12, ${secondaryValue})">+</button>
                 </div>
             </div>`;
 
     } else if (dataIdValue == '13') {
 
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
 
         grid_html = `
 
-                <div class="form-row" id="grid_13" style="width:84%">   
+                <div class="form-row" id="${id_var}13" style="width:84%">   
                     <div class="form-group col-md-2">
                         <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                         <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="13_si[]" id="13_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -590,13 +776,13 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                     </div>
                     <div class="form-group">
                         <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,13)">x</button>
-                        <button style="margin-top: 44px;position: absolute;margin-left: 5px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(13)">+</button>
+                        <button style="margin-top: 44px;position: absolute;margin-left: 5px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(13, ${secondaryValue})">+</button>
                     </div>
                 </div>`;
 
     } else {
         for (var i = 1; i <= 13; i++) {
-            $('#grid_' + i).remove();
+            $('#' + id_var + i).remove();
         }
         grid_html = '';
         $('#btnGridSubmit').hide();
@@ -608,7 +794,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
     if (dataIdValue == '1') {
         $('#gpa_sum_si').trigger('keyup');
         $('#gpa_sum_si2').trigger('keyup');
-       // $('input[name="gpa_sum_si[]"]').each(function() {
+        // $('input[name="gpa_sum_si[]"]').each(function() {
         //     console.log($(this));
         //     $(this).trigger('keyup');
         // });
@@ -628,7 +814,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 $("#GridForm").submit(function(event) {
 
-    var check = checkDuplicate();
+    var check = checkDuplicate(0);
 
 
     event.preventDefault();
@@ -649,8 +835,7 @@ $("#GridForm").submit(function(event) {
 
     var formData = new FormData($('#GridForm')[0]);
     var policy_form_action = '<?= base_url("client/premimum/create") ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+
 
     if (check) {
         $('.loader').fadeOut();
@@ -672,31 +857,85 @@ $("#GridForm").submit(function(event) {
                     return;
                 }
 
-                setTimeout(function() {
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    var message = (policy_PrimaryKey === '') ?
-                        'Policy Premium Added successfully' :
-                        'Policy Premium Added Successfully';
-                    toastr.success(message, 'Success');
-                    $('.close').click();
-                }, 1000);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                var message = (policy_PrimaryKey === '') ? 'Policy Premium Added successfully' :'Policy Premium Added Successfully';
+                toastr.success(message, 'Success');
+                // $('.close').click();
 
             },
             error: function(xhr, status, error) {
+
                 console.error(xhr.responseText);
                 console.error(status, error);
-                setTimeout(function() {
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    if (xhr.status === 404) {
-                        toastr.warning('Resource not found', 'Warning');
-                    } else if (xhr.status === 500) {
-                        toastr.warning('Internal server error', 'Warning');
-                    } else {
-                        toastr.warning('Unknown error occurred', 'Warning');
-                    }
-                }, 1000);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    }
+
+});
+
+
+$("#AdditionalGridForm").submit(function(event) {
+
+    var check = checkDuplicate(1);
+    event.preventDefault();
+
+    if ($('#grid_emp_count').val() == 'false') {
+        toastr.warning('Client has active employees', 'Warning');
+        return;
+    }
+
+    var isValid = $('#AdditionalGridForm').parsley().validate();
+    if (!isValid) {
+        console.log('Form is Empty', 'Warning');
+        return;
+    }
+
+    $('.loader').fadeIn();
+    $('.loader-mask').fadeIn();
+
+    var formData = new FormData($('#AdditionalGridForm')[0]);
+    var policy_form_action = '<?= base_url("client/premimum/create") ?>';
+
+
+    if (check) {
+        $('.loader').fadeOut();
+        $('.loader-mask').delay(350).fadeOut('slow');
+    } else {
+        $.ajax({
+            data: formData,
+            url: policy_form_action,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
+
+                console.log("Response", res);
+
+                if (res.status === false) {
+                    toastr.error('Policy Dose Not Create', 'Error');
+                    return;
+                }
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                var message = (policy_PrimaryKey === '') ?
+                    'Policy Additional Rack Rate Added successfully' :
+                    'Policy Additional Rack Rate Added Successfully';
+                toastr.success(message, 'Success');
+                $('.close').click();
+
+            },
+            error: function(xhr, status, error) {
+
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
             }
         });
     }
@@ -710,6 +949,7 @@ $('body').on('click', '.btnPolicyModel', function() {
 
     var client_policy_id = $(this).data('id');
     $('#client_policy_id').val(client_policy_id);
+    $('#client_policy_id_2').val(client_policy_id);
     // console.log('client_policy_id', client_policy_id)
 
     var policy_type_string = $(this).attr('id');
@@ -724,6 +964,20 @@ $('body').on('click', '.btnPolicyModel', function() {
         $('.loader-mask').fadeIn();
 
 
+        if (policy_type_string == 'GPA') {
+            $('#rack_rate_one').hide()
+            $('#rack_rate_two').hide()
+            $('#AdditionalGridForm').hide()
+            $('#additional_rack_rate_premium_type').hide()
+
+        } else {
+            $('#rack_rate_one').show()
+            $('#rack_rate_two').show()
+            $('#AdditionalGridForm').show()
+            $('#additional_rack_rate_premium_type').show()
+        }
+
+
         $.ajax({
             url: '<?= base_url("util/policy-premium") ?>',
             type: "GET",
@@ -733,53 +987,109 @@ $('body').on('click', '.btnPolicyModel', function() {
             dataType: 'json',
             success: function(res) {
 
-
+                if (res.self == "") {
+                    $('.close').click();
+                    toastr.warning('Unable to create rack rate due to the absence of policy terms.',
+                        'Warning');
+                }
 
                 $('#GridForm')[0].reset();
+                $('#AdditionalGridForm')[0].reset();
 
-                if(policy_type_string == 'GMC'){
+                if (policy_type_string == 'GMC') {
                     $('#premium_type').show();
                     $('#individual').prop('checked', true)
-                }else{
+                } else {
                     $('#premium_type').hide();
                     $('#individual').prop('checked', true)
                 }
 
+
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                }, 1000);
+                }, 500);
+
 
                 console.log('policy grid responce', res);
                 var temp_for_premiumData = JSON.parse(res.premiumData);
-                console.log('policy grid responce', temp_for_premiumData);
                 res.premiumData = JSON.parse(res.premiumData);
-                console.log('policy grid responce',  res.premiumData);
+
+                console.log('policy grid responce', res.premiumData);
+                console.log('policy name', res.policy_name);
 
 
-                $('#nameOfThePolicy').html(' - ' + res.policy_name);
+                $('#nameOfThePolicy').text(' - ' + res.policy_name);
                 $('#grid_emp_count').val(res.count);
 
 
                 if (res.count > 0) {
-                    console.log(' hide submit btn count ', res.count);
                     $("#hide_smbt_btn").hide();
+                    $("#secondary_rack_rate_btn_grp").hide();
                 } else {
                     $("#hide_smbt_btn").show();
-                    console.log('show submit btn count ', res.count);
+                    $("#secondary_rack_rate_btn_grp").show();
                 }
+                
 
                 if (res.status === false) {
                     toastr.error(res.status);
                     return;
                 }
 
-                var policy_grid_id_value = '';
-                if (res.premiumData && res.premiumData.length > 0 && res.premiumData[0]
-                    .policy_grid_id) {
-                    policy_grid_id_value = res.premiumData[0].policy_grid_id;
+                var policy_grid_id_value = null;
+                var secondary_policy_grid_id_value = null;
+                var secondary = 0;
+                var additional_relationship = null;
+                var premium_type_for_sec_rr = []
+                var premium_type_for_primary_rr = []
+
+                if (res.premiumData && res.premiumData.length > 0) {
+                    $.each(res.premiumData, function(index, item) {
+
+                        if (item.rack_rate_type == 0) {
+                            policy_grid_id_value = item.policy_grid_id;
+                            secondary = item.policy_grid_id;
+                            premium_type_for_sec_rr.push(item.premium_type);
+
+                        } else if (item.rack_rate_type == 1) {
+
+                            secondary_policy_grid_id_value = item.policy_grid_id;
+                            secondary = item.policy_grid_id;
+                            additional_relationship = item.additional_relationship;
+                            premium_type_for_sec_rr.push(item.premium_type);
+                        }
+                    });
+
                 }
 
+
+                if (premium_type_for_sec_rr.length > 0) {
+
+                    if (premium_type_for_sec_rr[0] == '2') {
+
+                        $('#individual_2').prop('checked', true)
+                        $('#single_2').prop('checked', false)
+
+                    } else if (premium_type_for_sec_rr[0] == '1') {
+
+                        $('#single_2').prop('checked', true)
+                        $('#individual_2').prop('checked', false)
+
+                    } else {
+
+                        $('#single_2').prop('checked', false)
+                        $('#individual_2').prop('checked', true)
+                    }
+
+                }
+
+                createCheckboxes(res.self, additional_relationship);
+
+
+                console.log('policy_grid_id_value', policy_grid_id_value);
+                console.log('secondary_policy_grid_id_value', secondary_policy_grid_id_value);
+
                 $('#grid_content_input').empty();
                 var policeGridOptionHTML = '';
                 policeGridOptionHTML += ` <option value="">Select Premium Type</option>`;
@@ -789,46 +1099,56 @@ $('body').on('click', '.btnPolicyModel', function() {
                             'selected="selected"' : '') + '>' + item.policy_grid_type +
                         '</option>';
                 });
+
+
+                $('#additional_grid_content_input').empty();
+                var policeGridOptionHTMLforSecondary = '';
+                policeGridOptionHTMLforSecondary +=
+                ` <option value="">Select Premium Type</option>`;
+                $.each(res.data, function(index, item) {
+                    policeGridOptionHTMLforSecondary += '<option data-id="' + item.ui_type +
+                        '" value="' + item.id + '" ' + (secondary_policy_grid_id_value ===
+                            item.id ?
+                            'selected="selected"' : '') + '>' + item.policy_grid_type +
+                        '</option>';
+                });
+
+
                 $('#grid').html(policeGridOptionHTML);
-                
+                $('#additional_grid').html(policeGridOptionHTMLforSecondary);
 
-                if (res.premiumData[0].hasOwnProperty('premium_type')) {
-
-                    if (res.premiumData[0].premium_type == '2') {
-
-                        $('#individual').prop('checked', true)
-                        $('#single').prop('checked', false)
-
-                    } else if (res.premiumData[0].premium_type == '1') {
-
-                        $('#single').prop('checked', true)
-                        $('#individual').prop('checked', false)
 
+                if (premium_type_for_primary_rr.length > 0) {
+                    if (premium_type_for_primary_rr[0] === '2') {
+                        $('#individual').prop('checked', true);
+                        $('#single').prop('checked', false);
+                    } else if (premium_type_for_primary_rr[0] === '1') {
+                        $('#single').prop('checked', true);
+                        $('#individual').prop('checked', false);
                     } else {
-                        $('#single').prop('checked', false)
-                        $('#individual').prop('checked', true)
+                        $('#single').prop('checked', false);
+                        $('#individual').prop('checked', true);
                     }
-
                 }
 
 
                 var si_or_bp_value = '';
                 if (res.premiumData && res.premiumData.length > 0) {
 
-
                     if (res.premiumData[0].si_or_bp) {
                         si_or_bp_value = res.premiumData[0].si_or_bp;
                     }
 
                     addGridHTML(false, res.premiumData[0], res.premiumData[0].policy_grid_id,
-                        si_or_bp_value);
+                        si_or_bp_value, res.premiumData[0].rack_rate_type);
 
                     res.premiumData.shift();
                     $.each(res.premiumData, function(index, item) {
+
                         if (item.si_or_bp == '1') {
-                            appendGridtHtml('1', item);
+                            appendGridtHtml('1', item.rack_rate_type, item);
                         } else {
-                            appendGridtHtml(item.policy_grid_id, item);
+                            appendGridtHtml(item.policy_grid_id, item.rack_rate_type, item);
                         }
                     });
 
@@ -860,7 +1180,12 @@ $('body').on('click', '.btnPolicyModel', function() {
                     $(this).trigger('keyup');
                 });
 
-                var id_for_trigger = temp_for_premiumData[0].policy_grid_id;
+                var id_for_trigger = [];
+                if (temp_for_premiumData.length > 0 && temp_for_premiumData[0] !== undefined) {
+                    id_for_trigger = temp_for_premiumData[0].policy_grid_id;
+                } 
+
+
                 $(`input[name="${id_for_trigger}_si[]"]`).each(function() {
                     // console.log($(this));
                     $(this).trigger('keyup');
@@ -897,6 +1222,9 @@ $('body').on('click', '.btnPolicyModel', function() {
 
 
 $('#grid').change(function() {
+
+    $('.excel_textarea').val('');
+
     var grid_id = $(this)[0].value;
     var client_policy_id = $('#client_policy_id')[0].value;
 
@@ -969,11 +1297,9 @@ $('#grid').change(function() {
                         si_or_bp_value = res.premiumData[0].si_or_bp;
 
                         $('#si_or_bp').val(si_or_bp_value);
-
                     }
 
 
-
                     addGridHTML(false, res.premiumData[0], res.premiumData[0].policy_grid_id,
                         si_or_bp_value);
 
@@ -1005,9 +1331,125 @@ $('#grid').change(function() {
     });
 })
 
+
+$('#additional_grid').change(function() {
+
+    $('.excel_textarea').val('');
+
+    var grid_id = $(this)[0].value;
+    var client_policy_id = $('#client_policy_id')[0].value;
+
+
+    $('.loader').fadeIn();
+    $('.loader-mask').fadeIn();
+
+    $.ajax({
+        url: '<?= base_url("util/policy-premium") ?>',
+        type: "GET",
+        data: {
+            client_policy_id: client_policy_id
+        },
+        dataType: 'json',
+        success: function(res) {
+
+            console.log('responce :', res);
+
+            setTimeout(function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }, 1000);
+
+            if (res.count > 0) {
+                // console.log(' hide submit btn count ', res.count);
+                $("#secondary_rack_rate_btn_grp").hide();
+            } else {
+                $("#secondary_rack_rate_btn_grp").show();
+                // console.log('show submit btn count ', res.count);
+            }
+
+            if (res.premiumData.length > 0 && res.premiumData[0].policy_grid_id === grid_id) {
+
+                $('#nameOfThePolicy').html(' - ' + res.policy_name);
+                $('#grid_emp_count').val(res.count);
+
+                if (res.count > 0) {
+                    // console.log(' hide submit btn count ', res.count);
+                    $("#secondary_rack_rate_btn_grp").hide();
+                } else {
+                    $("#secondary_rack_rate_btn_grp").show();
+                    // console.log('show submit btn count ', res.count);
+                }
+
+                if (res.status === false) {
+                    toastr.error(res.status);
+                    return;
+                }
+
+                var policy_grid_id_value = '';
+                if (res.premiumData && res.premiumData.length > 0 && res.premiumData[0]
+                    .policy_grid_id) {
+                    policy_grid_id_value = res.premiumData[0].policy_grid_id;
+                }
+
+                $('#additional_grid_content_input').empty();
+                var policeGridOptionHTML = '';
+                policeGridOptionHTML += ` <option value="">Select Premium Type</option>`;
+                $.each(res.data, function(index, item) {
+                    policeGridOptionHTML += '<option data-id="' + item.ui_type +
+                        '" value="' + item.id + '" ' + (policy_grid_id_value === item.id ?
+                            'selected="selected"' : '') + '>' + item.policy_grid_type +
+                        '</option>';
+                });
+
+                // $('#grid').html(policeGridOptionHTML);
+
+                var si_or_bp_value = '';
+                if (res.premiumData && res.premiumData.length > 0) {
+
+                    if (res.premiumData[0].si_or_bp) {
+                        si_or_bp_value = res.premiumData[0].si_or_bp;
+
+                        $('#si_or_bp').val(si_or_bp_value);
+
+                    }
+
+
+                    addGridHTML(false, res.premiumData[0], res.premiumData[0].policy_grid_id,
+                        si_or_bp_value, 1);
+
+                    res.premiumData.shift();
+                    $.each(res.premiumData, function(index, item) {
+                        appendGridtHtml(item.policy_grid_id, item, 1);
+                    });
+
+                } else {
+                    console.log("res.premiumData is undefined, null, or empty.");
+                }
+            } else if (res.data[0].policy_type == "GPA") {
+                $('#si_or_bp').val('2');
+
+                setTimeout(() => {
+                    $('#si_or_bp').trigger('change')
+                }, 300);
+            }
+        },
+        error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            setTimeout(function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                toastr.warning('Something Wrong!', 'warning');
+            }, 1000);
+        }
+    });
+})
+
+
+
 var Count = 1
 
-function appendGridtHtml(ui_type = false, data = false, ) {
+function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
 
     // console.log('appendGridtHtml function called')
     // console.log(ui_type)
@@ -1018,17 +1460,21 @@ function appendGridtHtml(ui_type = false, data = false, ) {
     Count++;
     var container = document.getElementById('grid_content_input');
 
+    if (secondary == 1) {
+        container = document.getElementById('additional_grid_content_input')
+    }
+
     if (ui_type == '1') {
 
         // console.log('step 1')
         var currentTime = getCurrentTime();
         // console.log(currentTime);
 
-            if($("#si_or_bp").val() == 1 || data.si_or_bp == '1'){
+        if ($("#si_or_bp").val() == 1 || data.si_or_bp == '1') {
 
-                // console.log('step 2')
+            // console.log('step 2')
 
-                html = `<div class="form-row gpa_sum_insure_remove" style="width:101%" id="removeChild_${Count}">
+            html = `<div class="form-row gpa_sum_insure_remove" style="width:101%" id="removeChild_${Count}">
                             <div class="form-group col-md-4" id="">
                                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="gpa_sum_si[]" id="gpa_sum_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
@@ -1042,15 +1488,15 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                             </div>
                             <div class="form-group">
                                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml('1')">+</button>
+                                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml('1', ${secondary})">+</button>
                             </div>
                         </div>`;
 
-            }else if($("#si_or_bp").val() == 3 || data.si_or_bp == '3'){
+        } else if ($("#si_or_bp").val() == 3 || data.si_or_bp == '3') {
 
-                // console.log('step 3')
+            // console.log('step 3')
 
-                html = `<div class="form-row gpa_band_remove" style="width:101%" id="removeChild_${Count}">
+            html = `<div class="form-row gpa_band_remove" style="width:101%" id="removeChild_${Count}">
                             
                             <div class="form-group col-md-2" id="">
                                 <label for="mobile">Band/Grade<span class="text-danger">*</span></label>
@@ -1071,11 +1517,11 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                             
                             <div class="form-group">
                                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml('1')">+</button>
+                                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml('1', ${secondary})">+</button>
                             </div>
                         </div>`;
 
-            }
+        }
 
         // console.log('step 4')
 
@@ -1095,7 +1541,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(3)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(3, ${secondary})">+</button>
                 </div>
             </div>
         `;
@@ -1120,7 +1566,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(4)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(4, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1149,7 +1595,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(5)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(5, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1172,7 +1618,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(6)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(6, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1200,7 +1646,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(7)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(7, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1224,7 +1670,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(8)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(8, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1248,7 +1694,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(9)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(9, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1276,7 +1722,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                 </div>
                 <div class="form-group">
                     <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(10)">+</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(10, ${secondary})">+</button>
                 </div>
             </div>`;
 
@@ -1305,7 +1751,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
                     </div>
                     <div class="form-group">
                         <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                        <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(11)">+</button>
+                        <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(11, ${secondary})">+</button>
                     </div>
                 </div>`;
     } else if (ui_type == '12') {
@@ -1337,7 +1783,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(12)">+</button>
+                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(12, ${secondary})">+</button>
             </div>
         </div>`;
     } else if (ui_type == '13') {
@@ -1377,7 +1823,7 @@ function appendGridtHtml(ui_type = false, data = false, ) {
             </div>
             <div class="form-group">
                 <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(${Count})">x</button>
-                <button style="margin-top: 44px;position: absolute;margin-left: 5px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(13)">+</button>
+                <button style="margin-top: 44px;position: absolute;margin-left: 5px;" type="button" class="btn btn-primary" id="gmc_add_more_${Count}" onclick="appendGridtHtml(13, ${secondary})">+</button>
             </div>
         </div>`;
     }
@@ -1387,12 +1833,12 @@ function appendGridtHtml(ui_type = false, data = false, ) {
 
     container.insertAdjacentHTML('beforeend', html);
 
-    $('#gmc_add_more').hide();
-    $('#gmc_add_more2').hide();
-    $('#gmc_remove').show();
-    Count--
-    $('#gmc_add_more_' + Count).hide()
-    Count++
+    // $('#gmc_add_more').hide();
+    // $('#gmc_add_more2').hide();
+    // $('#gmc_remove').show();
+    // Count--
+    // $('#gmc_add_more_' + Count).hide()
+    // Count++
 
 
     // Number to word 
@@ -1437,12 +1883,25 @@ function removebutton(index, type) {
 
 }
 
-function checkDuplicate() {
+function checkDuplicate(val) {
 
-    if ($('#grid')[0].value === '3') {
+    $('#additional_grid_content_input');
+    $('#grid_content_input')
 
-        var siInputs = $('input[name="3_si[]"]');
-        var premiumInputs = $('input[name="3_premium[]"]');
+    var id = $('#additional_grid')[0];
+    var container = $('#additional_grid_content_input');
+    if (val == 0) {
+        id = $('#grid')[0];
+        container = $('#grid_content_input');
+    }
+
+    console.log(id);
+    console.log(container);
+
+    if (id.value === '3') {
+
+        var siInputs = container.find('input[name="3_si[]"]');
+        var premiumInputs = container.find('input[name="3_premium[]"]');
 
         var siValues = [];
         var premiumValues = [];
@@ -1472,10 +1931,10 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '4') {
+    } else if (id.value === '4') {
 
-        var ageFrom = $('input[name="4_age_from[]"]');
-        var ageTo = $('input[name="4_age_to[]"]');
+        var ageFrom = container.find('input[name="4_age_from[]"]');
+        var ageTo = container.find('input[name="4_age_to[]"]');
 
         var ageFromValues = [];
         var ageToValues = [];
@@ -1506,10 +1965,10 @@ function checkDuplicate() {
             return false;
         }
 
-    } else if ($('#grid')[0].value === '5') {
-        var si = $('input[name="5_si[]"]');
-        var ageFrom = $('input[name="5_age_from[]"]');
-        var ageTo = $('input[name="5_age_to[]"]');
+    } else if (id.value === '5') {
+        var si = container.find('input[name="5_si[]"]');
+        var ageFrom = container.find('input[name="5_age_from[]"]');
+        var ageTo = container.find('input[name="5_age_to[]"]');
 
         var si_array = [];
         var ageFrom_array = [];
@@ -1544,9 +2003,9 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '6') {
-        var ageFrom = $('input[name="6_age_from[]"]');
-        var ageTo = $('input[name="6_age_to[]"]');
+    } else if (id.value === '6') {
+        var ageFrom = container.find('input[name="6_age_from[]"]');
+        var ageTo = container.find('input[name="6_age_to[]"]');
 
         var ageFromValues = [];
         var ageToValues = [];
@@ -1576,10 +2035,10 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '7') {
-        var si = $('input[name="7_si[]"]');
-        var ageFrom = $('input[name="7_age_from[]"]');
-        var ageTo = $('input[name="7_age_to[]"]');
+    } else if (id.value === '7') {
+        var si = container.find('input[name="7_si[]"]');
+        var ageFrom = container.find('input[name="7_age_from[]"]');
+        var ageTo = container.find('input[name="7_age_to[]"]');
 
         var si_array = [];
         var ageFrom_array = [];
@@ -1614,10 +2073,10 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '10') {
-        var si = $('input[name="10_si[]"]');
-        var ageFrom = $('input[name="10_age_from[]"]');
-        var ageTo = $('input[name="10_age_to[]"]');
+    } else if (id.value === '10') {
+        var si = container.find('input[name="10_si[]"]');
+        var ageFrom = container.find('input[name="10_age_from[]"]');
+        var ageTo = container.find('input[name="10_age_to[]"]');
 
         var si_array = [];
         var ageFrom_array = [];
@@ -1653,9 +2112,9 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '8') {
-        var siInputs = $('input[name="8_si[]"]');
-        var gradeInputs = $('input[name="8_grade[]"]');
+    } else if (id.value === '8') {
+        var siInputs = container.find('input[name="8_si[]"]');
+        var gradeInputs = container.find('input[name="8_grade[]"]');
 
         var siValues = [];
         var gradeValues = [];
@@ -1685,9 +2144,9 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '9') {
-        var siInputs = $('input[name="9_si[]"]');
-        var gradeInputs = $('input[name="9_grade[]"]');
+    } else if (id.value === '9') {
+        var siInputs = container.find('input[name="9_si[]"]');
+        var gradeInputs = container.find('input[name="9_grade[]"]');
 
         var siValues = [];
         var gradeValues = [];
@@ -1717,10 +2176,10 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    } else if ($('#grid')[0].value === '11') {
-        var siInputs = $('input[name="11_si[]"]');
-        var gradeInputs = $('input[name="11_grade[]"]');
-        var maxSiInputs = $('input[name="11_max_si[]"]');
+    } else if (id.value === '11') {
+        var siInputs = container.find('input[name="11_si[]"]');
+        var gradeInputs = container.find('input[name="11_grade[]"]');
+        var maxSiInputs = container.find('input[name="11_max_si[]"]');
 
         var siValues = [];
         var gradeValues = [];
@@ -1758,13 +2217,13 @@ function checkDuplicate() {
         } else {
             return false;
         }
-    }else if ($('#grid')[0].value === '1') {
+    } else if (id.value === '1') {
         var selectedValue = $('#si_or_bp').val();
 
-        if(selectedValue == 1){
+        if (selectedValue == 1) {
 
-            var siInputs = $('input[name="gpa_sum_si[]"]');
-            var premiumInputs = $('input[name="gpa_sum_premium[]"]');
+            var siInputs = container.find('input[name="gpa_sum_si[]"]');
+            var premiumInputs = container.find('input[name="gpa_sum_premium[]"]');
 
             var siValues = [];
             var premiumValues = [];
@@ -1800,11 +2259,11 @@ function checkDuplicate() {
                 return false;
             }
 
-        }else if(selectedValue == 3){
+        } else if (selectedValue == 3) {
 
-            var siInputs = $('input[name="gpa_sum_si2[]"]');
-            var premiumInputs = $('input[name="gpa_sum_premium2[]"]');
-            var bandInputs = $('input[name="gpa_band[]"]');
+            var siInputs = container.find('input[name="gpa_sum_si2[]"]');
+            var premiumInputs = container.find('input[name="gpa_sum_premium2[]"]');
+            var bandInputs = container.find('input[name="gpa_band[]"]');
 
             var siValues = [];
             var premiumValues = [];
@@ -1861,7 +2320,7 @@ function checkDuplicate() {
 }
 
 function basicPayMultiple(input) {
-    
+
     if (input.id == 'basic_pay') {
         var multi = $('#basic_multiplier')[0].value.replace(/,/g, '') * input.value.replace(/,/g, '');
 
@@ -1877,7 +2336,8 @@ function basicPayMultiple(input) {
         var multi = input.value * $('#basic_pay')[0].value.replace(/,/g, '');
         $('#gpa_basic_si').val(multi).trigger('keyup');
 
-        var multi_2 = $('#gpa_basic_si')[0].value.replace(/,/g, '') * $('#premium_multiplier')[0].value.replace(/,/g,'');
+        var multi_2 = $('#gpa_basic_si')[0].value.replace(/,/g, '') * $('#premium_multiplier')[0].value.replace(/,/g,
+            '');
         $('#gpa_basic_premium').val(multi_2).trigger('keyup');
 
     } else if (input.id == 'premium_multiplier') {
@@ -1897,11 +2357,11 @@ function basicPayMultiple(input) {
 function gpaSumInsureMultiplier(element) {
 
     // console.log(element);
-    
-    var element = $('#gpa_sum_multiplier')[0];
-    var sumInsured =  $('input[name="gpa_sum_si[]"]');
 
-    if ($('#si_or_bp').val() == 3) { 
+    var element = $('#gpa_sum_multiplier')[0];
+    var sumInsured = $('input[name="gpa_sum_si[]"]');
+
+    if ($('#si_or_bp').val() == 3) {
 
         var element = $('#gpa_sum_multiplier2')[0]
         var sumInsured = $('input[name="gpa_sum_si2[]"]')
@@ -1913,7 +2373,7 @@ function gpaSumInsureMultiplier(element) {
         var premium = $('input[name="premium[]"]');
     } else if ($('#si_or_bp').val() == 3) {
         var premium = $('input[name="gpa_sum_premium2[]"]');
-    }else {
+    } else {
         var premium = $('input[name="gpa_sum_premium[]"]');
     }
 
@@ -1995,11 +2455,11 @@ function si_orbp_change_function() {
         $('.gpa_sum_insure_remove').show();
         $('.gpa_band_remove').hide();
 
-        var count = $("div.form-row.gpa_sum_insure_remove").length;  
-        
-        if(count == 0){
+        var count = $("div.form-row.gpa_sum_insure_remove").length;
+
+        if (count == 0) {
             $('#gmc_add_more').show();
-        }else{
+        } else {
             $('#gmc_add_more').hide();
         }
 
@@ -2050,15 +2510,15 @@ function si_orbp_change_function() {
         elementsToUnhide.show();
 
     } else if (selectedValue == 3) {
-        
+
         $('.gpa_sum_insure_remove').hide();
         $('.gpa_band_remove').show();
 
-        var count = $("div.form-row.gpa_band_remove").length; 
-        
-        if(count == 0){
+        var count = $("div.form-row.gpa_band_remove").length;
+
+        if (count == 0) {
             $('#gmc_add_more2').show();
-        }else{
+        } else {
             $('#gmc_add_more2').hide();
         }
 
@@ -2118,17 +2578,57 @@ function si_orbp_change_function() {
 }
 
 function getCurrentTime() {
-  var now = new Date();
-  var hours = now.getHours();
-  var minutes = now.getMinutes();
-  var ampm = hours >= 12 ? 'PM' : 'AM';
-  hours = hours % 12;
-  hours = hours ? hours : 12; // 0 should be considered as 12
-  minutes = minutes < 10 ? '0' + minutes : minutes; // Add leading zero if minutes < 10
-  var timeString = hours + ':' + minutes + ' ' + ampm;
-  return timeString;
+    var now = new Date();
+    var hours = now.getHours();
+    var minutes = now.getMinutes();
+    var ampm = hours >= 12 ? 'PM' : 'AM';
+    hours = hours % 12;
+    hours = hours ? hours : 12; // 0 should be considered as 12
+    minutes = minutes < 10 ? '0' + minutes : minutes; // Add leading zero if minutes < 10
+    var timeString = hours + ':' + minutes + ' ' + ampm;
+    return timeString;
+}
+
+
+function createCheckboxes(obj, additional_relationship) {
+    console.log('createCheckboxes function called');
+
+    console.log(additional_relationship);
+    try {
+        additional_relationship = JSON.parse(additional_relationship);
+        console.log(additional_relationship);
+    } catch (error) {
+        console.error("Error parsing additional_relationship:", error);
+        return;
+    }
+
+    $('#relationship').empty();
+    const $relationshipElement = $('#relationship');
+    let html = ` <div class="col-12">
+                    <label>Additional Premium Applicable to</label>
+                </div>`;
+    const multiplier = 7; // Adjust this value as needed
+
+    $.each(obj, function(key, value) {
+        if (value > 0 && key != 'either-parents-pil') {
+            const isChecked = additional_relationship && typeof additional_relationship === 'object' && additional_relationship[key] == 1 ? 'checked' : '';
+            key = formatString(key);
+            console.log('isChecked', isChecked);
+            html += `
+                    <div class="col-2">
+                        <input type="checkbox" name="${key}" ${isChecked}>
+                        <label style="position: relative;left: 18px;bottom: 30px;">${key}</label>
+                    </div>`;
+            // console.log(html);
+        }
+    });
+
+    $relationshipElement.append(html);
 }
 
 
 
+function formatString(str) {
+    return str.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+}
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_grid_excel.php b/app/Views/policy_grid_excel.php
new file mode 100644
index 00000000..009c6bb6
--- /dev/null
+++ b/app/Views/policy_grid_excel.php
@@ -0,0 +1,412 @@
+<style>
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+td,
+th {
+    padding: 0.2rem;
+}
+
+.error {
+    background-color: #f8d7da;
+}
+
+.duplicate {
+    background-color: #fff3cd;
+}
+
+.container {
+    margin-top: 20px;
+}
+
+.compact-table td,
+.compact-table th {
+    padding: 0.1rem;
+}
+</style>
+
+
+
+<script>
+    const formatType = 0; // Specify the format type here
+    const excel_headers = {
+        3: {
+            "sum_insured": "Sum Insured",
+            "premium": "Premium"
+        },
+        4: {
+            "sum_insured": "Sum Insured",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        },
+        5: {
+            "sum_insured": "Sum Insured",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        },
+        6: {
+            "sum_insured": "Sum Insured",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        },
+        7: {
+            "sum_insured": "Sum Insured",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        },
+        8: {
+            "sum_insured": "Sum Insured",
+            "grade": "Grade",
+            "premium": "Premium"
+        },
+        9: {
+            "sum_insured": "Sum Insured",
+            "premium": "Premium"
+        },
+        10: {
+            "sum_insured": "Sum Insured",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        },
+        11: {
+            "sum_insured": "Sum Insured",
+            "grade": "Grade",
+            "premium": "Premium",
+            "max_si": "Max Si"
+        },
+        12: {
+            "sum_insured": "Sum Insured",
+            "relationship": "Relationship",
+            "premium": "Premium"
+        },
+        13: {
+            "sum_insured": "Sum Insured",
+            "relationship": "Relationship",
+            "from_age": "From Age",
+            "to_age": "To Age",
+            "premium": "Premium"
+        }
+
+    };
+
+    function slugify(text) {
+        return text.toString().toLowerCase().replace(/\s+/g, '_').replace(/[^\w\-]+/g, '').replace(/\-\-+/g, '_')
+            .replace(/^-+/, '').replace(/-+$/, '');
+    }
+
+    function copyHeaders(rack_rate_type) {
+
+        let formatType = $('#grid').val();
+        var obj = $('#grid');
+        if(rack_rate_type == 1){
+            formatType = $('#additional_grid').val();
+            obj = $('#additional_grid');
+        }
+
+        console.log(obj)
+        console.log(formatType)
+
+        if(!formatType && formatType == ""){
+            toastr.warning('Please select the Policy Premium Type', 'Warning');
+            return;
+        }
+        const headerString = Object.values(excel_headers[formatType]).join("\t"); // Using specified format type for copying headers
+        navigator.clipboard.writeText(headerString).then(function() {
+            toastr.success('Headers copied to clipboard', 'success');
+        }, function(err) {
+            toastr.error(err, 'Could not copy headers:');
+        });
+    }
+
+    function generateTable(rack_rate_type) {
+
+        var data = $('#copied_excel_data').val();
+        let formatType = $('#grid').val();
+        var obj = $('#grid');
+        
+        if (rack_rate_type == 1) {
+            data = $('#additional_copied_excel_data').val();
+            formatType = $('#additional_grid').val();
+            obj = $('#additional_grid');
+        }
+
+        console.log(obj);
+        console.log(formatType);
+        console.log(data);
+
+        if (!formatType || formatType == "") {
+            $('.excel_table_class').empty();
+            $('.excel_textarea').val('');
+            toastr.warning('Please select the Policy Premium Type', 'Warning');
+            return;
+        }
+
+        // Check if Excel data is empty
+        if (!data.trim()) {
+            toastr.warning('Excel data is empty.', 'Warning');
+            return;
+        }
+
+        var rows = data.split("\n");
+
+        // Filter out empty rows
+        rows = rows.filter(rowText => rowText.split("\t").some(cell => cell.trim()));
+
+        if (rows.length === 0) {
+            toastr.warning('All rows are empty after filtering.', 'Warning');
+            return;
+        }
+
+        var header = rows[0].split("\t");
+
+        // Determine the columns to keep (non-empty columns)
+        var columnsToKeep = [];
+        for (let i = 0; i < header.length; i++) {
+            if (rows.some(rowText => rowText.split("\t")[i].trim())) {
+                columnsToKeep.push(i);
+            }
+        }
+
+        // Filter header based on columns to keep
+        header = columnsToKeep.map(i => slugify(header[i]));
+
+        if (!excel_headers[formatType]) {
+            toastr.warning("Unknown format type. Please check the header columns.", 'Warning');
+            $('.excel_table_class').empty();
+            $('.excel_textarea').val('');
+            return;
+        }
+
+        var expectedHeader = Object.keys(excel_headers[formatType]);
+
+        if (JSON.stringify(header) !== JSON.stringify(expectedHeader)) {
+            const expectedHeaders = JSON.stringify(Object.values(excel_headers[formatType]));
+            const receivedHeaders = JSON.stringify(columnsToKeep.map(i => rows[0].split("\t")[i]));
+
+            Swal.fire({
+                title: "Header Mismatch",
+                html: `
+                    <p>Header columns do not match expected format:</p>
+                    <p><strong>Expected:</strong> ${expectedHeaders}</p>
+                    <p><strong>Received:</strong> ${receivedHeaders}</p>
+                `,
+                icon: "error"
+            });
+            $('.excel_table_class').empty();
+            $('.excel_textarea').val('');
+            return;
+        }
+
+        var table = $('<table class="table table-striped compact-table" />');
+        var uniqueRows = new Set();
+        var emptyCellCount = 0;
+
+        rows.forEach((rowText, y) => {
+            var cells = rowText.split("\t").filter((_, i) => columnsToKeep.includes(i));
+            var row = $('<tr />');
+
+            // Skip empty rows after filtering columns
+            if (cells.every(cell => !cell.trim())) {
+                return;
+            }
+
+            cells.forEach(cellText => {
+                row.append('<td>' + cellText + '</td>');
+                if (!cellText.trim()) {
+                    emptyCellCount++;
+                }
+            });
+
+            var key;
+            switch (formatType) {
+                case 3:
+                    key = cells[0] + "|" + cells[1] // Sum Insured, Premium
+                    break;
+                case 4:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, From Age, To Age, Premium
+                    break;
+                case 5:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, From Age, To Age, Premium
+                    break;
+                case 6:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, From Age, To Age, Premium
+                    break;
+                case 7:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, From Age, To Age, Premium
+                    break;
+                case 8:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2]; // Sum Insured, Grade, Premium
+                    break;
+                case 9:
+                    key = cells[0] + "|" + cells[1]; // Sum Insured, Premium
+                    break;
+                case 10:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, From Age, To Age, Premium
+                    break;
+                case 11:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3]; // Sum Insured, Grade, Premium, Max SI
+                    break;
+                case 12:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2]; // Sum Insured, Relationship, Premium
+                    break;
+                case 13:
+                    key = cells[0] + "|" + cells[1] + "|" + cells[2] + "|" + cells[3] + "|" + cells[4]; // Sum Insured, Relationship, From Age, To Age, Premium
+                    break;
+                default:
+                    key = cells.join("|");
+
+            }
+
+            if (y > 0 && uniqueRows.has(key)) {
+                row.addClass('duplicate');
+            } else {
+                uniqueRows.add(key);
+            }
+            table.append(row);
+        });
+
+        if (rack_rate_type == 1) {
+            $('#additional_excel_table').empty();
+            $('#additional_excel_table').html(table);
+        } else if (rack_rate_type == 0) {
+            $('#excel_table').empty();
+            $('#excel_table').html(table);
+        }
+
+        if ($('.duplicate').length > 0) {
+            console.log('test');
+            toastr.warning("Duplicates found!", "warning");
+            $('.excel_table_class').empty();
+            $('.excel_textarea').val('');
+        }
+
+        if (emptyCellCount > 0) {
+            toastr.warning('Number of empty cells: ' + emptyCellCount);
+            $('.excel_table_class').empty();
+            $('.excel_textarea').val('');
+        }
+        submitData(rack_rate_type);
+    }
+
+
+    function submitData(rack_rate_type) {
+
+        let formatType = $('#grid').val();
+        var table = $('#excel_table table');
+        var obj = $('#grid');
+
+        if(rack_rate_type == 1){
+
+            formatType = $('#additional_grid').val();
+            table = $('#additional_excel_table table');
+            obj = $('#additional_grid');
+        }
+
+
+        var headers = $(table).find('tr').first().find('td').map(function() {
+            return slugify($(this).text());
+        }).get();
+
+        var rows = $(table).find('tr:gt(0)').map(function() {
+            return $(this).find('td').map(function() {
+                return $(this).text();
+            }).get();
+        }).get();
+
+        var jsonData = [];
+
+        $(table).find('tr:gt(0)').each(function(idx) {
+            var row = $(this).find('td').map(function() {
+                return $(this).text();
+            }).get();
+            var rowData = {};
+            row.forEach((cell, colIdx) => {
+                rowData[headers[colIdx]] = cell;
+            });
+            jsonData.push(rowData);
+        });
+
+        console.log(jsonData);
+
+        jsonData.forEach(obj => {
+
+            if ('sum_insured' in obj) {
+                obj.si = obj.sum_insured;
+                delete obj.sum_insured;
+            }
+
+            if ('from_age' in obj) {
+                obj.age_from = obj.from_age;
+                delete obj.from_age;
+            }
+
+            if ('to_age' in obj) {
+                obj.age_to = obj.to_age;
+                delete obj.to_age;
+            }
+        });
+
+        console.log(jsonData);
+
+
+        if(rack_rate_type == 1){
+
+            $('#additional_grid_content_input').empty()
+
+            if ($('#copyfromexcelforadditional').text() == "Manual entry") {
+                $('#copyfromexcelforadditional').text("Copy from excel")
+            } else {
+                $('#copyfromexcelforadditional').text("Copy from excel");
+            }
+
+            $('#additional_grid_content_input').toggle();
+            $('#additional_grid_content_from_excel').toggle();
+
+        }else{
+
+            $('#grid_content_input').empty()
+
+            if ($('#copyfromexcel').text() == "Manual entry") {
+                $('#copyfromexcel').text("Copy from excel")
+            } else {
+                $('#copyfromexcel').text("Copy from excel");
+            }
+
+            $('#grid_content_input').toggle();
+            $('#grid_content_from_excel').toggle();
+
+
+        }
+
+        $.each(jsonData, function(index, item) {
+            appendGridtHtml(formatType, rack_rate_type, item)
+        });
+
+
+        $('input[name="11_max_si[]"]').each(function() {
+            $(this).trigger('keyup');
+        });
+
+
+        $(`input[name="${formatType}_si[]"]`).each(function() {
+            // console.log($(this));
+            $(this).trigger('keyup');
+        });
+
+        $(`input[name="${formatType}_premium[]"]`).each(function() {
+            // console.log($(this));
+            $(this).trigger('keyup');
+        });
+
+
+
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index e004bb33..0e2c6854 100644
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -84,7 +84,7 @@
 
                 <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
-                        <h4 class="header-title" style="position: relative;">Transaction Details</h4>
+                        <h4 style="position: relative;">Transaction Details</h4>
                     </div>
 
                     <div class="col-6" style="text-align: right; position: relative;top: 53px;">