diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7917751a..041caaa3 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -114,6 +114,7 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) { $routes->group("terms", ["filter" => "authMVC"], function ($routes) { $routes->post("gpa_create", "ClientController::policyGPATerms"); $routes->post("edit", "ClientController::editClientPolicyPremium"); + $routes->post("other_terms", "ClientController::otherPolicyTermsFormSubmit"); }); }); @@ -206,6 +207,14 @@ $routes->group("/master", ["filter" => "authMVC"], function ($routes) { $routes->get("remove/(:any)", "MasterController::removePolicyPolicies/$1"); }); }); + + $routes->group("cash_deposite", ["filter" => "authMVC"], function ($routes) { + $routes->get("list", "MasterController::CDMasterList"); + $routes->post("create", "MasterController::createCDMasterData"); + $routes->post("edit", "MasterController::editCDMasterData"); + $routes->get("list/(:any)", "MasterController::getCDMasterDataByID/$1"); + // $routes->get("remove/(:any)", "MasterController::policyTypeRemove/$1"); + }); }); @@ -234,6 +243,11 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->get("get-client-branch/(:any)", "ClientController::getClientBranch/$1"); $routes->get("get-client-details/(:any)", "ClientController::getClientAllDetailsByUsingClientID/$1"); $routes->get("delete-additional-rack-rate/(:any)", "ClientController::deleteAdditionalRackRate/$1"); + $routes->get("check_cd_ac_no/(:any)", "MasterController::checkUniqueCDAccountNumber/$1"); + $routes->get("get_cd_ac/(:any)", "ClientController::get_cd_ac/$1"); + $routes->get("check_policy_type/(:any)", "ClientController::checkPolicyType/$1"); + $routes->get("getPolicyTerms/(:any)", "ClientController::getPolicyTerms/$1"); + $routes->get("getPolicyTermsFormJson/(:any)", "ClientController::getPolicyTermsFormJson/$1"); }); $routes->cli('cli/processjob', 'JobWorker::processJob'); diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 52b3dbca..13be8344 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -31,6 +31,10 @@ use App\Models\PolicyPremium2Model; use App\Models\EmployeeModel; use App\Models\EmployeePolicyModel; use App\Models\NotificationModel; +use App\Models\CDMasterModel; +use App\Models\PolicyTypeModel; + + @@ -62,12 +66,15 @@ class ClientController extends AdminController protected $employeeModel; protected $employeePolicyModel; protected $notificationModel; + protected $CDMasterModel; + protected $policyTypeModel; + public function __construct() { set_session_context('Client'); $this->myLogger = \Config\Services::mylogger(); - + $this->clientModel = new ClientModel(); $this->userModel = new UserModel(); $this->clientBranchModel = new ClientBranchModel(); @@ -89,7 +96,11 @@ class ClientController extends AdminController $this->policyPremium2Model = new PolicyPremium2Model(); $this->employeeModel = new EmployeeModel(); $this->employeePolicyModel = new EmployeePolicyModel(); - $this->notificationModel = new NotificationModel(); + $this->notificationModel = new NotificationModel(); + $this->CDMasterModel = new CDMasterModel(); + $this->policyTypeModel = new PolicyTypeModel(); + + @@ -200,13 +211,19 @@ class ClientController extends AdminController public function view_Deposit($insurerId) { // Load your model to fetch data based on $clientId and $insurerId + // $subTypeOptions = [ + // 1 => 'Deposit', + // 2 => 'Adjustment', + // 3 => 'Refund', + // 4 => 'Debit', + // ]; $subTypeOptions = [ - 1 => 'Deposit', + 1 => 'Replenishment', 2 => 'Adjustment', - 3 => 'Refund', + 3 => 'Refund From Deletion', 4 => 'Debit', - // Add more options as needed ]; + $data['subTypeOptions'] = $subTypeOptions; $headerData['page_name'] = 'Client Deposit'; $data['insurerName']= $this->insurerModel->getInsurerName($insurerId); @@ -231,20 +248,33 @@ class ClientController extends AdminController // Retrieve form data from POST request $loggedInUserID = get_session_userid(); + $client_id = $this->request->getPost('client_id'); + $insurer_id = $this->request->getPost('insurer_id'); + + $CD_Account_Number = $this->CDMasterModel + ->where('client_id', $client_id) + ->where('insurer_id', $insurer_id) + ->first(); + // Prepare the array with data $data = [ 'amount' => $this->request->getPost('amount'), 'sub_type_id' => $this->request->getPost('sub_type_id'), 'client_id' => $this->request->getPost('client_id'), + 'client_policy_id' => null, + 'cd_ac_no' => $CD_Account_Number['cd_ac_no'] ?? null, + 'endorsement_no' => null, 'insurer_id' => $this->request->getPost('insurer_id'), 'description' => $this->request->getPost('description'), 'transaction_type' => $this->request->getPost('transaction_type') ?: 'Credit', - 'updated_by' => 1, // You need to set the correct value for updated_by + 'updated_by' => 1, ]; + // Call the saveDeposit function from DepositHelper $response = DepositHelper::saveDeposit($data, $loggedInUserID); + // Return a boolean value based on success return $this->response->setJSON(['success' => $response['success']]); } @@ -588,22 +618,13 @@ class ClientController extends AdminController $policy_type_id = $this->request->getPost('policy_type_id'); $client_branch_id = $this->request->getPost('client_branch_id'); - - $policyCount = $this->clientPolicyModel - ->where('policy_type_id', $policy_type_id) - ->where('client_branch_id', $client_branch_id) - ->countAllResults(); - - if($policyCount > 0 ){ - $clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($this->request->getPost('client_id')); - return $this->respond(['status' => 'policy_exist','code' => 200,'data' => $clientPoliceData, 'method' => 'CERATE'], 200); - } - - $insurerValue = (string) $this->request->getPost('insurer'); - list($insurerBranchId, $insurerId) = explode('-', $insurerValue); $client_id = $this->request->getPost('client_id'); + $insurerValue = (string) $this->request->getPost('insurer'); + list($insurerBranchId, $insurerId) = explode('-', $insurerValue); + + $data['insurer_branch_id'] = $insurerBranchId; $data['insurer_id'] = $insurerId; @@ -638,7 +659,8 @@ class ClientController extends AdminController $data['base_policy'] = $this->request->getPost('base_policy'); $data['policy_status'] = 1; $data['inception_type'] = $this->request->getPost('inception_type') ? 2 : 1; - $data['client_branch_id'] = $this->request->getPost('client_branch_id'); + $data['client_branch_id'] = $this->request->getPost('client_branch_id'); + $data['cd_ac_no'] = $this->request->getPost('cd_ac_no'); @@ -733,7 +755,8 @@ class ClientController extends AdminController $data['base_policy'] = $this->request->getPost('base_policy'); $data['policy_status'] = 1; $data['inception_type'] = $this->request->getPost('inception_type') ? 2 : 1; - $data['client_branch_id'] = $this->request->getPost('client_branch_id'); + $data['client_branch_id'] = $this->request->getPost('client_branch_id'); + $data['cd_ac_no'] = $this->request->getPost('cd_ac_no'); @@ -884,6 +907,24 @@ class ClientController extends AdminController $policyPremium = $this->policyPremium1Model->insert($data); } + }else if ($si_or_bp == '2') { + + $premium = str_replace(',', '', $this->request->getPost('gpa_basic_premium[]')); + $sum_insure = str_replace(',', '', $this->request->getPost('gpa_basic_si[]')); + $basic_pay = str_replace(',', '', $this->request->getPost('basic_pay[]')); + + for ($i = 0; $i < count($premium); $i++) { + + $data['si_or_bp'] = $this->request->getPost('si_or_bp'); + $data['basic_multiplier'] = str_replace(',', '', $this->request->getPost('basic_multiplier')); + $data['multiplier'] = $this->request->getPost('premium_multiplier'); + $data['basic_pay'] = $basic_pay[$i]; + $data['si'] = $sum_insure[$i]; + $data['premium'] = $premium[$i]; + + $policyPremium = $this->policyPremium1Model->insert($data); + } + }else { $data['premium'] = str_replace(',', '', $this->request->getPost('gpa_basic_premium')); @@ -1140,9 +1181,10 @@ class ClientController extends AdminController $client_id = $client_policy_data['client_id']; $polices = $this->policesModel->where(['insurer_id' => $insurer_id, 'is_active' => 1])->findAll(); $client_policy_list = $this->clientPolicyModel->getpolicyWithPattern( $client_id ); + $cd_data = $this->CDMasterModel->where('client_id', $client_id)->where('insurer_id', $insurer_id)->findAll(); - return $this->respond(['status' => true,'code' => 200, 'client_policy_list' => $client_policy_list, 'data' => $client_policy_data, "insurer_id" => $client_policy_data['insurer_id'], 'policy' => $polices], 200); + return $this->respond(['status' => true,'code' => 200, 'client_policy_list' => $client_policy_list, 'data' => $client_policy_data, 'cd_data' => $cd_data, "insurer_id" => $client_policy_data['insurer_id'], 'policy' => $polices], 200); }else{ return $this->respond(['status' => false,'code' => 404, 'message' => 'no data found'], 200); } @@ -1177,19 +1219,11 @@ class ClientController extends AdminController $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(); - - // $emp_count = count($data); - - // if($emp_count == 0){ - // $emp_count = true; - // }else{ - // $emp_count = false; - // } + ->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->policesModel->getPolicyPremium($record['policy_id']); @@ -1197,9 +1231,11 @@ class ClientController extends AdminController $gmc_pattern = '/gmc/i'; $gpa_pattern = '/gpa/i'; $subject = $data[0]->policy_type; + $policy_type_id = $data[0]->id; + if (preg_match($gmc_pattern, $subject)) { $search_term = 'GMC'; - } else if (preg_match($gpa_pattern, $subject)) { + } else if (preg_match($gpa_pattern, $subject) || $policy_type_id == 6 || $policy_type_id == 7) { $search_term = 'GPA'; } else { $search_term = ""; @@ -1207,7 +1243,7 @@ class ClientController extends AdminController $results = $this->policyGridModel->like('policy_type', $search_term)->findAll(); - if ($search_term === 'GPA') { + if ($search_term === 'GPA' || $policy_type_id == 6 || $policy_type_id == 7) { $premiumData = $this->policyPremium1Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll(); } else if ($search_term === 'GMC') { @@ -1218,9 +1254,6 @@ class ClientController extends AdminController $premiumData = ""; } - - - // echo '
';
         // print_r($premiumData); die;
@@ -1294,7 +1327,7 @@ class ClientController extends AdminController
 
             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);
 
-        } else if ($search_term === 'GPA') {
+        } else if ($search_term === 'GPA' || $policy_type_id == 6 || $policy_type_id == 7) {
 
             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 {
@@ -1315,7 +1348,7 @@ class ClientController extends AdminController
 
             $data['sum_insured']   =str_replace(',', '',$this->request->getPost("sum_insured"));
             $data['family_floater']   =$this->request->getPost("family_floater") ? $this->request->getPost("family_floater") : 0;
-            $data['corporatebuffer'] = $this->request->getPost("corporatebuffer") ? $this->request->getPost("corporatebuffer") : 0;
+            // $data['corporatebuffer'] = $this->request->getPost("corporatebuffer") ? $this->request->getPost("corporatebuffer") : 0;
             $data['family_floaters'] = $this->request->getPost("family_floaters") ?? [];        
             
             $data['age_ratio']['self']['min'] =  $this->request->getPost("self_min_age") ? $this->request->getPost("self_min_age") :0;
@@ -1427,7 +1460,7 @@ class ClientController extends AdminController
             $data['bioabsorbablestenttoriclensmultifocallens'] =$this->request->getPost("bioabsorbablestenttoriclensmultifocallens");
             $data['roomrentlimit'] =str_replace(',', '',$this->request->getPost("roomrentlimit"));
             $data['proportionatedeductionclause'] =str_replace(',', '',$this->request->getPost("proportionatedeductionclause"));
-            $data['nursingallowance'] =str_replace(',', '',$this->request->getPost("nursingallowance"));
+            // $data['nursingallowance'] =str_replace(',', '',$this->request->getPost("nursingallowance"));
             $data['ailmentcapping'] =str_replace(',', '',$this->request->getPost("ailmentcapping"));
             $data['ambulancecharges'] =str_replace(',', '',$this->request->getPost("ambulancecharges"));
             $data['airambulance'] =str_replace(',', '',$this->request->getPost("airambulance"));
@@ -1435,6 +1468,12 @@ class ClientController extends AdminController
             $data['reasonableandcustomarycharges'] =str_replace(',', '',$this->request->getPost("reasonableandcustomarycharges"));
             $data['ayudhtreatmentcover'] =str_replace(',', '',$this->request->getPost("ayudhtreatmentcover"));
 
+            $data['congenitaldiseasesexternal'] =str_replace(',', '',$this->request->getPost("congenitaldiseasesexternal"));
+            $data['optionalparentalcopay'] =str_replace(',', '',$this->request->getPost("optionalparentalcopay"));
+            $data['posthospitalizationcover'] =str_replace(',', '',$this->request->getPost("posthospitalizationcover"));
+            $data['corporatebuffer'] =str_replace(',', '',$this->request->getPost("corporatebuffer"));
+            $data['sublimitofcorporatebuffer'] =str_replace(',', '',$this->request->getPost("sublimitofcorporatebuffer"));
+
             if ($data['ayudhtreatmentcover'] == 1) {
                 $data['ayushTreatmentCoverData']   = str_replace(',', '',$this->request->getPost("ayushTreatmentCoverData"));
             }else{
@@ -1455,6 +1494,7 @@ class ClientController extends AdminController
             $data['days_from_dod'] =str_replace(',', '',$this->request->getPost("days_from_dod"));
             $data['special_condition_label'] = str_replace(',', '',$this->request->getPost("special_condition_label")) ?? [];
             $data['special_condition_input'] = str_replace(',', '',$this->request->getPost("special_condition_input")) ?? [];
+            $data['multiple_sum_insured'] = str_replace(',', '',$this->request->getPost("multiple_sum_insured")) ?? [];
 
             $data['cataract'] =str_replace(',', '',$this->request->getPost("cataract"));
 
@@ -1509,16 +1549,22 @@ class ClientController extends AdminController
         //     ->where("employees.emp_status",'active')
         //     ->countAllResults();
 
-        $emp_count_by_policy = $this->employeePolicyModel->where('client_policy_id',$client_policy_id)->where('is_active',1)->countAllResults();
+        $emp_count_by_policy = $this->employeePolicyModel
+                        ->where('client_policy_id',$client_policy_id)
+                        ->where("status", 'active')
+                        ->where('is_active',1)
+                        ->countAllResults();
         
-        // if($emp_count == 0){
-        //     $emp_count = true;
-        // }else{
-        //     $emp_count = false;
-        // }
 
         if ($record) {
-            return $this->respond(['Status' => true,'code' => 200,'data' => $record['policy_terms'],  'policy_name' => $policy_name,'policy_addon' => $record['is_addon'], 'emp_count_by_policy'=>$emp_count_by_policy], 200);
+            return $this->respond([
+                'Status' => true,
+                'code' => 200,        
+                'data' => $record['policy_terms'],  
+                'policy_name' => $policy_name,
+                'policy_addon' => $record['is_addon'], 
+                'emp_count_by_policy'=>$emp_count_by_policy],
+            200);
         } else {
             return $this->respond(['Status' => false,'code' => 200,'message' => 'Record not found.',  'policy_name' => $policy_name], 200);
         }
@@ -1584,6 +1630,8 @@ class ClientController extends AdminController
             $data['worldwideCover']        = $this->request->getPost("worldwideCover");
             $data['gpa_special_condition_label'] = str_replace(',', '',$this->request->getPost("gpa_special_condition_label")) ?? [];
             $data['gpa_special_condition_input'] = str_replace(',', '',$this->request->getPost("gpa_special_condition_input")) ?? [];
+            $data['multiple_sum_insured'] = str_replace(',', '',$this->request->getPost("multiple_sum_insured")) ?? [];
+
 
 
             $jsonData = json_encode($data);
@@ -1942,10 +1990,6 @@ class ClientController extends AdminController
 
 
         $data['client_policy'] = $client_policy;
-        
-
-
-
         $data['client_branch'] = $this->clientModel
 
             ->select('
@@ -2120,5 +2164,83 @@ class ClientController extends AdminController
     
 
 
+    public function get_cd_ac($client_id, $insurer_id){
+
+        $cd_data = $this->CDMasterModel->where('client_id', $client_id)->where('insurer_id', $insurer_id)->findAll();
+
+        if($cd_data){
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_data], 200);
+        }else{
+            return $this->respond(['status' => false, 'code' => 404, 'insurer_id' => $insurer_id, 'client_id' => $client_id], 200);
+        }
+
+    }
+
+
+    public function otherPolicyTermsFormSubmit()
+    {
+
+        $client_policy_id = $this->request->getPost("client_policy_id");
+        $policy_terms = $this->request->getPost("policy_terms");
+
+        $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+        if ($record) {
+
+            $update = $this->clientPolicyModel->where('id', $client_policy_id)->set('policy_terms',  $policy_terms)->update();
+
+            if ($update) {
+                return $this->respond(['status' => true, 'code' => 200, 'message' => 'Data updated successfully', 'client_policy_id' => $client_policy_id], 200);
+            } else {
+                return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to update data', 'formdata' => $this->request->getPost()], 200);
+            }
+        } else {
+
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to store data. The client policy does not exist', 'formdata' => $this->request->getPost()], 200);
+        }
+    }
+
+
+    public function checkPolicyType($client_policy_id, $policy_type_id, $client_branch_id, $client_id){
+
+        $policyCount = $this->clientPolicyModel
+        ->where('policy_type_id', $policy_type_id) 
+        ->where('client_branch_id', $client_branch_id)
+        ->where('client_id', $client_id)
+        ->countAllResults(); 
+
+        if($policyCount > 0 ){
+            $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($client_id);
+            return $this->respond(['status' => true,'code' => 200, 'count' =>  $policyCount, 'data' => $clientPoliceData, 'method' => 'CERATE' ,'client_id' => $client_id, 'client_branch_id' => $client_branch_id, 'policy_type_id' => $policy_type_id], 200);
+        }else{
+            return $this->respond(['status' => false,'code' => 200,'client_id' => $client_id, 'client_branch_id' => $client_branch_id, 'policy_type_id' => $policy_type_id], 200);
+        }
+
+    }
+
+
+    public function getPolicyTerms($client_policy_id){
+
+        $policy_terms = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+        if(isset($policy_terms['policy_terms']) && $policy_terms['policy_terms'] != null){
+
+            $JSON = json_decode($policy_terms['policy_terms']);
+            $si = $JSON->sum_insured ?? $JSON->sumInsured2;
+            $multi_si = $JSON->multiple_sum_insured;
+            $multi_si[] = $si;
+        }else{
+            $$multi_si = [];
+        }
+
+        return $this->respond(['status' => true, 'data'=>$multi_si], 200);
+    }
+
+
+    public function getPolicyTermsFormJson($policy_type_id){
+
+        $JSON = $this->policyTypeModel->where('id', $policy_type_id)->first();
+        return $this->respond(['status' => true, 'data' => $JSON], 200);
+    }
 
 }
\ No newline at end of file
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 1b3fa587..3cb36091 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -24,6 +24,7 @@ use App\Models\ClientDepositModel;
 use App\Models\NotificationModel;
 use App\Models\MessageModel;
 use App\Models\UserMessageModel;
+use App\Models\CDMasterModel;
 
 use App\Controllers\Jobs;
 use App\Controllers\JobWorker;
@@ -52,6 +53,8 @@ class EmpDataServiceController extends BaseController
     protected $notificationModel;
     protected $messageModel;
     protected $userMessageModel;
+    protected $CDMasterModel;
+
 
     public function __construct()
     {
@@ -70,6 +73,8 @@ class EmpDataServiceController extends BaseController
         $this->notificationModel    = new NotificationModel();
         $this->messageModel        = new MessageModel();
         $this->userMessageModel          = new UserMessageModel();
+        $this->CDMasterModel    = new CDMasterModel();
+
     }
 
     
@@ -138,6 +143,12 @@ class EmpDataServiceController extends BaseController
         $insurer_id = $this->clientPolicyModel->where('id', $export_data['client_policy_id'])->first();
         $cash_balance = $this->clientDepositModel->where('client_id', $export_data['client_id'])->where('insurer_id', $insurer_id['insurer_id'])->orderBy('id', 'DESC')->first();
 
+        if($cash_balance == null){
+
+            $balance = $this->CDMasterModel->where('client_id', $export_data['client_id'])->where('insurer_id', $insurer_id['insurer_id'])->orderBy('id', 'DESC')->first();
+            $cash_balance['balance'] = $balance['opening_bal'];
+        }
+
 
         // Calculate the total amount from the objects
         $totals = array_reduce($objects, function ($carry, $item) {
@@ -188,7 +199,7 @@ class EmpDataServiceController extends BaseController
             'NAME OF EMP/DEP',
             'EMP ID',
             'EMP/DEP TYPE',
-            'RELATION',
+            'RELATIONSHIP CODE',
             'DOB',
             'GENDER',
             'PRE EXISTING AILMENTS',
@@ -673,7 +684,7 @@ class EmpDataServiceController extends BaseController
         unset($excel_data[0]);
         array_pop($excel_data);
 
-        $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATION','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL'];
+        $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATIONSHIP CODE','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL'];
 
         foreach ($inceptionHeader as $key => $value) {
             if($excel_header[$key] != $value){
@@ -1083,6 +1094,13 @@ class EmpDataServiceController extends BaseController
         $batch_code = $file['batch_code'];
         $user_id = $file['created_by'];
 
+        $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+        $CD_Account_Number = $this->CDMasterModel
+                    ->where('client_id', $client_id)
+                    ->where('insurer_id', $insurer_id['insurer_id'])
+                    ->first();
+
 
         $get_policy_type = $this->clientPolicyModel
             ->select('policy_type.policy_type, policies.policy_type_id as policy_type_id')
@@ -1192,6 +1210,8 @@ class EmpDataServiceController extends BaseController
                 'employeeIds' => $emp_policy_ids,
                 'client_id' => $client_id,
                 'client_policy_id' => $client_policy_id,
+                'cd_ac_no' => $CD_Account_Number['cd_ac_no'] ?? null,
+                'endorsement_no' => null,
                 'client_branch_id' => $client_branch_id,
                 'count' => $emp_count,
                 'event' => $file['event_type'],
@@ -2095,6 +2115,13 @@ class EmpDataServiceController extends BaseController
         $batch_code = $file['batch_code'];
         $user_id = $file['created_by'];
 
+        $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+        $CD_Account_Number = $this->CDMasterModel
+                    ->where('client_id', $client_id)
+                    ->where('insurer_id', $insurer_id['insurer_id'])
+                    ->first();
+
 
         $status_val = 'success';
         if ($status == 'in-progress-partially') {
@@ -2113,7 +2140,7 @@ class EmpDataServiceController extends BaseController
         $emp_policy_ids = [];
         $employeeIds = [];
         $emp_details = [];
-        $endorsement_id = [];
+        $endorsement_id = '';
         $endorsement_details = [];
         $totals = 0;
 
@@ -2121,7 +2148,7 @@ class EmpDataServiceController extends BaseController
 
             $emp_name = $value[1];
             $emp_code = $value[2];
-            $endorsement_id[] = $value[19];
+            $endorsement_id = $value[19];
             $totals += $value[18];
 
 
@@ -2229,6 +2256,8 @@ class EmpDataServiceController extends BaseController
             'client_id' => $client_id,
             'client_policy_id' => $client_policy_id,
             'client_branch_id' => $client_branch_id,
+            'cd_ac_no' => $CD_Account_Number['cd_ac_no'] ?? null,
+            'endorsement_no' => $endorsement_id ?? null,
             'count' => $emp_count,
             'event' => $file['event_type'],
             'policy_name' => $policy_name['policy_name'],
@@ -2633,6 +2662,13 @@ class EmpDataServiceController extends BaseController
         $batch_code = $file['batch_code'];
         $user_id = $file['created_by'];
 
+        $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+        $CD_Account_Number = $this->CDMasterModel
+                    ->where('client_id', $client_id)
+                    ->where('insurer_id', $insurer_id['insurer_id'])
+                    ->first();
+
 
         $status_val = 'success';
         if ($status == 'in-progress-partially') {
@@ -2653,6 +2689,7 @@ class EmpDataServiceController extends BaseController
         $emp_endorsement_table_data = [];
         $employee_policy_table_data = [];
         $employee_policy_table_primaryKey = [];
+        $endorsement_id = '';
 
         $totals = 0;
 
@@ -2662,6 +2699,7 @@ class EmpDataServiceController extends BaseController
             $emp_name = $value[2]; //employee name
             $emp_code = $value[1]; //employee code
             $totals = $totals + $value[13];
+            $endorsement_id = $value[15];
 
 
             $fetch_data = [
@@ -2733,6 +2771,8 @@ class EmpDataServiceController extends BaseController
             'client_id' => $client_id,
             'client_policy_id' => $client_policy_id,
             'client_branch_id' => $client_branch_id,
+            'cd_ac_no' => $CD_Account_Number['cd_ac_no'] ?? null,
+            'endorsement_no' => $endorsement_id ?? null,
             'count' => $emp_count,
             'event' => $file['event_type'],
             'policy_name' => $policy_name['policy_name'],
@@ -3176,6 +3216,9 @@ class EmpDataServiceController extends BaseController
                 'amount' => $amount->total_sum ?? 0,
                 'sub_type_id' => 4,
                 'client_id' => $arrayData['client_id'],
+                'client_policy_id' => $arrayData['client_policy_id'],
+                'endorsement_no' => $arrayData['endorsement_no'] ?? null,
+                'cd_ac_no' => $arrayData['cd_ac_no'] ?? null,
                 'insurer_id' => $insurer_id['insurer_id'],
                 'description' => $description,
                 'transaction_type' => 'Debit',
@@ -3214,6 +3257,9 @@ class EmpDataServiceController extends BaseController
                 'amount' => $amount->total_sum,
                 'sub_type_id' => 4,
                 'client_id' => $arrayData['client_id'],
+                'client_policy_id' => $arrayData['client_policy_id'],
+                'endorsement_no' => $arrayData['endorsement_no'] ?? null,
+                'cd_ac_no' => $arrayData['cd_ac_no'] ?? null,
                 'insurer_id' => $insurer_id['insurer_id'],
                 'description' => $description,
                 'transaction_type' => 'Debit',
@@ -3254,6 +3300,9 @@ class EmpDataServiceController extends BaseController
                 'amount' => $amount->total_sum,
                 'sub_type_id' => 3,
                 'client_id' => $arrayData['client_id'],
+                'client_policy_id' => $arrayData['client_policy_id'],
+                'endorsement_no' => $arrayData['endorsement_no'] ?? null,
+                'cd_ac_no' => $arrayData['cd_ac_no'] ?? null,
                 'insurer_id' => $insurer_id['insurer_id'],
                 'description' => $description,
                 'transaction_type' => 'Credit',
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 61c66278..80571810 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -772,13 +772,9 @@ class EmployeeController extends AdminController
             ->findAll();
 
         $emp_count = count($data);
-
-        if ($data) {
-            return $this->respond(['dataStatus' => true, 'code' => 200, 'emp_count' => $emp_count], 200);
-        } else {
-
-            return $this->respond(['dataStatus' => false, 'code' => 404], 404);
-        }
+        $events = ['inception' => 'Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
+        return $this->respond(['dataStatus' => true, 'code' => 200,  'emp_count' => $emp_count, 'events' => $events, 'client_policy_id' => $id], 200);
+       
     }
 
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index a14aac42..cffff6ce 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -487,7 +487,7 @@ class EmployeeRestController extends AdminController
     {
         try {
             $empData =   $this->employeePolicyModel->getEmployeePolicy( client_id:$this->request->getGet('client_id'),policy_id: $this->request->getGet('client_policy_id'),status:0,branch_id:$this->request->getGet('client_branch_id'));
-           
+         
             if ($empData) {
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
             } else {
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 8afffb88..04f1e336 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -25,6 +25,7 @@ use App\Models\TPABranchModel;
 use App\Models\TPAModel;
 use App\Models\StateModel;
 use App\Models\PolicyTypeModel;
+use App\Models\CDMasterModel;
 
 class MasterController extends AdminController
 {   
@@ -45,6 +46,9 @@ class MasterController extends AdminController
     protected $tpaModel;
     protected $stateModel;
     protected $policyTypeModel;
+    protected $CDMasterModel;
+    protected $clientModel;
+
 
     
     public function __construct()
@@ -68,6 +72,9 @@ class MasterController extends AdminController
         $this->tpaModel           = new TPAModel();
         $this->stateModel         = new StateModel();
         $this->policyTypeModel    = new PolicyTypeModel();
+        $this->CDMasterModel    = new CDMasterModel();
+        $this->clientModel        = new ClientModel();
+
     }
 
     public function insurerList()
@@ -1111,4 +1118,103 @@ class MasterController extends AdminController
         }
     }
 
+
+
+    public function CDMasterList()
+    {
+
+        $data['CD_Master_Data'] = $this->CDMasterModel
+            ->select('cd_master.*, clients.client_name, clients.short_name, insurers.name as insurer_name, user_profiles.first_name as user_name')
+            ->join('clients', 'clients.id = cd_master.client_id')
+            ->join('insurers', 'insurers.id = cd_master.insurer_id')
+            ->join('user_profiles', 'user_profiles.id = cd_master.created_by')
+            ->where('cd_master.is_active', 1)
+            ->findAll();
+        $data['insurers'] = $this->insurerModel->findAll();
+        $data['clients'] = $this->clientModel->findAll();
+        $this->loadLayout('cd_master_list', $data);
+    }
+
+
+    public function createCDMasterData()
+    {
+
+        $data = $this->request->getPost();
+        $date = (string) $this->request->getPost('opening_date');
+        $data['opening_date'] = date('Y-m-d', strtotime($date));
+
+
+        if ($data) {
+
+            $insert = $this->CDMasterModel->insert($data);
+
+            if ($insert) {
+
+                session()->setFlashdata('success', "Cash Deposite Master Added Successfully");
+                return redirect()->to(base_url('/master/cash_deposite/list'));
+            } else {
+
+                session()->setFlashdata('error', "Cash Deposite Master Added Failed");
+                return redirect()->to(base_url('/master/cash_deposite/list'));
+            }
+        } else {
+
+            session()->setFlashdata('error', "Cash Deposite Master Added Failed. Data Not Found");
+            return redirect()->to(base_url('/master/cash_deposite/list'));
+        }
+    }
+
+
+    public function editCDMasterData($id = null)
+    {
+
+        $id = $this->request->getPost('PrimaryKey');
+        $date = (string) $this->request->getPost('opening_date');
+        $data = $this->request->getPost();
+        $data['opening_date'] = date('Y-m-d', strtotime($date));
+
+        if ($data) {
+
+            $insert = $this->CDMasterModel->where('id', $id)->set($data)->update();
+
+            if ($insert) {
+
+                session()->setFlashdata('success', "Cash Deposite Master Updated Successfully");
+                return redirect()->to(base_url('/master/cash_deposite/list'));
+            } else {
+
+                session()->setFlashdata('error', "Cash Deposite Master Update Failed");
+                return redirect()->to(base_url('/master/cash_deposite/list'));
+            }
+        } else {
+
+            session()->setFlashdata('error', "Cash Deposite Master Update Failed. Data Not Found");
+            return redirect()->to(base_url('/master/cash_deposite/list'));
+        }
+    }
+
+    public function getCDMasterDataByID($id = null)
+    {
+
+        $cd_data = $this->CDMasterModel->where('id', $id)->first();
+        $cd_data['opening_date'] = date('d-m-Y', strtotime($cd_data['opening_date']));
+
+        if ($cd_data) {
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_data], 200);
+        } else {
+            return $this->respond(['status' => false, 'code' => 404], 200);
+        }
+    }
+
+    public function checkUniqueCDAccountNumber($AccountNumber)
+    {
+        $uniqueAC = $this->CDMasterModel->where('cd_ac_no', $AccountNumber)->findAll();
+
+        if($uniqueAC != null){
+            return $this->respond(['status' => true, 'message' => 'The CD Account Number is Already Exist', 'code' => 200], 200);
+        }else{
+            return $this->respond(['status' => false, 'code' => 404], 200);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/Helpers/DepositHelper.php b/app/Helpers/DepositHelper.php
index a25aff9e..7d3c713d 100644
--- a/app/Helpers/DepositHelper.php
+++ b/app/Helpers/DepositHelper.php
@@ -4,6 +4,7 @@
 namespace App\Helpers;
 
 use App\Models\ClientDepositModel;
+use App\Models\CDMasterModel;
 
 class DepositHelper
 {
@@ -49,6 +50,9 @@ class DepositHelper
             'amount' => $data['amount'],
             'sub_type' => $data['sub_type_id'],
             'client_id' => $data['client_id'],
+            'client_policy_id' => $data['client_policy_id'],
+            'cd_ac_no' => $data['cd_ac_no'],
+            'endorsement_no' => $data['endorsement_no'],
             'insurer_id' => $data['insurer_id'],
             'description' => $data['description'],
             'transaction_type' => $data['transaction_type'],
@@ -90,7 +94,18 @@ class DepositHelper
         $getLastBalanceQuery = "SELECT balance FROM cash_deposit WHERE client_id = ? AND insurer_id = ? ORDER BY created_at DESC LIMIT 1";
         $getLastBalanceParams = [$clientId, $insurerId];
 
-        $lastBalance = $model->query($getLastBalanceQuery, $getLastBalanceParams)->getRow()->balance ?? 0;
+        $lastBalance = $model->query($getLastBalanceQuery, $getLastBalanceParams)->getRow()->balance;
+
+        if(!$lastBalance){
+
+            $cd_model = new ClientDepositModel();
+
+            $getLastBalanceQuery = "SELECT opening_bal FROM cd_master WHERE client_id = ? AND insurer_id = ? ORDER BY created_at DESC LIMIT 1";
+            $getLastBalanceParams = [$clientId, $insurerId];
+    
+            $lastBalance = $cd_model->query($getLastBalanceQuery, $getLastBalanceParams)->getRow()->opening_bal ?? 0;
+    
+        }
 
         return $lastBalance;
     }
diff --git a/app/Models/CDMasterModel.php b/app/Models/CDMasterModel.php
new file mode 100644
index 00000000..491d1007
--- /dev/null
+++ b/app/Models/CDMasterModel.php
@@ -0,0 +1,64 @@
+select('cash_deposit.*')
             ->select('insurers.name as insurer_name, insurers.short_name as insurer_short')
             ->select('clients.client_name as clientname, clients.short_name as clientshort')
+            ->select('policies.name as policy_name')
             ->select('user_profiles.first_name as username')
-             ->join('user_profiles','user_profiles.id=cash_deposit.created_by')
-            ->join('insurers', 'insurers.id = cash_deposit.insurer_id')
-            ->join('clients', 'clients.id = cash_deposit.client_id')
-           
+            ->join('user_profiles', 'user_profiles.id = cash_deposit.created_by', 'left')
+            ->join('insurers', 'insurers.id = cash_deposit.insurer_id', 'left')
+            ->join('clients', 'clients.id = cash_deposit.client_id', 'left')
+            ->join('client_policy', 'client_policy.id = cash_deposit.client_policy_id', 'left')
+            ->join('policies', 'policies.id = client_policy.policy_id', 'left')
             ->where('cash_deposit.client_id', $clientId)
-            ->where('cash_deposit.insurer_id', $insurerId) // Add this line to filter by insurer_id
+            ->where('cash_deposit.insurer_id', $insurerId)
             ->orderBy('cash_deposit.id', 'DESC')
             ->get()
             ->getResult();
     }
     
+    
     public function getDepositSummary($clientId, $insurerId)
 {
     // Fetch the sum of credit and debit transactions and calculate the balance
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index c21b8f5d..2dcac592 100644
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -84,8 +84,8 @@ class EmployeePolicyModel extends Model
                         ->join('policies pm', 'cp.policy_id = pm.id') //pm - policy master
                         ->join('insurers im', 'cp.insurer_id = im.id') //im - insurar master
                         ->join('insurer_branch ib', 'cp.insurer_branch_id = ib.id') //ib - insurar branch
-                        ->join('tpa tpam', 'cp.tpa_id = tpam.id') //tpam - tpa master
-                        ->join('tpa_branch tpab', 'cp.tpa_branch_id = tpab.id') //tpab - tpa brach
+                        ->join('tpa tpam', 'cp.tpa_id = tpam.id','left') //tpam - tpa master
+                        ->join('tpa_branch tpab', 'cp.tpa_branch_id = tpab.id','left') //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)
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
new file mode 100644
index 00000000..7a001b39
--- /dev/null
+++ b/app/Views/cd_master_list.php
@@ -0,0 +1,293 @@
+
+
+

+    

+        

+            

+                

+                    

+                        
CD Master List

+                    

+                    

+                        
+                    

+                

+                
+                    
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                    
+
+                    
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                    
+                
Client NameInsurer NameOpening DateCD Account NoDeposite AmountDate/UserAction
(  ) by
+                                
+                                

+                                    
+                                    

+                                         Edit
+                                    

+                                

+                            

+            

+        

+    

+

+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 34a1cd9e..e5626a3a 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -7,8 +7,8 @@
 
     

 
-        
-            
+    
            
+        
@@ -121,13 +121,22 @@
 
                         

@@ -148,6 +157,7 @@
 
+
\ No newline at end of file
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 496ad3a0..16fad890 100644
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -869,7 +869,7 @@ $(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');
@@ -885,27 +885,31 @@ $(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");
                                     for (var i = 0; i < select.options.length; i++) {
+                                            select.options[i].disabled = false;
                                         if (select.options[i].value === "inception") {
                                             select.options[i].disabled = true;
-                                        break;
+                                        // break;
                                         }
                                     }
-                            }else{
+                            }else {
 
                                 var select = document.getElementById("upload-action-type");
                                     for (var i = 0; i < select.options.length; i++) {
+                                            select.options[i].disabled = true;
                                         if (select.options[i].value === "inception") {
                                             select.options[i].disabled = false;
-                                        break;
+                                        }
+                                        if (select.options[i].value === "") {
+                                            select.options[i].disabled = false;
                                         }
                                     }
                             }
@@ -933,6 +937,16 @@ $(document).ready(function() {
                 }
             });
 
+        if($('#policy_id').val() == 0){
+
+            var select = document.getElementById("upload-action-type");
+            console.log('select', select)
+            for (var i = 0; i < select.options.length; i++) {
+                    select.options[i].disabled = false;
+                    console.log(select.options[i])
+            }
+        }    
+
     })
 
 })
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index a4458cb1..11e7405f 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -159,7 +159,7 @@
                 method: 'GET',
                 success: function(response) {
 
-                    console.log('responce', response)
+                    // console.log('responce', response)
 
                     if(response.status == false){
                         $('#notification_count').html('0')
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 9c6a4795..7fe56a99 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -543,16 +543,17 @@
                         
                             
                             2
-                             Employees 
+                             Members 
                         

                             
                         

diff --git a/app/Views/other_policy_terms.php b/app/Views/other_policy_terms.php
new file mode 100644
index 00000000..6e1160c2
--- /dev/null
+++ b/app/Views/other_policy_terms.php
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 2b710321..69a89773 100644
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -110,9 +110,12 @@
                     
 
                                                   
                     

-                    

-                    
+                    

+                    
                     
   
+                    

+                                            
+                    

                     

                     

                     

@@ -120,6 +123,8 @@
                     
    
                 
  
 
+                

+
                 
                          
                     
 
                                            
@@ -136,14 +141,14 @@
                                 

-                                    
-                                    
+                                    
+                                    
-                                    
-                                    
+                                    
+                                    
@@ -155,8 +160,8 @@
                                             
-                                    
-                                    
+                                    
+                                    

                 

                     Insurer
                     Policy
 
                         
 
 
 
 
                         
                     

                                     Self:
                                      
Min Age:
Max Age:
Min Age:
Max Age:

                                 

                                 

                                     Spouse:
                                     
Min Age:
Max Age:
Min Age:
Max Age:

                                 

                                 

                                     Children:
                                         
                                     
Min Age:
Max Age:
Min Age:
Max Age:

                                 

                             
                         

@@ -184,21 +189,19 @@
                                                                          
-                                    
-                                        
-                                        
+                                    
+                                        
+                                        
-                                    
                                 

                                 
                                     
Elders Count:
Min Age:
Max Age:
Elders Count:
Min Age:
Max Age:

                                     

                             

-                            
                         

                       
                 
 
                 

 
-                
 
+            

+                

+                    
+                

+                

+                    
+                

+            

+
             

                 

                     
@@ -315,6 +327,15 @@
                 

             

 
+            

+                

+                    
+                

+                

+                    
+                

+            

+
             

                 

                     
@@ -323,6 +344,29 @@
                     
+                

+            

+
+            

+                

+                    
+                

+                

+                    
+                

+            

+
+            

+                

+                    
+                

+                

+                    
+                

+            

+
             

                 

                     
@@ -615,7 +677,7 @@
 
 
     // $('input[name="family_floater"]').change(function() {
-    //     console.log($(this).val());
+    //     //console.log($(this).val());
     //     if ($(this).val() == '1') {
     //         var element = $(this).parent().next()[0];
     //         $(element).css("display", "block");
@@ -631,7 +693,7 @@
 
     $('input[name="ayudhtreatmentcover"]').change(function() {
 
-        console.log($(this).val());
+        ////console.log($(this).val());
 
         if ($(this).val() == '1') {
             var element = $(this).parent().parent().next()[0];
@@ -645,7 +707,7 @@
 
     $('input[name="cataract"]').change(function() {
 
-        console.log($(this).val());
+        //console.log($(this).val());
 
         if ($(this).val() == '1') {
             var element = $(this).parent().parent().next()[0];
@@ -715,7 +777,7 @@
         }
 
         if (!isValid) {
-            console.log('Form is Empty', 'Warning');
+            //console.log('Form is Empty', 'Warning');
             return;
         }
 
@@ -751,7 +813,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    console.log('Something Wrong!', 'warning');
+                    //console.log('Something Wrong!', 'warning');
                 }, 1000);
             }
         });
@@ -773,14 +835,15 @@
     $('body').on('click', '.btnPolicyMaster', function() {
 
         var client_policy_id = $(this).data('id');
-        console.log('gmc_client_policy_id :', client_policy_id);
+        //console.log('gmc_client_policy_id :', client_policy_id);
 
         $('#gmc_client_policy_id').val(client_policy_id)
 
         $('.removeDom').remove();
+        $('#gmc_si_add_more').empty();
 
         var gmc_policy_type_id = $(this).attr('id');
-        // console.log(gmc_policy_type_id)
+        // //console.log(gmc_policy_type_id)
 
         if (gmc_policy_type_id == 'GMC') {
 
@@ -798,10 +861,10 @@
                     client_policy_id: client_policy_id
                 },
                 success: function(response) {
-                    console.log('response', response);
+                    //console.log('response', response);
 
 
-                    // console.log('count', response.count);
+                    // //console.log('count', response.count);
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
@@ -809,18 +872,18 @@
                     $('#nameOfThePolicyInGMC').html(' - ' + response.policy_name.name);
                     $('gmc_emp_count').val(response.count);
 
-                    //     console.log('count--1', response.count);
+                    //     //console.log('count--1', response.count);
                     //    $('emp_count').val(response.count)
                     //    if (response && response.hasOwnProperty('count')) {
                     //         if (response.count === false) {
-                    //             console.log('count -- 2', response.count);
-                    //             console.log(document.getElementById('btnGridSubmit1'))
+                    //             //console.log('count -- 2', response.count);
+                    //             //console.log(document.getElementById('btnGridSubmit1'))
                     //             $("#btnGridSubmit1").hide();
                     //             $("#myButtonSpecialCondition").hide();
                     //         } else {
                     //             $("#btnGridSubmit1").show();
                     //             $("#myButtonSpecialCondition").show();
-                    //             console.log('count -- ', response.count);
+                    //             //console.log('count -- ', response.count);
                     //         }
                     //     } else {
                     //         console.error('Response object does not have a "count" property or is invalid.');
@@ -849,13 +912,13 @@
                                     }
                                 }
 
-                                console.log('key', key)
+                                //console.log('key', key)
                                 let elements = document.getElementsByName(`${key}[]`);
-                                console.log(elements)
+                                //console.log(elements)
 
                                 if (elements) {
                                     elements.forEach((element, index) => {
-                                        console.log()
+                                        //console.log()
                                         if(jsonObject[key][index] == undefined){
                                             element.value = " ";
                                         }else{
@@ -865,12 +928,19 @@
                                 }
                             }
 
+
+                            if (key.includes("multiple_sum_insured")) {
+                                jsonObject[key].forEach((value, index) => {
+                                    appendGMCSIAddMore(value);
+                                });
+                            }
+
                             if (key.includes("family_floaters")) {
                                 let checkboxes = document.querySelectorAll(`input[name="${key}[]"]`);
                                 if (jsonObject[key]) {
                                     
-                                    console.log(jsonObject[key]);
-                                // console.log(jsonObject[key]);
+                                    //console.log(jsonObject[key]);
+                                // //console.log(jsonObject[key]);
                                     if (jsonObject[key].childrens) {
                                         $('#children').val(jsonObject[key].childrens);
                                     }
@@ -916,8 +986,11 @@
                                     $('.waiverof1234thyearexclusions').prop('disabled', true);
                                     $('.waiverof30dayswaitingperiod').prop('disabled', true);
                                     $('#prehospitalizationcover').prop('disabled', true);
+                                    $('#posthospitalizationcover').prop('disabled', true);
                                     $('.congenitaldiseasesinternal').prop('disabled', true);
+                                    $('#congenitaldiseasesexternal').prop('disabled', true);
                                     $('#copayzonewisecopay').prop('disabled', true);
+                                    $('#optionalparentalcopay').prop('disabled', true);
                                     $('#bioabsorbablestenttoriclensmultifocallens').prop('disabled', true);
                                     $('#roomrentlimit').prop('disabled', true);
                                     $('#proportionatedeductionclause').prop('disabled', true);
@@ -939,6 +1012,8 @@
                                     $('#moderntreatmentsasperirdai').prop('disabled', true);
                                     $('#days_of_discharge').prop('disabled', true);
                                     $('#days_from_dod').prop('disabled', true);
+                                    $('#corporatebuffer').prop('disabled', true);
+                                    $('#sublimitofcorporatebuffer').prop('disabled', true);
 
                                     setTimeout(function() {
                                         var editor1 = new Jodit('#additionalsicknessbenefit');
@@ -998,7 +1073,7 @@
                                             pTag.innerHTML = jsonObject[key]; // Add your new content inside the 
 tag
                                         }
                                     }
-                                    // console.log(jsonObject[key]);
+                                    // //console.log(jsonObject[key]);
                                 } else {
 
                                     if(jsonObject[key] == undefined){
@@ -1027,7 +1102,8 @@
                         });
                     }
                     $("#sum_insured").trigger("keyup");
-
+                    $(".multiple_sum_insured").trigger("keyup");
+                    
                     $('.jodit-wysiwyg').each(function() {
                         $(this).click();
                     });
@@ -1047,8 +1123,8 @@
                         $('.spouse-age').css('display','none');
                     }
 
-                    console.log("child ");
-                    console.log($('#children').val());
+                    //console.log("child ");
+                    //console.log($('#children').val());
 
                     if($('#children').val() != 0){
                         $('.child-age').css('display','');
@@ -1087,7 +1163,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        console.log('Something Wrong!', 'warning');
+                        //console.log('Something Wrong!', 'warning');
                     }, 1000);
                 }
             });
@@ -1109,8 +1185,8 @@
                         $('.spouse-age').css('display','none');
                     }
 
-                    console.log("child ");
-                    console.log($('#children').val());
+                    //console.log("child ");
+                    //console.log($('#children').val());
 
                     if($('#children').val() != 0){
                         $('.child-age').css('display','');
@@ -1145,8 +1221,11 @@
 
     });
 
-    $("#sum_insured").on("keyup", function() {
-        var inputNumber = $(this).val();
+    function si_keup_num_to_word(input) {
+
+        console.log('keyup sum insured');
+        var inputNumber = $(input).val();
+        console.log(inputNumber)
         if (inputNumber) {
             var result = convertCommaNumberToWords(inputNumber);
 
@@ -1154,7 +1233,7 @@
         } else {
             $("#numberToWordGMC").text("");
         }
-    });
+    };
     
 
 
@@ -1179,7 +1258,7 @@
 
\ No newline at end of file
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index 99275624..b19fd8a6 100644
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -90,16 +90,21 @@
                     
 
                                                   
                     

-                    

+                    

                         
                     
    
-                    

+                    

+                                            
                     
   
+                    

+                    

                     

                         
                                             
                     
   
                     
  
 
+                    

+
                     
                          
                         
 
                                                
@@ -132,13 +137,13 @@
                                     
                                         

                                             Min Age:
-                                            
+                                            
                                         

                                     
                                     
                                         

                                             Max Age:
-                                            
+                                            
                                         

                                     
                                     
@@ -569,6 +574,12 @@
                                     });
                                 }
                             }
+
+                            if (key.includes("multiple_sum_insured")) {
+                                gpaJsonObjectForSpecialCondition[key].forEach((value, index) => {
+                                    appendGPASIAddMore(value);
+                                });
+                            }
                         });
 
                         let jsonObject = JSON.parse(res.data);
@@ -634,6 +645,7 @@
 
                     }
                     $("#sumInsured2").trigger("keyup");
+                    $('.multiple_sum_insured').trigger("keyup");
                     $("#totalSumInsured").trigger("keyup");
 
 
@@ -651,7 +663,7 @@
             });
 
         } else if (gpa_policy_type_id != 'GPA' && gpa_policy_type_id != 'GMC') {
-            toastr.warning("This policy has no policy terms.", 'warning');
+            // toastr.warning("This policy has no policy terms.", 'warning');
         }
 
     });
@@ -723,6 +735,41 @@
         }
     });
 
+    $(".multiple_sum_insured").on("keyup", function() {
+
+        console.log('multiple_sum_insured key up')
+
+        var inputNumber = $(this).val();
+        console.log('inputNumber', inputNumber);
+        if (inputNumber) {
+            var result = convertCommaNumberToWords(inputNumber);
+            console.log(result);
+            $(".numberToWordSumInsured").text(result);
+        } else {
+            $(".numberToWordSumInsured").text("");
+        }
+    });
+
+
+    function numtowordinkeyup(input){
+        console.log('testing......')
+        console.log(input);
+     
+        var inputNumber = $(input).val();
+        console.log('inputNumber', inputNumber);
+
+        if (inputNumber) {
+            var result = convertCommaNumberToWords(inputNumber);
+            console.log(result);
+            var $parentRow = $(input).closest('.row');
+            console.log('$parentRow', $parentRow)
+            var $targetDiv = $parentRow.find('.numberToWordSumInsured');
+            $targetDiv.text(result)
+            console.log('$targetDiv', $targetDiv)
+        } 
+
+    }
+
 
     $("#totalSumInsured").on("keyup", function() {
         var inputNumber = $(this).val();
@@ -735,16 +782,29 @@
     });
 
 
+    function appendGPASIAddMore(data = null){
 
+        console.log('function called')
 
-    // function formatNumber(input) {
-    // Remove non-numeric characters
-    // let value = input.value.replace(/\D/g, '');
+        var html = `
+        
                        
+            
 
+                                          
+            

+            

+                
+            
   
+            

+                
+                            
+            

+            

+            

+            

+                
                           
+            
    
+        
`;
 
-    // Add commas
-    // value = Number(value).toLocaleString('en-IN');
-
-    // Update the input value
-    // input.value = value;
-    // }
+        $('#gpa_si_add_more').append(html);
+    }
 
\ No newline at end of file
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index f69a7648..927895d0 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -6,7 +6,7 @@
     

         

             

-                
+                
                 
             

             

@@ -250,14 +250,14 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
 
     var secondaryValue = $(event.target).data('secondary');
-    console.log('secondaryValue', secondaryValue)
-    console.log(rr_type);
+    //console.log('secondaryValue', secondaryValue)
+    //console.log(rr_type);
 
     if (!secondaryValue) {
         secondaryValue = rr_type
     }
 
-    console.log('secondaryValue', secondaryValue)
+    //console.log('secondaryValue', secondaryValue)
 
 
     var grid_container = document.getElementById('grid_content_input');
@@ -280,10 +280,10 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         var selectElement = event.target;
         var selectedOption = selectElement.options[selectElement.selectedIndex];
         dataIdValue = selectedOption.getAttribute('data-id');
-        // console.log('dataIdValue', dataIdValue)
+        // //console.log('dataIdValue', dataIdValue)
     }
 
-    console.log(grid_container)
+    //console.log(grid_container)
 
     if (dataIdValue == '1') {
         for (var i = 1; i <= 13; i++) {
@@ -348,7 +348,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                     

                         

                             
-                            
+                            
                             
                                             
                         
                  
                         

@@ -368,40 +368,44 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                 

 
                     

-                        
-                        

-                            
-                            
-                             
                                             
-                        
 
 
                         

                             
-                            
+                            
                         
     
 
+                        

+                            
+                            
+                        
 
+
                     

 
                     

 
+                        

+                            
+                            
+                             
                                             
+                        
 
                         
-                        

+                        

                             
-                            
+                            
                             
                                             
                         
    
 
-                        

-                            
-                            
-                        
 
-
-                        

+                        

                             
-                            
+                            
                             
   
                         

 
+                        

+                                
+                                
+                        

+
                     

                 

             

@@ -417,7 +421,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             
             

                 
-                
+                
                 
                                             
             
                            
             

@@ -438,7 +442,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 
                                             
             
                                                    
             

@@ -462,7 +466,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             
        
@@ -497,7 +501,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             

@@ -530,7 +534,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             
        
@@ -565,7 +569,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             

@@ -600,7 +604,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             

@@ -629,7 +633,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             
             

                 
-                
+                
                 
                                             
             
                            
             

@@ -650,7 +654,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             

@@ -683,7 +687,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         
   
             

                 
-                
+                
                 

             
                    
             

@@ -717,7 +721,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
             
   
                 

                     
-                    
+                    
                     

                 
                    
                 

@@ -755,7 +759,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
                 
   
                     

                         
-                        
+                        
                         

                     
                    
                     

@@ -804,8 +808,9 @@ 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');
+        $('#gpa_basic_si_first').trigger('keyup');
         // $('input[name="gpa_sum_si[]"]').each(function() {
-        //     console.log($(this));
+        //     //console.log($(this));
         //     $(this).trigger('keyup');
         // });
     }
@@ -822,11 +827,11 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 };
 
 
-$("#GridForm").submit(function(event) {
+$("#GridForm").submit(async function(event) {
 
     var check = checkDuplicate(0);
-
-
+    console.log(check)
+    
     event.preventDefault();
 
     if ($('#grid_emp_count').val() == 'false') {
@@ -836,10 +841,11 @@ $("#GridForm").submit(function(event) {
 
     var isValid = $('#GridForm').parsley().validate();
     if (!isValid) {
-        console.log('Form is Empty', 'Warning');
+        //console.log('Form is Empty', 'Warning');
         return;
     }
 
+
     $('.loader').fadeIn();
     $('.loader-mask').fadeIn();
 
@@ -847,45 +853,63 @@ $("#GridForm").submit(function(event) {
     var policy_form_action = '';
 
 
-    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;
-                }
+    checkPolicyTermsSI(function(result) {
+        if (!result) {
 
+            if (check) {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                var message = (policy_PrimaryKey === '') ? 'Policy Premium Added successfully' :'Policy Premium Added Successfully';
-                toastr.success(message, 'Success');
+            } else {
+                
+                $.ajax({
+                    data: formData,
+                    url: policy_form_action,
+                    type: "POST",
+                    dataType: 'json',
+                    processData: false,
+                    contentType: false,
+                    success: function(res) {
 
-                if($('#grid').val() == 1 ||  $('#grid').val() == 2){
-                    $('.close').click();
-                }
+                        //console.log("Response", res);
 
-            },
-            error: function(xhr, status, error) {
+                        if (res.status === false) {
+                            toastr.error('Policy Dose Not Create', 'Error');
+                            return;
+                        }
 
-                console.error(xhr.responseText);
-                console.error(status, error);
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        var message = (policy_PrimaryKey === '') ? 'Policy Premium Added successfully' :'Policy Premium Added Successfully';
+                        toastr.success(message, 'Success');
+
+                        if($('#grid').val() == 1 ||  $('#grid').val() == 2){
+                            $('.close').click();
+                        }
+
+                    },
+                    error: function(xhr, status, error) {
+
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                    }
+                });
             }
-        });
-    }
+
+        }else{
+
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning(`Value does not exist in the Policy Terms.`);
+
+        }
+
+}).catch(function(error) {
+                console.error('Error checking policy terms:', error);
+                // Handle error if necessary
+                toastr.error(`Error checking policy terms: ${error}`);
+            });
 
 });
 
@@ -907,7 +931,7 @@ $("#AdditionalGridForm").submit(function(event) {
 
     var isValid = $('#AdditionalGridForm').parsley().validate();
     if (!isValid) {
-        console.log('Form is Empty', 'Warning');
+        //console.log('Form is Empty', 'Warning');
         return;
     }
 
@@ -931,7 +955,7 @@ $("#AdditionalGridForm").submit(function(event) {
             contentType: false,
             success: function(res) {
 
-                console.log("Response", res);
+                //console.log("Response", res);
 
                 if (res.status === false) {
                     toastr.error('Policy Dose Not Create', 'Error');
@@ -964,16 +988,19 @@ $("#AdditionalGridForm").submit(function(event) {
 $('body').on('click', '.btnPolicyModel', function() {
 
     // $('#grid').empty();
-
     var client_policy_id = $(this).data('id');
+    var policy_type_id = $(this).data('typeid');
+
     $('#client_policy_id').val(client_policy_id);
     $('#client_policy_id_2').val(client_policy_id);
-    // console.log('client_policy_id', client_policy_id)
+    // //console.log('client_policy_id', client_policy_id)
 
     var policy_type_string = $(this).attr('id');
-    // console.log('policy_type_string', policy_type_string)
+    // //console.log('policy_type_string', policy_type_string)
+
+    // if (policy_type_string == 'GPA' || policy_type_string == 'GMC') {
+    if (policy_type_id) {
 
-    if (policy_type_string == 'GPA' || policy_type_string == 'GMC') {
 
         $('#GridForm').show();
         $('#no_data').html('');
@@ -982,7 +1009,7 @@ $('body').on('click', '.btnPolicyModel', function() {
         $('.loader-mask').fadeIn();
 
 
-        if (policy_type_string == 'GPA') {
+        if (policy_type_string == 'GPA' || policy_type_id == 6 || policy_type_id == 7) {
             $('#rack_rate_one').hide()
             $('#rack_rate_two').hide()
             $('#AdditionalGridForm').hide()
@@ -1033,15 +1060,15 @@ $('body').on('click', '.btnPolicyModel', function() {
                 }, 500);
 
 
-                console.log('policy grid responce', res);
+                //console.log('policy grid responce', res);
                 var temp_for_premiumData = JSON.parse(res.premiumData);
                 res.premiumData = JSON.parse(res.premiumData);
 
                 console.log('policy grid responce', res.premiumData);
-                console.log('policy name', res.policy_name);
+                //console.log('policy name', res.policy_name);
 
 
-                $('#nameOfThePolicy').text(' - ' + res.policy_name);
+                $('#PolicyNameForTitle').text(' - ' + res.policy_name);
                 $('#grid_emp_count').val(res.count);
 
 
@@ -1070,7 +1097,7 @@ $('body').on('click', '.btnPolicyModel', function() {
                 if (res.premiumData && res.premiumData.length > 0) {
                     $.each(res.premiumData, function(index, item) {
 
-                        if (item.rack_rate_type == 0 || policy_type_string == 'GPA') {
+                        if (item.rack_rate_type == 0 || policy_type_string == 'GPA' || policy_type_id == 6 || policy_type_id == 7) {
                             policy_grid_id_value = item.policy_grid_id;
                             first = item.policy_grid_id;
                             premium_type_for_primary_rr.push(item.premium_type);
@@ -1086,7 +1113,7 @@ $('body').on('click', '.btnPolicyModel', function() {
 
                 }
 
-                console.log('premium_type_for_sec_rr', premium_type_for_sec_rr)
+                //console.log('premium_type_for_sec_rr', premium_type_for_sec_rr)
 
                 if(premium_type_for_sec_rr.length > 0){
                     $('#del_btn_col').show();
@@ -1122,8 +1149,8 @@ $('body').on('click', '.btnPolicyModel', function() {
                 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);
+                //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 = '';
@@ -1182,8 +1209,9 @@ $('body').on('click', '.btnPolicyModel', function() {
 
                     res.premiumData.shift();
                     $.each(res.premiumData, function(index, item) {
-
+                        
                         if (item.si_or_bp == '1') {
+                            console.log('gpa basic pay items', item)
                             appendGridtHtml('1', item.rack_rate_type, item);
                         } else {
                             appendGridtHtml(item.policy_grid_id, item.rack_rate_type, item);
@@ -1208,8 +1236,8 @@ $('body').on('click', '.btnPolicyModel', function() {
 
                 $('input[name="gpa_sum_si2[]"]').each(function() {
                     $(this).trigger('keyup');
-                });
-
+                }); 
+                
                 $('input[name="gpa_sum_premium[]"]').each(function() {
                     $(this).trigger('keyup');
                 });
@@ -1218,34 +1246,46 @@ $('body').on('click', '.btnPolicyModel', function() {
                     $(this).trigger('keyup');
                 });
 
+                $('input[name="gpa_basic_si[]"]').each(function() {
+                    $(this).trigger('keyup');
+                });
+
+                $('input[name="gpa_basic_premium[]"]').each(function() {
+                    $(this).trigger('keyup');
+                });
+
+                $('input[name="basic_pay[]"]').each(function() {
+                    $(this).trigger('keyup');
+                });
+
                 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;
                 } 
 
 
-                console.log('id_for_trigger', id_for_trigger)
-                console.log('temp_for_premiumData', temp_for_premiumData)
-                console.log('temp_for_premiumData', temp_for_premiumData[0])
+                // //console.log('id_for_trigger', id_for_trigger)
+                // //console.log('temp_for_premiumData', temp_for_premiumData)
+                // //console.log('temp_for_premiumData', temp_for_premiumData[0])
 
 
                 $(`input[name="${first}_si[]"]`).each(function() {
-                    // console.log($(this));
+                    // //console.log($(this));
                     $(this).trigger('keyup');
                 });
 
                 $(`input[name="${first}_premium[]"]`).each(function() {
-                    // console.log($(this));
+                    // //console.log($(this));
                     $(this).trigger('keyup');
                 });
 
                 $(`input[name="${secondary}_si[]"]`).each(function() {
-                    // console.log($(this));
+                    // //console.log($(this));
                     $(this).trigger('keyup');
                 });
 
                 $(`input[name="${secondary}_premium[]"]`).each(function() {
-                    // console.log($(this));
+                    // //console.log($(this));
                     $(this).trigger('keyup');
                 });
 
@@ -1265,7 +1305,7 @@ $('body').on('click', '.btnPolicyModel', function() {
     } else {
 
         $('#grid').empty();
-        $('#nameOfThePolicy').html('');
+        $('#PolicyNameForTitle').html('');
         $('#GridForm').hide();
         $('#no_data').html('The policy has no Policy Rack Rate');
         toastr.warning("The policy has no Policy Rack Rate", "Warning")
@@ -1295,7 +1335,7 @@ $('#grid').change(function() {
         dataType: 'json',
         success: function(res) {
 
-            console.log('responce :', res);
+            //console.log('responce :', res);
 
             setTimeout(function() {
                 $('.loader').fadeOut();
@@ -1303,24 +1343,24 @@ $('#grid').change(function() {
             }, 1000);
 
             if (res.count > 0) {
-                // console.log(' hide submit btn count ', res.count);
+                // //console.log(' hide submit btn count ', res.count);
                 $("#hide_smbt_btn").hide();
             } else {
                 $("#hide_smbt_btn").show();
-                // console.log('show submit btn count ', res.count);
+                // //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);
+                $('#PolicyNameForTitle').html(' - ' + res.policy_name);
                 $('#grid_emp_count').val(res.count);
 
                 if (res.count > 0) {
-                    // console.log(' hide submit btn count ', res.count);
+                    // //console.log(' hide submit btn count ', res.count);
                     $("#hide_smbt_btn").hide();
                 } else {
                     $("#hide_smbt_btn").show();
-                    // console.log('show submit btn count ', res.count);
+                    // //console.log('show submit btn count ', res.count);
                 }
 
                 if (res.status === false) {
@@ -1363,7 +1403,7 @@ $('#grid').change(function() {
                     });
 
                 } else {
-                    console.log("res.premiumData is undefined, null, or empty.");
+                    //console.log("res.premiumData is undefined, null, or empty.");
                 }
             } else if (res.data[0].policy_type == "GPA") {
                 $('#si_or_bp').val('2');
@@ -1406,7 +1446,7 @@ $('#additional_grid').change(function() {
         dataType: 'json',
         success: function(res) {
 
-            console.log('responce :', res);
+            //console.log('responce :', res);
 
             setTimeout(function() {
                 $('.loader').fadeOut();
@@ -1414,24 +1454,24 @@ $('#additional_grid').change(function() {
             }, 1000);
 
             if (res.count > 0) {
-                // console.log(' hide submit btn count ', res.count);
+                // //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);
+                // //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);
+                $('#PolicyNameForTitle').html(' - ' + res.policy_name);
                 $('#grid_emp_count').val(res.count);
 
                 if (res.count > 0) {
-                    // console.log(' hide submit btn count ', res.count);
+                    // //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);
+                    // //console.log('show submit btn count ', res.count);
                 }
 
                 if (res.status === false) {
@@ -1477,7 +1517,7 @@ $('#additional_grid').change(function() {
                     });
 
                 } else {
-                    console.log("res.premiumData is undefined, null, or empty.");
+                    //console.log("res.premiumData is undefined, null, or empty.");
                 }
             } else if (res.data[0].policy_type == "GPA") {
                 $('#si_or_bp').val('2');
@@ -1507,10 +1547,10 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
 
     // console.log('appendGridtHtml function called')
     // console.log(ui_type)
-    // console.log(data)
+    // //console.log(data)
 
     var html = '';
-    // console.log('Grid Content',data)
+    // //console.log('Grid Content',data)
     Count++;
     var container = document.getElementById('grid_content_input');
 
@@ -1526,12 +1566,12 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
 
         if ($("#si_or_bp").val() == 1 || data.si_or_bp == '1') {
 
-            // console.log('step 2')
+            // //console.log('step 2')
 
             html = `

                             

                                 
-                                
+                                
                                 
                                             
                             
                  
                             

@@ -1548,7 +1588,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
 
         } else if ($("#si_or_bp").val() == 3 || data.si_or_bp == '3') {
 
-            // console.log('step 3')
+            // //console.log('step 3')
 
             html = `

                             
@@ -1559,7 +1599,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
 
                             

                                 
-                                
+                                
                                 
                                             
                             
 
 
@@ -1575,9 +1615,37 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
                             

                         
`;
 
+        }else if ($("#si_or_bp").val() == 2 || data.si_or_bp == '2') {
+
+            // console.log('step 3')
+
+            html = `
+            

+                

+                    
+                    
+                    

+                

+                

+                    
+                    
+                    

+                

+                

+                    
+                    
+                    

+                

+                

+                    
+                    
+                

+            

+            `;
+
         }
 
-        // console.log('step 4')
+        console.log('step 4')
 
     } else if (ui_type == '3') {
 
@@ -1585,7 +1653,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     
                                             
                 
                                                    
                 

@@ -1631,7 +1699,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     
                                             
                 
                    
                 

@@ -1682,7 +1750,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     

                 
                    
                 

@@ -1710,7 +1778,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     
                                             
                 
                    
                 

@@ -1734,7 +1802,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     
                                             
                 
                    
                 

@@ -1758,7 +1826,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
             
   
                 

                     
-                    
+                    
                     
                                             
                 
                    
                 

@@ -1786,7 +1854,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
                 
   
                     

                         
-                        
+                        
                         
                                             
                     
                    
                     

@@ -1814,7 +1882,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
         
   
             

                 
-                
+                
                 
                                             
             
                    
             

@@ -1846,7 +1914,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
         
   
             

                 
-                
+                
                 
                                             
             
    
             

@@ -1883,7 +1951,7 @@ function appendGridtHtml(ui_type = false, secondary = 0, data = false) {
     }
 
 
-    // console.log('html', html)
+    // //console.log('html', html)
 
     container.insertAdjacentHTML('beforeend', html);
 
@@ -1949,8 +2017,8 @@ function checkDuplicate(val) {
         container = $('#grid_content_input');
     }
 
-    console.log(id);
-    console.log(container);
+    //console.log(id);
+    //console.log(container);
 
     if (id.value === '3') {
 
@@ -2255,9 +2323,9 @@ function checkDuplicate(val) {
 
         for (var i = 0; i < siValues.length; i++) {
             for (var j = i + 1; j < siValues.length; j++) {
-                // console.log(maxSiValues);
-                // console.log("maxSiValues[i] ", maxSiValues[i] );
-                // console.log("maxSiValues[j]", maxSiValues[j]);
+                // //console.log(maxSiValues);
+                // //console.log("maxSiValues[i] ", maxSiValues[i] );
+                // //console.log("maxSiValues[j]", maxSiValues[j]);
                 if (siValues[i] === siValues[j] && gradeValues[i] === gradeValues[j] && maxSiValues[i] === maxSiValues[
                         j]) {
                     duplicatesFound = true;
@@ -2301,10 +2369,10 @@ function checkDuplicate(val) {
                 }
             }
 
-            // console.log('siValues', siValues);
-            // console.log('premiumValues', premiumValues);
-            // console.log('siDuplicates', siDuplicates);
-            // console.log('premiumDuplicates', premiumDuplicates);
+            // //console.log('siValues', siValues);
+            // //console.log('premiumValues', premiumValues);
+            // //console.log('siDuplicates', siDuplicates);
+            // //console.log('premiumDuplicates', premiumDuplicates);
 
             if (siDuplicates || premiumDuplicates) {
                 toastr.warning('Duplicates found!', 'warning');
@@ -2355,12 +2423,12 @@ function checkDuplicate(val) {
                 }
             }
 
-            // console.log('siValues', siValues);
-            // console.log('premiumValues', premiumValues);
-            // console.log('bandValues', bandValues);
-            // console.log('siDuplicates', siDuplicates);
-            // console.log('premiumDuplicates', premiumDuplicates);
-            // console.log('bandDuplicates', bandDuplicates);
+            // //console.log('siValues', siValues);
+            // //console.log('premiumValues', premiumValues);
+            // //console.log('bandValues', bandValues);
+            // //console.log('siDuplicates', siDuplicates);
+            // //console.log('premiumDuplicates', premiumDuplicates);
+            // //console.log('bandDuplicates', bandDuplicates);
 
             if (siDuplicates || bandDuplicates || premiumDuplicates) {
                 toastr.warning('Duplicates found!', 'warning');
@@ -2375,42 +2443,87 @@ function checkDuplicate(val) {
 
 function basicPayMultiple(input) {
 
-    if (input.id == 'basic_pay') {
-        var multi = $('#basic_multiplier')[0].value.replace(/,/g, '') * input.value.replace(/,/g, '');
+    console.log('basicPayMultiple function called')
 
-        $('#gpa_basic_si').val(multi).trigger('keyup');
+    var inputId = input.id;
+    var inputValue = input.value.replace(/,/g, '');
+    var count = inputId.split('_')[2]; // Extract the count from the id
+    console.log('input', input);
+    console.log('input id ', input.id);
+    console.log('input class ', input.className);
+    
+    if (input.className.includes('basic_pay')) {
 
-        var multi_2 = $('#gpa_basic_si')[0].value.replace(/,/g, '') * $('#premium_multiplier')[0].value.replace(/,/g,
-            '');
+        // Sum insured
+        var basicMultiplier = $('#basic_multiplier').val().replace(/,/g, '');
+        var multi = basicMultiplier * inputValue;
+        console.log('multi', multi);
+        $('#gpa_basic_si_' + count).val(multi).trigger('keyup');
 
-        $('#gpa_basic_premium').val(multi_2).trigger('keyup');
+        // Premium
+        var gpaBasicSiValue = multi; // We just calculated this value
+        var premiumMultiplier = $('#premium_multiplier').val().replace(/,/g, '');
+        var multi_2 = gpaBasicSiValue * premiumMultiplier / 1000;
+        console.log('multi_2', multi_2);
+        $('#gpa_basic_premium_' + count).val(multi_2).trigger('keyup');
 
-    } else if (input.id == 'basic_multiplier') {
+    } else if (input.className.includes('basic_multiplier')) {
 
-        var multi = input.value * $('#basic_pay')[0].value.replace(/,/g, '');
-        $('#gpa_basic_si').val(multi).trigger('keyup');
+        var multi = inputValue * $('#basic_pay_' + count).val().replace(/,/g, '');
+        $('#gpa_basic_si_' + count).val(multi).trigger('keyup');
+        var multi_2 = multi * $('#premium_multiplier').val().replace(/,/g, '') / 1000;
+        $('#gpa_basic_premium_' + count).val(multi_2).trigger('keyup');
 
-        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.className.includes('premium_multiplier')) {
 
-    } else if (input.id == 'premium_multiplier') {
+        // Sum insured
+        var basicMultiplier = $('#basic_multiplier').val().replace(/,/g, '');
+        var multi = basicMultiplier * inputValue;
+        console.log('multi', multi);
+        $('#gpa_basic_si_' + count).val(multi).trigger('keyup');
 
-        var multi = input.value.replace(/,/g, '') / 1000 * $('#gpa_basic_si')[0].value.replace(/,/g, '');
-        $('#gpa_basic_premium').val(multi).trigger('keyup');
+        // Premium
+        var gpaBasicSiValue = multi; // We just calculated this value
+        var premiumMultiplier = $('#premium_multiplier').val().replace(/,/g, '');
+        var multi_2 = gpaBasicSiValue * premiumMultiplier / 1000;
+        console.log('multi_2', multi_2);    } else if (input.className.includes('gpa_basic_si')) {
+        var multi = inputValue * $('#premium_multiplier').val().replace(/,/g, '');
+        $('#gpa_basic_premium_' + count).val(multi).trigger('keyup');
 
-
-    } else if (input.id == 'gpa_basic_si') {
-
-        var multi = input.value.replace(/,/g, '') * $('#premium_multiplier')[0].value.replace(/,/g, '');
-
-        $('#gpa_basic_premium').val(multi).trigger('keyup');
     }
 }
 
+
+function basicPayMultipleforfirstone(input){
+
+    var inputId = input.id;
+    var inputValue = input.value.replace(/,/g, '');
+
+    console.log('basicPayMultipleforfirstone')
+    console.log('input', input);
+    console.log('input id ', input.id); 
+    console.log('input class ', input.className); 
+    console.log('inputValue', inputValue); 
+
+     // Sum insured
+        var basicMultiplier = $('#basic_multiplier').val().replace(/,/g, '');
+        var multi = basicMultiplier * inputValue;
+        console.log('multi', multi);
+        $('#gpa_basic_si_first').val(multi).trigger('keyup');
+
+        // Premium
+        var gpaBasicSiValue = multi; // We just calculated this value
+        var premiumMultiplier = $('#premium_multiplier').val().replace(/,/g, '');
+        var multi_2 = gpaBasicSiValue * premiumMultiplier / 1000;
+        console.log('multi_2', multi_2);
+        $('#gpa_basic_premium_first').val(multi_2).trigger('keyup');
+
+}
+
+
 function gpaSumInsureMultiplier(element) {
 
-    // console.log(element);
+    // //console.log(element);
 
     var element = $('#gpa_sum_multiplier')[0];
     var sumInsured = $('input[name="gpa_sum_si[]"]');
@@ -2421,7 +2534,7 @@ function gpaSumInsureMultiplier(element) {
         var sumInsured = $('input[name="gpa_sum_si2[]"]')
     }
 
-    // console.log('sumInsured', sumInsured);
+    // //console.log('sumInsured', sumInsured);
 
     if ($('#si_or_bp').val() == 2) {
         var premium = $('input[name="premium[]"]');
@@ -2431,18 +2544,18 @@ function gpaSumInsureMultiplier(element) {
         var premium = $('input[name="gpa_sum_premium[]"]');
     }
 
-    // console.log(premium);
+    // //console.log(premium);
 
     sumInsured.each(function(index) {
 
         var siValue = $(this).val().replace(/,/g, '');
-        // console.log('siValue', siValue);
+        // //console.log('siValue', siValue);
 
         var premiumValue = (siValue / 1000) * element.value;
-        // console.log('premiumValue', premiumValue);
+        // //console.log('premiumValue', premiumValue);
 
         var premiumValuedata = premium[index];
-        // console.log('premiumValuedata', premiumValuedata);
+        // //console.log('premiumValuedata', premiumValuedata);
 
 
         if (premiumValuedata) {
@@ -2465,6 +2578,7 @@ function si_orbp_change_function() {
 
         $('.gpa_sum_insure_remove').hide();
         $('.gpa_band_remove').hide();
+        $('.gpa_basic_pay_remove').show();
 
         $('#si_or_bp_full_div').css({
             'display': '',
@@ -2508,6 +2622,7 @@ function si_orbp_change_function() {
 
         $('.gpa_sum_insure_remove').show();
         $('.gpa_band_remove').hide();
+        $('.gpa_basic_pay_remove').hide();
 
         var count = $("div.form-row.gpa_sum_insure_remove").length;
 
@@ -2517,14 +2632,14 @@ function si_orbp_change_function() {
             $('#gmc_add_more').hide();
         }
 
-        // console.log('gmcBandInput', count)
+        // //console.log('gmcBandInput', count)
 
 
         var gpaBandRemoveElements = $("#grid_1").nextAll("div").find(".gpa_band_remove").length;
-        console.log("Elements with class 'gpa_band_remove' within next div siblings:", gpaBandRemoveElements);
+        //console.log("Elements with class 'gpa_band_remove' within next div siblings:", gpaBandRemoveElements);
 
         var gmcBandInput = $("#grid_1").find('input[name="gmc_band[]"]').length
-        console.log('gmcBandInput', gmcBandInput)
+        //console.log('gmcBandInput', gmcBandInput)
 
 
         $('#si_or_bp_full_div').css({
@@ -2567,6 +2682,7 @@ function si_orbp_change_function() {
 
         $('.gpa_sum_insure_remove').hide();
         $('.gpa_band_remove').show();
+        $('.gpa_basic_pay_remove').hide();
 
         var count = $("div.form-row.gpa_band_remove").length;
 
@@ -2576,7 +2692,7 @@ function si_orbp_change_function() {
             $('#gmc_add_more2').hide();
         }
 
-        // console.log('gmcBandInput', count)
+        // //console.log('gmcBandInput', count)
 
         $('#si_or_bp_full_div').css({
             'display': '',
@@ -2645,12 +2761,12 @@ function getCurrentTime() {
 
 
 function createCheckboxes(obj, additional_relationship) {
-    console.log('createCheckboxes function called');
+    //console.log('createCheckboxes function called');
 
-    console.log(additional_relationship);
+    //console.log(additional_relationship);
     try {
         additional_relationship = JSON.parse(additional_relationship);
-        console.log(additional_relationship);
+        //console.log(additional_relationship);
     } catch (error) {
         console.error("Error parsing additional_relationship:", error);
         return;
@@ -2666,13 +2782,13 @@ function createCheckboxes(obj, additional_relationship) {
     $.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' : '';
-            console.log('isChecked', isChecked);
+            //console.log('isChecked', isChecked);
             html += `
                     

                         
                         
                     
`;
-            // console.log(html);
+            // //console.log(html);
         }
     });
 
@@ -2686,7 +2802,7 @@ function formatString(str) {
 
 
 $('#del_btn').click(function() {
-    console.log('delete btn clicked');
+    //console.log('delete btn clicked');
 
     Swal.fire({
         title: "Are you sure?",
@@ -2696,19 +2812,19 @@ $('#del_btn').click(function() {
         confirmButtonColor: "#3085d6",
         confirmButtonText: "Yes",
     }).then((result) => {
-        console.log('after then entered');
+        //console.log('after then entered');
 
         if (result.isConfirmed) {
-            console.log('isConfirmed entered');
+            //console.log('isConfirmed entered');
 
             var client_policy_id = $('#client_policy_id_2').val();
-            console.log('client_policy_id', client_policy_id)
+            //console.log('client_policy_id', client_policy_id)
 
             var rack_rate_type = $('#rack_rate_type_2').val();
-            console.log('rack_rate_type', rack_rate_type)
+            //console.log('rack_rate_type', rack_rate_type)
 
             var client_id = $('#Client_id_2').val();
-            console.log('client_id', client_id)
+            //console.log('client_id', client_id)
 
 
             $('.loader').fadeIn();
@@ -2719,8 +2835,8 @@ $('#del_btn').click(function() {
                 type: 'GET',
                 success: function(res) {
                     
-                    console.log('ajax success entered');
-                    console.log(res);
+                    //console.log('ajax success entered');
+                    //console.log(res);
 
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
@@ -2742,7 +2858,7 @@ $('#del_btn').click(function() {
                     }
                 },
                 error: function(xhr, status, error) {
-                    console.log('ajax error entered');
+                    //console.log('ajax error entered');
                     console.error(xhr.responseText);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
@@ -2752,10 +2868,10 @@ $('#del_btn').click(function() {
             // Removed the duplicated loader hiding code here
         }
 
-        console.log('after then entered end or cancel');
+        //console.log('after then entered end or cancel');
     });
 
-    console.log('delete btn clicked end');
+    //console.log('delete btn clicked end');
 });
 
 
@@ -2765,8 +2881,8 @@ function checkCheckboxes() {
     var checkedCount = checkboxes.filter(':checked').length;
     var uncheckedCount = checkboxes.not(':checked').length;
 
-    console.log('Checked count:', checkedCount); // Debugging
-    console.log('unchecked Count', uncheckedCount);
+    //console.log('Checked count:', checkedCount); // Debugging
+    //console.log('unchecked Count', uncheckedCount);
 
     if (checkedCount < 1) {
         toastr.warning('You must select at least one checkbox.', 'Warning');
@@ -2778,4 +2894,168 @@ function checkCheckboxes() {
     return true;
 }
 
+
+function checkTermsSISameAsRackRateSI(input) {
+
+    console.log('checkTermsSISameAsRackRateSI testing..........');
+    console.log(input);
+
+    var client_policy_id = $('#client_policy_id').val();
+    console.log('client_policy_id', client_policy_id)
+
+    var inputValue = input.value.replace(/,/g, ''); 
+    inputValue = parseFloat(inputValue); 
+    console.log(inputValue);
+
+    var url = '' + client_policy_id;
+
+    $.get(url, function(response) {
+        console.log(response);
+        console.log(response.data);
+
+        var policyTerms = response.data; 
+        var valueExists = false;
+
+        for (var i = 0; i < policyTerms.length; i++) {
+            if (parseFloat(policyTerms[i]) === inputValue) {
+                valueExists = true;
+                break;
+            }
+        }
+
+        if (!valueExists) {
+            input.value = ""; 
+            toastr.warning(`Value does not exist in the Policy Terms.`);
+        }
+
+    }).fail(function(xhr, status, error) {
+        console.error(xhr.responseText);
+        console.error(status, error);
+        toastr.error(`Failed to retrieve Policy Terms. Error: ${error}`);
+    });
+}
+
+
+ function checkPolicyTermsSI(callback) {
+
+
+    console.log('r function called');
+
+    var id = $('#additional_grid')[0]; 
+    var container = $('#additional_grid_content_input');
+
+    var val = 0;  
+
+    if (val == 0) {
+        id = $('#grid')[0];
+        container = $('#grid_content_input');
+    }
+
+
+    console.log(id);
+    console.log(container);
+
+    var siInputs = 0;
+
+    if (id.value === '2') {
+        siInputs = container.find('input[name="gpa_si"]');
+    } else if (id.value === '3') {
+        siInputs = container.find('input[name="3_si[]"]');
+    } else if (id.value === '4') {
+        siInputs = container.find('input[name="4_si[]"]');
+    } else if (id.value === '5') {
+        siInputs = container.find('input[name="5_si[]"]');
+    } else if (id.value === '6') {
+        siInputs = container.find('input[name="6_si[]"]');
+    } else if (id.value === '7') {
+        siInputs = container.find('input[name="7_si[]"]');
+    } else if (id.value === '8') {
+        siInputs = container.find('input[name="8_si[]"]');
+    } else if (id.value === '9') {
+        siInputs = container.find('input[name="9_si[]"]');
+    } else if (id.value === '10') {
+        siInputs = container.find('input[name="10_si[]"]');
+    }  else if (id.value === '11') {
+        siInputs = container.find('input[name="11_si[]"]');
+    } else if (id.value === '1') {
+        var selectedValue = $('#si_or_bp').val();
+
+        if (selectedValue == 1) {
+            siInputs = container.find('input[name="gpa_sum_si[]"]');
+        } else if (selectedValue == 3) {
+            siInputs = container.find('input[name="gpa_sum_si2[]"]');
+        }
+    }
+
+    var client_policy_id = $('#client_policy_id').val();
+    console.log('client_policy_id', client_policy_id)
+
+    var url = '' + client_policy_id;
+
+    var arrayLength = 0;
+
+    $.ajax({
+        url: url,
+        type: 'GET',
+        dataType: 'json',
+        success: function(response) {
+            console.log(response);
+            console.log(response.data);
+
+            var array1 = response.data;
+            var array2 = [];
+
+            siInputs.each(function() {
+                var input = $(this).val();
+                array2.push(input.replace(/,/g, ''));
+            });
+
+            console.log('array1', array1)
+            console.log('array2', array2)
+
+
+            function intersection(arr1, arr2) {
+                return arr1.filter(value => arr2.includes(value));
+            }
+
+            var commonElements = intersection(array1, array2);
+
+            function removeCommonElements(arr, common) {
+                return arr.filter(value => !common.includes(value));
+            }
+
+            array1 = removeCommonElements(array1, commonElements);
+            array2 = removeCommonElements(array2, commonElements);
+
+            console.log('array1', array1)
+            console.log('array2', array2)
+
+
+        // var result = array1.concat(array2);
+        var result = array1;
+
+        console.log('result', result)
+
+        arrayLength = result.length;
+
+        console.log('arrayLength', arrayLength)
+
+        if (arrayLength > 0) {
+            callback(true);
+        } else {
+            callback(false);
+        }
+
+        },
+        error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            toastr.error(`Failed to retrieve Policy Terms. Error: ${error}`);
+            callback(false);
+        }
+    });
+
+
+}
+
 
\ No newline at end of file
diff --git a/app/Views/policy_grid_excel.php b/app/Views/policy_grid_excel.php
index 009c6bb6..b5cf2531 100644
--- a/app/Views/policy_grid_excel.php
+++ b/app/Views/policy_grid_excel.php
@@ -30,383 +30,540 @@ th {
 
 
 
\ No newline at end of file
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index 222c7929..0d91fa62 100644
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -76,11 +76,12 @@
         

             

 
-            

-                

-                id"); ?>">
+                

+                    

+                        id"); ?>">
+                    

                 

-            

 
                 

                     

@@ -97,27 +98,31 @@
                     id="tickets-table">
                     
                         
-
-                            Date
-                            User
-                            Description
+                            CD Account No
+                            Policy Name
+                            Endorsement No
                             Sub Type
                             Credit
                             Debit
                             Balance
-
+                            Description
+                            Date/User
                         
                     
                     
                         
                         
-                            created_at)); ?>
-                            username; ?>
-                            description; ?>
-                            sub_type]) ? $subTypeOptions[$row->sub_type] : ''; ?>
+                            cd_ac_no; ?>
+                            policy_name; ?>
+                            endorsement_no; ?>
+                            sub_type]) ? $subTypeOptions[$row->sub_type] : ''; ?>
+                            
                             transaction_type == 'Credit') ? $row->amount : ''; ?>
                             transaction_type == 'Debit') ? $row->amount : ''; ?>
                             balance; ?>
+                            description; ?>
+                            created_at)); ?> by
+                                username; ?> 
                         
                         
                     
@@ -151,7 +156,7 @@
                             

                                 
-                                
+                                
                             

                             

                                 
                     
                     
@@ -222,22 +227,22 @@ $(document).ready(function() {
     $('#tickets-table').DataTable({
         dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>",
         buttons: [{
-            extend: 'csv',
-            text: 'CSV',
-            title: 'TransactionDetails',
-            exportOptions: {
-                columns: ''
+                extend: 'csv',
+                text: 'CSV',
+                title: 'TransactionDetails',
+                exportOptions: {
+                    columns: ''
+                }
+            },
+            {
+                extend: 'pdf',
+                text: 'PDF',
+                title: 'TransactionDetails',
+                exportOptions: {
+                    columns: ''
+                }
             }
-        },
-        {
-            extend: 'pdf',
-            text: 'PDF',
-            title: 'TransactionDetails',
-            exportOptions: {
-                columns: ''
-            }
-        }
-    ],
+        ],
 
 
         language: {
@@ -288,15 +293,25 @@ $(document).ready(function() {
             // Add more options as needed
         };
 
+
         var subType = $('#subType').val();
         var subTypeId = subTypeOptions[subType] || null;
 
         if (subTypeId === null) {
             // Handle the case where sub_type is not found in the options
-            alert('Invalid sub_type selected.');
+            toastr.warning('Invalid sub_type selected.', "Warning");
             return;
         }
 
+        // console.log('transactionType ', transactionType)
+        // console.log('description ', description)
+        // console.log('amount ', amount)
+        // console.log('subType ', subType)
+        // console.log('sub_type_id ', sub_type_id)
+        // console.log('clientId ', clientId)
+        // console.log('insurerId ', insurerId)
+
+
         // Send data to the server using Ajax
         $.ajax({
             type: 'POST',
@@ -312,15 +327,18 @@ $(document).ready(function() {
             },
             success: function(response) {
                 // Handle success response
-                console.log("Transaction saved successfully");
+                toastr.success("Transaction saved successfully", "Success");
                 // Reload the page or perform other actions as needed
                 location.reload();
             },
-            error: function(error) {
-                // Handle error response
-                console.error(error);
+            error: function(xhr, status, error) {
+                toastr.error("Transaction save failed", "Error");
+                console.error(xhr.responseText);
+                console.error(status, error);
+                location.reload(); // Uncomment if you need to reload the page on error
             }
         });
+
     });
 });
 
\ No newline at end of file