diff --git a/.env.sample b/.env.sample
index ebc9ab1d..ceb7085a 100755
--- a/.env.sample
+++ b/.env.sample
@@ -33,11 +33,11 @@ database.default.DBDriver =
 
 # session.driver = 'CodeIgniter\Session\Handlers\FileHandler'
 # session.cookieName = 'ci_session'
-#session.expiration = 28800
+session.expiration = 
 # session.savePath = null
 # session.matchIP = false
-# session.timeToUpdate = 300
-# session.regenerateDestroy = false
+session.timeToUpdate = 300
+session.regenerateDestroy = false
 
 #--------------------------------------------------------------------
 # LOGGER
@@ -81,16 +81,6 @@ cookie.secure = 'true';// if https set as true or if http set as false
 unlayer.projectID = 
 email.enquiryMail = 
 
-database.postDB.hostname = 
-database.postDB.database = 
-database.postDB.username = 
-database.postDB.password = 
-database.postDB.DBDriver = 
-database.postDB.DBPrefix =
-database.postDB.port =
-
-POST_ENROLLMENT_BASEURL = 
-
 #SMS
 SMS_API_KEY = 
 SMS_SENDER_ID = 
@@ -108,3 +98,26 @@ CORS_MAX_AGE=7200
 CORS_DEBUG=true
 
 APP_SIGNATURE = 
+TOKENTIMEOUT = 
+JWT_SECRET =
+
+ICICI_PRIMARY_KEY_CONSTANT = 
+
+ABHI_PRIMARY_KEY_CONSTANT = 
+
+R_CARE_PRIMARY_KEY_CONSTANT = 
+
+FHPL_PRIMARY_KEY_CONSTANT = 
+
+VIDAL_PRIMARY_KEY_CONSTANT = 
+
+MEDI_ASSIST_PRIMARY_KEY_CONSTANT = 
+
+
+FHPL_TOKEN_URL = 
+FHPL_BASE_URL = 
+FHPL_USER_NAME  = 
+FHPL_PASSWORD   = 
+FHPL_GRANT_TYPE = 
+
+METABASE_SECRET_KEY=
\ No newline at end of file
diff --git a/app/Config/Acl.php b/app/Config/Acl.php
new file mode 100644
index 00000000..a1b44339
--- /dev/null
+++ b/app/Config/Acl.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Config;
+
+class Acl
+{
+    public array $rules = [
+
+        // ===================== PUBLIC / AUTH =====================
+        '#^/login#' => ['public' => true],
+        '#^/downloadCdSplitUpFile#' => ['public' => true],
+        '#^/logout#' => ['public' => true],
+        '#^/auth#' => ['public' => true],
+        '#^/oauth2callback#' => ['public' => true],
+        '#^/loginPos#' => ['public' => true],
+        '#^/getVerifyPosMobileNo#' => ['public' => true],
+        '#^/getVerifiedPosUserData#' => ['public' => true],
+        '#^/swagger#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/visitOffBoardCheck#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/logs#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/util/log_list#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/util/view_log#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/util/download_log#' => ['roles' => [ADMIN_ROLE_ID]],
+        '#^/metaDashboardDemo#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]],
+
+        // ===================== PUBLIC DOWNLOADS / FORMS =====================
+        '#^/download-#' => ['public' => true],
+        '#^/claim-form-download#' => ['public' => true],
+        '#^/claims-feedback-form#' => ['public' => true],
+        '#^/autobookstackLogin#' => ['public' => true],
+
+        // ===================== DASHBOARD =====================
+        '#^/dashboard#' => [
+            'roles' => [ ADMIN_ROLE_ID,HEAD_ROLE_ID, MANAGER_ROLE_ID, STAFF_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => []
+        ],
+
+         // ===================== VIEW INCEPTION PAGE =====================
+        '#^/hrFileList#' => [
+            'roles' => [ ADMIN_ROLE_ID,HEAD_ROLE_ID, MANAGER_ROLE_ID, STAFF_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== USER MANAGEMENT =====================
+        '#^/user#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== CLIENT =====================
+        '#^/client#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== EMPLOYEE / ENROLLMENT =====================
+        '#^/employee#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [ENROLLMENT_TEAM_ID]
+        ],
+
+        // ===================== MASTERS =====================
+        '#^/master#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => []
+        ],
+        '#^/util#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== POLICY TRANSACTION / BDS =====================
+        '#^/policy_tranction#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID]
+        ],
+        '#^/bds_upload#' => [
+           'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID]
+        ],
+
+        // ===================== REPORTS =====================
+        '#^/bdsReport#' => [
+           'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID]
+        ],
+
+        // ===================== PAYOUT / COMMISSION =====================
+        '#^/payout#' => [
+           'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID]
+        ],
+        '#^/commission#' => [
+           'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+           'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID]
+        ],
+
+        // ===================== CLAIMS / TICKETS =====================
+        '#^/ticket#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [CLAIMS_TEAM_ID]
+        ],
+        '#^/claim_mis#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [CLAIMS_TEAM_ID]
+        ],
+
+        // ===================== LEADS / SALES =====================
+        '#^/leads#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [BUSINESS_SUPPORT_TEAM_ID, SALES_TEAM_ID]
+        ],
+        '#^/rfq#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID],
+            'teams' => [SALES_TEAM_ID]
+        ],
+        '#^/sales#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID],
+            'teams' => [SALES_TEAM_ID]
+        ],
+
+        // ===================== CMS / CONTENT =====================
+        '#^/add_image_index#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID],
+            'teams' => []
+        ],
+        '#^/frontend_content#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID],
+            'teams' => []
+        ],
+        '#^/FAQ#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== LOGS =====================
+        '#^/logs#' => [
+            'roles' => [ADMIN_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== INTERNAL TEST =====================
+        '#^/test#' => [
+            'roles' => [ADMIN_ROLE_ID],
+            'teams' => []
+        ],
+
+        // ===================== API (JWT / SIGNED) =====================
+        '#^/api#' => ['public' => true],
+        '#^/employeeRest#' => ['public' => true],
+        '#^/clientApi#' => ['public' => true],
+
+        // ===================== WEBHOOKS / 3RD PARTY =====================
+        '#^/dispatchWebhookData#' => ['public' => true],
+        '#^/retrieveWebhookData#' => ['public' => true],
+        // '#^/ICICI#' => ['public' => true],
+        // '#^/Vidal#' => ['public' => true],
+        // '#^/MediAssist#' => ['public' => true],
+
+        // ===================== CLI =====================
+        '#^/cli/#' => ['public' => true],
+
+        // ===================== DEFAULT DENY (ZERO TRUST) =====================
+        '#^/#' => [
+            'roles' => [ADMIN_ROLE_ID],
+            'teams' => []
+        ],
+    ];
+}
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index 62b24b8d..58edbca1 100755
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -101,6 +101,6 @@ class Autoload extends AutoloadConfig
      * @phpstan-var list<string>
      */
     public $helpers = ['uuid','session','utility', 'form', 'url', 'oauth', 'fileupload',
-    'excel_import_export', 'file', 'drive','ExcelSanitizeHelper', 'api_helper','exception','sms_helper'
+    'excel_import_export', 'file', 'drive','ExcelSanitizeHelper', 'api_helper','exception','sms_helper','sanitizeInputArrayAdvanced'
 ];
 }
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 2128f042..c9431b94 100755
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -16,6 +16,10 @@ use App\Filters\AuthClientApi;
 use App\Filters\CommissionApiFilter;
 use App\Filters\VerifyAppSignature;
 use App\Filters\Cors;
+use App\Filters\SecurityInputFilter;
+use App\Filters\GlobalPostFileUploadGuard;
+use App\Filters\AclFilter;
+use App\Filters\RateLimitFilter;
 
 use App\Filters\AuthJWT;
 
@@ -43,6 +47,11 @@ class Filters extends BaseConfig
         'CommissionApiFilter'=> CommissionApiFilter::class,
         'appSignature'       => VerifyAppSignature::class,
         'Cors'       => Cors::class,
+        'SecurityInputFilter'       => SecurityInputFilter::class,
+        'GlobalPostFileUploadGuard'       => GlobalPostFileUploadGuard::class,
+        'AclFilter'       => AclFilter::class,
+        'ratelimit' => RateLimitFilter::class,
+        
     ];
 
     /**
@@ -56,6 +65,9 @@ class Filters extends BaseConfig
         'before' => [
             'HttpRequestLog' => ['except' => 'cli/*'],
             'Cors',
+            'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission']],
+            'SecurityInputFilter' => ['except' => ['/client/notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ],
+            'GlobalPostFileUploadGuard'
             // 'csrf',
             // 'invalidchars',
         ],
@@ -86,5 +98,5 @@ class Filters extends BaseConfig
      * Example:
      * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
      */
-    public array $filters = [];
+    // public array $filters = [ 'Cors' => ['before' => ['employeeRest/*']]];
 }
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 531d5836..02f194d1 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -21,6 +21,8 @@ $routes->get('/chatbot', 'ChatbotControllerNew::chatbot');
 $routes->get('/swagger', 'SwaggerController::index', ['filter' => 'authMVC']);
 $routes->get('/fedeploy', 'DeployController::fedeploy_view', ['filter' => 'authMVC']);
 $routes->post('/fedeploy', 'DeployController::fedeploy', ['filter' => 'authMVC']);
+$routes->get('/visitOffBoardCheck', 'EmployeeController::visitOffBoardCheck');
+$routes->get('/metaDashboardDemo', 'TestingController::metaDashboardDemo');
 
 // Reminder Mail Notification
 
@@ -35,7 +37,6 @@ $routes->get("view", "EmployeeController::viewECard/$1");
 $routes->get("checkWellnessOnboardStatus/(:any)", "EmployeeController::checkWellnessOnboardStatus/$1");
 $routes->get("initiateWellnessOnboard/(:any)", "EmployeeController::initiateWellnessOnboard/$1");
 $routes->get("exportQCRandRFQ/(:any)", "LeadsController::exportQCRandRFQ/$1");
-$routes->get("smapletest", "ClientController::smapletest");
 $routes->get("testMailAttachments", "ClientController::testMailAttachments");
 $routes->get("updatePolicyTermsKey", "ClientController::updatePolicyTermsKey");
 $routes->get("updateRemainderDate", "ClientController::updateRemainderDate");
@@ -215,6 +216,9 @@ $routes->group("/employee", ["filter" => "authMVC"], function ($routes) {
     $routes->post("retail-endorsement-save", "EmployeeController::retailendorsementsave");
     $routes->get("getTPADataVariationReport/(:num)", "EmployeeController::getTPADataVariationReport/$1");
     $routes->get("bulkGenerateEcardAndStoreinS3", "EmployeeController::bulkGenerateEcardAndStoreinS3");
+    $routes->get('clearCdSession', 'EmployeeController::clearCdSession');
+    $routes->get('checkSessionStatus', 'EmployeeController::checkSessionStatus');
+
 });
 
 
@@ -427,6 +431,8 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('checkDuplicateCdAccount', 'MasterController::checkDuplicateCdAccount');
     $routes->get('proceedExcelFileDataValidation', 'EmployeeController::proceedExcelFileDataValidation');
     $routes->get('checkTpaApiEnable', 'EmployeeRestController::checkTpaApiEnable');
+    $routes->get('generateDemographyDataTable', 'LeadsController::generateDemographyDataTable');
+    $routes->post('insufficientCdBalanceHrMailSend', 'EmployeeController::insufficientCdBalanceHrMailSend');
 });
 
 $routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
@@ -525,7 +531,6 @@ $routes->cli('cli/check_env', 'MasterController::checkEnv');
 $routes->cli('cli/enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus');
 $routes->cli("cli/sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail");
 $routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
-$routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
 $routes->cli('cli/insurerRFQRemainder', 'LeadsController::remainderForQcr');
 $routes->cli('cli/sendMailWithAutoQuery','TicketController::sendMailWithAutoQuery');
 $routes->cli('cli/MediAssit-ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate');
@@ -544,7 +549,7 @@ $routes->get('get_ticket_data',"EmployeeRestController::get_ticket_data");
 
 
 //api
-$routes->group("/api", ["filter" => "authJWT"], function ($routes) {
+$routes->group("/api", ["filter" => [ 'ratelimit' , 'authJWT']], function ($routes) {
     $routes->get('get_ticket_type',"EmployeeRestController::get_ticket_type");
     $routes->post("logined", "RestAuthenticationController::logined");
     $routes->post("getId", "RestAuthenticationController::getUserIdFromToken");
@@ -554,8 +559,12 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 
 $routes->get("getSSORedirectUrl", "ApiServiceController::getSSORedirectUrl");
 $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
+$routes->get("downloadCdSplitUpFile", "EmployeeRestController::downloadCdSplitUpFile");
+$routes->get("downloadFileTableFile/(:any)", "EmployeeController::downloadFileList/$1");
 
-$routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($routes) {
+
+
+$routes->group("employeeRest", ['filter' => ['ratelimit' , 'appSignature'] ], function ($routes) {
 
     //Employee login api's
     $routes->post("verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
@@ -598,7 +607,9 @@ $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($route
 
 });
 
-$routes->group("employeeRest", ["filter" => ['appSignature' , 'authJWT']], function ($routes) {
+$routes->group("employeeRest", ["filter" => ['GlobalPostFileUploadGuard', 'ratelimit' , 'appSignature', 'authJWT']], function ($routes) {
+
+    $routes->post('logout', 'RestAuthenticationController::logout');
 
     $routes->post("ecardRequest", "ApiServiceController::ecardRequest");
     $routes->get("getWellnessURL", "ApiServiceController::getWellnessURL");
@@ -648,6 +659,7 @@ $routes->group("employeeRest", ["filter" => ['appSignature' , 'authJWT']], funct
     $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
     $routes->post("hrFileUpload", "EmployeeRestController::hrFileUpload");
     $routes->post("updateHrFileUploadData", "EmployeeRestController::updateHrFileUploadData");
+    $routes->post("getHrDashboad", "EmployeeRestController::getHrDashboad");
 
 
     //thz_master's
@@ -659,7 +671,7 @@ $routes->group("employeeRest", ["filter" => ['appSignature' , 'authJWT']], funct
     $routes->match(['get','post','put'], 'ticketType', 'ThzController::ticketType');
 
     //this route for nhance website contact form (sales/service)
-    $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($routes) {
+    $routes->group("employeeRest", ['filter' => ['ratelimit' , 'appSignature'] ], function ($routes) {
         $routes->post("ticketSave", "ThzController::ticketSave");
     });
 
@@ -678,7 +690,10 @@ $routes->group("employeeRest", ["filter" => ['appSignature' , 'authJWT']], funct
 
     // get insurer and policy type
     $routes->get("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
-
+    $routes->get("getExcelFileErrors/(:any)", "EmployeeController::getExcelFileErrors/$1");
+    $routes->get("getPolicyAndEndorsementFiles", "EmployeeRestController::getPolicyAndEndorsementFiles");
+    $routes->get("downloadPolicyFiles", "EmployeeRestController::downloadPolicyFiles");
+    $routes->post("bulkEcardDownloadAsZip", "EmployeeRestController::bulkEcardDownloadAsZip");
 });
 
 $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
@@ -736,6 +751,12 @@ $routes->group("/ticket", ["filter" => "authMVC"], function ($routes) {
    $routes->get('getTpaClaimStatus',"ApiServiceController::getClaimStatus");
 });
 
+$routes->group("/claim_mis", ["filter" => "authMVC"], function ($routes) {
+   $routes->get('list','TicketController::claimMisFileList');
+   $routes->get('download','TicketController::downloadClaimMisFile');
+   $routes->post('upload','TicketController::uploadClaimMisFile');
+});
+
 $routes->group("clientApi",["filter" => "AuthClientApi"], function ($routes){
 
     $routes->post("getPolicyMaster","ClientAPIController::sendPolicyMaster");
@@ -753,7 +774,6 @@ $routes->post("retrieveWebhookDataClaim","ClientWebHooksController::pullData_cla
 
 
 //Third party ICICILombard Api Call
-
 $routes->get('generateAuthToken','ICICILombardController::generateAuthToken');
 $routes->get('createEnrollmentBatch','ICICILombardController::createEnrollmentBatch');
 $routes->get('getEnrollmentBatchStatus','ICICILombardController::getEnrollmentBatchStatus');
@@ -762,16 +782,17 @@ $routes->get('fetchUHIDDetails','ICICILombardController::fetchUHIDDetails');
 
 
 //Third party  - testing route
-
-$routes->get('EcardRequest','VidalApiController::EcardRequest');
+$routes->get('FhplGetBenefDetails','FhplApiController::FhplGetBenefDetails');
+$routes->get('EcardRequest','FhplApiController::EcardRequest');
 $routes->get('HospitalNetwork','MediAssistApiController::HospitalNetwork');
 $routes->get('VidalGetBenefDetails','VidalApiController::VidalGetBenefDetails');
-$routes->get('ClaimDetail','VidalApiController::ClaimDetail');
-$routes->get('SubmitClaim','MediAssistApiController::SubmitClaim');
+$routes->get('ClaimDetail','FhplApiController::ClaimDetail');
+$routes->get('SubmitClaim','HealthIndiaApiController::SubmitClaim');
 $routes->get('IntimateClaim','MediAssistApiController::IntimateClaim');
 $routes->get('IRSubmission','MediAssistApiController::IRSubmission');
 $routes->get('ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate');
 $routes->get('syncTpaClaimToNhance','MediAssistApiController::syncTpaClaimToNhance');
+$routes->get('HealthIndiaGetBenefDetails','HealthIndiaApiController::HealthIndiaGetBenefDetails');
 
 
 // API service (Don't delete)
diff --git a/app/Controllers/ApiServiceController.php b/app/Controllers/ApiServiceController.php
index f59de0f0..6f2e8ae2 100644
--- a/app/Controllers/ApiServiceController.php
+++ b/app/Controllers/ApiServiceController.php
@@ -12,6 +12,7 @@ use App\Controllers\BaseController;
 use App\Controllers\VidalApiController;
 use App\Controllers\ICICILombardController;
 use App\Controllers\MediAssistApiController;
+use App\Controllers\FhplApiController;
 use App\Models\BatchFileModel;
 use App\Models\FileModel;
 use App\Helpers\TPADataCompareHelper;
@@ -26,6 +27,8 @@ class ApiServiceController extends BaseController
     protected $medi_assist_primary_key;
     protected $vidal_primary_key;
     protected $icici_primary_key;
+    protected $fhpl_primary_key;
+    protected $health_india_primary_key;
 
     public function __construct()
     {
@@ -34,6 +37,8 @@ class ApiServiceController extends BaseController
         $this->medi_assist_primary_key = getenv('MEDI_ASSIST_PRIMARY_KEY_CONSTANT');
         $this->vidal_primary_key = getenv('VIDAL_PRIMARY_KEY_CONSTANT');
         $this->icici_primary_key = getenv('ICICI_PRIMARY_KEY_CONSTANT');
+        $this->fhpl_primary_key = getenv('FHPL_PRIMARY_KEY_CONSTANT');
+        $this->health_india_primary_key = getenv('HEALTH_INDIA_PRIMARY_KEY_CONSTANT');
     }
 
     //  Push Claims
@@ -55,6 +60,10 @@ class ApiServiceController extends BaseController
             { // Vidal
                 $vidalApiController = new VidalApiController;
                 return $vidalApiController->SubmitClaim($claimId);
+            }else if ($tpaID == $this->fhpl_primary_key)
+            { // fhpl
+                $fhplApiController = new FhplApiController;
+                return $fhplApiController->SubmitClaim($claimId);
             }else{
                 log_message('error', "This ticket id ( {$claimId} ) TPA has no API service enabled. TPA ID : {$tpaID}");
             }
@@ -106,10 +115,11 @@ class ApiServiceController extends BaseController
                                 ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
                                 ->where('employees.emp_code', $emp_code)
                                 ->where('employee_polices.client_policy_id', $client_policy_id)
+                                ->where('employees.id', $id)
                                 ->where('employee_polices.is_active', 1)
                                 ->where('employees.is_active', 1)
-                                ->where('employee_polices.status', 'active')
-                                ->where('employees.emp_status', 'active')
+                                ->whereIn('employee_polices.status', ['active', 'expired'])
+                                ->whereIn('employees.emp_status', ['active', 'expired'])
                                 ->findAll();
 
           
@@ -129,6 +139,12 @@ class ApiServiceController extends BaseController
                     $vidalApiController = new VidalApiController;
                     $data['eCardDownload'] = $vidalApiController->EcardRequest( $emp_code, $policy_no , $employee_policy[0]['tpa_id'] );
 
+                  }else if($employee_policy[0]['tpa_primary_id'] == $this->fhpl_primary_key)// Fhpl
+                  { 
+
+                    $fhplApiController = new FhplApiController;
+                    $data['eCardDownload'] = $fhplApiController->EcardRequest( $emp_code, $policy_no , $employee_policy[0]['tpa_id'] );
+
                   }else{
 
                     if($type == "download"){
@@ -265,6 +281,17 @@ class ApiServiceController extends BaseController
 
             return $this->respond(['status'  => true, 'code' => 200, 'message' => 'Action Triggered','data'    => [] ]);
 
+        }else if ($tpa_id == $this->fhpl_primary_key) // Fhpl
+        { 
+            $file_id = $fileModel->insert($data);
+            log_message('error', "Files table inserted successfully, File id : {$file_id}");
+            // $fhplApiController = new FhplApiController;
+            // $fhplApiController->FhplGetBenefDetails( [ 'polict_no' => $policy_no, 'file_id' =>$file_id ] );
+            $r = Jobs::addJob(['job_name' => 'FhplGetBenefDetails', 'payload' => ['policy_no' => $policy_no, 'file_id' => $file_id, 'client_policy_id' => $policy_id, 'return_type' => 'job']]);
+            log_message('error', "FhplGetBenefDetails job pushed successfully.");
+
+            return $this->respond(['status'  => true, 'code' => 200, 'message' => 'Action Triggered','data'    => [] ]);
+
         }else{
             return $this->respond(['status'  => false, 'code' => 200,'message' => 'TPA not found ','data'    => [] ]);
         }
@@ -286,12 +313,20 @@ class ApiServiceController extends BaseController
             if ($tpaID == $this->medi_assist_primary_key) { // MediAssist
 
                 $mediAssistController = new MediAssistApiController();
-                return $mediAssistController->ClaimDetail($claimId);
+                $res =  $mediAssistController->ClaimDetail($claimId);
+                return $this->response->setJSON(['status' => $res['status'],'message' => $res['message'] ]);
 
             }else if ($tpaID == $this->vidal_primary_key) { // vidal
 
                 $vidalApiController = new VidalApiController;
-                return $vidalApiController->ClaimDetail($claimId);
+                $res =  $vidalApiController->ClaimDetail($claimId);
+                return $this->response->setJSON(['status' => $res['status'],'message' => $res['message'] ]);
+
+            }else if ($tpaID == $this->fhpl_primary_key) { // Fhpl
+
+               $fhplApiController = new FhplApiController;
+               $res =  $fhplApiController->ClaimDetail($claimId);
+               return $this->response->setJSON(['status' => $res['status'],'message' => $res['message'] ]);
 
             }else{
                 log_message('error', "This ticket id ( {$claimId} ) TPA has no API service enabled. TPA ID : {$tpaID}");
diff --git a/app/Controllers/AppContentManagementController.php b/app/Controllers/AppContentManagementController.php
index 33d592e9..a7032a4c 100755
--- a/app/Controllers/AppContentManagementController.php
+++ b/app/Controllers/AppContentManagementController.php
@@ -59,8 +59,48 @@ class AppContentManagementController extends AdminController
     // add and edit 
     public function add_advertise_image() {
             try {
+
+                $data = $this->request->getPost();
+                $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+                $id = ((int) $sanitized_post_data['add_image_id']) ?? null;
+
+                $rules = [
+                    'client_id' => [
+                        'rules'  => 'required|integer',
+                        'errors' => [
+                            'required' => 'Client is required',
+                            'integer'  => 'Invalid client selected'
+                        ]
+                    ],
+                ];
+                $rules['advertise_image'] = [
+                    'rules'  => ($id === 0 ? 'uploaded[advertise_image]|' : '')  // required only for ADD
+                            . 'is_image[advertise_image]'
+                            . '|mime_in[advertise_image,image/jpg,image/jpeg,image/png]'
+                            . '|max_size[advertise_image,200]'
+                            . '|min_dims[advertise_image,1640,664]'
+                            . '|max_dims[advertise_image,1640,664]',
+                    'errors' => [
+                        'uploaded' => 'Image is required',
+                        'is_image' => 'File must be an image',
+                        'mime_in'  => 'Only JPG, JPEG, PNG allowed',
+                        'max_size' => 'Image size must not exceed 200 KB',
+                        'min_dims' => 'Image dimensions must be exactly 1640x664 pixels',
+                        'max_dims' => 'Image dimensions must be exactly 1640x664 pixels',
+                    ]
+                ];
+                if (!$this->validate($rules)) {
+                    return $this->response->setStatusCode(400)->setJSON([
+                        'status' => false,
+                        'message' => 'Input validation failed',
+                        'code' => 400,
+                        'errors' => $this->validator->getErrors()
+                    ]);
+                }
+
+
                 $file = $this->request->getFile('advertise_image');
-                $client_id = $this->request->getPost('client_id');
+                $client_id = $sanitized_post_data['client_id'] ?? null;
                 //1) original file name for vaildations
                 $fileName = $file->getClientName(); //original file name for vaildations
                 $existing = $this->addImgModel->where('name', $fileName)->where('client_id', $fileName)->where('is_active', 1)->first();
@@ -80,13 +120,13 @@ class AppContentManagementController extends AdminController
                 
                 $file->move($uploadPath, $fileName);
 
-                $id = $this->request->getPost('add_image_id');
-                $data = ['name' => $fileName,'client_id'=>$client_id];
+                $id = $sanitized_post_data['add_image_id'] ?? null;
+                $details = ['name' => $fileName,'client_id'=>$client_id];
 
                 if ($id == 0) {
-                    $this->addImgModel->insert($data);
+                    $this->addImgModel->insert($details);
                 } else {
-                    $this->addImgModel->update($id, $data);
+                    $this->addImgModel->update($id, $details);
                 }
 
             return $this->respond(['status' => true, 'message' => 'Image saved successfully.']);
@@ -143,8 +183,56 @@ class AppContentManagementController extends AdminController
         
         if ($this->request->getMethod() === 'post') {
 
-            $id   = $this->request->getPost('fe_id');
-            $data = $this->request->getPost();
+            $rules = [
+                    'type' => [
+                        'rules'  => 'required|max_length[255]',
+                        'errors' => [
+                            'required'   => 'Type is required',
+                            'max_length' => 'Type cannot exceed 255 characters'
+                        ]
+                    ],
+                    'content_section' => [
+                        'rules'  => 'required|max_length[255]',
+                        'errors' => [
+                            'required'   => 'Content Section is required',
+                            'max_length' => 'Content Section cannot exceed 255 characters'
+                        ]
+                    ],
+                    'heading' => [
+                        'rules'  => 'required|max_length[255]',
+                        'errors' => [
+                            'required'   => 'Heading is required',
+                            'max_length' => 'Heading cannot exceed 255 characters'
+                        ]
+                    ],
+                    'content' => [
+                        'rules'  => 'required|max_length[5000]',
+                        'errors' => [
+                            'required'   => 'Content is required',
+                            'max_length' => 'Content cannot exceed 5000 characters'
+                        ]
+                    ],
+                    'notes' => [
+                        'rules'  => 'required|max_length[1500]',
+                        'errors' => [
+                            'required'   => 'Notes are required',
+                            'max_length' => 'Notes cannot exceed 1500 characters'
+                        ]
+                    ]
+            ];
+
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+            $request_post_data   = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($request_post_data);
+            $id   = $data['fe_id'];
+            
 
             unset($data['fe_id']); 
 
@@ -231,8 +319,30 @@ class AppContentManagementController extends AdminController
         try {
             // --- 1. POST: CREATE OR UPDATE ---
             if ($method === 'post') {
-                $id   = $this->request->getPost('faq_id');
-                $data = array_filter($this->request->getPost(), fn($v) => $v !== '' && $v !== null);
+                $rules = [
+                            'category' => [
+                                'rules'  => 'required',
+                                'errors' => [
+                                    'required' => 'Category is required'
+                                ]
+                            ],
+                            'question' => [
+                                'rules'  => 'required',
+                                'errors' => [
+                                    'required' => 'Question is required'
+                                ]
+                            ],
+                            'answer' => [
+                                'rules'  => 'required',
+                                'errors' => [
+                                    'required' => 'Answer is required'
+                                ]
+                            ]
+                ];
+                $request_post_data = $this->request->getPost();
+                $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+                $data = array_filter($sanitized_post_data, fn($v) => $v !== '' && $v !== null);
+                $id   = $data['faq_id'];
 
                 if (empty($id)) {
                     $status = $this->faqModel->insert($data);
@@ -264,9 +374,9 @@ class AppContentManagementController extends AdminController
             
                 if (!empty($id)) {
                     if($returnType === 'web'){
-                        $row = $this->faqModel->find($id);
+                        $row = $this->faqModel->find((int)$id);
                     }else{
-                        $row = $this->faqModel->where('is_active', 1)->find($id);
+                        $row = $this->faqModel->where('is_active', 1)->find((int)$id);
                     }
                     
                     $data['faq_list'] = $row ? [$row] : [];
diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index abc1ac14..f9d68b1e 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -101,10 +101,10 @@ class BDSReportController extends AdminController
                 SELECT
                         ins.id,
                         ins.name AS insurers,
-                        COALESCE(SUM(CASE WHEN pt.action_type = 'inception' AND pt.insurer_id = ins.id AND ptp.policy_category = $insurerCategory THEN 1 ELSE 0 END), 0) AS Policies,
-                        COALESCE(SUM(CASE WHEN ptp.policy_category = $insurerCategory AND pt_co.insurer_id = ins.id THEN (pt_co.cop_amt + pt_co.cotp_amt + pt_co.cotep_amt + pt_co.non_comm_per_amt) ELSE 0 END), 0) AS Premium,
-                        COALESCE(SUM(CASE WHEN stmt.co_share_id = pt_co.id AND ptp.policy_category = $insurerCategory AND pt_co.insurer_id = ins.id THEN stmt.reward + stmt.actual_bp_brokerage_amt + stmt.actual_tep_brokerage_amt + stmt.actual_tp_brokerage_amt ELSE 0 END), 0) AS Revenue,
-                        COALESCE(SUM(CASE WHEN ptp.policy_category = $insurerCategory AND pt_co.insurer_id = ins.id THEN pt_co.exp_amt ELSE 0 END), 0) AS Expected_amt
+                        COALESCE(SUM(CASE WHEN pt.action_type = 'inception' AND pt.insurer_id = ins.id AND ptp.policy_category = :insurerCategory: THEN 1 ELSE 0 END), 0) AS Policies,
+                        COALESCE(SUM(CASE WHEN ptp.policy_category = :insurerCategory: AND pt_co.insurer_id = ins.id THEN (pt_co.cop_amt + pt_co.cotp_amt + pt_co.cotep_amt + pt_co.non_comm_per_amt) ELSE 0 END), 0) AS Premium,
+                        COALESCE(SUM(CASE WHEN stmt.co_share_id = pt_co.id AND ptp.policy_category = :insurerCategory: AND pt_co.insurer_id = ins.id THEN stmt.reward + stmt.actual_bp_brokerage_amt + stmt.actual_tep_brokerage_amt + stmt.actual_tp_brokerage_amt ELSE 0 END), 0) AS Revenue,
+                        COALESCE(SUM(CASE WHEN ptp.policy_category = :insurerCategory: AND pt_co.insurer_id = ins.id THEN pt_co.exp_amt ELSE 0 END), 0) AS Expected_amt
                     FROM
                         insurers ins
                     LEFT JOIN
@@ -112,16 +112,17 @@ class BDSReportController extends AdminController
                     LEFT JOIN
                         co_share_stmt_details stmt ON pt_co.id = stmt.co_share_id AND stmt.is_active = 1
                     LEFT JOIN
-                        policy_transaction pt ON pt_co.pt_id = pt.id AND pt.is_active = 1 AND pt.policy_issue_date >= '$fromDate' AND pt.policy_issue_date <= '$toDate'
+                        policy_transaction pt ON pt_co.pt_id = pt.id AND pt.is_active = 1 AND pt.policy_issue_date >= :fromDate: AND pt.policy_issue_date <= :toDate:
                     LEFT JOIN
-                        policy_type ptp ON pt.policy_type_id = ptp.id AND ptp.policy_category = $insurerCategory AND ptp.is_active = 1
+                        policy_type ptp ON pt.policy_type_id = ptp.id AND ptp.policy_category = :insurerCategory: AND ptp.is_active = 1
                     WHERE
-                        ins.is_active = 1 AND (ptp.policy_category = $insurerCategory OR ptp.policy_category IS NULL)
+                        ins.is_active = 1 AND (ptp.policy_category = :insurerCategory: OR ptp.policy_category IS NULL)
                     GROUP BY
                         ins.id;
             ";
 
-            $data['insurer_wise_data'] = $this->insurerModel->query($sql)->getResultArray();
+            $binds = ['insurerCategory'=>$insurerCategory,'fromDate'=>$fromDate,'toDate'=>$toDate];
+            $data['insurer_wise_data'] = $this->insurerModel->query($sql,$binds)->getResultArray();
             // log_message('error',$this->insurerModel->getLastQuery());
             // log_message('error',json_encode($data));
         } catch (\Exception $e) {
@@ -146,15 +147,16 @@ class BDSReportController extends AdminController
                     COALESCE(SUM(co.reward + co.actual_bp_brokerage_amt + co.actual_tep_brokerage_amt + co.actual_tp_brokerage_amt), 0) AS Revenue,
                     COALESCE(SUM(pt_co.exp_amt), 0) AS Expected_amt
                 FROM policy_type AS pot
-                LEFT JOIN policy_transaction AS pt ON pot.id = pt.policy_type_id AND pt.is_active = 1 AND pt.action_type = 'inception' and pt.policy_issue_date >= '$fromDate' and pt.policy_issue_date <= '$toDate'
+                LEFT JOIN policy_transaction AS pt ON pot.id = pt.policy_type_id AND pt.is_active = 1 AND pt.action_type = 'inception' and pt.policy_issue_date >= :fromDate: and pt.policy_issue_date <= :toDate:
                 LEFT JOIN pt_co_share_details AS pt_co ON pt.id = pt_co.pt_id AND pt_co.is_active = 1
                 LEFT JOIN co_share_stmt_details AS co ON pt_co.id = co.co_share_id AND co.is_active = 1
                 WHERE pot.is_active = 1
-                AND pot.policy_category = $insurerCategory
+                AND pot.policy_category = :insurerCategory:
                 GROUP BY pot.bap;
 
             ";
-            $data['bap_wise_data'] = $this->policyTypeModel->query($sql)->getResultArray();
+            $binds = ['insurerCategory'=>$insurerCategory,'fromDate'=>$fromDate,'toDate'=>$toDate];
+            $data['bap_wise_data'] = $this->policyTypeModel->query($sql,$binds)->getResultArray();
         } catch (\Exception $e) {
             $data['message'] = 'No Data Found';
             $this->myLogger->logme('error', $e->getMessage());
@@ -189,10 +191,13 @@ class BDSReportController extends AdminController
             return $this->loadLayout('irba_report', $data);
         } else {
 
-            $fromDate = $this->request->getPost('fromDate');
-            $toDate  = $this->request->getPost('toDate');
-            $category = $this->request->getPost('category');
-            $report_type = $this->request->getPost('report_type');
+            $request_post_data   = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+
+            $fromDate = $sanitized_post_data['fromDate'] ?? null;
+            $toDate  = $sanitized_post_data['toDate'] ?? null;
+            $category = $sanitized_post_data['category'] ?? null;
+            $report_type = $sanitized_post_data['report_type'] ?? null;
             // log_message('error',json_encode($_POST));die();
             if ($report_type == 'insurer') {
                 $life = $category == 'life' ? 1 : 0;
@@ -265,6 +270,7 @@ class BDSReportController extends AdminController
     //Function for get BAP INSURE wise data for premium , policy count , revenue only
     public function getBAPInsurerData($category = 0, $start_date = null, $end_date = null)
     {
+        $category = (int)$category;
         try {
             $this->myLogger->logme('error', 'getBAPInsurerData function called');
             $this->myLogger->logme('error', 'category : {data}', ['data' => $category]);
@@ -424,7 +430,7 @@ class BDSReportController extends AdminController
     //Function for get BAP CLIENT wise data for premium , policy count , revenue only
     public function getBAPClientData($category = 0, $start_date = null, $end_date = null)
     {
-
+        $category = (int)$category;
         try {
             $this->myLogger->logme('error', 'getBAPClientData function called');
             $this->myLogger->logme('error', 'category : {data}', ['data' => $category]);
@@ -525,7 +531,7 @@ class BDSReportController extends AdminController
     //Function for get CLIENT wise data for premium and policy count only
     public function getClientData($category = 0, $start_date = null, $end_date = null)
     {
-
+        $category = (int)$category;
         try {
 
             $this->myLogger->logme('error', 'getClientData function called');
@@ -935,11 +941,13 @@ class BDSReportController extends AdminController
             return $this->loadLayout('renewal_search', $data);
         } else {
 
-            $fromDate = $this->request->getPost('fromDate');
-            $toDate  = $this->request->getPost('toDate');
-            $client_id = $this->request->getPost('client_id');
-            $client_type = $this->request->getPost('client_type');
-            $issuer_branch = $this->request->getPost('issuer_branch');
+            $request_post_data   = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+            $fromDate = $sanitized_post_data['fromDate'] ?? null;
+            $toDate  = $sanitized_post_data['toDate'] ?? null;
+            $client_id = $sanitized_post_data['client_id'] ?? null;
+            $client_type = $sanitized_post_data['client_type'] ?? null;
+            $issuer_branch = $sanitized_post_data['issuer_branch'] ?? null;
 
             $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
             $data['client_type'] = [1 => 'Group', 2 => 'Individual'];
diff --git a/app/Controllers/ClaimsUploadController.php b/app/Controllers/ClaimsUploadController.php
new file mode 100644
index 00000000..02c9a187
--- /dev/null
+++ b/app/Controllers/ClaimsUploadController.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\API\ResponseTrait;
+
+use App\Controllers\BaseController;
+
+class ClaimsUploadController extends BaseController
+{
+    use ResponseTrait;
+    protected $db;
+    public function __construct()
+    {
+        $this->db = \Config\Database::connect();
+    }
+
+    public function uploadDump()
+    {
+        $file = $this->request->getFile('file');
+
+        if (!$file || !$file->isValid()) {
+            return $this->respond([
+                'status' => 'failed',
+                'message' => 'Invalid file'
+            ], 400);
+        }
+
+        $data = [
+            'client_id'        => $this->request->getPost('client_id'),
+            'tpa_id'           => $this->request->getPost('tpa_id'),
+            'client_policy_id' => $this->request->getPost('client_policy_id'),
+            'from_date'        => $this->request->getPost('from_date'),
+            'to_date'          => $this->request->getPost('to_date'),
+            'upload_file'      => $file->getRandomName(),
+            // 'uploaded_by'      => user_id()
+        ];
+
+        $file->move(WRITEPATH . 'uploads/claims_dump', $data['upload_file']);
+
+        $this->db->table('claims_dump_uploads')->insert($data);
+
+        return $this->respond([
+            'status' => 'success',
+            'message' => 'Claims dump uploaded'
+        ]);
+    }
+}
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 4853fea1..2874c2cc 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -141,6 +141,7 @@ class ClientController extends AdminController
         $isDuplicate = $this->clientModel->isDuplicateByClientBranch($value, $field, $clientId, $branchId);
         return $this->response->setJSON(['isDuplicate' => $isDuplicate]);
     }
+
     public function checkDuplicateTableFieldValue()
     {
         $table = $this->request->getPost('table');
@@ -162,35 +163,6 @@ class ClientController extends AdminController
         return $this->response->setJSON(['isDuplicate' => $isDuplicate]);
     }
 
-    public function smapletest()
-    {
-        $headers = [
-            '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',
-            'PRO RATA PREMIUM',
-            'GST',
-            'TOTAL AMOUNT'
-        ];
-        $filePath = generateExcelWithHeader($headers);
-        echo "Excel file created at: $filePath";
-    }
-
     public function testMailAttachments($email = 'venkateshraman786@gmail.com')
     {
         $message = '<style>body{font-family:Arial,sans-serif;color:#333;line-height:1.6;margin:0;padding:0}.email-container{width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9}.header{background-color:#4a90e2;color:#fff;padding:15px;text-align:center}.header h1{margin:0;font-size:24px}.content{padding:20px;background-color:#fff}.content h2{color:#4a90e2;font-size:20px;margin-top:0}.content p{margin:10px 0}.details-table{width:100%;border-collapse:collapse;margin-top:20px}.details-table td,.details-table th{border:1px solid #ddd;padding:10px;text-align:left}.details-table th{background-color:#f2f2f2}.footer{margin-top:20px;font-size:12px;color:#777;text-align:center}.attachment-note{margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic}</style><div class=email-container><div class=header><h1>Request for Quotation (RFQ)</h1></div><div class=content><h2>Dear {{RECIPIENT_NAME}},</h2><p>We are reaching out to request a quotation for the following insurance coverage. Please review the details below and provide your quote at your earliest convenience.<h2>RFQ Details</h2><table data-custom-table-css="table" class=details-table><tr><th>Client name<td>{{CLIENT_NAME}}<tr><th>Coverage Type<td>{{POLICY_LONG_NAME}}<tr><th>Policy Start Date<td>{{POLICY_START_DATE}}<tr><th>Policy Duration<td>{{DURATION}}</table><div class=attachment-note>Please note: Additional terms and details are included in the attachment for your reference.</div><p>Please feel free to reach out if you require any further information to prepare the quote. We look forward to receiving your proposal.<p>Best regards,<p><strong>Nhance India Pvt Ltd</strong><br></div><div class=footer><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
@@ -478,13 +450,32 @@ class ClientController extends AdminController
     public function index()
     {
         $this->myLogger->logme('error', 'Client list function called');
+        // echo "<script>console.log( 'client list function called );</script>";
+    
         $headerData['tab_name'] = 'Clients';
         $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
-        $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
+        //  $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
         $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
+        
+        $rawList = $this->clientModel->getCreatedByUserName(1); 
+        $clientRM = $data['client_rm'];
+        $rmMap = [];
+        foreach ($clientRM as $rm) {
+            $rmMap[$rm->client_id][] = $rm->account_manager;
+        }
+        $data['clientList'] = (!empty($rawList) && is_array($rawList)) ? array_map(function($item) use ($rmMap) {
+            $managers = isset($rmMap[$item->id]) ? implode(", ", $rmMap[$item->id]) : "N/A";
+            return (object) [
+                'id'              => $item->id,
+                'client_name'     => $item->client_name,
+                'short_name'      => $item->short_name,
+                'account_managers' => $managers
+            ];
+        }, $rawList) : [];
 
         // dd($data);
+        // dd($data['clientList']);
 
         echo view('layout/header', $headerData);
         echo view('client_list', $data);
@@ -493,11 +484,25 @@ class ClientController extends AdminController
         // $this->loadLayout('client_onboarding', $data);
     }
 
-    
     public function typeList($id = null)
     {
         try {
-            $data = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            $rawList = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            $clientRM = $this->clientRMModel->getAllClientRM();;
+            $rmMap = [];
+            foreach ($clientRM as $rm) {
+                $rmMap[$rm->client_id][] = $rm->account_manager;
+            }
+            $data['clientList'] = (!empty($rawList) && is_array($rawList)) ? array_map(function($item) use ($rmMap) {
+                $managers = isset($rmMap[$item->id]) ? implode(", ", $rmMap[$item->id]) : "N/A";
+                return (object) [
+                    'id'              => $item->id,
+                    'client_name'     => $item->client_name,
+                    'short_name'      => $item->short_name,
+                    'account_managers' => $managers
+                ];
+            }, $rawList) : [];
+
             if (empty($data)) {
                 return $this->response
                     ->setJSON(['status' => 'error', 'message' => 'No Records found'])
@@ -515,10 +520,10 @@ class ClientController extends AdminController
         }
     }
 
-
     public function updateEmpAndPolicyStatus()
     {
         $return =  $this->clientPolicyModel->updateStatus();
+        print_rr($return);
         $this->myLogger->logme('error', 'Client Policy Status Update Count: {data}', ['data' => $return['client']]);
         $this->myLogger->logme('error', 'Employee Policy Status Update Count: {data}', ['data' => $return['emp']]);
     }
@@ -645,7 +650,7 @@ class ClientController extends AdminController
 
         // echo "<pre>";
         // print_r($data); die;
-        $data['placeHolders'] = ['member_name', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
+        $data['placeHolders'] = ['hr_name', 'member_name', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
 
         // dd($data['placeHolders']);
 
@@ -659,18 +664,25 @@ class ClientController extends AdminController
     }
 
     // In your controller
-    public function deposit($id = null, $requestFrom = null, $policyId = null)
+    public function deposit($ClientId = null, $requestFrom = null, $policyId = null)
     {
         $headerData['tab_name'] = 'Client Deposit';
         $headerData['page_name'] = 'Clients';
 
-        $data['clientName'] = $this->clientModel->where('id', $id)->find();
-        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id, $policyId);
+        if (is_string($ClientId) && preg_match('/^[a-f0-9]{32}$/i', $ClientId)) 
+        {
+           $data['clientName'] = $this->clientModel->where('md5(id)', $ClientId)->find();
+        }else  {
+           $data['clientName'] = $this->clientModel->where('id', $ClientId)->find();
+        }
 
-        $data['depositsummary'] = $this->clientPolicyModel->getDepositlistsummary($id);
+        
+        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($ClientId, $policyId);
+
+        $data['depositsummary'] = $this->clientPolicyModel->getDepositlistsummary($ClientId);
 
         // Fetch associated insurer names and balances
-        $balances = $this->clientPolicyModel->getBalances($id);
+        $balances = $this->clientPolicyModel->getBalances($ClientId);
         $data['balances'] = $balances;
 
         // dd($data);
@@ -735,14 +747,102 @@ class ClientController extends AdminController
 
     public function saveDeposit()
     {
+
+       $rules = [
+
+            'amount' => [
+                'rules' => 'required|numeric|greater_than_equal_to[0]',
+                'errors' => [
+                    'required' => 'Amount is required',
+                    'numeric'  => 'Amount must be a valid number',
+                    'greater_than_equal_to' => 'Amount cannot be negative',
+                ]
+            ],
+
+            'client_id' => [
+                'rules' => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Client ID is required',
+                    'is_natural_no_zero' => 'Client ID must be a positive integer',
+                ]
+            ],
+
+            'insurer_id' => [
+                'rules' => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Insurer ID is required',
+                    'is_natural_no_zero' => 'Insurer ID must be a positive integer',
+                ]
+            ],
+
+            'cd_ac_pk' => [
+                'rules' => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Account PK is required',
+                    'is_natural_no_zero' => 'Account PK must be a positive integer',
+                ]
+            ],
+
+            'cd_ac_no' => [
+                'rules' => 'required|regex_match[/^[a-zA-Z0-9\/_\\-]+$/]',
+                'errors' => [
+                    'required' => 'Account number is required',
+                    'regex_match' => 'Account number can only contain letters, numbers, slashes (/), underscores (_), and hyphens (-)',
+                ]
+            ],
+
+            'sub_type_id' => [
+                'rules' => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Sub type ID is required',
+                    'is_natural_no_zero' => 'Sub type ID must be a positive integer',
+                ]
+            ],
+
+            'description' => [
+                'rules' => 'required|string|min_length[3]|max_length[255]',
+                'errors' => [
+                    'required' => 'Description is required',
+                    'string' => 'Description must be text',
+                    'min_length' => 'Description must be at least 3 characters',
+                    'max_length' => 'Description must not exceed 255 characters',
+                ]
+            ],
+
+            'transaction_type' => [
+                'rules' => 'required|in_list[Credit,Debit]',
+                'errors' => [
+                    'required' => 'Transaction type is required',
+                    'in_list' => 'Transaction type must be either credit or debit',
+                ]
+            ],
+
+        ];
+
+
+        if (! $this->validate($rules)) {
+            return $this->response
+                ->setStatusCode(400)
+                ->setJSON([
+                    'status' => 'error',
+                    'message' => 'Input validation failed',
+                    'errors' => $this->validator->getErrors()
+                ]);
+        }
+
+        //sanitize the post params
+        $post_data = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($post_data);
         // Retrieve form data from POST request
         $loggedInUserID = get_session_userid();
+        // print_rr($sanitized_post_data);die();
+        $client_id = $sanitized_post_data['client_id'] ?? null;
+        $insurer_id = $sanitized_post_data['insurer_id'] ?? null;
+        $record_date = $sanitized_post_data['record_date'] ?? null;
+        $cd_ac_pk = $sanitized_post_data['cd_ac_pk'] ?? null;
+        $cd_ac_no = $sanitized_post_data['cd_ac_no'] ?? null;
 
-        $client_id = $this->request->getPost('client_id');
-        $insurer_id = $this->request->getPost('insurer_id');
-        $record_date = $this->request->getPost('record_date');
-        $cd_ac_pk = $this->request->getPost('cd_ac_pk');
-        $cd_ac_no = $this->request->getPost('cd_ac_no');
+         
 
         // $CD_Account_Number = $this->CDMasterModel
         //     ->where('client_id', $client_id)
@@ -760,16 +860,16 @@ class ClientController extends AdminController
         }
 
         $data = [
-            'amount' => $this->request->getPost('amount'),
-            'sub_type_id' => $this->request->getPost('sub_type_id'),
-            'client_id' => $this->request->getPost('client_id'),
+            'amount' => $sanitized_post_data['amount'] ?? null,
+            'sub_type_id' => $sanitized_post_data['sub_type_id'] ?? null,
+            'client_id' => $sanitized_post_data['client_id'] ?? null,
             'client_policy_id' => null,
             'cd_ac_no' => $cd_ac_no ?? null,
             'cd_ac_pk' => $cd_ac_pk ?? null,
             'endorsement_no' => null,
-            'insurer_id' => $this->request->getPost('insurer_id'),
-            'description' => $this->request->getPost('description'),
-            'transaction_type' => $this->request->getPost('transaction_type') ?: 'Credit',
+            'insurer_id' => $sanitized_post_data['insurer_id'] ?? null,
+            'description' => $sanitized_post_data['description'] ?? null,
+            'transaction_type' => $sanitized_post_data['transaction_type'] ?: 'Credit',
             'updated_by' => 1,
             'record_date' => $record_date
         ];
@@ -829,9 +929,32 @@ class ClientController extends AdminController
         }
 
         $editData['client_policy']    = $clientPoliceData;
+        //Notes : $editData['client_policy'] this on called in client_policy page 
+        $rawList = $editData['client_policy'];
+
+        $editData['client_policy'] = (!empty($rawList) && is_array($rawList))
+            ? array_values(array_map(function ($item) {
+                    return (object) [
+                        'id'                   => $item->id,
+                        'policy_no'            => $item->policy_no,
+                        'policy_type_name'     => $item->policy_type_name,
+                        'policy_start_date'    => $item->policy_start_date,
+                        'policy_end_date'      => $item->policy_end_date,
+                        'insurer_short'        => $item->insurer_short,
+                        'insurer_branch_name'  => $item->insurer_branch_name,
+                        'branch_name'          => $item->branch_name ?? ' - ',
+                        'tpa_short'            => $item->tpa_short,
+                        'policy_type_name'     => $item->policy_type_name,
+                        'policy_type_id'       => $item->policy_type_id,
+                        'lead_cd_amount'       => $item->lead_cd_amount,
+                        'tpa_branch_code'      => $item->tpa_branch_code,
+                        'branch_name'          => $item->branch_name ?? ' - ',
+                        'policy_type_id'       => $item->policy_type_id,
+                    ];
+                }, $rawList)) : [];
         $editData['client_policy']['role'] = get_role_id();
         $editData['notification'] = $this->notificationModel->select('template_name,enabled')->where('client_id', $id)->findAll();
-        $editData['placeHolders'] = ['member_name', 'member_mobile', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
+        $editData['placeHolders'] = ['hr_name', 'member_name', 'member_mobile', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
         $editData['api_data'] = $this->clientApi->where("client_id", $id)->where("is_active", 1)->first();
         // dd($editData);
 
@@ -847,40 +970,109 @@ class ClientController extends AdminController
 
     public function createClientGeneralInfo()
     {
-
         $this->myLogger->logme('error', 'Client general info function called');
+
+        $rules = [
+            'entity_type_id' => [
+                'rules' => 'required|numeric',
+                'errors' => [
+                    'required' => 'Entity Type is required',
+                    'numeric'  => 'Invalid Entity Type selected'
+                ]
+            ],
+            'client_name' => [
+                'rules' => 'required|regex_match[/^[a-zA-Z0-9\s_-]+$/]|min_length[2]||max_length[45]',
+                'errors' => [
+                    'required'    => 'Client Name is required',
+                    'regex_match' => 'Client Name can only contain letters, numbers, spaces, hyphens(-), and underscores(_).',
+                    'min_length'  => 'Client Name must be at least 2 characters.',
+                    'max_length'  => 'Client Name must not exceed 45 characters.',
+                ]
+            ],
+            'short_name' => [
+                'rules' => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]|min_length[2]||max_length[15]',
+                'errors' => [
+                    'required'    => 'Client Short Name is required',
+                    'regex_match' => 'Client Short Name can only contain letters, numbers, hyphens(-), and underscores(_) with no spaces.',
+                    'min_length'  => 'Client Short Name must be at least 2 characters.',
+                    'max_length'  => 'Client Short Name must not exceed 15 characters.',
+                ]
+            ],
+            'pan' => [
+                'rules' => 'required|regex_match[/^[A-Z]{5}[0-9]{4}[A-Z]$/]',
+                'errors' => [
+                    'required'    => 'PAN Number is required.',
+                    'regex_match' => 'Invalid PAN format. Example: ABCDE1234F'
+                ]
+            ],
+            'hr_file_processed_by' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required'    => 'HR File Processed By is required.',
+                ]
+            ],
+            'client_logo' => [
+                    'rules' => [
+                        'is_image[client_logo]',
+                        'max_size[client_logo,200]', // 200 KB
+                        'ext_in[client_logo,jpg,jpeg,png]',
+                        'max_dims[client_logo,100,100]',
+                    ],
+                    'errors' => [
+                        'is_image' => 'The uploaded file must be an image',
+                        'max_size' => 'File size should not exceed 200 KB',
+                        'ext_in'   => 'Allowed file types: jpg, jpeg, png',
+                        'max_dims' => 'Image dimensions must be 100 x 100 pixels',
+                    ]
+            ],
+
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        
+
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
         $file_name = file_Upload($this->request->getFile('client_logo'), $uploadFilePath);
         $data   = $this->request->getPost();
-        $data['created_by'] = get_session_userid();
-        $data['client_logo'] = $file_name;
-        $data['client_code'] = generate_client_code();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $sanitized_post_data['client_logo'] = $file_name;
+        $sanitized_post_data['client_code'] = generate_client_code();
 
 
-        if (!isset($data['is_download_btn'])) {
-            $data['is_download_btn'] = 0;
-        } elseif ($data['is_download_btn']) {
-            $data['is_download_btn'] = 1;
+        if (!isset($sanitized_post_data['is_download_btn'])) {
+            $sanitized_post_data['is_download_btn'] = 0;
+        } elseif ($sanitized_post_data['is_download_btn']) {
+            $sanitized_post_data['is_download_btn'] = 1;
         }
 
-        if (empty($data['parent_client_id'])) {
-            $data['parent_client_id'] = null;
+        if (empty($sanitized_post_data['parent_client_id'])) {
+            $sanitized_post_data['parent_client_id'] = null;
         }
 
-        $insert = $this->clientModel->insert($data);
+        $insertID = $this->clientModel->insert($sanitized_post_data);
 
-        if ($insert) {
-            $client_data = $this->clientModel->where(['id' => $insert, 'is_active' => 1])->first();
-
-            $client_id = $insert;
-            $default_template_creation = $this->createDefaultMailTemplate($client_id , $client_data);
-            if($default_template_creation == false){
-                $this->myLogger->logme('error', 'Default Mail Template Creation Failed for Client ID: {data}', ['data' => $client_id]);
+        if ($insertID) {
+            
+            $client_info = $this->clientModel->where(['id' => $insertID, 'is_active' => 1])->first();
+            
+            // Template Creation
+            if (!$this->createDefaultMailTemplate($insertID, $client_info)) {
+                $this->myLogger->logme('error', 'Default Mail Template Creation Failed for Client ID: ' . $insertID);
             }
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $client_data], 200);
-        } else {
-            return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
+
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $client_info], 200);
         }
+
+        return $this->respond(['status' => false, 'code' => 500, 'message' => 'Failed to create client'], 500);
     }
 
     public function editClientGeneralInfo()
@@ -920,7 +1112,7 @@ class ClientController extends AdminController
 
 
 
-    public function createClientKYCInfo()
+    public function createClientKYCInf()
     {
         $this->myLogger->logme('error', 'create Client kyc function called');
         $data = $this->request->getPost();
@@ -953,33 +1145,124 @@ class ClientController extends AdminController
         }
     }
 
+    /** Create Client KYC Documents V1 */
+    public function createClientKYCInfo()
+    {
+        $this->myLogger->logme('error', 'Create Client KYC function called');
+        
+        $rules = [
+            'other_docs_name' => [
+                'label'  => 'Documents Name',
+                'rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9_\- ]+$/]',
+                'errors' => [
+                    'regex_match' => 'Document Name can only contain letters, numbers, hyphens, and underscores'
+                ]
+            ],
+
+            'file_name' => [
+                'rules'  => 'uploaded[file_name]|max_size[file_name,5120]|ext_in[file_name,pdf,jpg,jpeg,png]',
+                'errors' => [
+                    'uploaded' => 'KYC document file is required',
+                    'max_size' => 'File size should not exceed 5MB',
+                    'ext_in'   => 'Allowed file types: pdf, jpg, jpeg, png',
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $data = $this->request->getPost();
+        $sanitized_data = sanitizeInputArrayAdvanced($data);
+        $form_type = $sanitized_data['form_type'] ?? null;
+        $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
+
+        unset($data['file_name']);
+        
+        $file = $this->request->getFile('file_name');
+
+        $fileName = file_Upload($file, $uploadFilePath);
+
+        if (!empty($fileName)) {
+            $sanitized_data['file_name'] = $fileName;
+        }
+
+        $sanitized_data['created_by'] = get_session_userid();
+
+        $insertID = $this->clientKYCDocsModel->insert($sanitized_data);
+        if ($insertID) {
+            if ($form_type === 'others') {
+                $kycDocs = $this->generateKycOthersTable($sanitized_data['client_id']);
+            } else {
+                $kycDocs = $this->generateKycPrimaryTable($sanitized_data['client_id']);
+            }
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs, 'file_name' => $file
+            ], 200);
+        } else {
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to upload KYC document'], 200);
+        }
+    }
+
+    /** Edit Client KYC Documents V1 */
     public function editClientKYCInfo()
     {
+        $this->myLogger->logme('error', 'Edit Client KYC function called');
+        
+        $rules = [
+            'file_name' => [
+                'rules'  => 'uploaded[file_name]|max_size[file_name,5120]|ext_in[file_name,pdf,jpg,jpeg,png]',
+                'errors' => [
+                    'uploaded' => 'KYC document file is required',
+                    'max_size' => 'File size should not exceed 5MB',
+                    'ext_in'   => 'Allowed file types: pdf, jpg, jpeg, png',
+                ]
+            ],
+        ];
 
-        $this->myLogger->logme('error', 'edit client kyc function called');
-        $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
-        $File = file_Upload($this->request->getFile('file_name'), $uploadFilePath);
-        $form_type = $this->request->getPost('form_type') ?? null;
-
-        if (!empty($File)) {
-            $data['file_name'] = $File;
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
         }
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data['client_id']  = $id;
-        $data['kyc_doc_type_id'] = $this->request->getPost('kyc_doc_id');
-        $data['updated_by'] = get_session_userid();
-        $insert = $this->clientKYCDocsModel->insert($data);
 
-        if ($insert) {
-            // $kycDocs = $this->clientKYCDocsModel->getKycDocsName($id);
-            if ($form_type == "others") {
-                $kycDocs = $this->generateKycOthersTable($this->request->getPost('client_id'));
+        $data = $this->request->getPost();
+        $sanitized_data = sanitizeInputArrayAdvanced($data);
+        $form_type = $sanitized_data['form_type'] ?? null;
+        $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
+
+        unset($sanitized_data['file_name']);
+        
+        $file = $this->request->getFile('file_name');
+
+        $fileName = file_Upload($file, $uploadFilePath);
+
+        if (!empty($fileName)) {
+            $sanitized_data['file_name'] = $fileName;
+        }
+        $id                 = $sanitized_data['PrimaryKey'];
+        $sanitized_data['client_id']  = $id;
+        $sanitized_data['kyc_doc_type_id'] = $this->request->getPost('kyc_doc_id');
+        $sanitized_data['updated_by'] = get_session_userid();
+
+        $insertID = $this->clientKYCDocsModel->insert($sanitized_data);
+        if ($insertID) {
+            if ($form_type === 'others') {
+                $kycDocs = $this->generateKycOthersTable($sanitized_data['client_id']);
             } else {
-                $kycDocs = $this->generateKycPrimaryTable($this->request->getPost('client_id'));
+                $kycDocs = $this->generateKycPrimaryTable($sanitized_data['client_id']);
             }
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs, 'file_name' => $file], 200);
         } else {
-            return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to upload KYC document'], 200);
         }
     }
 
@@ -1006,12 +1289,33 @@ class ClientController extends AdminController
     }
 
 
-
+    /** Client KYC Documents V2 */
     public function createClientKYCInfo_2()
     {
-        $this->myLogger->logme('error', 'create Client kyc function called');
-        $data = $this->request->getPost();
 
+        $this->myLogger->logme('error', 'Create Client KYC V2 function called');
+        
+        $rules = [
+            'file_name' => [
+                'rules'  => 'uploaded[file_name]|max_size[file_name,5120]|ext_in[file_name,pdf,jpg,jpeg,png]',
+                'errors' => [
+                    'uploaded' => 'KYC document file is required',
+                    'max_size' => 'File size should not exceed 5MB',
+                    'ext_in'   => 'Allowed file types: pdf, jpg, jpeg, png',
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $data = $this->request->getPost();
         $uploadedFile = $this->request->getFile('file_name');
 
         if ($uploadedFile && $uploadedFile->isValid() && !$uploadedFile->hasMoved()) {
@@ -1019,34 +1323,78 @@ class ClientController extends AdminController
         } else {
             $this->myLogger->logme('error', 'File failed validation or was not uploaded.');
         }
+        unset($data['file_name']);
+        $sanitized_data = sanitizeInputArrayAdvanced($data);
+        $form_type = $sanitized_data['form_type'] ?? null;
+        
+        $file = $this->request->getFile('file_name');
 
         $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
+        $fileName = file_Upload($file, $uploadFilePath);
+
+        if (!empty($fileName)) {
+            $sanitized_data['file_name'] = $fileName;
+        }
+
+        $sanitized_data['created_by'] = get_session_userid();
         
-        $File = file_Upload($uploadedFile, $uploadFilePath);
-        $this->myLogger->logme('info', 'Result of file_Upload: ' . $File);
+        
+        
+        $this->myLogger->logme('info', 'Result of file_Upload: ' . $fileName);
         unset($data['file_name']);
 
-        if (!empty($File)) { $data['file_name'] = $File; }
+        $insertID = $this->clientKYCDocsModel->insert($sanitized_data);
 
-        $data['created_by'] = get_session_userid();
-        $insert = $this->clientKYCDocsModel->insert($data);
-
-        if ($insert) {
-            $html = $this->generateKycSingleTable($data['client_id']);
-            $dropdown = $this->fetch_dropdown($data['client_id']);
-            return $this->respond(['status' => true, 'code' => 200, 'file_name' => $File, 'html' => $html,'dropdown'=>$dropdown], 200);
+        if ($insertID) {
+            $html = $this->generateKycSingleTable($sanitized_data['client_id']);
+            $dropdown = $this->fetch_dropdown($sanitized_data['client_id']);
+            return $this->respond(['status' => true, 'code' => 200, 'file_name' => $fileName, 'html' => $html,'dropdown'=>$dropdown], 200);
         } else {
             $this->myLogger->logme('error', 'Database insert failed.');
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to add document'], 200);
         }
     }
 
+    /** Edit Client KYC Documents V2 */
     public function editClientKYCInfo_2()
     {
         
-        $kyc_id = $this->request->getPost('id'); 
-        $client_id = $this->request->getPost('client_id');
-        $old_file_name = $this->request->getPost('old_file_name');
+        $this->myLogger->logme('error', 'Edit Client KYC V2 function called');
+        
+        $rules = [
+            'file_name' => [
+                'rules'  => 'uploaded[file_name]|max_size[file_name,5120]|ext_in[file_name,pdf,jpg,jpeg,png]',
+                'errors' => [
+                    'uploaded' => 'KYC document file is required',
+                    'max_size' => 'File size should not exceed 5MB',
+                    'ext_in'   => 'Allowed file types: pdf, jpg, jpeg, png',
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        
+    
+        $data = $this->request->getPost();
+        unset($data['file_name']);    
+        $sanitized_data = sanitizeInputArrayAdvanced($data);
+        $form_type = $sanitized_data['form_type'] ?? null;
+        $kyc_id        = $sanitized_data['id'] ?? null;
+        $client_id     = $sanitized_data['client_id'] ?? null;
+        $old_file_name = $sanitized_data['old_file_name'] ?? null;
+
+        if (empty($kyc_id)) {
+            return $this->respond(['status' => false, 'message' => 'Missing KYC ID'], 400);
+        }
+
+        $updateData = [];
         $uploadedFile = $this->request->getFile('file_name');
         $new_file_name = null;
         $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
@@ -1054,12 +1402,11 @@ class ClientController extends AdminController
         
         if ($uploadedFile && $uploadedFile->isValid() && !$uploadedFile->hasMoved()) {
             
-            
-            $new_file_name = file_Upload($uploadedFile, $uploadFilePath); 
-
-            if (!empty($new_file_name)) {
-                
-                $updateData['file_name'] = $new_file_name;
+            $new_file_name = file_Upload($uploadedFile, $uploadFilePath);
+            if (!$new_file_name) {
+                return $this->respond(['status' => false, 'code' => 500, 'message' => 'New file upload failed on server.'], 200);
+            }
+            $updateData['file_name'] = $new_file_name;
 
                 // Delete the old file from the storage if it exists
                 // if (!empty($old_file_name)) {
@@ -1069,56 +1416,64 @@ class ClientController extends AdminController
                 //         // Optionally delete from G-Drive here if applicable
                 //     }
                 // }
-            } else {
-                // New file upload failed
-                return $this->respond(['status' => false, 'code' => 500, 'message' => 'New file upload failed on server.'], 200);
-            }
+            
         } 
 
-        // 2. Perform the database update
-        if (!empty($updateData)) {
-            
-            $updateData['updated_by'] = get_session_userid();
-            $update = $this->clientKYCDocsModel->update($kyc_id, $updateData);
-            $html = $this->generateKycSingleTable($client_id);
-            $dropdown = $this->fetch_dropdown($client_id);
-
-            if ($update) {
-                return $this->respond(['status' => true, 'code' => 200, 'message' => 'Document updated successfully.','html' => $html,'dropdown' => $dropdown], 200);
-            }
-        } else {
-            
+         if (empty($updateData)) {
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'No changes detected. Document remains the same.'], 200);
         }
 
-        
+        $updateData['updated_by'] = get_session_userid();
+
+        $update = $this->clientKYCDocsModel->update($kyc_id, $updateData);
+
+        if ($update) {
+            return $this->respond([
+                'status' => true,
+                'message' => 'Document updated successfully',
+                'html' => $this->generateKycSingleTable($client_id),
+                'dropdown' => $this->fetch_dropdown($client_id)
+            ], 200);
+        }
+
         return $this->respond(['status' => false, 'code' => 404, 'message' => 'Database update failed or record not found.'], 200);
     }
 
-
-    public function deleteClientKycDocs_2() 
+    /** Delete Client KYC Documents V2 */
+    public function deleteClientKycDocs_2()
     {
-        
-        $kyc_id = $this->request->getPost('id'); 
-        $client_id = $this->request->getPost('client_id');
-        // echo "KID".$kyc_id;
-        // echo "CID".$client_id;
+        $this->myLogger->logme('error', 'Delete Client KYC V2 function called');
+        $data = $this->request->getPost();
+        $sanitized_data = sanitizeInputArrayAdvanced($data);
+        $kyc_id    = $sanitized_data['id'] ?? null;
+        $client_id = $sanitized_data['client_id'] ?? null;
+        $is_active = $sanitized_data['is_active'] ?? null;
 
         if (empty($kyc_id)) {
             return $this->respond(['status' => false, 'code' => 400, 'message' => 'Missing document ID.'], 200);
         }
-        $updateData['updated_by'] = get_session_userid();
-        $updateData['is_active'] = $this->request->getPost('is_active'); 
+
+    
+        $updateData = [
+            'is_active'  => (int) $is_active,
+            'updated_by' => get_session_userid()
+        ];
+
 
         $delete = $this->clientKYCDocsModel->update($kyc_id, $updateData);
-        // $delete = 1;
+
         if ($delete) {
-            $html = $this->generateKycSingleTable($client_id);
-            $dropdown = $this->fetch_dropdown($client_id);
-            return $this->respond(['status' => true, 'code' => 200, 'id' => $kyc_id, 'message' => 'Document successfully deactivated.','html' => $html,'dropdown' => $dropdown], 200);
-        } else {
-            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to update record (ID not found or DB error).'], 200);
+            return $this->respond([
+                'status' => true,
+                'code' => 200,
+                'id' => $kyc_id,
+                'message' => 'Document successfully deactivated.',
+                'html' => $this->generateKycSingleTable($client_id),
+                'dropdown' => $this->fetch_dropdown($client_id)
+            ], 200);
         }
+
+        return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to update record (ID not found or DB error).'], 200);
     }
 
     public function fetch_dropdown($client_id)
@@ -1167,6 +1522,52 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error', 'Client relation function called');
 
+        $rules = [
+            // --- Hidden Fields ---
+            'PrimaryKey' => [
+                'rules'  => 'permit_empty|numeric',
+            ],
+            'client_id' => [
+                'rules'  => 'required|numeric',
+                'errors' => ['required' => 'Client ID is missing.']
+            ],
+
+            // --- Account Manager (Array Category) ---
+            // Note the .* which validates every item inside the multiple select array
+            'account_manager' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Please select at least one Account Manager (L1).',
+                ]
+            ],
+
+            // --- Manager (L2) ---
+            'manager' => [
+                'rules'  => 'required|numeric',
+                'errors' => [
+                    'required' => 'Please select a Manager (L2).',
+                    'numeric'  => 'Invalid Manager selection.'
+                ]
+            ],
+
+            // --- Head ---
+            'head' => [
+                'rules'  => 'required|numeric',
+                'errors' => [
+                    'required' => 'Please select a Head.',
+                    'numeric'  => 'Invalid Head selection.'
+                ]
+            ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
         $data['client_id'] = $this->request->getPost('client_id');
         $data['created_by'] = get_session_userid();
         $inserted = false;
@@ -1201,6 +1602,52 @@ class ClientController extends AdminController
     public function editClientRelation()
     {
         $this->myLogger->logme('error', 'Client relation function called');
+        $rules = [
+            // --- Hidden Fields ---
+            'PrimaryKey' => [
+                'rules'  => 'permit_empty|numeric',
+            ],
+
+            'client_id' => [
+                'rules'  => 'required|numeric',
+                'errors' => ['required' => 'Client ID is missing.']
+            ],
+
+            // --- Account Manager (Array Category) ---
+            // Note the .* which validates every item inside the multiple select array
+            'account_manager' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Please select at least one Account Manager (L1).',
+                ]
+            ],
+            
+            // --- Manager (L2) ---
+            'manager' => [
+                'rules'  => 'required|numeric',
+                'errors' => [
+                    'required' => 'Please select a Manager (L2).',
+                    'numeric'  => 'Invalid Manager selection.'
+                ]
+            ],
+
+            // --- Head ---
+            'head' => [
+                'rules'  => 'required|numeric',
+                'errors' => [
+                    'required' => 'Please select a Head.',
+                    'numeric'  => 'Invalid Head selection.'
+                ]
+            ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
 
         $id                 = $this->request->getPost('PrimaryKey');
         $data['client_id']  = $this->request->getPost('client_id');
@@ -1272,11 +1719,498 @@ class ClientController extends AdminController
     }
 
 
+    public function createClientBranchNew()
+    {
+
+        $this->myLogger->logme('error', 'Client branch CREATE function called');
+
+        $rules = [
+                    'branch_name' => [
+                        'rules' => 'required|regex_match[/^[a-zA-Z0-9\s_-]+$/]|min_length[3]',
+                        'errors' => [
+                            'required'    => 'Branch Name is required',
+                            'regex_match' => 'Branch Name can only contain letters, numbers, spaces, hyphens(-), and underscores(_).',
+                        ]
+                    ],
+                    'branch_code' => [
+                        'rules' => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                        'errors' => [
+                            'required'    => 'Branch Code is required',
+                            'regex_match' => 'Branch Code can only contain letters, numbers, hyphens(-), and underscores(_).',
+                        ]
+                    ],
+                    'address1' => [
+                        'rules' => 'required',
+                        'errors' => ['required' => 'Address Line 1 is required']
+                    ],
+                    'address2' => [
+                        'rules' => 'permit_empty|string',
+                    ],
+                    'state' => [
+                        'rules' => 'required|numeric',
+                        'errors' => ['required' => 'State is required']
+                    ],
+                    'district' => [
+                        'rules' => 'required',
+                        'errors' => ['required' => 'District is required.']
+                    ],
+                    'city' => [
+                        'rules' => 'required',
+                        'errors' => ['required' => 'City is required.']
+                    ],
+                    'pincode' => [
+                        'rules' => 'required|numeric|exact_length[6]',
+                        'errors' => [
+                            'required' => 'Pincode is required.',
+                            'numeric'  => 'Pincode must be numeric',
+                            'exact_length' => 'Pincode must be exactly 6 digits'
+                        ]
+                    ],
+                    'gst' => [
+                        'rules'  => 'required|regex_match[/^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}Z[A-Z\d]{1}$/]',
+                        'errors' => [
+                            'required'    => 'GST number is required',
+                            'regex_match' => 'Invalid GST Number format.'
+                        ]
+                    ],
+                    'name.*' => [
+                        'rules'  => 'required|alpha_space',
+                        'errors' => [
+                            'required'    => 'Contact name is required',
+                            'alpha_space' => 'Contact name may contain only letters and spaces'
+                        ]
+                    ],
+                    'designation.*' => [
+                        'rules'  => 'required|alpha_space',
+                        'errors' => [
+                            'required'    => 'Designation is required',
+                            'alpha_space' => 'Designation may contain only letters and spaces'
+                        ]
+                    ],
+                    'email.*' => [
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                    ],
+                    'mobile.*' => [
+                        'rules'  => 'required|numeric|exact_length[10]',
+                        'errors' => [
+                            'required'      => 'Mobile number is required',
+                            'numeric'       => 'Mobile number must contain digits only',
+                            'exact_length'  => 'Mobile number must be exactly 10 digits'
+                        ]
+                    ],
+                    'units.*' => [
+                        'rules' => 'permit_empty|numeric' // For the multiple select
+                    ],
+                    'sez' => [
+                        'rules' => 'permit_empty' // For the checkbox
+                    ]
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+
+        if (!isset($sanitized_post_data['sez'])) {
+            $sanitized_post_data['sez'] = 0;
+        } elseif ($sanitized_post_data['sez']) {
+            $sanitized_post_data['sez'] = 1;
+        }
+
+        $units = json_decode($sanitized_post_data['units'], true) ?? [];
+
+        if (!is_array($units) || empty($units)) {
+            $client_data = $this->clientModel->where('id', $sanitized_post_data['client_id'])->first();
+            $default_unit = trim(($client_data['short_name'] ?? '') . '-' . ($sanitized_post_data['branch_code'] ?? ''), '-');
+            $sanitized_post_data['units'] = json_encode([$default_unit]);
+        }
+
+        $sanitized_post_data['created_by'] = get_session_userid();
+
+        
+        // before updating check if pre_branch_id is already existing in the current db
+
+        if(isset($sanitized_post_data['pre_branch_id']) && !empty($sanitized_post_data['pre_branch_id']))
+        {
+            $existing_pre_branch = $this->clientBranchModel
+                                    ->where('pre_branch_id',$sanitized_post_data['pre_branch_id'])
+                                    //->where('id !=',$post_branch_id)
+                                    ->first();
+
+            if($existing_pre_branch)
+            {
+                return $this->respond([
+                    'status' => false,
+                    'code' => 409,
+                    'message' => 'The  branch  is already mapped with another branch. Please check.',
+                ], 409);
+            }
+        }
+
+
+
+        $insert = $this->clientBranchModel->insert($sanitized_post_data);
+
+        $post_branch_id = $insert;
+
+        if ($insert) {
+            
+            $level_contact_data_raw = $this->request->getPost('level_contect_data');
+            $level_contact_data = [];
+
+            if (!empty($level_contact_data_raw)) {
+                $level_contact_data_decoded = json_decode($level_contact_data_raw, true);
+
+                if (json_last_error() === JSON_ERROR_NONE && is_array($level_contact_data_decoded)) {
+                    $level_contact_data = sanitizeInputArrayAdvanced($level_contact_data_decoded);
+                }
+            }
+
+            if (!empty($level_contact_data)) {
+                $this->saveLevelContacts($level_contact_data, $insert);
+            }
+
+        }
+
+        if($post_branch_id && isset($sanitized_post_data['pre_branch_id']) && !empty($sanitized_post_data['pre_branch_id']))
+        {
+            // need to update the client_branch in the pre
+            $result = $this->updatePreClientBranch($sanitized_post_data['pre_branch_id'],$post_branch_id , "create");
+
+            log_message('error','Pre client_branch update result for pre_branch_id '.$sanitized_post_data['pre_branch_id'].' and post_branch_id '.$post_branch_id.' is '.json_encode($result));
+        }
+
+        if ($insert) {
+            $branchData = $this->clientBranchModel->where('client_id', $sanitized_post_data['client_id'])->findAll();
+            $branchData['role'] = get_role_id();
+            return $this->respond([
+                'status' => true,
+                'code' => 200,
+                'data' => $branchData,
+                'message' => 'Client branch created successfully',
+            ], 200);
+        } else {
+            return $this->respond([
+                'status' => false,
+                'code' => 404,
+                'message' => 'Failed to create client branch ',
+            ], 200);
+        }
+    }
+
+    public function editClientBranchNew()
+    {
+
+        $this->myLogger->logme('error', 'Client branch EDIT function called');
+        $data = $this->request->getPost();
+    
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id     = $sanitized_post_data['branch_id_primarykey'] ?? null;
+        $client_id     = $sanitized_post_data['client_id'] ?? null;
+        $pre_branch_id = $sanitized_post_data['pre_branch_id'] ?? '';
+
+        $data['pre_branch_id']  = $pre_branch_id;
+
+        $raw_units = $this->request->getPost('units');
+
+        $emp_unit_count = 0;
+        $rr_unit_count  = 0;
+        $rr_unit_count2 = 0;
+        $total_count    = 0;
+
+        $list_of_branch_units = $this->clientBranchModel->find((int)$id);
+        $units = !empty($list_of_branch_units['units']) ? json_decode($list_of_branch_units['units'], true) : [];
+
+        if (!is_array($units) || empty($units)) {
+            $client_data = $this->clientModel->where('id', $sanitized_post_data['client_id'])->first();
+            $default_unit = trim(($client_data['short_name'] ?? '') . '-' . ($sanitized_post_data['branch_code'] ?? ''), '-');
+            $sanitized_post_data['units'] = json_encode([$default_unit]);
+            $units = [$default_unit]; // Update local variable for counting
+        }
+
+        if (!empty($units)) {
+            foreach ($units as $unit) {
+                $emp_unit_count += $this->employeeModel->where('unit', $unit)->countAllResults();
+                $rr_unit_count += $this->policyPremium2Model->where('unit', $unit)->countAllResults();
+                $rr_unit_count2 += $this->policyPremium1Model->where('unit', $unit)->countAllResults();
+            }
+
+            $total_count = $emp_unit_count + $rr_unit_count + $rr_unit_count2;
+        }
+
+        $uncommonValues = [];
+
+
+        if ($total_count > 0) {
+            
+            $post_units_raw = $sanitized_post_data['units'] ?? '[]'; 
+
+            $branch_units = json_decode($list_of_branch_units['units'] ?? '[]', true);
+            
+            // Ensure we handle both string-json and array types
+            $incoming_units = is_array($post_units_raw) ? $post_units_raw : json_decode($post_units_raw, true);
+            
+            if (is_array($branch_units) && is_array($incoming_units)) {
+                $uncommonValues = array_diff($branch_units, $incoming_units);
+            }
+
+            if (count($uncommonValues) > 0) {
+                $branchData = $this->clientBranchModel->where('client_id', $client_id)->findAll();
+
+                return $this->respond([
+                    'status' => false,
+                    'code' => 404,
+                    'message' => "Deleted unit(s) in use. couldn't complete this operation.",
+                    'uncommonValues' => $uncommonValues,
+                    'data' => $branchData,
+                ], 200);
+            }
+        }
+        
+        if (!isset($sanitized_post_data['sez'])) {
+            $sanitized_post_data['sez'] = 0;
+        } elseif ($sanitized_post_data['sez']) {
+            $sanitized_post_data['sez'] = 1;
+        }
+
+        $sanitized_post_data['updated_by'] = get_session_userid();
+
+        $post_branch_id = $id;
+
+        // before updating check if pre_branch_id is already existing in the current db
+
+        if(isset($sanitized_post_data['pre_branch_id']) && !empty($sanitized_post_data['pre_branch_id']))
+        {
+            $existing_pre_branch = $this->clientBranchModel
+                                    ->where('pre_branch_id',$sanitized_post_data['pre_branch_id'])
+                                    ->where('id !=',$post_branch_id)
+                                    ->first();
+
+            if($existing_pre_branch)
+            {
+                return $this->respond([
+                    'status' => false,
+                    'code' => 409,
+                    'message' => 'The  branch  is already mapped with another branch. Please check.',
+                ], 409);
+            }
+        }
+
+        $insert = $this->clientBranchModel->update($id, $sanitized_post_data);
+
+
+
+        if($post_branch_id && isset($sanitized_post_data['pre_branch_id']) && !empty($sanitized_post_data['pre_branch_id']))
+        {
+            // need to update the client_branch in the pre
+            $result = $this->updatePreClientBranch($sanitized_post_data['pre_branch_id'],$post_branch_id , "update");
+
+            log_message('error','Pre client_branch update result for pre_branch_id '.$sanitized_post_data['pre_branch_id'].' and post_branch_id '.$post_branch_id.' is '.json_encode($result));
+        }
+
+
+        $this->myLogger->logme('error', 'Client branch EDITED by {data}', ['data' => get_session_userid()]);
+
+
+        if ($insert) {
+            
+            $level_contact_data_raw = $this->request->getPost('level_contect_data');
+            $level_contact_data = [];
+
+            if (!empty($level_contact_data_raw)) {
+                $level_contact_data_decoded = json_decode($level_contact_data_raw ?? '{}', true);
+
+                    $level_contact_data = sanitizeInputArrayAdvanced($level_contact_data_decoded);
+            }
+
+            if (!empty($level_contact_data)) {
+                $this->saveLevelContacts($level_contact_data, $insert);
+            }
+
+        }
+
+        if ($insert) {
+            $branchData = $this->clientBranchModel->where('client_id', $client_id)->findAll();
+            return $this->respond([
+                'status' => true,
+                'code' => 200,
+                'data' => $branchData,
+                'emp_unit_count' => $emp_unit_count,
+                'rr_unit_count' => $rr_unit_count,
+                'list_of_branch_units' => $list_of_branch_units,
+                'total_count' => $total_count,
+                'uncommonValues' => $uncommonValues,
+                'message' => 'Client branch updated successfully',
+                'response_data' => $sanitized_post_data
+
+            ], 200);
+        } else {
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to update client branch'], 200);
+        }
+    }
+
+    public function saveLevelContactsNew($level_contact_data, $branch_id)
+    {
+        if (!empty($level_contact_data) && is_array($level_contact_data)) {
+            foreach ($level_contact_data as $value) {
+                if (!empty($value['id'])) {
+                    $id = $value['id'];
+                    unset($value['id']);
+                    $this->levelContactModel->update($id, $value);
+                } else {
+                    unset($value['id']);
+                    $value['contact_type'] = "client";
+                    $value['ref_id'] = $branch_id ?? null;
+                    $this->levelContactModel->insert($value);
+                }
+            }
+        }
+    }
+
+    public function removeLevelContactsNew()
+    {
+        $id = $this->request->getGet('id');
+        try {
+            if (empty($id)) {
+                return $this->respond([
+                    'status'  => false,
+                    'message' => 'Invalid ID provided. ID is empty',
+                    'data' => $id
+                ], 400);
+            }
+
+            $updated = $this->levelContactModel->update($id, ['is_active' => 0]);
+
+            if ($updated === false) {
+                return $this->respond([
+                    'status'  => false,
+                    'message' => 'Failed to remove contact'
+                ], 500);
+            }
+
+            return $this->respond([
+                'status'  => true,
+                'message' => 'Contact removed successfully'
+            ]);
+        } catch (\Exception $e) {
+            return $this->respond([
+                'status'  => false,
+                'message' => 'An error occurred: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+
+    
     public function createClientBranch()
     {
 
         $this->myLogger->logme('error', 'Client branch CREATE function called');
-        $data   = $this->request->getPost();
+
+        $rules = [
+            'branch_name' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required' => 'Branch Name is required',
+                ]
+            ],
+            'branch_code' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required' => 'Branch Code is required',
+                ]
+            ],
+            'address1' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required' => 'Address Line 1 is required',
+                ]
+            ],
+            'state' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required' => 'State is required',
+                ]
+            ],
+            'district' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required'    => 'District is required.',
+                ]
+            ],
+            'city' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required'    => 'City is required.',
+                ]
+            ],
+            'pincode' => [
+                'rules' => 'required',
+                'errors' => [
+                    'required'    => 'Pincode is required.',
+                ]
+            ],
+            'gst' => [
+                'rules'  => 'required|regex_match[/^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}Z[A-Z\d]{1}$/]',
+                'errors' => [
+                    'required'    => 'GST number is required',
+                    'regex_match' => 'Invalid GST Number. Example: 12ABCDE1234F5Z6'
+                ]
+            ],
+            'name.*' => [
+                'rules'  => 'required|alpha_space',
+                'errors' => [
+                    'required'    => 'Contact name is required',
+                    'alpha_space' => 'Contact name may contain only letters and spaces'
+                ]
+            ],
+            'designation.*' => [
+                'rules'  => 'required|alpha_space',
+                'errors' => [
+                    'required'    => 'Designation is required',
+                    'alpha_space' => 'Designation may contain only letters and spaces'
+                ]
+            ],
+            'email.*' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+            ],
+            'mobile.*' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'      => 'Mobile number is required',
+                    'numeric'       => 'Mobile number must contain digits only',
+                    'exact_length'  => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $data = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($data);
+
 
         if (!isset($data['sez'])) {
             $data['sez'] = 0;
@@ -1361,6 +2295,7 @@ class ClientController extends AdminController
         $pre_branch_id = $this->request->getPost('pre_branch_id') ?? '';
 
         $data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($data);
         $data['pre_branch_id']  = $pre_branch_id;
 
         $units   = $this->request->getPost('units');
@@ -1370,7 +2305,7 @@ class ClientController extends AdminController
         $rr_unit_count2 = 0;
         $total_count    = 0;
 
-        $list_of_branch_units = $this->clientBranchModel->find($id);
+        $list_of_branch_units = $this->clientBranchModel->find((int)$id);
         $units = json_decode($list_of_branch_units['units']);
 
         if (!is_array($units) || empty($units)) {
@@ -1394,7 +2329,7 @@ class ClientController extends AdminController
         if ($total_count > 0) {
             $units = (string) $this->request->getPost('units'); // Assuming 'units' is an array
 
-            $list_of_branch_units = $this->clientBranchModel->find($id);
+            $list_of_branch_units = $this->clientBranchModel->find((int)$id);
             $branch_units = json_decode($list_of_branch_units['units'], true);
             $units = json_decode($units);
 
@@ -1538,8 +2473,7 @@ class ClientController extends AdminController
     }
 
 
-
-
+    /** here ci4 rules not implemented, because UI screen Fields are hide/show implemented thats why */
     public function createClientPolicy()
     {
 
@@ -1548,20 +2482,109 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error', 'Client policy CREATE function called');
 
-        $policy_type_id   = $this->request->getPost('policy_type_id');
-        $client_branch_id = $this->request->getPost('client_branch_id');
-        $client_id        = $this->request->getPost('client_id');
-        $base_policy      = $this->request->getPost('base_policy');
+        $request_post_data = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+
+        $rules = [
+            // --- BASIC SELECTS (Required) ---
+            'client_branch_id' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select a Client Branch.']
+            ],
+            'policy_type_id' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required'            => 'Policy Type is required.',
+                    'is_natural_no_zero'  => 'Please select a valid Policy Type.'
+                ]
+            ],
+            'insurer' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select an Insurer.']
+            ],
+            'tpa' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select a TPA.']
+            ],
+
+            // --- TEXT FIELDS (Required & Specific Format) ---
+            'policy_no' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9\s_\-\/\\\]+$/]',
+                'errors' => [
+                    'required'    => 'This field is required.',
+                    'regex_match' => 'Only letters, numbers, spaces, _, -, /, and \ are allowed.'
+                ]
+            ],
+            'gst' => [
+                'rules'  => 'required|numeric|greater_than_equal_to[0]|less_than_equal_to[100]',
+                'errors' => [
+                    'required'              => 'GST percentage is required.',
+                    'numeric'               => 'GST must be a valid number.',
+                    'greater_than_equal_to' => 'GST cannot be negative.',
+                    'less_than_equal_to'    => 'GST percentage cannot exceed 100%.'
+                ]
+            ],
+
+            // --- DATE FIELDS (Required) ---
+            'policy_start_date' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required'   => 'Start date is required.',
+                ]
+            ],
+            'policy_end_date' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required'   => 'End date is required.',
+                ]
+            ],
+
+            // --- PERMIT EMPTY FIELDS (Optional) ---
+            'base_policy' => [
+                'rules' => 'permit_empty'
+            ],
+            'wellness_plan_id' => [
+                'rules'  => 'permit_empty|alpha_numeric',
+                'errors' => [
+                    'alpha_numeric' => 'Wellness Plan ID can only contain letters and numbers (no spaces or special characters).'
+                ]
+            ],
+            'wellness_vendor_id' => [
+                'rules' => 'permit_empty'
+            ],
+            'disclaimer' => [
+                'rules'  => 'permit_empty|string|min_length[5]',
+                'errors' => ['min_length' => 'Disclaimer should be at least 5 characters long if provided.']
+            ],
+
+            // --- CHECKBOXES (Permit Empty) ---
+            'enrolment_visibility' => ['rules' => 'permit_empty'],
+            'is_lgbtq'             => ['rules' => 'permit_empty']
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $policy_type_id   = $sanitized_post_data['policy_type_id'] ?? null;
+        $client_branch_id = $sanitized_post_data['client_branch_id'] ?? null;
+        $client_id        = $sanitized_post_data['client_id'] ?? null;
+        $base_policy      = $sanitized_post_data['base_policy'] ?? null;
 
 
-        $insurerValue  = (string) $this->request->getPost('insurer');
+        $insurerValue  = (string) $sanitized_post_data['insurer'] ?? null;
         list($insurerBranchId, $insurerId) = explode('-', $insurerValue);
 
 
-        $data['insurer_branch_id'] = $insurerBranchId;
-        $data['insurer_id']        = $insurerId;
+        $sanitized_post_data['insurer_branch_id'] = $insurerBranchId;
+        $sanitized_post_data['insurer_id']        = $insurerId;
 
-        $tpaValue = (string) $this->request->getPost('tpa');
+        $tpaValue = (string) $sanitized_post_data['tpa'] ?? null;
 
         if ($tpaValue === null || $tpaValue === '') {
             $tpaBranchId = null;
@@ -1571,98 +2594,185 @@ class ClientController extends AdminController
         }
 
 
-        $data['client_id']         = $client_id;
-        $data['tpa_branch_id']     = $tpaBranchId;
-        $data['tpa_id']            = $tpaId;
-        $data['policy_type_id']    = $this->request->getPost('policy_type_id');
+        $sanitized_post_data['client_id']         = $client_id;
+        $sanitized_post_data['tpa_branch_id']     = $tpaBranchId;
+        $sanitized_post_data['tpa_id']            = $tpaId;
+        $sanitized_post_data['policy_type_id']    = $sanitized_post_data['policy_type_id'] ?? null;
 
-        $data['no_of_lives']                        = $this->request->getPost('no_of_lives');
-        $data['policy_status']                      = $this->request->getPost('policy_status');
-        $data['no_of_employees']                    = $this->request->getPost('no_of_employees');
-        $data['earned_premium_date']                = change_date_format($this->request->getPost('earned_premium_date'), 'd-m-Y', 'Y-m-d')  ?? null;
-        $data['claims_incurred_date']               = change_date_format($this->request->getPost('claims_incurred_date'), 'd-m-Y', 'Y-m-d') ?? null;
-        $data['incurred_claims_ratio']              = $this->request->getPost('incurred_claims_ratio');
-        $data['no_lives_at_inception']              = $this->request->getPost('no_lives_at_inception');
-        $data['premium_paid_at_inception']          = $this->request->getPost('premium_paid_at_inception');
-        $data['claims_experience_for_last_3_years'] = $this->request->getPost('claims_experience_for_last_3_years');
-        $data['earned_premium_amount']              = $this->request->getPost('earned_premium_amount');
-        $data['claims_incurred_amount']             = $this->request->getPost('claims_incurred_amount');
-        $data['base_policy']                        = ($this->request->getPost('base_policy') === '' || $this->request->getPost('base_policy') == 0) ? null : $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['cd_ac_pk']                           = $this->request->getPost('cd_ac_no');
-        $data['gst']                                = $this->request->getPost('gst');
-        $data['disclaimer']                         = $this->request->getPost('disclaimer');
-        $data['is_member_modify_allowed']           = $this->request->getPost('is_member_modify_allowed') ? 1 : 0;
-        $data['enrolment_visibility']               = $this->request->getPost('enrolment_visibility') ? 1 : 0;
-        $data['is_lgbtq']                           = $this->request->getPost('is_lgbtq') ? 1 : 0;
-        $data['wellness_plan_id']                   = $this->request->getPost('wellness_plan_id');
-        $data['wellness_vendor_id']                 = $this->request->getPost('wellness_vendor_id');
-        $data['wellness_vendor_id']                 = !empty($data['wellness_vendor_id']) ? $data['wellness_vendor_id'] : null;
+        
+        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date']  ?? null, 'd-m-Y', 'Y-m-d')  ?? null;
+        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date']  ?? null, 'd-m-Y', 'Y-m-d') ?? null;
+        
+        $sanitized_post_data['base_policy']                        = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy'];
+        $sanitized_post_data['policy_status']                       = 1;
+        $sanitized_post_data['inception_type']                       = (isset($sanitized_post_data['inception_type']) && $sanitized_post_data['inception_type'] !== "")
+                                                                        ? $sanitized_post_data['inception_type']
+                                                                        : 1;
+
+        
+        
+        
+        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ?? null ? 1 : 0;
+        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ?? null ? 1 : 0;
+        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ?? null ? 1 : 0;
+        $sanitized_post_data['wellness_vendor_id']                 = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null;
+        $sanitized_post_data['cd_ac_pk']                           = $sanitized_post_data['cd_ac_no']  ?? null;
 
 
         if ($policy_type_id == 1 || $policy_type_id == 2 || $policy_type_id == 6 || $policy_type_id == 7) {
 
-            $data['is_addon'] = 1; // Base Policy
+            $sanitized_post_data['is_addon'] = 1; // Base Policy
 
         } else if ($policy_type_id == 4 || $policy_type_id == 5) {
 
-            $data['is_addon'] = 2; // SI TOPUP
+            $sanitized_post_data['is_addon'] = 2; // SI TOPUP
 
         } else if ($policy_type_id == 3) {
 
             if ($base_policy) {
-                $data['is_addon'] = 3; // Dependent Addon
+                $sanitized_post_data['is_addon'] = 3; // Dependent Addon
             } else {
-                $data['is_addon'] = 1;
+                $sanitized_post_data['is_addon'] = 1;
             }
         }
 
 
-        $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
-        $data['policy_end_date']   = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
-        $data['policy_no'] = $this->request->getPost('policy_no');
-        if ($data['inception_type'] == 2) {
-            $data['open_date'] = change_date_format($this->request->getPost('open_date'), 'd-m-Y', 'Y-m-d');
-            $data['close_date']   = change_date_format($this->request->getPost('close_date'), 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'] ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_end_date']   = change_date_format($sanitized_post_data['policy_end_date'] ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_no'] = $sanitized_post_data['policy_no'] ?? null;
+        if (isset($sanitized_post_data['inception_type']) && $sanitized_post_data['inception_type'] == 2) {
+            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'] ?? null, 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'] ?? null, 'd-m-Y', 'Y-m-d');
             // $data['reminder_date']   = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d');
-            $data['reminder_date']   = $this->request->getPost('reminder_date');
+            $sanitized_post_data['reminder_date']   = $sanitized_post_data['reminder_date'] ?? null;
         } else {
-            $data['open_date'] = null;
-            $data['closedate'] = null;
-            $data['reminder_date'] = null;
+            $sanitized_post_data['open_date'] = null;
+            $sanitized_post_data['closedate'] = null;
+            $sanitized_post_data['reminder_date'] = null;
         }
 
-        $data['created_by']  = get_session_userid();
+        $sanitized_post_data['created_by']  = get_session_userid();
 
-        $insert = $this->clientPolicyModel->insert($data);
+        $insert = $this->clientPolicyModel->insert($sanitized_post_data);
         if ($insert) {
-            $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($this->request->getPost('client_id'));
+            // this function to create a policy transaction entry at the time of client policy create
+            $this->createPolicyTransactionInceptionEntry($insert, $sanitized_post_data);
+            $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($sanitized_post_data['client_id']);
             $clientPoliceData['role'] = get_role_id();
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'method' => 'CERATE', 'post_data' => $data], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'client_id' => $client_id, 'method' => 'CERATE', 'post_data' => $insert], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
         }
     }
 
+    /** here ci4 rules not implemented, because UI screen Fields are hide/show implemented thats why */
     public function editClientPolicy()
     {
+        $rules = [
+            // --- BASIC SELECTS (Required) ---
+            'client_branch_id' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select a Client Branch.']
+            ],
+            'policy_type_id' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required'            => 'Policy Type is required.',
+                    'is_natural_no_zero'  => 'Please select a valid Policy Type.'
+                ]
+            ],
+            'insurer' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select an Insurer.']
+            ],
+            'tpa' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Please select a TPA.']
+            ],
+
+            // --- TEXT FIELDS (Required & Specific Format) ---
+            'policy_no' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9\s_\-\/\\\]+$/]',
+                'errors' => [
+                    'required'    => 'This field is required.',
+                    'regex_match' => 'Only letters, numbers, spaces, _, -, /, and \ are allowed.'
+                ]
+            ],
+            'gst' => [
+                'rules'  => 'required|numeric|greater_than_equal_to[0]|less_than_equal_to[100]',
+                'errors' => [
+                    'required'              => 'GST percentage is required.',
+                    'numeric'               => 'GST must be a valid number.',
+                    'greater_than_equal_to' => 'GST cannot be negative.',
+                    'less_than_equal_to'    => 'GST percentage cannot exceed 100%.'
+                ]
+            ],
+
+            // --- DATE FIELDS (Required) ---
+            'policy_start_date' => [
+                'rules'  => 'required|valid_date',
+                'errors' => [
+                    'required'   => 'Start date is required.',
+                    'valid_date' => 'Enter a valid date format (YYYY-MM-DD).'
+                ]
+            ],
+            'policy_end_date' => [
+                'rules'  => 'required|valid_date',
+                'errors' => [
+                    'required'   => 'End date is required.',
+                    'valid_date' => 'Enter a valid date format (YYYY-MM-DD).'
+                ]
+            ],
+
+            // --- PERMIT EMPTY FIELDS (Optional) ---
+            'base_policy' => [
+                'rules' => 'permit_empty'
+            ],
+            'wellness_plan_id' => [
+                'rules'  => 'permit_empty|alpha_numeric',
+                'errors' => [
+                    'alpha_numeric' => 'Wellness Plan ID can only contain letters and numbers (no spaces or special characters).'
+                ]
+            ],
+            'wellness_vendor_id' => [
+                'rules' => 'permit_empty'
+            ],
+            'disclaimer' => [
+                'rules'  => 'permit_empty|string|min_length[5]',
+                'errors' => ['min_length' => 'Disclaimer should be at least 5 characters long if provided.']
+            ],
+
+            // --- CHECKBOXES (Permit Empty) ---
+            'enrolment_visibility' => ['rules' => 'permit_empty'],
+            'is_lgbtq'             => ['rules' => 'permit_empty']
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
         $this->myLogger->logme('error', 'Client policy function called');
+        $data = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
 
-        $id             = $this->request->getPost('PrimaryKey');
-        $client_id      = $this->request->getPost('client_id');
-        $policy_type_id = $this->request->getPost('policy_type_id');
-        $base_policy    = $this->request->getPost('base_policy');
+        $id             = $sanitized_post_data['PrimaryKey'] ?? null;
+        $client_id      = $sanitized_post_data['client_id'] ?? null;
+        $policy_type_id = $sanitized_post_data['policy_type_id'] ?? null;
+        $base_policy    = $sanitized_post_data['base_policy'] ?? null;
 
 
-        $insurerValue                      = (string) $this->request->getPost('insurer');
+        $insurerValue                      = (string) $sanitized_post_data['insurer'];
         list($insurerBranchId, $insurerId) = explode('-', $insurerValue);
 
-        $data['insurer_branch_id'] = $insurerBranchId;
-        $data['insurer_id']        = $insurerId;
+        $sanitized_post_data['insurer_branch_id'] = $insurerBranchId ?? null;
+        $sanitized_post_data['insurer_id']        = $insurerId ?? null;
 
-        $tpaValue                  = (string) $this->request->getPost('tpa');
+        $tpaValue                  = (string) $sanitized_post_data['tpa'] ?? null;
         if (!empty($tpaValue) || $tpaValue !== '') {
             list($tpaBranchId, $tpaId) = explode('-', $tpaValue);
         } else {
@@ -1670,75 +2780,75 @@ class ClientController extends AdminController
             $tpaId = null;
         }
 
-        $data['tpa_branch_id']     = $tpaBranchId;
-        $data['client_id']         = $client_id;
-        $data['tpa_id']            = $tpaId;
-        $data['policy_type_id']    = $this->request->getPost('policy_type_id');
-        $data['policy_no']         = $this->request->getPost('policy_no');
+        $sanitized_post_data['tpa_branch_id']     = $tpaBranchId ?? null;
+        $sanitized_post_data['client_id']         = $client_id ?? null;
+        $sanitized_post_data['tpa_id']            = $tpaId ?? null;
+        $sanitized_post_data['policy_type_id']    = $sanitized_post_data['policy_type_id'] ?? null;
+        $sanitized_post_data['policy_no']         = $sanitized_post_data['policy_no'] ?? null;
 
-        $data['insured']                            = $this->request->getPost('insured');
-        $data['no_of_lives']                        = $this->request->getPost('no_of_lives');
-        $data['policy_status']                      = $this->request->getPost('policy_status');
-        $data['no_of_employees']                    = $this->request->getPost('no_of_employees');
-        $data['earned_premium_date']                = change_date_format($this->request->getPost('earned_premium_date'), 'd-m-Y', 'Y-m-d') ?? null;
-        $data['claims_incurred_date']               = change_date_format($this->request->getPost('claims_incurred_date'), 'd-m-Y', 'Y-m-d') ?? null;
-        $data['incurred_claims_ratio']              = $this->request->getPost('incurred_claims_ratio');
-        $data['no_lives_at_inception']              = $this->request->getPost('no_lives_at_inception');
-        $data['premium_paid_at_inception']          = $this->request->getPost('premium_paid_at_inception');
-        $data['claims_experience_for_last_3_years'] = $this->request->getPost('claims_experience_for_last_3_years');
-        $data['earned_premium_amount']              = $this->request->getPost('earned_premium_amount');
-        $data['claims_incurred_amount']             = $this->request->getPost('claims_incurred_amount');
-        $data['base_policy']                        = ($this->request->getPost('base_policy') === '' || $this->request->getPost('base_policy') == 0) ? null : $this->request->getPost('base_policy');
-        $data['policy_status']                      = 1;
-        $data['inception_type']                     = $this->request->getPost('inception_type') ? 2 : 1;
-        $data['enrolment_visibility']               = $this->request->getPost('enrolment_visibility') ? 1 : 0;
-        $data['client_branch_id']                   = $this->request->getPost('client_branch_id');
-        $data['cd_ac_pk']                           = $this->request->getPost('cd_ac_no');
-        $data['gst']                                = $this->request->getPost('gst');
-        $data['disclaimer']                         = $this->request->getPost('disclaimer');
-        $data['policy_start_date']                  = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
-        $data['policy_end_date']                    = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
-        $data['is_member_modify_allowed']           = $this->request->getPost('is_member_modify_allowed') ? 1 : 0;
-        $data['is_lgbtq']                           = $this->request->getPost('is_lgbtq') ? 1 : 0;
-        $data['wellness_plan_id']                   = $this->request->getPost('wellness_plan_id');
-        $data['wellness_vendor_id']                 = $this->request->getPost('wellness_vendor_id');
-        $data['wellness_vendor_id']                 = !empty($data['wellness_vendor_id']) ? $data['wellness_vendor_id'] : null;
+        // $sanitized_post_data['insured']                            = $sanitized_post_data['insured'];
+        $sanitized_post_data['no_of_lives']                        = $sanitized_post_data['no_of_lives']  ?? null;
+        $sanitized_post_data['policy_status']                      = $sanitized_post_data['policy_status']  ?? null;
+        $sanitized_post_data['no_of_employees']                    = $sanitized_post_data['no_of_employees']  ?? null;
+        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date'] ?? null, 'd-m-Y', 'Y-m-d') ?? null;
+        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date']  ?? null, 'd-m-Y', 'Y-m-d') ?? null;
+        $sanitized_post_data['incurred_claims_ratio']              = $sanitized_post_data['incurred_claims_ratio']  ?? null;
+        $sanitized_post_data['no_lives_at_inception']              = $sanitized_post_data['no_lives_at_inception']  ?? null;
+        $sanitized_post_data['premium_paid_at_inception']          = $sanitized_post_data['premium_paid_at_inception']  ?? null;
+        $sanitized_post_data['claims_experience_for_last_3_years'] = $sanitized_post_data['claims_experience_for_last_3_years']  ?? null;
+        $sanitized_post_data['earned_premium_amount']              = $sanitized_post_data['earned_premium_amount']  ?? null;
+        $sanitized_post_data['claims_incurred_amount']             = $sanitized_post_data['claims_incurred_amount']  ?? null;
+        $sanitized_post_data['base_policy']                        = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy'];
+        $sanitized_post_data['policy_status']                      = 1;
+        $sanitized_post_data['inception_type']                     = $sanitized_post_data['inception_type'] ?? null ? 2 : 1;
+        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ?? null ? 1 : 0;
+        $sanitized_post_data['client_branch_id']                   = $sanitized_post_data['client_branch_id']  ?? null;
+        $sanitized_post_data['cd_ac_pk']                           = $sanitized_post_data['cd_ac_no']  ?? null;
+        $sanitized_post_data['gst']                                = $sanitized_post_data['gst']  ?? null;
+        $sanitized_post_data['disclaimer']                         = $sanitized_post_data['disclaimer']  ?? null;
+        $sanitized_post_data['policy_start_date']                  = change_date_format($sanitized_post_data['policy_start_date']  ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_end_date']                    = change_date_format($sanitized_post_data['policy_end_date']  ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ?? null ? 1 : 0;
+        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ?? null ? 1 : 0;
+        $sanitized_post_data['wellness_plan_id']                   = $sanitized_post_data['wellness_plan_id']  ?? null;
+        $sanitized_post_data['wellness_vendor_id']                 = $sanitized_post_data['wellness_vendor_id']  ?? null;
+        $sanitized_post_data['wellness_vendor_id']                 = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null;
 
-        if ($data['inception_type'] == 2) {
-            $data['open_date'] = change_date_format($this->request->getPost('open_date'), 'd-m-Y', 'Y-m-d');
-            $data['close_date']   = change_date_format($this->request->getPost('close_date'), 'd-m-Y', 'Y-m-d');
-            // $data['reminder_date']   = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d');
-            $data['reminder_date']   = $this->request->getPost('reminder_date');
+        if ($sanitized_post_data['inception_type'] == 2) {
+            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'] ?? null, 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'] ?? null, 'd-m-Y', 'Y-m-d');
+            // $sanitized_post_data['reminder_date']   = change_date_format($sanitized_post_data['reminder_date'), 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['reminder_date']   = $sanitized_post_data['reminder_date']  ?? null;
         } else {
-            $data['open_date'] = null;
-            $data['close_date'] = null;
-            $data['reminder_date'] = null;
+            $sanitized_post_data['open_date'] = null;
+            $sanitized_post_data['close_date'] = null;
+            $sanitized_post_data['reminder_date'] = null;
         }
 
         if ($policy_type_id == 1 || $policy_type_id == 2 || $policy_type_id == 6 || $policy_type_id == 7) {
 
-            $data['is_addon'] = 1; // Base Policy
+            $sanitized_post_data['is_addon'] = 1; // Base Policy
 
         } else if ($policy_type_id == 4 || $policy_type_id == 5) {
 
-            $data['is_addon'] = 2; // SI TOPUP
+            $sanitized_post_data['is_addon'] = 2; // SI TOPUP
 
         } else if ($policy_type_id == 3) {
 
             if ($base_policy) {
-                $data['is_addon'] = 3; // Dependent Addon
+                $sanitized_post_data['is_addon'] = 3; // Dependent Addon
             } else {
-                $data['is_addon'] = 1;
+                $sanitized_post_data['is_addon'] = 1;
             }
         }
 
-        $policy_terms =  $this->clientPolicyModel->where('id', $this->request->getPost('base_policy'))->first();
+        $policy_terms =  $this->clientPolicyModel->where('id', $sanitized_post_data['base_policy'])->first();
 
         $old_client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $id)->first();
-        $data['updated_by'] = get_session_userid();
-        $insert = $this->clientPolicyModel->update($id, $data);
+        $sanitized_post_data['updated_by'] = get_session_userid();
+        $update = $this->clientPolicyModel->update($id, $sanitized_post_data);
 
-        if ($insert) {
+        if ($update) {
 
             $new_client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $id)->first();
             $policy_transaction_data = $this->policyTransactionModel->where('is_active', 1)->where('client_policy_id', $id)->countAllResults();
@@ -1752,7 +2862,7 @@ class ClientController extends AdminController
                 ]]);
             }
 
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'method' => 'EDIT'], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'client_id' => $client_id, 'method' => 'EDIT'], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
         }
@@ -1819,436 +2929,177 @@ class ClientController extends AdminController
         }
     }
 
+    public function createPolicyTransactionInceptionEntry($client_policy_id, $data)
+    {   
+        $data['action_type'] = 'inception';
+        $data['client_policy_id'] = $client_policy_id;
+        $data['entry_from'] = 3;
+        $data['issuer_branch'] = 1;
+        $data['issuer'] = 2;
+        $data['status'] = 'completed';
+        $data['renewal_date'] = $data['policy_end_date'];
+        $data['bro_payable_by'] = 1;
+        $insert = $this->policyTransactionModel->insert($data);
 
+        if($insert){
+
+            $pcsd_data['pt_id'] = $insert;
+            $pcsd_data['insurer_id'] = $data['insurer_id'] ?? null;
+            $pcsd_data['insurer_branch_id'] = $data['insurer_branch_id'] ?? null;
+
+            $this->PTCOShareDetailsModel->insert($pcsd_data);
+        }
+        return $insert;
+    }
 
     // Save Rack Rate function
     public function createClientPolicyPremium()
     {
-
-        // echo json_encode(['key' => $this->request->getPost()]); die;
-
         try {
-            $client_id = $this->request->getPost('client_id');
-            $client_policy_id = $this->request->getPost('client_policy_id');
-            $record    = $this->clientPolicyModel->where('client_policy.id', $client_policy_id)->first();
-            $premium_type = $this->request->getPost('premium_type');
-            if (!empty($client_id) && $client_id != null) {
-                $client_policy_data = $this->clientPolicyModel->where('id', $client_policy_id)->first();
-                $client_id =  $client_policy_data['client_id'];
+            // 1. Fetch and Sanitize all input at once
+            $rawPost = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($rawPost);
+
+            // Extract base variables from the sanitized array
+            $client_id        = $data['client_id'] ?? null;
+            $client_policy_id = $data['client_policy_id'] ?? null;
+            $premium_type     = $data['premium_type'] ?? null;
+            $policy_grid_id   = $data['policy_grid_id'] ?? null;
+            $rack_rate_name   = $data['rack_rate_name'] ?? null;
+            $si_or_bp         = $data['si_or_bp'] ?? null;
+
+            $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+            if (!$record) {
+                return $this->respond(['status' => false, 'message' => 'Policy record not found'], 404);
             }
 
-            $branch_units = $this->getBranchUnitsByBranchId($record['client_branch_id']);
-            $branch_units = json_decode($branch_units);
+            if (empty($client_id)) {
+                $client_id = $record['client_id'];
+            }
 
-            $policy_grid_id = $this->request->getPost('policy_grid_id');
-            $rack_rate_name = $this->request->getPost('rack_rate_name');
+            $branch_units_raw = $this->getBranchUnitsByBranchId($record['client_branch_id']);
+            $branch_units = json_decode($branch_units_raw, true);
+            $default_unit = !empty($branch_units) ? $branch_units[0] : null;
 
+            // Relationship Logic
             $relation_data = [
-                'self'          => $this->request->getPost('self') ?? 'NA',
-                'spouse'        => $this->request->getPost('spouse') ?? 'NA',
-                'childrens'     => $this->request->getPost('childrens') ?? 'NA',
-                'parents'       => $this->request->getPost('parents') ?? 'NA',
-                'parents-in-law' => $this->request->getPost('parents-in-law') ?? 'NA',
+                'self'           => $data['self'] ?? 'NA',
+                'spouse'         => $data['spouse'] ?? 'NA',
+                'childrens'      => $data['childrens'] ?? 'NA',
+                'parents'        => $data['parents'] ?? 'NA',
+                'parents-in-law' => $data['parents-in-law'] ?? 'NA',
             ];
 
-            $relation_data_for_form_submit_check = [
-                $rack_rate_name => [
-                    'self'          => $this->request->getPost('self') ?? 'NA',
-                    'spouse'        => $this->request->getPost('spouse') ?? 'NA',
-                    'childrens'     => $this->request->getPost('childrens') ?? 'NA',
-                    'parents'       => $this->request->getPost('parents') ?? 'NA',
-                    'parents-in-law' => $this->request->getPost('parents-in-law') ?? 'NA',
-                ]
-            ];
-
-            if ($policy_grid_id == 1 || $policy_grid_id == 2) {
-                $relation_data = [
-                    'self'          => 1,
-                    'spouse'        => 'NA',
-                    'childrens'     => 'NA',
-                    'parents'       => 'NA',
-                    'parents-in-law' => 'NA',
-                ];
+            if (in_array($policy_grid_id, ['1', '2'])) {
+                $relation_data = ['self' => 1, 'spouse' => 'NA', 'childrens' => 'NA', 'parents' => 'NA', 'parents-in-law' => 'NA'];
             }
 
-            // Convert to JSON
             $jsonDataForRelation = json_encode($relation_data);
-            $json_data_relation_data_for_form_submit_check = json_encode($relation_data_for_form_submit_check);
+            $submit_check_json = json_encode([$rack_rate_name => $relation_data]);
 
-            $si_or_bp = $this->request->getPost('si_or_bp');
-            $basic_multiplier = str_replace(',', '', $this->request->getPost('basic_multiplier'));
-            $premium_multiplier = str_replace(',', '', $this->request->getPost('premium_multiplier'));
-            $multiplier = str_replace(',', '', $this->request->getPost('multiplier'));
-            $basic_pay = str_replace(',', '', $this->request->getPost('basic_pay'));
-
-            $data = [];
-            $data['client_id'] = $client_id;
-            $data['client_policy_id'] = $client_policy_id;
-            $data['policy_grid_id'] = $policy_grid_id;
-            $data['premium_type'] = $premium_type;
-            $data['rack_rate_name'] = $rack_rate_name;
-            $data['additional_relationship'] = $jsonDataForRelation;
-
-            $premium = [];
-
-            if ($policy_grid_id == '1' || $policy_grid_id == '2') {
-                $this->policyPremium1Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->set('is_active', 0)->update();
+            // Deactivate old records
+            if (in_array($policy_grid_id, ['1', '2'])) {
+                $this->policyPremium1Model->where(['client_id' => $client_id, 'client_policy_id' => $client_policy_id])->set(['is_active' => 0])->update();
             } else {
-                $this->policyPremium2Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->where('rack_rate_name', $rack_rate_name)->set('is_active', 0)->update();
+                $this->policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $client_policy_id, 'rack_rate_name' => $rack_rate_name])->set(['is_active' => 0])->update();
             }
 
+            // Helper closures for cleaning and unit selection
+            $cleanNum = fn($val) => str_replace(',', '', (string)($val ?? '0'));
+            $getUnit  = fn($unitArr, $index) => (empty($unitArr[$index]) || $unitArr[$index] === 'undefined') ? $default_unit : $unitArr[$index];
+
+            $insert = false;
+            $baseInsertData = [
+                'client_id' => $client_id,
+                'client_policy_id' => $client_policy_id,
+                'policy_grid_id' => $policy_grid_id,
+                'premium_type' => $premium_type,
+                'rack_rate_name' => $rack_rate_name,
+                'additional_relationship' => $jsonDataForRelation
+            ];
+
+            // --- Logic Switch based on Grid ID ---
+
             if ($policy_grid_id == '1') {
-
                 if ($si_or_bp == '1') {
-
-                    $premium = str_replace(',', '', $this->request->getPost('gpa_sum_premium[]'));
-                    $sum_insure = str_replace(',', '', $this->request->getPost('gpa_sum_si[]'));
-                    $multiplier = $this->request->getPost('gpa_sum_multiplier');
-                    $unit = $this->request->getPost('gpa_unit_1[]');
-
-                    for ($i = 0; $i < count($premium); $i++) {
-                        $data['si'] = $sum_insure[$i];
-                        $data['premium'] = $premium[$i];
-                        $data['multiplier'] = $multiplier;
-                        $data['si_or_bp'] = $this->request->getPost('si_or_bp');
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_sum_premium'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si' => $cleanNum($data['gpa_sum_si'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'multiplier' => $data['gpa_sum_multiplier'] ?? null,
+                            'si_or_bp' => $si_or_bp,
+                            'unit' => $getUnit($data['gpa_unit_1'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
                 } else if ($si_or_bp == '3') {
-
-                    $premium = str_replace(',', '', $this->request->getPost('gpa_sum_premium2[]'));
-                    $sum_insure = str_replace(',', '', $this->request->getPost('gpa_sum_si2[]'));
-                    $multiplier = $this->request->getPost('gpa_sum_multiplier2');
-                    $grade = $this->request->getPost('gpa_band[]');
-                    $unit = $this->request->getPost('gpa_unit_3[]');
-
-
-                    for ($i = 0; $i < count($premium); $i++) {
-                        $data['si'] = $sum_insure[$i];
-                        $data['premium'] = $premium[$i];
-                        $data['grade'] = $grade[$i];
-                        $data['multiplier'] = $multiplier;
-                        $data['si_or_bp'] = $this->request->getPost('si_or_bp');
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_sum_premium2'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si' => $cleanNum($data['gpa_sum_si2'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'grade' => $data['gpa_band'][$i] ?? null,
+                            'multiplier' => $data['gpa_sum_multiplier2'] ?? null,
+                            'si_or_bp' => $si_or_bp,
+                            'unit' => $getUnit($data['gpa_unit_3'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
                 } 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[]'));
-                    $unit = $this->request->getPost('gpa_unit[]');
-
-
-                    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];
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_basic_premium'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si_or_bp' => $si_or_bp,
+                            'basic_multiplier' => $cleanNum($data['basic_multiplier'] ?? 0),
+                            'multiplier' => $cleanNum($data['premium_multiplier'] ?? 0),
+                            'basic_pay' => $cleanNum($data['basic_pay'][$i] ?? 0),
+                            'si' => $cleanNum($data['gpa_basic_si'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'unit' => $getUnit($data['gpa_unit'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
-                } else {
-
-                    $data['premium'] = str_replace(',', '', $this->request->getPost('gpa_basic_premium'));
-                    $data['si'] = str_replace(',', '', $this->request->getPost('gpa_basic_si'));
-                    $data['basic_multiplier'] = str_replace(',', '', $this->request->getPost('basic_multiplier'));
-                    $data['multiplier'] = $this->request->getPost('premium_multiplier');
-                    $data['basic_pay'] = str_replace(',', '', $this->request->getPost('basic_pay'));
-                    $data['si_or_bp'] = $this->request->getPost('si_or_bp');
-
-                    $policyPremium = $this->policyPremium1Model->insert($data);
                 }
-
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '2') {
-
-                $premium = $this->request->getPost('gpa_premium29[]');
-                $sum_insure = $this->request->getPost('gpa_si29[]');
-                $unit = $this->request->getPost('gpa_unit29[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium1Model->insert($data);
+            } else if (in_array($policy_grid_id, ['2', '9'])) {
+                $premiums = $data['gpa_premium29'] ?? [];
+                $model = ($policy_grid_id == '2') ? $this->policyPremium1Model : $this->policyPremium2Model;
+                foreach ($premiums as $i => $p) {
+                    $model->insert(array_merge($baseInsertData, [
+                        'premium' => $cleanNum($p),
+                        'si' => $cleanNum($data['gpa_si29'][$i] ?? 0),
+                        'unit' => $getUnit($data['gpa_unit29'] ?? [], $i)
+                    ]));
+                    $insert = true;
                 }
+            } else {
+                // Handles grids 3, 4, 5, 6, 7, 8, 10, 11, 12, 13
+                $pfx = $policy_grid_id . "_";
+                $premiums = $data[$pfx . 'premium'] ?? [];
+                $is_si_array = is_array($data[$pfx . 'si'] ?? null);
 
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '3') {
-
-                $premium = $this->request->getPost('3_premium[]');
-                $sum_insure = $this->request->getPost('3_si[]');
-                $unit = $this->request->getPost('3_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium2Model->insert($data);
+                foreach ($premiums as $i => $p) {
+                    $this->policyPremium2Model->insert(array_merge($baseInsertData, [
+                        'premium'      => $cleanNum($p),
+                        'si'           => $cleanNum($is_si_array ? ($data[$pfx . 'si'][$i] ?? 0) : ($data[$pfx . 'si'] ?? 0)),
+                        'unit'         => $getUnit($data[$pfx . 'unit'] ?? [], $i),
+                        'age_from'     => $data[$pfx . 'age_from'][$i] ?? null,
+                        'age_to'       => $data[$pfx . 'age_to'][$i] ?? null,
+                        'grade'        => $data[$pfx . 'grade'][$i] ?? null,
+                        'relationship' => $data[$pfx . 'relationship'][$i] ?? null,
+                        'max_si'       => $cleanNum($data[$pfx . 'max_si'][$i] ?? 0)
+                    ]));
+                    $insert = true;
                 }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '4') {
-
-                $premium = $this->request->getPost('4_premium[]');
-                $sum_insure = $this->request->getPost('4_si');
-                $age_from = $this->request->getPost('4_age_from[]');
-                $age_to = $this->request->getPost('4_age_to[]');
-                $unit = $this->request->getPost('4_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '5') {
-
-                $premium = $this->request->getPost('5_premium[]');
-                $sum_insure = $this->request->getPost('5_si[]');
-                $age_from = $this->request->getPost('5_age_from[]');
-                $age_to = $this->request->getPost('5_age_to[]');
-                $unit = $this->request->getPost('5_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i] || $unit[$i] == 'undefined')) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '6') {
-
-                $premium = $this->request->getPost('6_premium[]');
-                $sum_insure = $this->request->getPost('6_si');
-                $age_from = $this->request->getPost('6_age_from[]');
-                $age_to = $this->request->getPost('6_age_to[]');
-                $unit = $this->request->getPost('6_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '7') {
-                $premium = $this->request->getPost('7_premium[]');
-                $sum_insure = $this->request->getPost('7_si[]');
-                $age_from = $this->request->getPost('7_age_from[]');
-                $age_to = $this->request->getPost('7_age_to[]');
-                $unit = $this->request->getPost('7_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '8') {
-                $premium = $this->request->getPost('8_premium[]');
-                $sum_insure = $this->request->getPost('8_si[]');
-                $grade = $this->request->getPost('8_grade[]');
-                $unit = $this->request->getPost('8_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['grade'] = $grade[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '9') {
-
-                $premium = $this->request->getPost('gpa_premium29[]');
-                $sum_insure = $this->request->getPost('gpa_si29[]');
-                $unit = $this->request->getPost('gpa_unit29[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '10') {
-                $premium = $this->request->getPost('10_premium[]');
-                $sum_insure = $this->request->getPost('10_si[]');
-                $age_from = $this->request->getPost('10_age_from[]');
-                $age_to = $this->request->getPost('10_age_to[]');
-                $unit = $this->request->getPost('10_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-
-                    $policyPremium = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '11') {
-
-                $premium = $this->request->getPost('11_premium[]');
-                $sum_insure = $this->request->getPost('11_si[]');
-                $grade = $this->request->getPost('11_grade[]');
-                $max_sum_insure = $this->request->getPost('11_max_si[]');
-                $unit = $this->request->getPost('11_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['grade'] = $grade[$i];
-                    $data['max_si'] = str_replace(',', '', $max_sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '12') {
-
-                $premium = $this->request->getPost('12_premium[]');
-                $sum_insure = $this->request->getPost('12_si[]');
-                $relationship = $this->request->getPost('12_relationship[]');
-                $unit = $this->request->getPost('12_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['relationship'] = $relationship[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
-            } else if ($policy_grid_id == '13') {
-
-                $premium = $this->request->getPost('13_premium[]');
-                $sum_insure = $this->request->getPost('13_si[]');
-                $age_from = $this->request->getPost('13_age_from[]');
-                $age_to = $this->request->getPost('13_age_to[]');
-                $relationship = $this->request->getPost('13_relationship[]');
-                $unit = $this->request->getPost('13_unit[]');
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    $data['relationship'] = $relationship[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $this->request->getPost();
-                $insert = true;
             }
 
             if ($insert) {
-                return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'rack_rate_json' => $json_data_relation_data_for_form_submit_check,], 200);
-            } else {
-                return $this->respond(['status' => false, 'code' => 404, 'data' => $data, 'message' => 'no data found'], 200);
+                return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'rack_rate_json' => $submit_check_json], 200);
             }
+
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No data found'], 200);
         } catch (\Exception $e) {
-            echo 'Error: ' . $e->getMessage() . ' at line no ' . $e->getLine();
+            return $this->respond(['status' => false, 'message' => $e->getMessage() . ' line ' . $e->getLine()], 500);
         }
     }
 
@@ -2349,7 +3200,6 @@ class ClientController extends AdminController
         }
     }
 
-
     private function updatePTCoShareTableEntry($policy_transaction_data, $old_client_policy_data, $data)
     {
         $updated_ids = [];
@@ -2395,9 +3245,6 @@ class ClientController extends AdminController
         ];
     }
 
-
-
-
     public function uploadVehicleFile($params = null)
     {
         $this->myLogger->logme('error', 'uploadVehicleFile function called');
@@ -2409,10 +3256,11 @@ class ClientController extends AdminController
 
         if(empty($params) && $this->request){
             $data = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
             $files = $this->request->getFiles();
-            $client_id = $data['client_id'] ?? null;
-            $vehicle_id = $data['vehicle_id'] ?? null;
-            $docs_name = $data['other_docs_name'] ?? null;
+            $client_id = $sanitized_post_data['client_id'] ?? null;
+            $vehicle_id = $sanitized_post_data['vehicle_id'] ?? null;
+            $docs_name = $sanitized_post_data['other_docs_name'] ?? null;
         }else {
             $client_id = $params['client_id'] ?? null;
             $vehicle_id = $params['vehicle_id'] ?? null;
@@ -2463,8 +3311,8 @@ class ClientController extends AdminController
             if (!empty($insertedDocs)) {
                 // Fetch all documents for the client
                 $vehicleDocs = $this->clientKYCDocsModel
-                    ->where('client_id', $data['client_id'])
-                    ->where('vehicle_id', $data['vehicle_id'])
+                    ->where('client_id', $sanitized_post_data['client_id'])
+                    ->where('vehicle_id', $sanitized_post_data['vehicle_id'])
                     ->findAll();
                 return $this->respond(['status' => true, 'code' => 200, 'vehicle_docs' => $vehicleDocs, 'inserted_docs' => $insertedDocs, 'message' => 'File uploaded successfully'], 200);
             } else {
@@ -3116,194 +3964,6 @@ class ClientController extends AdminController
         }
     }
 
-    // public function enrollmentGMCDisplayValueTransform()
-    // {
-    //     $data = [];
-
-    //     if ($this->request->getPost("waiverofpreexistingdiseases_display")) {
-    //         $data['Waiver of Pre-existing Diseases'] = $this->request->getPost("waiverofpreexistingdiseases");
-    //     }
-
-    //     if ($this->request->getPost("waiverof1234thyearexclusions_display")) {
-    //         $data['Waiver of 1, 2, 3 & 4th year Exclusions'] = $this->request->getPost("waiverof1,2,3&4thyearexclusions");
-    //     }
-
-    //     if ($this->request->getPost("waiverof30dayswaitingperiod_display")) {
-    //         $data['Waiver of 30 days waiting period'] = $this->request->getPost("waiverof30dayswaitingperiod");
-    //     }
-
-    //     if ($this->request->getPost("suminsuredenhancement_display")) {
-    //         $data['Sum Insured Enhancement'] = $this->request->getPost("suminsuredenhancement");
-    //     }
-
-    //     if ($this->request->getPost("waiver_of_90_days_waiting_period_display")) {
-    //         $data['Waiver of 90 Days Waiting Period'] = $this->request->getPost("waiver_of_90_days_waiting_period");
-    //     }
-
-    //     if ($this->request->getPost("waiver_of_other_waiting_periods_display")) {
-    //         $data['Waiver of Other Waiting Periods'] = $this->request->getPost("waiver_of_other_waiting_periods");
-    //     }
-
-    //     if ($this->request->getPost("maternity_benefit_display")) {
-    //         $data['Maternity Benefit'] = $this->request->getPost("maternity_benefit");
-    //     }
-
-    //     if ($this->request->getPost("9monthwaitingperiodwaived_display")) {
-    //         $data['9-month waiting Period - waived'] = $this->request->getPost("9monthwaitingperiodwaived");
-    //     }
-
-    //     if ($this->request->getPost("maternitycoverage_display")) {
-    //         $data['Maternity Coverage'] = $this->request->getPost("maternitycoverage");
-    //     }
-
-    //     if ($this->request->getPost("twindelivery_display")) {
-    //         $data['Twin Delivery'] = $this->request->getPost("twindelivery");
-    //     }
-
-    //     if ($this->request->getPost("well_baby_well_mother_expenses_display")) {
-    //         $data['Well baby / Well Mother Expenses'] = $this->request->getPost("well_baby_well_mother_expenses");
-    //     }
-
-    //     if ($this->request->getPost("preandpostnatal_display")) {
-    //         $data['Pre and Post natal'] = $this->request->getPost("preandpostnatal");
-    //     }
-
-    //     if ($this->request->getPost("infertility_treatment_coverage_display")) {
-    //         $data['Infertility Treatment Coverage'] = $this->request->getPost("infertility_treatment_coverage");
-    //     }
-
-    //     if ($this->request->getPost("babyday1cover_display")) {
-    //         $data['Baby Day 1 Cover'] = $this->request->getPost("babyday1cover");
-    //     }
-
-    //     if ($this->request->getPost("coverfromthedateofjoining_display")) {
-    //         $data['Cover from the date of Joining'] = $this->request->getPost("coverfromthedateofjoining");
-    //     }
-
-    //     if ($this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse_display")) {
-    //         $data['Mid Term Addition of New Born / Newly Wedded Spouse'] = $this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse");
-    //     }
-
-    //     if ($this->request->getPost("prehospitalizationcover_display")) {
-    //         $data['Pre Hospitalization Cover'] = $this->request->getPost("prehospitalizationcover");
-    //     }
-
-    //     if ($this->request->getPost("posthospitalizationcover_display")) {
-    //         $data['Post Hospitalization Cover'] = $this->request->getPost("posthospitalizationcover");
-    //     }
-
-    //     if ($this->request->getPost("congenitaldiseasesinternal_display")) {
-    //         $data['Congenital Diseases - Internal'] = $this->request->getPost("congenitaldiseasesinternal");
-    //     }
-
-    //     if ($this->request->getPost("congenitaldiseasesexternal_display")) {
-    //         $data['Congenital Diseases - External'] = $this->request->getPost("congenitaldiseasesexternal");
-    //     }
-
-    //     if ($this->request->getPost("copayzonewisecopay_display")) {
-    //         $data['Co-Pay/Zone wise Co Pay'] = $this->request->getPost("copayzonewisecopay");
-    //     }
-
-    //     if ($this->request->getPost("roomrentlimit_display")) {
-    //         $data['Room Rent Limit'] = $this->request->getPost("roomrentlimit");
-    //     }
-
-    //     if ($this->request->getPost("icu_limit_display")) {
-    //         $data['ICU Limit'] = $this->request->getPost("icu_limit");
-    //     }
-
-    //     if ($this->request->getPost("proportionatedeductionclause_display")) {
-    //         $data['Proportionate Deduction Clause'] = $this->request->getPost("proportionatedeductionclause");
-    //     }
-
-    //     if ($this->request->getPost("ailmentcapping_display")) {
-    //         $data['Ailment capping'] = $this->request->getPost("ailmentcapping");
-    //     }
-
-    //     if ($this->request->getPost("ailment_capping_details_display")) {
-    //         $data['Ailment capping Details'] = $this->request->getPost("ailment_capping_details");
-    //     }
-
-    //     if ($this->request->getPost("corporatebuffer_display")) {
-    //         $data['Corporate Buffer'] = $this->request->getPost("corporatebuffer");
-    //     }
-
-    //     if ($this->request->getPost("non_admissible_contingency_corporate_buffer_display")) {
-    //         $data['Non-Admissible / Contingency Corporate Buffer'] = $this->request->getPost("non_admissible_contingency_corporate_buffer");
-    //     }
-
-    //     if ($this->request->getPost("ambulancecharges_display")) {
-    //         $data['Ambulance Charges'] = $this->request->getPost("ambulancecharges");
-    //     }
-
-    //     if ($this->request->getPost("airambulance_display")) {
-    //         $data['Air Ambulance'] = $this->request->getPost("airambulance");
-    //     }
-
-    //     if ($this->request->getPost("reasonableandcustomarycharges_display")) {
-    //         $data['Reasonable and Customary Charges'] = $this->request->getPost("reasonableandcustomarycharges");
-    //     }
-
-    //     if ($this->request->getPost("daycaretreatment_display")) {
-    //         $data['Day Care Treatment'] = $this->request->getPost("daycaretreatment");
-    //     }
-
-    //     if ($this->request->getPost("lasiksurgery_display")) {
-    //         $data['Lasik Surgery'] = $this->request->getPost("lasiksurgery");
-    //     }
-
-    //     if ($this->request->getPost("ayushtreatmentcover_display")) {
-    //         $data['AYUSH treatment cover'] = $this->request->getPost("ayudhtreatmentcover");
-    //     }
-
-    //     if ($this->request->getPost("moderntreatmentsasperirdai_display")) {
-    //         $data['Modern treatments as per IRDAI'] = $this->request->getPost("moderntreatmentsasperirdai");
-    //     }
-
-    //     if ($this->request->getPost("opd_treatment_display")) {
-    //         $data['OPD Treatment'] = $this->request->getPost("opd_treatment");
-    //     }
-
-    //     if ($this->request->getPost("days_of_discharge_display")) {
-    //         $data['Claim Intimation Clause'] = $this->request->getPost("days_of_discharge");
-    //     }
-
-    //     if ($this->request->getPost("days_from_dod_display")) {
-    //         $data['Claim Submission'] = $this->request->getPost("days_from_dod");
-    //     }
-
-    //     if ($this->request->getPost("terrorism_display")) {
-    //         $data['Terrorism'] = $this->request->getPost("terrorism");
-    //     }
-
-    //     if ($this->request->getPost("widower_cover_display")) {
-    //         $data['Widower Cover'] = $this->request->getPost("widower_cover");
-    //     }
-
-    //     if ($this->request->getPost("breavement_cover_display")) {
-    //         $data['Breavement Cover'] = $this->request->getPost("breavement_cover");
-    //     }
-
-    //     if ($this->request->getPost("special_condition_display_value")) {
-
-    //         $specialConditionKeyValue = $this->request->getPost("special_condition_display_value") ?? [];
-    //         $specialConditionKeyValue = json_decode($specialConditionKeyValue, true);
-
-    //         if (is_array($specialConditionKeyValue) && count($specialConditionKeyValue) > 0) {
-    //             $mergedArray = array_merge(...array_map(fn($item) => (array) $item, $specialConditionKeyValue));
-    //             $data = array_merge($data, $mergedArray);
-    //         }
-    //     }
-
-    //     if(isset($data) && !empty($data)){
-    //         return $data;
-    //     }else{
-    //         $data = [];
-    //         return $data;
-    //     }
-
-    // }
-
     public function enrollmentGMCDisplayValueTransform()
     {
         $data = [];
@@ -3378,7 +4038,6 @@ class ClientController extends AdminController
         return $data;
     }
 
-
     public function getterms()
     {
         $client_policy_id = $this->request->getVar('client_policy_id');
@@ -3539,94 +4198,6 @@ class ClientController extends AdminController
         }
     }
 
-    // public function enrollmentGPADisplayValueTransform()
-    // {   
-    //     $data = [];
-
-    //     if ($this->request->getPost("accidentalDeathBenefit_display")) {
-    //         $data['Accidental Death Benefit'] = $this->request->getPost("accidentalDeathBenefit");
-    //     }
-    //     if ($this->request->getPost("permanentTotalDisablement_display")) {
-    //         $data['Permanent Total Disablement'] = $this->request->getPost("permanentTotalDisablement");
-    //     }
-    //     if ($this->request->getPost("permanentPartialDisablement_display")) {
-    //         $data['Permanent Partial Disablement'] = $this->request->getPost("permanentPartialDisablement");
-    //     }
-    //     if ($this->request->getPost("temporaryTotalDisablementBenefit_display")) {
-    //         $data['Temporary Total Disablement Benefit'] = $this->request->getPost("temporaryTotalDisablementBenefit");
-    //     }
-    //     if ($this->request->getPost("medical_expenses_medical_extension_display")) {
-    //         $data['Medical Expenses / Medical Extension (IPD)'] = $this->request->getPost("medical_expenses_medical_extension");
-    //     }
-    //     if ($this->request->getPost("opd_treatment_cover_display")) {
-    //         $data['OPD Treatment Cover'] = $this->request->getPost("opd_treatment_cover");
-    //     }
-    //     if ($this->request->getPost("ambulanceCharges_display")) {
-    //         $data['Ambulance Charges'] = $this->request->getPost("ambulanceCharges");
-    //     }
-    //     if ($this->request->getPost("repatriation_of_mortal_remains_display")) {
-    //         $data['Repatriation of Mortal Remains'] = $this->request->getPost("repatriation_of_mortal_remains");
-    //     }
-    //     if ($this->request->getPost("childrenEducationWelfareFund_display")) {
-    //         $data['Children Education Welfare Fund'] = $this->request->getPost("childrenEducationWelfareFund");
-    //     }
-    //     if ($this->request->getPost("terrorism_display")) {
-    //         $data['Terrorism'] = $this->request->getPost("terrorism");
-    //     }
-    //     if ($this->request->getPost("worldwideCover_display")) {
-    //         $data['Worldwide Cover'] = $this->request->getPost("worldwideCover");
-    //     }
-    //     if ($this->request->getPost("family_transportation_benefits_display")) {
-    //         $data['Family Transportation Benefits'] = $this->request->getPost("family_transportation_benefits");
-    //     }
-    //     if ($this->request->getPost("fractures_dislocation_burns_display")) {
-    //         $data['Fractures / Dislocation / Burns'] = $this->request->getPost("fractures_dislocation_burns");
-    //     }
-    //     if ($this->request->getPost("coma_display")) {
-    //         $data['Coma'] = $this->request->getPost("coma");
-    //     }
-    //     if ($this->request->getPost("carriageofDeadBody_display")) {
-    //         $data['Carriage of Dead Body'] = $this->request->getPost("carriageOfDeadBody");
-    //     }
-    //     if ($this->request->getPost("compassionateVisitExpenses_display")) {
-    //         $data['Compassionate Visit Expenses'] = $this->request->getPost("compassionateVisitExpenses");
-    //     }
-    //     if ($this->request->getPost("travel_expenses_for_medical_treatment_display")) {
-    //         $data['Travel expenses for Medical Treatment'] = $this->request->getPost("travel_expenses_for_medical_treatment");
-    //     }
-    //     if ($this->request->getPost("daily_cash_allowance_display")) {
-    //         $data['Daily cash Allowance'] = $this->request->getPost("daily_cash_allowance");
-    //     }
-    //     if ($this->request->getPost("artifical_limb_and_prosthesis_display")) {
-    //         $data['Artifical Limb and Prosthesis'] = $this->request->getPost("artifical_limb_and_prosthesis");
-    //     }
-    //     if ($this->request->getPost("animalSnakeInsectBite_display")) {
-    //         $data['Animal/Snake/Insect Bite'] = $this->request->getPost("animalSnakeInsectBite");
-    //     }
-    //     if ($this->request->getPost("air_ambulance_display")) {
-    //         $data['Air Ambulance'] = $this->request->getPost("air_ambulance");
-    //     }
-
-    //     if ($this->request->getPost("gpa_special_condition_display_value")) {
-
-    //         $specialConditionKeyValue = $this->request->getPost("gpa_special_condition_display_value") ?? [];
-    //         $specialConditionKeyValue = json_decode($specialConditionKeyValue, true);
-
-    //         if (is_array($specialConditionKeyValue) && count($specialConditionKeyValue) > 0) {
-    //             $mergedArray = array_merge(...array_map(fn($item) => (array) $item, $specialConditionKeyValue));
-    //             $data = array_merge($data, $mergedArray);
-    //         }
-    //     }
-    //     // print_r($data); die;
-
-    //     if (isset($data) && !empty($data)) {
-    //         return $data;
-    //     } else {
-    //         $data = [];
-    //         return $data;
-    //     }
-    // }
-
     public function enrollmentGPADisplayValueTransform()
     {
         $data = [];
@@ -3761,9 +4332,9 @@ class ClientController extends AdminController
         // $policy_status = $this->clientPolicyModel->where('id', $client_policy_id )->set('policy_status', 1)->update();
 
         $json_data = '';
-        $open_for_enrollment = $this->clientPolicyModel->where('id', $client_policy_id)->set('open_for_enrollment', $open_for_enrollment_update_value)->update();
+        $open_for_enrollment = $this->clientPolicyModel->where('id', (int)$client_policy_id)->set('open_for_enrollment', $open_for_enrollment_update_value)->update();
         if ($open_for_enrollment) {
-            $open_for_enrollment_1 = $this->clientPolicyModel->where('id', $client_policy_id)->find();
+            $open_for_enrollment_1 = $this->clientPolicyModel->where('id', (int)$client_policy_id)->find();
             $open_for_enrollment_value = $open_for_enrollment_1[0]['open_for_enrollment'];
             $client_policy_id_value = $client_policy_id;
 
@@ -5103,12 +5674,65 @@ class ClientController extends AdminController
 
     public function createVehicleWithMinimalData()
     {
+        $rules = [
+            'Owner_type' => [
+                'rules'  => 'required|in_list[1,2]',
+                'errors' => [
+                    'required' => 'Owner type is required',
+                    'in_list'  => 'Invalid owner type selected'
+                ]
+            ],
+            'vehicle_no' => [
+                'rules'  => 'required|regex_match[/^[A-Z]{2}[0-9]{2}[A-Z]{1,2}[0-9]{4}$/]',
+                'errors' => [
+                    'required'    => 'Vehicle number is required',
+                    'regex_match' => 'Invalid Vehicle Number. Example: TN22AB1234'
+                ]
+            ],
+            'rc' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'RC Book number is required'
+                ]
+            ],
+
+            'type' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Vehicle type is required'
+                ]
+            ],
+
+            'description' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Vehicle description is required'
+                ]
+            ],
+            'owner' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Owner is required'
+                ]
+            ],
+
+        ];
+         if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data = $this->request->getPost();
-        $id = $this->request->getPost('vehicle_primary_key');
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id = $sanitized_post_data['vehicle_primary_key'] ?? null;
+
 
         if ($id) {
 
-            $vehicle_update = $this->vehicleModel->where('id', $id)->set($data)->update();
+            $vehicle_update = $this->vehicleModel->where('id', $id)->set($sanitized_post_data)->update();
 
             if ($vehicle_update) {
                 return $this->respond(['status' => true, 'message' => 'Vehicle details updated successfully'], 200);
@@ -5117,7 +5741,7 @@ class ClientController extends AdminController
             }
         } else {
 
-            $vehicle_insert = $this->vehicleModel->insert($data);
+            $vehicle_insert = $this->vehicleModel->insert($sanitized_post_data);
 
             if ($vehicle_insert) {
 
@@ -5130,9 +5754,9 @@ class ClientController extends AdminController
                 return $this->respond([
                     'status' => true,
                     'vehicle_id' => $vehicle_insert,
-                    'owner_id' => $data['owner'],
-                    'owner_branch_id' => $data['branch_id'] ?? null,
-                    'owner_type' => $data['Owner_type'],
+                    'owner_id' => $sanitized_post_data['owner'] ?? null,
+                    'owner_branch_id' => $sanitized_post_data['branch_id'] ?? null,
+                    'owner_type' => $sanitized_post_data['Owner_type']?? null,
                     'vehicles' => $vehicles,
                     'message' => 'Vehicle created successfully
                     '
@@ -6065,7 +6689,23 @@ class ClientController extends AdminController
     }
 
     public function sendextraparam()
-    {              
+    {      
+        // $zipService = new \App\Libraries\ZipService();
+        // $source = WRITEPATH . 'uploads/hr_files';
+        // $destination = WRITEPATH . 'tmp/archive_' . date('Ymd') . '.zip';
+
+        // $result = $zipService->createLocalZip($source, $destination);
+
+        // if ($result['status']) {
+        //     echo "File is ready at: " . $result['path'];
+        // } else {
+        //     echo "Error creating zip: " . $result['message'];
+        // }
+
+        // die;
+
+        // $cd = $this->view_Deposit(2, 'rest', ['client_id' => 58, 'cd_ac_pk' => 94]);
+        // dd($cd);
         // $return = db_connect()->table('jobs')->where('id', 1677)->get()->getRowArray();
         // $return = $this->updatePolicyTransactionDataWhileClinetPolicyUpdate(json_decode($data['payload'], true));
         // dd($return);
@@ -6078,7 +6718,10 @@ class ClientController extends AdminController
         // $res = $medi_assist->MediAssistGetBenefDetails(['policy_no' => '97000034240400000030', 'file_id' => 389, 'return_type' => 'job', 'client_policy_id' => 6192 ]); 
         // dd($res);
 
-        // $employeeController = new EmployeeController();
+        $employeeController = new EmployeeController();
+        // $response = $employeeController->getEmployeeEcardFromTmpFolderAndZipToS3(json_decode('{"batch_no":2,"last_emp_policy_id":"13218","folder_name":"bulk_ecards_IOCL-77448855996699885555_2026-02-05_09-32-22","processed_in_this_batch_data_count":7,"pdf_count":0,"hr_id":"1"}', true));
+        // $response = $employeeController->bulkEcardDownloadAsZipFromS3(json_decode('{"client_policy_id":"6066","hr_id":"1"}', true));
+        // dd($response);
         // $employeeController->truncateFileData('633');
         // $res = $this->getHrAccessData(4075); dd($res);
 
@@ -6090,6 +6733,16 @@ class ClientController extends AdminController
         // $response = $ticketServiceController->getClaimExcelErrorData(["file_id" => 41]);
         // $response = $ticketServiceController->claimDumpOnBoardProcess(["file_id" => 17]);
         // $response = $ticketServiceController->extractExcelData("claims_dump_form_client.xlsx");
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 51]); //abhi
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 50]); //fhpl
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 53]); //icici
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 54]); //mediassist
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 52]); //reliance
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 48]); //vidal
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 48]); //vidal
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 54]); //mediassist
+
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 4]); //abhi
         // dd($response);
 
         // ---------- TICKET CONTROLLER --------------------------------------------------------------------------------
@@ -6102,9 +6755,10 @@ class ClientController extends AdminController
         // ---------- EMP SERVICE CONTROLLER --------------------------------------------------------------------------------
 
         $empServiceController = new EmployeeServiceController();
-        // $res = $empServiceController->excelFileFormatValidation(['file_id' => '1248']);
-        // $res = $empServiceController->excelFileDataValidation(['file_id' => '1252']);
-        // $res = $empServiceController->employeesOnboardPreprocess(['file_id' => 1183]);
+        // $res = $empServiceController->excelFileFormatValidation(['file_id' => '1264']);
+        // $res = $empServiceController->excelFileDataValidation(['file_id' => '1264']);
+        // $res = $empServiceController->employeesOnboardPreprocess(['file_id' => 1264]);
+        // $res = $empServiceController->employeesOnboardPreprocess(['file_id' => 1262]);
         // $res = $empServiceController->employeesOnboardPreprocess(['file_id' => 1169]);
         // $res = $empServiceController->employeesOnboardProcess(['file_id' => 835]);
         // $res = $empServiceController->employeesEnrollmentInsert(['file_id' => 836]);
@@ -6131,31 +6785,32 @@ class ClientController extends AdminController
         $policyTransactionController = new PolicyTransactionController();
         // $res = $policyTransactionController->validateInsurerStatement(['file_id' => '281']);
         // $res = $policyTransactionController->updateInsurerStatement(['file_id' => '62']);
-        // dd('-----', $res);
+        // $res = $policyTransactionController->bdsDumpExcelFileFormatValidation(['file_id' => '73']);
+        // dd($res);
 
         // ----------EMP DATA SERVICE CONTROLLER--------------------------------------------------------------------------------
 
-        $batch_data = [
-            'client_id' => 51,
-            'client_branch_id' => 40,
-            'client_policy_id' => 63,
-            'insurer_or_tpa' => "insurer",
-            'event_type' => "correction",
-            'actions' => "export",
-            'file_name' => "deletion_enhancement_test_file.xlsx",
-        ];
-
         // $batch_data = [
-        //     'client_id' => 20,
-        //     'client_policy_id' => 77,
-        //     'client_branch_id' => 72,
+        //     'client_id' => 51,
+        //     'client_branch_id' => 40,
+        //     'client_policy_id' => 63,
         //     'insurer_or_tpa' => "insurer",
-        //     // 'insurer_or_tpa' => "tpa",
-        //     'event_type' => "si_enhancement",
-        //     'file_name' => "si_enhancement_test_file.xlsx",
+        //     'event_type' => "correction",
         //     'actions' => "export",
+        //     'file_name' => "deletion_enhancement_test_file.xlsx",
         // ];
 
+        $batch_data = [
+            'client_id' => 12,
+            'client_policy_id' => 8063,
+            'client_branch_id' => 1,
+            'insurer_or_tpa' => "insurer",
+            // 'insurer_or_tpa' => "tpa",
+            'event_type' => "inception",
+            'file_name' => "si_enhancement_test_file.xlsx",
+            'actions' => "export",
+        ];
+
         // $batch_data['insurer_or_tpa'] = 'insurer';
         // $batch_data['insurer_or_tpa'] = 'tpa';
 
@@ -6180,7 +6835,7 @@ class ClientController extends AdminController
         // $res = $EmpDataServiceController->importInceptionUpdateTPAandUHID(['file_id' => 310]); dd($res);//for live
         // $res = $EmpDataServiceController->getInceptionBasePremium(["13332","13333","13334","13335","13336"]); dd($res);//for live
         // $res = $EmpDataServiceController->getDeletionBasePremium(["13248","13250","13249","13247"], json_decode('{"employeeIds":["13248","13250","13249","13247"],"client_id":"3927","client_policy_id":"6183","client_branch_id":"1874","cd_ac_no":"CD9751909505","endorsement_no":"END1238","count":4,"event_name":"deletion","policy_name":"GMC","user_id":"48"}', true)); dd($res);//for live
-        // $res = $EmpDataServiceController->makeEntryForBDSPolicyTransaction(json_decode('{"client_policy_id":"6187","endorsement_no":null,"emp_count":5,"action_type":"inception","no_of_insured":3,"no_of_dependent":0}', true)); dd($res);//for live
+        // $res = $EmpDataServiceController->makeEntryForBDSPolicyTransaction(json_decode('{"client_policy_id":"6187","endorsement_no":"000000001","emp_count":5,"action_type":"addition","no_of_insured":3,"no_of_dependent":0, "base_premium" : "1000", "gst" : "180", "policy_issue_date" : "2025-12-31"}', true)); dd($res);//for live
         // $res = $EmpDataServiceController->sendMailForDownloadingECard(['ids' => $ids, 'client_policy_id' => $client_policy_id]);
         // $res = $this->employeePolicyModel->getDeletionEmployeeDataForExportExcel($batch_data, 1); dd($result);
         // $res = $this->employeePolicyModel->getSIEnhancementEmployeesDataForExportExcel($batch_data, 1);
@@ -6210,6 +6865,21 @@ class ClientController extends AdminController
         // $EmpDataServiceController->cashDepositCalculationForDeletion($array);
 
         // $result = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($batch_data);
+        // $totals = 0;
+        // foreach ($result as $item) {
+        //     $totals =  $totals + $item->total;
+        // }
+
+        // clear_cd_balance_session();
+
+        // $data = [
+        //     'cd_balance' => session()->get('cd_balance'),
+        //     'hr_data' => session()->get('hr_data'),
+        //     'cd_balance_info' => session()->get('cd_balance_info'),
+        //     get_cd_balance()
+        // ];
+
+        // dd($data);
         // $result = $this->employeePolicyModel->getCorrectionEmployeesDataForExportExcel($batch_data);
         // dd(db_connect()->getLastQuery());
 
@@ -6230,8 +6900,8 @@ class ClientController extends AdminController
         // $res = $LeadsController->convertQCRJsonToPolicyTerms($jsonArray, $policy_type, $proposel_name, $insurer_name);
         // $res = $LeadsController->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' => 169]);
         // $res = $LeadsController->reorderProposalsByInsurerTotal($jsonArray);
-        // $res = $LeadsController->calculateMembersDemography(['lead_id' => 326]);
-        // $res = $LeadsController->generateDemographyDataTable(['lead_id' => 326]);
+        // $res = $LeadsController->calculateMembersDemography(['lead_id' => 287], "internal");
+        // $res = $LeadsController->generateDemographyDataTable(['lead_id' => 287]);
         // echo $res;
         // dd($res);
 
@@ -7453,180 +8123,6 @@ class ClientController extends AdminController
         $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id ,$pre_client_data['id']);
         return $combinedHrAccessData;
     }
-
-    // do not remove this commented items
-    // public function constructHrAccessData($data, $client_id , $pre_client_id)
-    // {
-    //     // print_rr($data);die;
-
-    //     $preHrs = $data['pre_hr_data'];
-    //     $postHrs = $data['post_hr_data'];
-    //     $hrAccessTableData = $data['hr_access_table_data'];
-    //     $merged = [];
-
-    //     // Merge based on mobile and email
-    //     foreach ($postHrs as $post) {
-    //         $found = false;
-    //         foreach ($preHrs as $index => $pre) {
-
-    //             if ( trim($post['hr_mobile']) == trim($pre['hr_mobile'])  &&  trim($post['hr_mail']) == trim($pre['hr_mail']) ) {
-
-    //                 $merged[] = [
-    //                     'pre_hr_id' => $pre['pre_hr_id'],
-    //                     'post_hr_id' => $post['post_hr_id'],
-    //                     'hr_name' => $post['hr_name'],
-    //                     'hr_mobile' => $post['hr_mobile'],
-    //                     'hr_mail' => $post['hr_mail'],
-    //                     'pre_branch_id' => $pre['pre_branch_id'] ?? null,
-    //                     'post_branch_id'   => $post['post_branch_id'] ?? null,
-    //                     'post_branch_name' => $post['post_branch_name'] ?? null 
-    //                 ];
-    //                 unset($preHrs[$index]); // remove matched pre_hr
-    //                 $found = true;
-    //                 break;
-    //             }
-    //         }
-
-    //         if (!$found) {
-    //             $merged[] = [
-    //                 'pre_hr_id' => null,
-    //                 'post_hr_id' => $post['post_hr_id'],
-    //                 'hr_name' => $post['hr_name'],
-    //                 'hr_mobile' => $post['hr_mobile'],
-    //                 'hr_mail' => $post['hr_mail'],
-    //                 'pre_branch_id' => $pre['pre_branch_id'] ?? null,
-    //                 'post_branch_id' => $post['post_branch_id'] ?? null ,
-    //                 'post_branch_name' => $post['post_branch_name'] ?? null
-    //             ];
-    //         }
-    //     }
-
-    //     // Remaining preHrs (not matched)
-    //     foreach ($preHrs as $pre) {
-
-    //         foreach ($merged as $value) {
-    //             if ( trim($pre['hr_mobile']) == trim($value['hr_mobile'])  &&  trim($pre['hr_mail']) == trim($value['hr_mail']) ) {
-    //                 continue 2; // Skip adding this pre_hr as it's already matched
-    //             }
-    //         }
-            
-    //         $merged[] = [
-    //             'pre_hr_id' => $pre['pre_hr_id'],
-    //             'post_hr_id' => null,
-    //             'hr_name' => $pre['hr_name'],
-    //             'hr_mobile' => $pre['hr_mobile'],
-    //             'hr_mail' => $pre['hr_mail'],
-    //             'pre_branch_id' => $pre['pre_branch_id'] ?? null,
-    //             'post_branch_id' => $post['post_branch_id'] ?? null ,
-    //             'post_branch_name' => $post['post_branch_name'] ?? null
-    //         ];
-    //     }
-
-    //     // dd($merged);
-
-    //     $result = [];
-
-    //     if (empty($hrAccessTableData)) {
-
-    //         // No access data — fill result with hr data and other fields as null
-    //         foreach ($merged as $hr) {
-    //             $result[] = [
-    //                 'hr_access_table_pk' => null,
-    //                 'post_client_id' => $client_id ?? null,
-    //                 'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-    //                 'post_hr_id' => $hr['post_hr_id'] ?? null,
-    //                 'allowed_pre_modules' => [],
-    //                 'allowed_post_modules' => [],
-    //                 'allowed_pre_policies' => [],
-    //                 'allowed_active_policies' => [],
-    //                 'allowed_cd' => [],
-    //                 'hr_name' => $hr['hr_name'] ?? null,
-    //                 'hr_mobile' => $hr['hr_mobile'] ?? null,
-    //                 'hr_mail' => $hr['hr_mail'] ?? null,
-    //                 'pre_branch_id' => $hr['pre_branch_id'] ?? null,
-    //                 'post_branch_id' => $hr['post_branch_id'] ?? null ,
-    //                 'post_branch_name' => $hr['post_branch_name'] ?? null ,
-    //                 'pre_client_id'    => $pre_client_id ?? null
-    //             ];
-    //         }
-    //     } else {
-    //         // First create a map of HR data by post_hr_id for quick lookup
-    //         $hrMap = [];
-    //         foreach ($merged as $hr) {
-    //             $hrMap[$hr['post_hr_id']] = $hr;
-    //         }
-
-    //         // Process access data first
-    //         foreach ($hrAccessTableData as $access) {
-    //             $post_hr_id = $access['post_hr_id'];
-
-    //             // Check if this HR exists in our merged data
-    //             if (isset($hrMap[$post_hr_id])) {
-    //                 $hr = $hrMap[$post_hr_id];
-    //                 $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-
-    //                 // Parse allowed modules
-    //                 $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
-    //                 $allowed_pre_modules = $allowed_modules['pre'] ?? [];
-    //                 $allowed_post_modules = $allowed_modules['post'] ?? [];
-
-    //                 $result[$temp_arr_key] = [
-    //                     'hr_access_table_pk' => $access['id'] ?? null,
-    //                     'post_client_id' => $access['post_client_id'] ?? null,
-    //                     'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-    //                     'post_hr_id' => $hr['post_hr_id'] ?? null,
-    //                     'allowed_pre_modules' => $allowed_pre_modules,
-    //                     'allowed_post_modules' => $allowed_post_modules,
-    //                     'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
-    //                     'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
-    //                     'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
-    //                     'hr_name' => $hr['hr_name'],
-    //                     'hr_mobile' => $hr['hr_mobile'],
-    //                     'hr_mail' => $hr['hr_mail'],
-    //                     'pre_branch_id' => $hr['pre_branch_id'] ?? null,
-    //                     'post_branch_id' => $hr['post_branch_id'] ?? null ,
-    //                     'post_branch_name' => $hr['post_branch_name'] ?? null ,
-    //                     'pre_client_id'    => $pre_client_id ?? null
-    //                 ];
-
-    //                 // Remove from map so we know it's been processed
-    //                 unset($hrMap[$post_hr_id]);
-    //             }
-    //         }
-
-    //         // Now process any remaining HRs that didn't have access records
-    //         foreach ($hrMap as $hr) {
-    //             $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-
-    //             $result[$temp_arr_key] = [
-    //                 'hr_access_table_pk' => null,
-    //                 'post_client_id' => $client_id ?? null,
-    //                 'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-    //                 'post_hr_id' => $hr['post_hr_id'] ?? null,
-    //                 'allowed_pre_modules' => [],
-    //                 'allowed_post_modules' => [],
-    //                 'allowed_pre_policies' => [],
-    //                 'allowed_active_policies' => [],
-    //                 'allowed_cd' => [],
-    //                 'hr_name' => $hr['hr_name'] ?? null,
-    //                 'hr_mobile' => $hr['hr_mobile'] ?? null,
-    //                 'hr_mail' => $hr['hr_mail'] ?? null,
-    //                 'pre_branch_id' => $hr['pre_branch_id'] ?? null,
-    //                 'post_branch_id' => $hr['post_branch_id'] ?? null ,
-    //                 'post_branch_name' => $hr['post_branch_name'] ?? null ,
-    //                 'pre_client_id'    => $pre_client_id ?? null
-    //             ];
-    //         }
-    //     }
-
-
-    //     $resultData['hr_access_data']   = array_values($result);
-    //     $resultData['pre_policy_data']  = $data['pre_policy_data'];
-    //     $resultData['post_policy_data'] = $data['post_policy_data'];
-    //     $resultData['post_cd_data']     = $data['post_cd_data'];
-
-    //     return $resultData;
-    // }    
     
     public function constructHrAccessData($data, $client_id , $pre_client_id)
     {   
@@ -7882,7 +8378,180 @@ class ClientController extends AdminController
             ];
             return ['status' => 'failed', 'code' => 500, 'message' => $th->getMessage(), 'error_data' => $errorData];
         }
-    }       
+    }   
+
+    public function constructHrAccessData_OLD($data, $client_id , $pre_client_id)
+    {
+        // print_rr($data);die;
+
+        $preHrs = $data['pre_hr_data'];
+        $postHrs = $data['post_hr_data'];
+        $hrAccessTableData = $data['hr_access_table_data'];
+        $merged = [];
+
+        // Merge based on mobile and email
+        foreach ($postHrs as $post) {
+            $found = false;
+            foreach ($preHrs as $index => $pre) {
+
+                if ( trim($post['hr_mobile']) == trim($pre['hr_mobile'])  &&  trim($post['hr_mail']) == trim($pre['hr_mail']) ) {
+
+                    $merged[] = [
+                        'pre_hr_id' => $pre['pre_hr_id'],
+                        'post_hr_id' => $post['post_hr_id'],
+                        'hr_name' => $post['hr_name'],
+                        'hr_mobile' => $post['hr_mobile'],
+                        'hr_mail' => $post['hr_mail'],
+                        'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                        'post_branch_id'   => $post['post_branch_id'] ?? null,
+                        'post_branch_name' => $post['post_branch_name'] ?? null 
+                    ];
+                    unset($preHrs[$index]); // remove matched pre_hr
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                $merged[] = [
+                    'pre_hr_id' => null,
+                    'post_hr_id' => $post['post_hr_id'],
+                    'hr_name' => $post['hr_name'],
+                    'hr_mobile' => $post['hr_mobile'],
+                    'hr_mail' => $post['hr_mail'],
+                    'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                    'post_branch_id' => $post['post_branch_id'] ?? null ,
+                    'post_branch_name' => $post['post_branch_name'] ?? null
+                ];
+            }
+        }
+
+        // Remaining preHrs (not matched)
+        foreach ($preHrs as $pre) {
+
+            foreach ($merged as $value) {
+                if ( trim($pre['hr_mobile']) == trim($value['hr_mobile'])  &&  trim($pre['hr_mail']) == trim($value['hr_mail']) ) {
+                    continue 2; // Skip adding this pre_hr as it's already matched
+                }
+            }
+            
+            $merged[] = [
+                'pre_hr_id' => $pre['pre_hr_id'],
+                'post_hr_id' => null,
+                'hr_name' => $pre['hr_name'],
+                'hr_mobile' => $pre['hr_mobile'],
+                'hr_mail' => $pre['hr_mail'],
+                'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                'post_branch_id' => $post['post_branch_id'] ?? null ,
+                'post_branch_name' => $post['post_branch_name'] ?? null
+            ];
+        }
+
+        // dd($merged);
+
+        $result = [];
+
+        if (empty($hrAccessTableData)) {
+
+            // No access data — fill result with hr data and other fields as null
+            foreach ($merged as $hr) {
+                $result[] = [
+                    'hr_access_table_pk' => null,
+                    'post_client_id' => $client_id ?? null,
+                    'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                    'post_hr_id' => $hr['post_hr_id'] ?? null,
+                    'allowed_pre_modules' => [],
+                    'allowed_post_modules' => [],
+                    'allowed_pre_policies' => [],
+                    'allowed_active_policies' => [],
+                    'allowed_cd' => [],
+                    'hr_name' => $hr['hr_name'] ?? null,
+                    'hr_mobile' => $hr['hr_mobile'] ?? null,
+                    'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
+                ];
+            }
+        } else {
+            // First create a map of HR data by post_hr_id for quick lookup
+            $hrMap = [];
+            foreach ($merged as $hr) {
+                $hrMap[$hr['post_hr_id']] = $hr;
+            }
+
+            // Process access data first
+            foreach ($hrAccessTableData as $access) {
+                $post_hr_id = $access['post_hr_id'];
+
+                // Check if this HR exists in our merged data
+                if (isset($hrMap[$post_hr_id])) {
+                    $hr = $hrMap[$post_hr_id];
+                    $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                    // Parse allowed modules
+                    $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
+                    $allowed_pre_modules = $allowed_modules['pre'] ?? [];
+                    $allowed_post_modules = $allowed_modules['post'] ?? [];
+
+                    $result[$temp_arr_key] = [
+                        'hr_access_table_pk' => $access['id'] ?? null,
+                        'post_client_id' => $access['post_client_id'] ?? null,
+                        'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                        'post_hr_id' => $hr['post_hr_id'] ?? null,
+                        'allowed_pre_modules' => $allowed_pre_modules,
+                        'allowed_post_modules' => $allowed_post_modules,
+                        'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
+                        'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
+                        'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
+                        'hr_name' => $hr['hr_name'],
+                        'hr_mobile' => $hr['hr_mobile'],
+                        'hr_mail' => $hr['hr_mail'],
+                        'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                        'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                        'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                        'pre_client_id'    => $pre_client_id ?? null
+                    ];
+
+                    // Remove from map so we know it's been processed
+                    unset($hrMap[$post_hr_id]);
+                }
+            }
+
+            // Now process any remaining HRs that didn't have access records
+            foreach ($hrMap as $hr) {
+                $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                $result[$temp_arr_key] = [
+                    'hr_access_table_pk' => null,
+                    'post_client_id' => $client_id ?? null,
+                    'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                    'post_hr_id' => $hr['post_hr_id'] ?? null,
+                    'allowed_pre_modules' => [],
+                    'allowed_post_modules' => [],
+                    'allowed_pre_policies' => [],
+                    'allowed_active_policies' => [],
+                    'allowed_cd' => [],
+                    'hr_name' => $hr['hr_name'] ?? null,
+                    'hr_mobile' => $hr['hr_mobile'] ?? null,
+                    'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
+                ];
+            }
+        }
+
+
+        $resultData['hr_access_data']   = array_values($result);
+        $resultData['pre_policy_data']  = $data['pre_policy_data'];
+        $resultData['post_policy_data'] = $data['post_policy_data'];
+        $resultData['post_cd_data']     = $data['post_cd_data'];
+
+        return $resultData;
+    }   
 
     public function saveHrAccessData()
     {
@@ -8439,6 +9108,8 @@ class ClientController extends AdminController
         $member_ecard_mail_template              = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_ecard_mail')->get()->getResultArray()[0] ?? [];
 
         $member_common_mail_template             = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_common_mail')->get()->getResultArray()[0] ?? [];
+        
+        $hr_cd_insufficient_balance_mail_template  = $this->notificationModel->where('client_id', NULL)->where('template_name', 'hr_cd_insufficient_balance_mail')->get()->getResultArray()[0] ?? [];
 
         $default_member_welcome_mail_template = [
             'client_id'        => $client_id,
@@ -8510,6 +9181,20 @@ class ClientController extends AdminController
             'mail_content_copy' => null
         ];
 
+        $hr_cd_insufficient_balance_mail_template = [
+            'client_id'        => $client_id,
+            'template_name'    => 'hr_cd_insufficient_balance_mail',
+            'subject'          => $hr_cd_insufficient_balance_mail_template['subject'] ?? '',
+            'mail_content'     => $hr_cd_insufficient_balance_mail_template['mail_content'] ?? '',
+            'mail_content_json' => $hr_cd_insufficient_balance_mail_template['mail_content_json'] ?? '',
+
+            'created_by'       => get_session_userid(),
+            'created_at'       => date('Y-m-d H:i:s'),
+            'updated_by'       => null,
+            'updated_at'       => date('Y-m-d H:i:s'),
+            'mail_content_copy' => null
+        ];
+
         $this->myLogger->logme('error', 'Default Mail Template Data ' . json_encode([
             $default_member_welcome_mail_template,
             $default_member_remainder_mail_template,
@@ -8523,24 +9208,14 @@ class ClientController extends AdminController
             $default_member_remainder_mail_template,
             $default_member_review_and_summary_mail_template,
             $default_member_ecard_mail_template,
-            $default_member_common_mail_template
+            $default_member_common_mail_template,
+            $hr_cd_insufficient_balance_mail_template,
         ]);
 
 
         return $default_templates_inserted ? true : false;
     }
 
-    // public function downloadClientKycDocs_2() 
-    // {
-        
-    //     $file = WRITEPATH . 'uploads/client_kyc_documents/' . $file_name; // Example file path
-
-    //     if (file_exists($file)) {
-    //         return $this->response->download($file, null)->setFileName($file_name);
-    //     } else {
-    //         return "File not found.";
-    //     }
-    // }
     public function downloadClientKycDocs_2($file_name = null) 
     {
         if (!$file_name) {
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 50a9e4c1..1dab325b 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -443,7 +443,7 @@ class DashboardController extends AdminController
         foreach ($client_policy_data as $client_policy) {
 
             // Fetch client data
-            $client_data = $this->clientModel->find($client_policy['client_id']);
+            $client_data = $this->clientModel->find((int)$client_policy['client_id']);
 
             // Fetch notification settings
             $notification_data = $this->notificationModel
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 452f414b..4a4e9faf 100755
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -33,6 +33,8 @@ use App\Models\LeadsModel;
 use App\Models\LeadInstallmentPaymentDetails;
 use App\Models\PolicyTransactionModel;
 use App\Models\PTCOShareDetailsModel;
+use App\Models\LevelContactModel;
+
 
 use App\Controllers\Jobs;
 use App\Controllers\JobWorker;
@@ -71,6 +73,8 @@ class EmpDataServiceController extends BaseController
     protected $leadInstallmentPaymentDetailesModel;
     protected $policyTransactionModel;
     protected $PTCOShareDetailsModel;
+    protected $LevelContactModel;
+
 
 
     public function __construct()
@@ -99,6 +103,7 @@ class EmpDataServiceController extends BaseController
         $this->leadInstallmentPaymentDetailesModel  = new LeadInstallmentPaymentDetails();
         $this->policyTransactionModel  = new PolicyTransactionModel();
         $this->PTCOShareDetailsModel  = new PTCOShareDetailsModel();
+        $this->LevelContactModel  = new LevelContactModel();
 
     }
 
@@ -199,24 +204,28 @@ class EmpDataServiceController extends BaseController
             $totals =  $totals + $item->total;
         }
         
-        $totals = round($totals, 2);
+        $totals = round($totals);
 
         //check CD amt insufficient only insurer, not tpa // DO NOT REMOVE THIS
         if($export_data['insurer_or_tpa'] == 'insurer')
         {
-            if (!empty($cash_balance)) {
-                if ((int) $cash_balance['balance']  < (int) $totals) {
-                    $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.');
-                    $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.  CASH BALANCE : {balance}  and  TOTAL AMOUNT : {total}', ['balance' => $cash_balance['balance'], 'total' => $totals]);
-                     session()->set('cd_balance', false);
-                     session()->set('cd_amount', $cash_balance['balance']);
-                     session()->set('excel_file_amt', $totals);
-                }else{
-                     session()->set('cd_balance', true);
-                     session()->set('cd_amount', $cash_balance['balance']);
-                     session()->set('excel_file_amt', $totals);
-
-                }
+            if ((int) $cash_balance['balance'] < (int) $totals) {
+                clear_cd_balance_session(); // Clear old junk first
+                
+                $cd_session_data = json_encode([
+                    'cd_balance' => false, 
+                    'cd_amount' => $cash_balance['balance'], 
+                    'excel_file_amt' => $totals
+                ]);
+                
+                session()->set('cd_balance_info', $cd_session_data);
+                session()->set('cd_balance', 'insufficient'); // Use a string status for clarity
+                
+                $hr_data = $this->getHrdataForInsufficientMailSend($export_data['client_branch_id']);
+                session()->set('hr_data', json_encode(['client_id' => $export_data['client_id'], 'hr_data' => $hr_data]));
+            }else{
+                session()->set('cd_balance', 'sufficient'); // Use a string status for clarity
+                session()->set('cd_balance_info', null);
             }
         }
 
@@ -487,13 +496,18 @@ class EmpDataServiceController extends BaseController
                         WHEN `client_policy`.`policy_type_id` IN (2, 3, 4, 5) THEN 2
                         ELSE `client_policy`.`policy_type_id`
                     END
-                WHERE `client_policy`.`id` = '".$export_data['client_policy_id']."'
-                AND `insurer_excel_export_template`.`event_name` = '".$export_data['event_type']."'
+                WHERE `client_policy`.`id` = :client_policy_id:
+                AND `insurer_excel_export_template`.`event_name` = :event_name:
                 AND `insurer_excel_export_template`.`is_active` = 1
-                AND `insurer_excel_export_template`.`type_name` = '".$export_data['actions']."'
+                AND `insurer_excel_export_template`.`type_name` =  :type_name:
                 LIMIT 1";
-            
-            $query = db_connect()->query($sql);
+
+                $binds = [
+                    'client_policy_id' => (int)$export_data['client_policy_id'],
+                    'event_name'       => $export_data['event_type'],
+                    'type_name'        => $export_data['actions'],
+                ];
+            $query = db_connect()->query($sql,$binds);
             $template_json = $query->getRowArray();
         
             // dd(db_connect()->getLastQuery());
@@ -720,17 +734,23 @@ class EmpDataServiceController extends BaseController
         if($export_data['insurer_or_tpa'] == 'insurer')
         {
             if (!empty($cash_balance)) {
-                if ((int) $cash_balance['balance']  < (int) $rounded_totals) {
-                    $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.');
-                    $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.  CASH BALANCE : {balance}  and  TOTAL AMOUNT : {total}', ['balance' => $cash_balance['balance'], 'total' => $totals]);
-                    session()->set('cd_balance', false);
-                    session()->set('cd_amount', $cash_balance['balance']);
-                    session()->set('excel_file_amt', $rounded_totals);
+                if ((int) $cash_balance['balance'] < (int) $totals) {
+                    clear_cd_balance_session(); // Clear old junk first
+                    
+                    $cd_session_data = json_encode([
+                        'cd_balance' => false, 
+                        'cd_amount' => $cash_balance['balance'], 
+                        'excel_file_amt' => $totals
+                    ]);
+                    
+                    session()->set('cd_balance_info', $cd_session_data);
+                    session()->set('cd_balance', 'insufficient'); // Use a string status for clarity
+                    
+                    $hr_data = $this->getHrdataForInsufficientMailSend($export_data['client_branch_id']);
+                    session()->set('hr_data', json_encode(['client_id' => $export_data['client_id'], 'hr_data' => $hr_data]));
                 }else{
-                    session()->set('cd_balance', true);
-                    session()->set('cd_amount', $cash_balance['balance']);
-                    session()->set('excel_file_amt', $rounded_totals);
-
+                    session()->set('cd_balance', 'sufficient'); // Use a string status for clarity
+                    session()->set('cd_balance_info', null);
                 }
             }
         }
@@ -1051,17 +1071,23 @@ class EmpDataServiceController extends BaseController
             if($export_data['insurer_or_tpa'] != 'tpa')// check overal emp premium amt with cd balance only for insurer export, not tpa export
             { 
                 if (!empty($cash_balance)) {
-                    if ((int) $cash_balance['balance']  < (int) $totals) {
-                        $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.');
-                        $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.  CASH BALANCE : {balance}  and  TOTAL AMOUNT : {total}', ['balance' => $cash_balance['balance'], 'total' => $totals]);
-                        session()->set('cd_balance', false);
-                        session()->set('cd_amount', $cash_balance['balance']);
-                        session()->set('excel_file_amt', $totals);
+                    if ((int) $cash_balance['balance'] < (int) $totals) {
+                        clear_cd_balance_session(); // Clear old junk first
+                        
+                        $cd_session_data = json_encode([
+                            'cd_balance' => false, 
+                            'cd_amount' => $cash_balance['balance'], 
+                            'excel_file_amt' => $totals
+                        ]);
+                        
+                        session()->set('cd_balance_info', $cd_session_data);
+                        session()->set('cd_balance', 'insufficient'); // Use a string status for clarity
+                        
+                        $hr_data = $this->getHrdataForInsufficientMailSend($export_data['client_branch_id']);
+                        session()->set('hr_data', json_encode(['client_id' => $export_data['client_id'], 'hr_data' => $hr_data]));
                     }else{
-                        session()->set('cd_balance', true);
-                        session()->set('cd_amount', $cash_balance['balance']);
-                        session()->set('excel_file_amt', $totals);
-
+                        session()->set('cd_balance', 'sufficient'); // Use a string status for clarity
+                        session()->set('cd_balance_info', null);
                     }
                 }
             }
@@ -1095,13 +1121,15 @@ class EmpDataServiceController extends BaseController
                     WHEN `client_policy`.`policy_type_id` IN (2, 3, 4, 5) THEN 2
                     ELSE `client_policy`.`policy_type_id`
                 END
-            WHERE `client_policy`.`id` = '".$export_data['client_policy_id']."'
+            WHERE `client_policy`.`id` = :client_policy_id:
             AND `insurer_excel_export_template`.`event_name` = 'all'
             AND `insurer_excel_export_template`.`is_active` = 1
-            AND `insurer_excel_export_template`.`type_name` = '".$export_data['actions']."'
+            AND `insurer_excel_export_template`.`type_name` = :type_name:
             LIMIT 1";
         
-        $query = db_connect()->query($sql);
+            $binds = ['client_policy_id' => (int)$export_data['client_policy_id'],
+                             'type_name' => $export_data['actions']];
+        $query = db_connect()->query($sql,$binds);
         $template_json = $query->getRowArray();
 
 
@@ -1931,7 +1959,7 @@ class EmpDataServiceController extends BaseController
         $this->myLogger->logme('error', 'Inception Update TPA and UHID --  Function called');
 
         $file_id = $params['file_id'];
-        $file = $this->batchFileModel->find($file_id);
+        $file = $this->batchFileModel->find((int)$file_id);
         // dd($file);
 
         if (!$file) {
@@ -1940,10 +1968,10 @@ class EmpDataServiceController extends BaseController
                 'status' => 'failed-4',
             ];
 
-            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->batchFileModel->where('id', (int)$file_id)->set($data)->update();
             $this->myLogger->logme('error', 'Inception Update TPA and UHID --   The Physical file not found --   File id : {data}', ['data' => $file_id]);
 
-            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $file_data = $this->getDataByFileId((int)$file_id, 'failure');
             $this->setPullNotification($file_data);
 
             return ['status' => 'error', 'message' => 'Inception Update TPA and UHID --   The Physical file not found']; // Return error code if file not found
@@ -1958,17 +1986,17 @@ class EmpDataServiceController extends BaseController
         $user_id = $file['created_by'];
         $policy_issue_date = $file['policy_issue_date'];
 
-        $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+        $insurer_id = $this->clientPolicyModel->where('id', (int)$client_policy_id)->first();
 
         $CD_Account_Number = $this->CDMasterModel
-                    ->where('client_id', $client_id)
-                    ->where('insurer_id', $insurer_id['insurer_id'])
+                    ->where('client_id', (int)$client_id)
+                    ->where('insurer_id', (int)$insurer_id['insurer_id'])
                     ->first();
 
         $get_policy_type = $this->clientPolicyModel
             ->select('client_policy.*, policy_type.policy_type')
             ->join('policy_type', 'policy_type.id = client_policy.policy_type_id', 'left')
-            ->where('client_policy.id', $client_policy_id)
+            ->where('client_policy.id', (int)$client_policy_id)
             ->first();
 
         // dd($get_policy_type);
@@ -2178,6 +2206,7 @@ class EmpDataServiceController extends BaseController
                 'event_name' => $file['event_type'],
                 'policy_name' => $policy_name['policy_name'],
                 'user_id' => $user_id,
+                'file_id' => $file_id,
             ]]);
 
             $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
@@ -2201,7 +2230,7 @@ class EmpDataServiceController extends BaseController
         //send ecard mail if the event is tpa only
         if ($file['insurer_or_tpa'] == 'tpa') {
 
-            if ($get_policy_type['policy_type_id'] != 1) {
+            if (in_array($get_policy_type['policy_type_id'], [2, 3])) {
 
                 // generate e-card and store S3
                 $r = Jobs::addJob(['job_name' => 'bulkGenerateEcardAndStoreinS3', 'payload' => ['client_policy_id' => $client_policy_id]]);
@@ -2500,7 +2529,7 @@ class EmpDataServiceController extends BaseController
 
         $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID called');
 
-        $file_id = $params['file_id'];
+        $file_id = (int)$params['file_id'];
         $file = $this->batchFileModel->find($file_id);
         if (!$file) {
 
@@ -2617,7 +2646,7 @@ class EmpDataServiceController extends BaseController
             'status' =>  $status_val,
         ]);
 
-        if($client_policy_data['policy_type_id'] != 1){
+        if(in_array($client_policy_data['policy_type_id'], [2, 3])){
             // re-generate e-card and store S3
             $r = Jobs::addJob(['job_name' => 'bulkGenerateEcardAndStoreinS3', 'payload' => ['client_policy_id' => $client_policy_id]]);
         }
@@ -3135,7 +3164,7 @@ class EmpDataServiceController extends BaseController
 
         $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --   Function called');
 
-        $file_id = $params['file_id'];
+        $file_id = (int)$params['file_id'];
         $file = $this->batchFileModel->find($file_id);
         if (!$file) {
 
@@ -3361,6 +3390,7 @@ class EmpDataServiceController extends BaseController
                 'event_name' => $file['event_type'],
                 'policy_name' => $policy_name['policy_name'],
                 'user_id' => $user_id,
+                'file_id' => $file_id,
             ]]);
 
             $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
@@ -3709,7 +3739,7 @@ class EmpDataServiceController extends BaseController
 
         $this->myLogger->logme('error', 'Deletion Update Endorsement ID --   Function called');
 
-        $file_id = $params['file_id'];
+        $file_id = (int)$params['file_id'];
         $file = $this->batchFileModel->find($file_id);
         if (!$file) {
 
@@ -3872,6 +3902,7 @@ class EmpDataServiceController extends BaseController
                 'event_name' => $file['event_type'],
                 'policy_name' => $policy_name['policy_name'],
                 'user_id' => $user_id,
+                'file_id' => $file_id,
             ]]);
 
             $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
@@ -4193,7 +4224,7 @@ class EmpDataServiceController extends BaseController
 
         $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID called');
 
-        $file_id = $params['file_id'];
+        $file_id = (int)$params['file_id'];
         $file = $this->batchFileModel->find($file_id);
         if (!$file) {
 
@@ -4356,7 +4387,8 @@ class EmpDataServiceController extends BaseController
                         'updated_by' => $arrayData['user_id'],
                         'event_name' => $arrayData['event_name'],
                         'is_active' => 1,
-                        'cd_ac_pk'  => $cd_ac_pk['cd_ac_pk']
+                        'cd_ac_pk'  => $cd_ac_pk['cd_ac_pk'],
+                        'file_id' => $arrayData['file_id'],
                     ];
 
                     $response = DepositHelper::saveDeposit($data,  $arrayData['user_id']);
@@ -4454,11 +4486,12 @@ class EmpDataServiceController extends BaseController
                         SELECT SUM(rata_premimum + gst) AS total_sum
                         FROM employee_polices
                         JOIN employees ON employees.id = employee_polices.employee_id
-                        WHERE employees.unit = '{$unit}'
-                        AND employee_polices.id = '{$pk}'
+                        WHERE employees.unit = :unit:
+                        AND employee_polices.id = :pk:
                     ";
 
-                    $amount = $this->employeePolicyModel->query($query)->getRow();
+                    $binds = ['unit' => $unit,'pk' => $pk];
+                    $amount = $this->employeePolicyModel->query($query,$binds)->getRow();
 
                     if ($amount && $amount->total_sum > 0) {
                         if ($si_adjustment == 2) {
@@ -4492,7 +4525,8 @@ class EmpDataServiceController extends BaseController
                         'updated_by' => $arrayData['user_id'],
                         'event_name' => $arrayData['event_name'],
                         'is_active' => 1,
-                        'cd_ac_pk'  => $policy_data['cd_ac_pk']
+                        'cd_ac_pk'  => $policy_data['cd_ac_pk'],
+                        'file_id' => $arrayData['file_id'],
                     ];
 
                     DepositHelper::saveDeposit($data, $arrayData['user_id']);
@@ -4522,7 +4556,8 @@ class EmpDataServiceController extends BaseController
                         'updated_by' => $arrayData['user_id'],
                         'event_name' => $arrayData['event_name'],
                         'is_active' => 1,
-                        'cd_ac_pk'  => $policy_data['cd_ac_pk']
+                        'cd_ac_pk'  => $policy_data['cd_ac_pk'],
+                        'file_id' => $arrayData['file_id'],
                     ];
 
                     DepositHelper::saveDeposit($data, $arrayData['user_id']);
@@ -4634,7 +4669,8 @@ class EmpDataServiceController extends BaseController
                         'updated_by' => $arrayData['user_id'],
                         'event_name' => $arrayData['event_name'],
                         'is_active' => 1,
-                        'cd_ac_pk'  => $insurer_id['cd_ac_pk']
+                        'cd_ac_pk'  => $insurer_id['cd_ac_pk'],
+                        'file_id' => $arrayData['file_id'],
                     ];
 
                     $response = DepositHelper::saveDeposit($data, $arrayData['user_id']);
@@ -5400,7 +5436,7 @@ class EmpDataServiceController extends BaseController
             $this->myLogger->logme("error", "Policy transaction inserted successfully: " . json_encode(['insert_id' => $insert_id]));
 
             //do not remove this commented item
-            $coShareDetails = $this->ConstructPTShareData($policy_data, $insert_id, $params, $lead_data);
+            $coShareDetails = $this->ConstructPTShareData($policy_data, $insert_id, $params, $lead_data, $params['action_type']);
             $pt_co_share_id = $this->PTCOShareDetailsModel->insert($coShareDetails);
             $this->myLogger->logme("error", "PT Co share data inserted successfully: " . json_encode(['pt_co_share_id' => $pt_co_share_id]));
 
@@ -5532,7 +5568,46 @@ class EmpDataServiceController extends BaseController
         return $policyTransactionData;
     }
 
-    private function ConstructPTShareData($policy_data, $pt_id, $params, $lead_data)
+    private function ConstructPTShareData($policy_data, $pt_id, $params, $lead_data, $action_type)
+    {   
+        $policyTypeModel = new PolicyTypeModel();
+        $policy_type_data = $policyTypeModel->where('is_active', 1)->where('id', $policy_data['policy_type_id'])->first();
+
+        // Determine if we should negate the values
+        $multiplier = (strtolower($action_type) === 'deletion') ? -1 : 1;
+
+        $coShareData = [
+            'pt_id' => $pt_id,
+            'insurer_id' => $policy_data['insurer_id'],
+            'insurer_branch_id' => $policy_data['insurer_branch_id'],
+            'bp_amt' => ($params['base_premium'] ?? 0) * $multiplier,
+            'cop_amt' => ($params['base_premium'] ?? 0) * $multiplier,
+            'bp_gst_amt' => ($params['gst'] ?? 0) * $multiplier,
+            'bp_sgst' => 9, // Usually tax percentages remain positive, but multiply if this is an amount
+            'bp_cgst' => 9,
+            'co_share_type' => 1,
+            'co_share_per' => 100,
+            'standerd_bp_per' => $policy_type_data['ebp'],
+            'pt_policy_issue_date' => $params['policy_issue_date'] ?? null,
+            'amount' => (($params['base_premium'] ?? 0) + ($params['gst'] ?? 0)) * $multiplier,
+        ];
+
+        if(isset($policy_data['gst']) && $policy_data['gst'] != null){
+            $coShareData['bp_igst'] = $policy_data['gst'] ?? 0;
+            $coShareData['bp_sgst'] = 0;
+            $coShareData['bp_cgst'] = 0;
+        }
+
+        // Calculate exp_amt logic
+        $agreed_per = $lead_data['agreed_percentage'] ?? $policy_type_data['ebp'] ?? 0;
+        $coShareData['exp_amt'] = ((($params['base_premium'] ?? 0) * $agreed_per) / 100) * $multiplier;
+
+        $this->myLogger->logme("error", "Constructed PT co-share data: " . json_encode($coShareData));
+
+        return $coShareData;
+    }
+
+    private function ConstructPTShareDataOld($policy_data, $pt_id, $params, $lead_data, $action_type = null)
     {   
         $policyTypeModel = new PolicyTypeModel();
         $policy_type_data = $policyTypeModel->where('is_active', 1)->where('id', $policy_data['policy_type_id'])->first();
@@ -5850,4 +5925,16 @@ class EmpDataServiceController extends BaseController
             'gst' => round($amount['gst'] ?? 0, 2)
         ];
     }
+
+    public function getHrdataForInsufficientMailSend($ref_id)
+    {
+        $data = $this->LevelContactModel
+            ->select('id, name, email')
+            ->where('ref_id', $ref_id)
+            ->where('is_active', 1)
+            ->where('contact_type', 'client')
+            ->findAll();
+            
+        return $data;
+    }
 }
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 118b5330..4a019293 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -8,6 +8,7 @@ use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 use App\Helpers\DepositHelper;
+use App\Helpers\MailHelper;
 
 
 use App\Models\EmployeeModel;
@@ -29,6 +30,8 @@ use App\Models\AuditHistoryModel;
 use App\Models\UserModel;
 use App\Models\PartnerEndorsementRequestModel;
 use App\Models\TpaApiDataModel;
+use App\Models\LevelContactModel;
+use App\Models\NotificationModel;
 
 
 use App\Controllers\Jobs;
@@ -74,6 +77,7 @@ class EmployeeController extends AdminController
     protected $auditHistory;
     protected $userModel;
     protected $partnerEndorsementRequestModel;
+    protected $LevelContactModel;
 
     public function __construct()
     {
@@ -97,6 +101,7 @@ class EmployeeController extends AdminController
         $this->auditHistory = new AuditHistoryModel();
         $this->userModel = new userModel();
         $this->partnerEndorsementRequestModel  = new PartnerEndorsementRequestModel();
+        $this->LevelContactModel  = new LevelContactModel();
     }
 
     public function list()
@@ -177,7 +182,7 @@ class EmployeeController extends AdminController
         // die();
         // $file_id = $this->request->getGet();
         // echo $file_id;die();
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // print_r($result);die();
         if (!isset($file)) {
             return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'no data found'], 200);
@@ -188,7 +193,7 @@ class EmployeeController extends AdminController
     }
 
     //handles employee & dependent  bulk upload with events like inception,addition,deletion, correction and SI enhancements
-    public function employeesUplodWithEvents()
+    public function employeesUplodWithEvents($post_data = null)
     {
 
         // $empDataServiceController = new EmpDataServiceController();
@@ -242,64 +247,85 @@ class EmployeeController extends AdminController
         // $this->truncateFileData(747, 5) ;
         // print_rr($this->cloneWorksheet());
         // die();
-        if ($this->request->getMethod() == 'post') {
+
+        if (!empty($post_data) || $this->request->is('post') == 'post') {
 
             //validate uploaded file
             $filename = '';
             $fileSize = '';
-            $validated = $this->validate([
-                'emplist' => [
-                    'uploaded[emplist]',
-                    'mime_in[emplist,application/vnd.ms-excel,application/vnd,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet]',
-                    'max_size[emplist,16384]',
-                ],
-            ]);
-            
-            if ($validated) 
-            {
-                    $avatar = $this->request->getFile('emplist');
-                    if (!$avatar) {
-                        $this->myLogger->logme("error", 'File not found');
+
+            if (empty($post_data)) {
+                $validated = $this->validate([
+                    'emplist' => [
+                        'uploaded[emplist]',
+                        'mime_in[emplist,application/vnd.ms-excel,application/vnd,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet]',
+                        'max_size[emplist,16384]',
+                    ],
+                ]);
+            } else {
+                $validated = validateExcelFile($post_data['file_name']);
+            }
+
+            if ($validated) {
+
+                $avatar = isset($post_data['file_name']) ? $post_data['file_name'] : $this->request->getFile('emplist');
+                if (!$avatar) {
+                    $this->myLogger->logme("error", 'File not found');
+                    if (!empty($post_data)) {
+                        return ['status' => false, 'message' => 'File not found'];
+                    } else {
                         return $this->respond(['dataStatus' => false, 'code' => 400, 'message' => 'File not found'], 400);
                     }
+                }
 
-                    $is_moved = $avatar->move(WRITEPATH . 'uploads/excel/');
-                    if ($is_moved) {
-                        $filename = $avatar->getName();
-                        $fileSize = $avatar->getSize(); // File size in bytes
-                        $fileSize = $fileSize / (1024 * 1024); // Convert to MB
-                        // Handle successful upload, e.g., log success or further processing
-                        $this->myLogger->logme("error", 'File move successful');
-                        
+                $is_moved = $avatar->move(WRITEPATH . 'uploads/excel/');
+                if ($is_moved) {
+                    $filename = $avatar->getName();
+                    $fileSize = $avatar->getSize(); // File size in bytes
+                    $fileSize = $fileSize / (1024 * 1024); // Convert to MB
+                    // Handle successful upload, e.g., log success or further processing
+                    $this->myLogger->logme("error", 'File move successful');
+                } else {
+                    $this->myLogger->logme("error", 'File move failed');
+                    if (!empty($post_data)) {
+                        return ['status' => false, 'message' => 'File move failed'];
                     } else {
-                        $this->myLogger->logme("error", 'File move failed');
                         return $this->respond(['dataStatus' => false, 'code' => 500, 'message' => 'File move failed'], 500);
                     }
+                }
             } else {
                 $this->myLogger->logme("error", 'Upload failed Invalid file');
-                return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'Invalid file'], 404);
+                if (!empty($post_data)) {
+                    return ['status' => false, 'message' => 'Invalid file'];
+                } else {
+                    return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'Invalid file'], 404);
+                }
             }
 
             //process post variable entry in file table
-            $loggedInUserID = get_session_userid();
-            // dd($loggedInUserID);
-            // $loggedInUserID = 8;
+            $loggedInUserID = $post_data['created_by'] ?? get_session_userid();
 
-            $client_id = $this->request->getPost('client_id');
-            $policy_id = $this->request->getPost('policy_id');
-            $branch_id = $this->request->getPost('branch_id');
-            $hr_file_id = $this->request->getPost('hr_file_id') ?? null;
-            $action = $this->request->getPost('upload-action-type');
-            $status = 'inprogress';
+            $client_id  = isset($post_data['client_id']) ? $post_data['client_id'] : $this->request->getPost('client_id');
+            $policy_id  = isset($post_data['policy_id']) ? $post_data['policy_id'] : $this->request->getPost('policy_id');
+            $branch_id  = isset($post_data['client_branch_id']) ? $post_data['client_branch_id'] : $this->request->getPost('branch_id');
+            $action     = isset($post_data['file_action']) ? $post_data['file_action'] : $this->request->getPost('upload-action-type');
+            
+            if(empty($post_data)){
+                $hr_file_id = $this->request->getPost('hr_file_id') ?? null;
+            }else{
+                $hr_file_id = $post_data['hr_file_id'] ?? null ;
+            }
 
-            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id,'uploaded_by' => 1, 'hr_file_id' => $hr_file_id]); //here field policy_id have client_policy_id and not policy id from policy master
+            $hr_id      = $post_data['created_by'] ?? null;
+            $status     = 'inprogress';
+
+            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id, 'uploaded_by' => 1, 'hr_file_id' => $hr_file_id, 'hr_id' => $hr_id]); //here field policy_id have client_policy_id and not policy id from policy master
             $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]);
 
             if ($action == "all") {
 
                 $r = Jobs::addJob(['job_name' => 'excelMultieventFileFormateValidation', 'payload' => ['file_id' => $file_id]]);
                 $this->myLogger->logme("error", '{file_id} is greather than 1MB, validating with job queue', ['file_id' => $file_id]);
-
             } else {
                 //start validation process
                 if ($fileSize < 1) // if file size less than 1
@@ -309,7 +335,11 @@ class EmployeeController extends AdminController
                     $this->myLogger->logme("error", '{file_id} is less than 1MB, validating on the fly', ['file_id' => $file_id]);
                     //endof validation process
                     if (isset($result['error_summary']) && count($result['error_summary'])) {
-                        return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200);
+                        if(!empty($post_data)){
+                            return ['status' => false, 'message' => 'file rejected with errors', 'file_id' => $file_id];
+                        }else{
+                            return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200);
+                        }
                     }
                 } else //if file size greater than 1 add the file as job
                 {
@@ -319,7 +349,11 @@ class EmployeeController extends AdminController
                 }
             }
 
-            return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
+            if (!empty($post_data)) {
+                return ['status' => true, 'message' => 'File upload successs, Data validation is in-progress', 'file_id' => $file_id];
+            } else {
+                return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
+            }
         }
 
         $data['tab_name'] = 'View Inception';
@@ -350,7 +384,7 @@ class EmployeeController extends AdminController
                             ->select([
                                 'files.id','files.file_name','files.created_by','files.created_at','files.is_active','files.status','files.client_id','files.policy_id','files.client_branch_id','files.action','files.uploaded_by',
                                 'up.emp_code',
-                                'up.first_name',
+                                // 'up.first_name',
                                 'c.short_name',
                                 'cb.branch_name',
                                 'cp.id as client_policy_id',
@@ -358,8 +392,22 @@ class EmployeeController extends AdminController
                                 '"0" as total',
                                  'policy_type.policy_type' ,
                                  'cp.policy_no' ,
+                                "CASE
+                                    WHEN files.hr_id IS NOT NULL THEN
+                                        CONCAT(
+                                            (
+                                                SELECT lc.name
+                                                FROM level_contacts lc
+                                                WHERE lc.id = files.hr_id
+                                                LIMIT 1
+                                            ),
+                                            ' (HR)'
+                                        )
+                                    ELSE up.first_name
+                                END AS first_name
+                                "
                             ])
-                            ->join('user_profiles up', 'files.created_by = up.id')
+                            ->join('user_profiles up', 'files.created_by = up.id', 'left')
                             ->join('client_policy cp', 'files.policy_id = cp.id', 'left')
                             ->join('client_branch cb', 'files.client_branch_id = cb.id', 'left')
                             ->join('policy_type', 'policy_type.id = cp.policy_type_id')
@@ -369,7 +417,7 @@ class EmployeeController extends AdminController
                             if (in_array($role_id, [2, 3])) {
             
                                 // If the user is a Account Manager or Manager, filter by user_id
-                                $query->where('cr.user_id', $user_id);
+                                $query->where('cr.user_id', (int)$user_id);
                             }
                             // ->where('files.created_by', get_session_userid())
                             $data['fileList'] = $query->groupBy("files.id")->orderBy('files.created_at', 'desc')
@@ -398,6 +446,7 @@ class EmployeeController extends AdminController
                          batch_files.amount, 
                          batch_files.status,
                          batch_files.client_branch_id,
+                         DATE_FORMAT(batch_files.policy_issue_date, '%d/%m/%Y') AS policy_issue_date,
 
                         CASE 
                             WHEN batch_files.status IN ('partially success', 'in-progress-partially', 'failed-7') 
@@ -420,7 +469,7 @@ class EmployeeController extends AdminController
                             if (in_array($role_id, [2, 3])) {
             
                                 // If the user is a Account Manager or Manager, filter by user_id
-                                $query2->where('cr.user_id', $user_id);
+                                $query2->where('cr.user_id', (int)$user_id);
                             }
                             // ->where('files.created_by', get_session_userid())
                             $data['batch_list'] = $query2->groupBy("batch_files.id")->orderBy('batch_files.id', 'desc')
@@ -435,14 +484,50 @@ class EmployeeController extends AdminController
         }
     }
 
-    public function getExcelFileErrors()
-    {
-        $file_id = $this->request->uri->getSegment(3);
+    public function getExcelFileErrors($file_id, $retun_type = null)
+    {   
+
+        $file_data = $this->fileModel->where('id', $file_id)->first();
+        $error = json_decode($file_data['reason'] ?? '{}', true);
+        if(!empty($error) && $retun_type == 'api'){
+            $send = isset($error['error_summary'][5]) || isset($error['error_summary'][6]) ? true : false;
+            if($send){
+
+
+                $string = $error['error_data'] ?? 'System error';
+
+                $errorMap = [
+                    "Column order conflict" => "Invalid file format. Please use the sample file.",
+                ];
+
+                $message = $string; // Default to the original error
+
+                foreach ($errorMap as $keyword => $friendlyMessage) {
+                    if (strpos($string, $keyword) !== false) {
+                        $message = $friendlyMessage;
+                        break; // Stop looking once we find a match
+                    }
+                }
+
+
+                return $this->respond(['status' => false, 'code' => 404,  'message' => $message, 'data' => []], 200);
+            }
+        }
+
+        // $file_id = $this->request->uri->getSegment(3);
         $empServiceController = new EmployeeServiceController();
 
         // Render views and capture output
         $result = $empServiceController->getExcelErrorData($file_id);
 
+        if($retun_type == 'api'){
+            if(!empty($result)){
+                return $this->respond(['status' => true, 'code' => 200, 'message' => 'Error data feteched successfully', 'data' => $result], 200);
+            }else{
+                return $this->respond(['status' => false, 'code' => 404,  'message' => 'Failed to fetch error data', 'data' => []], 200);
+            }
+        }
+
         if ($result != 0) {
 
             $result['file_id'] = $file_id;
@@ -496,6 +581,8 @@ class EmployeeController extends AdminController
              $filePath = ROOTPATH . 'public/sample_excel/sample_multievent_file.xlsx';
         }else if ($actionType == 'bds_upload') {
              $filePath = ROOTPATH . 'public/sample_excel/sample_bds_bulk_upload_excel.xlsx';
+        }else if ($actionType == 'claim_dump_upload') {
+             $filePath = ROOTPATH . 'public/sample_excel/sample_claim_dump_upload_excel.xlsx';
         }
 
         // Check if the file exists
@@ -790,6 +877,7 @@ class EmployeeController extends AdminController
     {
 
         $data = [];
+        
         $data['status'] = ['pending' => 'Pending', 'inprogress' => 'In-Progress', 'complete' => 'Complete'];
         if (count($this->request->getGet())) {
             $filterData = $this->request->getGet();
@@ -799,9 +887,9 @@ class EmployeeController extends AdminController
                 status: $filterData['status'],
                 branch_id: $filterData['branch_id']
             );
-                        $data['getData'] = $filterData;
+            $data['getData'] = $filterData;
             // echo "<pre>";
-            // print_r($data); die;
+            
         }
 
         $this->myLogger->logme('error', 'list called');
@@ -1057,7 +1145,39 @@ class EmployeeController extends AdminController
 
         try {
 
-            $filePath = WRITEPATH . '/uploads/excel/' . $file_name['file_name'];
+            if (!$file_name) {
+                return $this->respond([
+                    'dataStatus' => false,
+                    'code' => 200,
+                    'data' => '<div class="text-center">No Data Found</div>',
+                    'file_data' => null
+                ], 200);
+            }
+
+            $filePath = WRITEPATH . 'uploads/excel/' . $file_name['file_name'];
+
+            // ✅ File not exists on disk
+            if (!file_exists($filePath)) {
+                return $this->respond([
+                    'dataStatus' => false,
+                    'code' => 200,
+                    'data' => '<div class="text-center">No Data Found</div>',
+                    'file_data' => $file_name
+                ], 200);
+            }
+
+        
+            $excel_data = $empDataServiceController->readExcelFileToArray($filePath);
+
+            // ✅ Excel empty or header only
+            if (empty($excel_data) || count($excel_data) <= 1) {
+                return $this->respond([
+                    'dataStatus' => false,
+                    'code' => 200,
+                    'data' => '<div class="text-center">No Data Found</div>',
+                    'file_data' => $file_name
+                ], 200);
+            }
 
             if (file_exists($filePath)) {
                 
@@ -1093,8 +1213,7 @@ class EmployeeController extends AdminController
             $errorMessage = 'Error occurred:' . PHP_EOL . json_encode($errorData, JSON_PRETTY_PRINT);
             $this->myLogger->logme('error', $errorMessage);
             
-            $html = '<div class="text-center">No Data Found</div>';
-            return $this->respond(['dataStatus' => false, 'code' => 500, 'data' =>  $html, 'file_data' => $file_name], 500);
+            return $this->respond(['dataStatus' => false, 'code' => 500, 'data' => '<div class="text-center">Something went wrong</div>', 'file_data' => $file_name ?? null], 500);
         }
     }
 
@@ -1116,7 +1235,7 @@ class EmployeeController extends AdminController
     public function downloadFullExcelErrorFile($file_id, $rowIndex = 1, $colIndex = 1)
     {
         // Get file data from the database
-        $file_data = $this->fileModel->find($file_id);
+        $file_data = $this->fileModel->find((int)$file_id);
 
         $error =  json_decode($file_data['reason']);
         //    echo '<pre>';
@@ -1466,10 +1585,10 @@ class EmployeeController extends AdminController
                 ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
                 ->join('employees', 'employees.id = employee_polices.employee_id')
                 ->join('tpa', 'tpa.id = client_policy.tpa_id')
-                ->where('employees.emp_status', 'active')
                 ->where('employees.is_active', '1')
                 ->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''")
-                ->where('employee_polices.status', 'active')
+                ->whereIn('employee_polices.status', ['active', 'expired'])
+                ->whereIn('employees.emp_status', ['active', 'expired'])
                 ->where('employee_polices.is_active', '1')
                 ->where('employee_polices.rand_string', $rand_string)
                 ->first();
@@ -1492,6 +1611,7 @@ class EmployeeController extends AdminController
             
             //new step check in S3 if yes then fetch from S3 bucket 
             $s3_key = 'ecard_'.$get_emp_code_and_client_policy_id['name'].'('.$get_emp_code_and_client_policy_id['emp_code'].')'.'_'.$get_emp_code_and_client_policy_id['tpa_id'].'.pdf';
+            $s3_key = $this->sanitizeFilePart($s3_key);
             // echo $s3_key;die();
             $s3 = \Config\Services::getS3Service();            
             if($s3->exists($s3_key) && $mode != 2) //2 => for bulk generate so skip s3 check and generate PDF
@@ -1727,7 +1847,7 @@ class EmployeeController extends AdminController
         $this->myLogger->logme('error', 'File id for truncate : -- FILE ID : {data} --', ['data' => $file_id]);
 
         //get the files data
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
 
         $client_id = $file['client_id'];
         $client_policy_id = $file['policy_id'];
@@ -1785,9 +1905,11 @@ class EmployeeController extends AdminController
                         $query = "
                             UPDATE employee_polices 
                             SET employee_polices.status = 'truncated', employee_polices.is_active = 0 
-                            WHERE employee_polices.file_id = $file_id
+                            WHERE employee_polices.file_id = :file_id:  
                         ";
-                        $db->query($query);
+
+                        $binds = ["file_id" => $file_id];
+                        $db->query($query,$binds);
                         $affectedRows = $db->affectedRows();
                         $this->myLogger->logme('error', '---- employee_polices table update query : {data} ----', ['data' => $query]);
                         $this->myLogger->logme('error', '---- employee_polices table updated - Affected Rows : {data} ----', ['data' => $affectedRows]);
@@ -1879,12 +2001,13 @@ class EmployeeController extends AdminController
                     $dependent_policies = '(' . implode(',', $dependent_policies) . ')';
                     $query = "
                                 UPDATE employee_polices 
-                                JOIN employees ON employees.id = employee_polices.employee_id and employees.emp_code in $emp_codes 
+                                JOIN employees ON employees.id = employee_polices.employee_id and employees.emp_code in :emp_codes:
                                 SET employee_polices.status = 'truncated', employee_polices.is_active = 0 
-                                WHERE employee_polices.client_policy_id in $dependent_policies
+                                WHERE employee_polices.client_policy_id in :dependent_policies:
                             ";
                     // print_r($query); die;
-                    $db->query($query);
+                    $binds = ["emp_codes" => $emp_codes , "dependent_policies" => $dependent_policies];
+                    $db->query($query,$binds);
                     $affectedRows = $db->affectedRows();
 
                     // dd($affectedRows);
@@ -2008,7 +2131,7 @@ class EmployeeController extends AdminController
     {
         $file_id = $this->request->uri->getSegment(3);
         // $file_id = 747;
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $client_id = $file['client_id'];
         $client_policy_id = $file['policy_id'];
         $loggedInUserID = get_session_userid();
@@ -2072,10 +2195,11 @@ class EmployeeController extends AdminController
                     $query = "
                                 UPDATE employee_polices 
                                 SET employee_polices.status = 'truncated', employee_polices.is_active = 0 
-                                WHERE employee_polices.file_id = $file_id
+                                WHERE employee_polices.file_id = :file_id:
                             ";
                 
-                    $db->query($query);
+                    $binds = ["file_id" => $file_id];
+                    $db->query($query,$binds);
                     $affectedRows = $db->affectedRows();
                     $this->myLogger->logme('error', 'employee_polices table update query : {data}', ['data' => $query]);
                     $this->myLogger->logme('error', 'employee_polices table updated - Affected Rows : {data}', ['data' => $affectedRows]);
@@ -2137,11 +2261,12 @@ class EmployeeController extends AdminController
                     $dependent_policies = '(' . implode(',', $dependent_policies) . ')';
                     $query = "
                                 UPDATE employee_polices 
-                                JOIN employees ON employees.id = employee_polices.employee_id and employees.emp_code in $emp_codes 
+                                JOIN employees ON employees.id = employee_polices.employee_id and employees.emp_code in :emp_codes:
                                 SET employee_polices.status = 'truncated', employee_polices.is_active = 0 
-                                WHERE employee_polices.client_policy_id in $dependent_policies
+                                WHERE employee_polices.client_policy_id in :dependent_policies:
                             ";
-                    $db->query($query);
+                    $binds = ["emp_codes" => $emp_codes , "dependent_policies" => $dependent_policies];
+                    $db->query($query,$binds);
                     $affectedRows = $db->affectedRows();
 
                     // dd($affectedRows);
@@ -2370,7 +2495,7 @@ class EmployeeController extends AdminController
     public function hasPolicyConfigCompleted()
     {
         $client_policy_id = $this->request->uri->getSegment(3);
-        $policy_details = $this->clientPolicyModel->find($client_policy_id);
+        $policy_details = $this->clientPolicyModel->find((int)$client_policy_id);
         $insurer_details = $this->insurerModel->where('id', $policy_details['insurer_id'])->first();
         $policy_terms = isset($policy_details['policy_terms']) ? true : false;
 
@@ -2619,12 +2744,71 @@ class EmployeeController extends AdminController
     //UPDATE EMPLOYEE
     public function update_emp_data()
     {
-        $data = $this->request->getPost();
+    
+        $rules = [
+            // 'emp_code' => [
+            //     'rules'  => 'required',
+            //     'errors' => [
+            //         'required' => 'Employee Code is missing'
+            //     ]
+            // ],
+            // 'name' => [
+            //     'rules'  => 'required|min_length[2]|max_length[100]',
+            //     'errors' => [
+            //         'required'   => 'Employee name is required',
+            //         'min_length' => 'Name must be at least 2 characters',
+            //         'max_length' => 'Name cannot exceed 100 characters'
+            //     ]
+            // ],
+            // 'gender' => [
+            //     'rules'  => 'permit_empty|in_list[M,F]',
+            //     'errors' => [
+            //         'in_list' => 'Invalid gender selected'
+            //     ]
+            // ],
+            'email_corporate' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+            'mobile' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'      => 'Mobile number is required',
+                    'numeric'       => 'Mobile number must contain digits only',
+                    'exact_length'  => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+        $request_post_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_post_data);
+        if (isset($data['relationship'])) { 
+                $rules['relationship'] = [
+                    'rules'  => 'required|in_list[Self,Spouse,Child,Father,Mother,Father-in-law,Mother-in-law]',
+                    'errors' => [
+                        'required' => 'Relationship is required',
+                        'in_list'  => 'The selected relationship is invalid.'
+                    ]
+                ];
+        }
+        
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        
+        
         // print_rr($data);die();
         // $data['dob'] = date('Y-m-d', strtotime($data['dob']));
-        if(isset( $data['dob'])){
-            $data['dob'] = change_date_format($data['dob'], null, 'Y-m-d');
-        }
+        $data['dob'] = (!empty($data['dob'])) ? change_date_format($data['dob'], null, 'Y-m-d') : null;
         // print_rr($data); die;
 
         // Fetch current employee data
@@ -2914,12 +3098,15 @@ class EmployeeController extends AdminController
     }
 
     public function mapEmployees(){
-        $client_id = $this->request->getPost('client_id');
-        $branch_id = $this->request->getPost('branch_id');
-        $policy_id = $this->request->getPost('client_policy_id');
-        $selected_employees = (array)$this->request->getPost('selected');
-        $si_amt = $this->request->getPost('si_amt');
-        $policy_start_date_unformatted = $this->request->getPost('policy_start_date');
+        $request_post_data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+
+        $client_id = $sanitized_post_data['client_id'] ?? null;
+        $branch_id = $sanitized_post_data['branch_id'] ?? null;
+        $policy_id = $sanitized_post_data['client_policy_id'] ?? null;
+        $selected_employees = (array)$sanitized_post_data['selected'] ?? [];
+        $si_amt = $sanitized_post_data['si_amt'] ?? null;
+        $policy_start_date_unformatted = $sanitized_post_data['policy_start_date'] ?? null;
 
         $policy_start_date = change_date_format($policy_start_date_unformatted, 'd/M/Y', 'Y-m-d');
 
@@ -2956,7 +3143,9 @@ class EmployeeController extends AdminController
     }
 
     public function unmapEmployees($actionType){
-        $selected_employees = (array)$this->request->getPost('selected');
+        $request_post_data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+        $selected_employees = (array)$sanitized_post_data['selected'] ?? [];
         if($actionType == 0){
             for($i = 0;$i<count($selected_employees);$i++){log_message('error',$selected_employees[$i]);
                 $result1 = $this->employeeModel->set(['client_id' => null, 'client_branch_id' => null])->where('id',$selected_employees[$i])->update();log_message('error',$result1);
@@ -3216,7 +3405,32 @@ class EmployeeController extends AdminController
     public function retailendorsementsave()
     {
         try {
-            $data = $this->request->getPost();
+            $rules = [
+            'endorsement_no' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9\/_\-]+$/]',
+                'errors' => [
+                    'required'    => 'Endorsement Number is missing.',
+                    'regex_match' => 'Endorsement Number can only contain letters, numbers, slashes (/), underscores (_), and hyphens (-).'
+                ]
+            ],
+            'status' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required'   => 'Status is required',
+                ]
+            ]
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $request_post_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_post_data);
+        
             if (!empty($data['id'])) {
                 $text   = "update";
                 $updateID = $data['id'];
@@ -3346,7 +3560,8 @@ class EmployeeController extends AdminController
 
     public function initiateWellnessOnboard($client_policy_id)
     {
-        $r = Jobs::addJob(['job_name' => 'initiateWellnessOnboardJob','payload' => ['client_policy_id' => $client_policy_id]]);
+         $r = Jobs::addJob(['job_name' => 'initiateWellnessOnboardJob','payload' => ['client_policy_id' => $client_policy_id]]);
+        //$this->initiateWellnessOnboardJob(['client_policy_id' => $client_policy_id]);
         return $this->respond(['status' => true, 'code' => 200, 'message' => 'Process started'], 200);
     }
 
@@ -3356,7 +3571,7 @@ class EmployeeController extends AdminController
         $client_policy_id = $arr['client_policy_id'];
         // $this->updateWellnessOnboardResponseToDB();die();
         // echo $client_policy_id;die();
-         $data = $this->employeePolicyModel->select('employee_polices.*,emp.name,emp.relationship,emp.emp_code,emp.name,emp.email_corporate,emp.mobile,emp.dob,cp.policy_no,cp.wellness_plan_id,cp.wellness_vendor_id,cp.policy_start_date as cp_policy_start_date,cp.policy_end_date,cls.short_name')
+         $data = $this->employeePolicyModel->select('employee_polices.*,emp.name,emp.relationship,emp.emp_code,emp.name,emp.gender,emp.email_corporate,emp.mobile,emp.dob,cp.policy_no,cp.wellness_plan_id,cp.wellness_vendor_id,cp.policy_start_date as cp_policy_start_date,cp.policy_end_date,cls.short_name')
             ->join('client_policy cp', 'cp.id = employee_polices.client_policy_id')
             ->join('clients cls', "cp.client_id = cls.id")
             ->join('employees emp', "emp.id = employee_polices.employee_id")
@@ -3377,7 +3592,7 @@ class EmployeeController extends AdminController
                 // echo '==============================';die();
         // $data = '[{"id":12847,"employee_id":"TEST_EMP_001","client_policy_id":null,"tpa_id":null,"uhid":null,"batch_code":null,"status":"active","pre_existing_alignments":null,"age_band":null,"basic_cover_si":"0","date_coverage":"2025-01-01","policy_end_date":"2025-12-31","days":"0","premium":"0","rata_premimum":"0","gst":"0","si_enhancement_date":null,"date_of_exit":null,"reason_for_exit":null,"claim_status":"0","created_by":null,"created_at":null,"updated_by":null,"updated_at":null,"is_active":"1","rand_string":null,"ecard_sent_status":"0","payable_employee":"0","file_id":null,"wellness_onboard":"0","name":"test name","relationship":"SELF","emp_code":"TEST_EMP_001","email_corporate":"test@gmail.com","mobile":"9797976565","dob":"1975-08-09"},{"id":12846,"employee_id":"TEST_EMP_001","client_policy_id":null,"tpa_id":null,"uhid":null,"batch_code":null,"status":"active","pre_existing_alignments":null,"age_band":null,"basic_cover_si":"0","date_coverage":"2025-01-01","policy_end_date":"2025-12-31","days":"0","premium":"0","rata_premimum":"0","gst":"0","si_enhancement_date":null,"date_of_exit":null,"reason_for_exit":null,"claim_status":"0","created_by":null,"created_at":null,"updated_by":null,"updated_at":null,"is_active":"1","rand_string":null,"ecard_sent_status":"0","payable_employee":"0","file_id":null,"wellness_onboard":"0","name":"dependent 1","relationship":"SON","emp_code":"TEST_EMP_001","email_corporate":"dependent1@gmail.com","mobile":"9898989898","dob":"2001-08-09"}]';
         // $data = (array)json_decode($data,true);
-        // print_r($data);
+        // print_r(count($data));
         // echo '==============================';die();
         if(is_array($data) && count($data))
         {
@@ -3406,7 +3621,7 @@ class EmployeeController extends AdminController
                 $familiesPayload[$empCode] = $this->buildFamilyPayload($empCode, $members);
             }
 
-            // print_r($familiesPayload);die();
+            // print_rr($familiesPayload);die();
             $apiResponse = $this->sendFamiliesToWellnessApi($familiesPayload);
             // print_r($apiResponse);
             $updatedData = $this->updateWellnessOnboardResponseToDB($apiResponse);
@@ -3439,7 +3654,7 @@ class EmployeeController extends AdminController
     {
         // Use the first member as primary reference for policy level data
         $primary = $members[0];
-
+        // print_rr($primary);die();
         // Map DB fields to your required "policyDetails" structure
         $policyStartDate = $primary['cp_policy_start_date'] ?? null;
         // $policyStartDate = '2025-01-01';
@@ -3468,7 +3683,7 @@ class EmployeeController extends AdminController
         foreach ($members as $index => $row) {
 
             // You don't have gender in data, so put null or default
-            $gender = null; // or "MALE" / "FEMALE" if you infer from somewhere
+            
 
             $payload["memberDetails"][] = [
                 "memberId"         => $row["id"],                       // or custom ID (e.g. employee_id.'-'.$index)
@@ -3476,7 +3691,7 @@ class EmployeeController extends AdminController
                 "phone"            => $row["mobile"],
                 "email"            => $row["email_corporate"],
                 "relationshipName" => strtoupper($row["relationship"] ?? ''),
-                "gender"           => $gender,
+                "gender"           => $row["gender"],
                 "dob"              => $row["dob"]
             ];
         }
@@ -3495,6 +3710,7 @@ class EmployeeController extends AdminController
     public function sendFamiliesToWellnessApi(array $familiesPayload): array
     {
         // CI4 HTTP client
+        // print_rr($familiesPayload);die();
         $client =  \Config\Services::curlrequest();//die();
         $endpointUrl = getenv('WELLNESS_ONBOARD_ENDPOINT_URL');
         // Custom headers
@@ -3504,7 +3720,7 @@ class EmployeeController extends AdminController
         ];
 
         foreach ($familiesPayload as $empCode => &$family) {
-
+             // print_rr($family);die();
             try {
                 $response = $client->post($endpointUrl, [
                     'headers' => $headers,
@@ -3522,6 +3738,8 @@ class EmployeeController extends AdminController
                     'rawBody'    => $body,
                     'data'       => $decoded,
                 ];
+
+
             } catch (\Throwable $e) {
                 // In case of exception, store error info
                 $family['apiResponse'] = [
@@ -3531,6 +3749,8 @@ class EmployeeController extends AdminController
                     'error'      => $e->getMessage(),
                 ];
             }
+
+              // print_rr($body );die();
         }
 
         unset($family); // break reference
@@ -4245,7 +4465,7 @@ class EmployeeController extends AdminController
          * 4. SEQUENTIAL RE-QUEUE (SAFE)
          * --------------------------------------------------------- */
         if ($execution_mode === 'sequential' && $rowCount === $batch_size) {
-            $this->myLogger->logme('info', "$log_search_context"."Re-queueing next batch - " .  json_encode([
+            $this->myLogger->logme('error', "$log_search_context"."Re-queueing next batch - " .  json_encode([
                 'next_batch' => $batch_no + 1,
                 'last_emp_id' => $new_last_emp_id
             ]));
@@ -4268,6 +4488,352 @@ class EmployeeController extends AdminController
         $this->myLogger->logme('error', "$log_search_context". "END Batch {$batch_no}");
     }
 
+    public function visitOffBoardCheck()
+    {
+         $params =            [
+                                "memberIds" =>  ["adi_1034292323", "EMPENHANCE-M1", "EMPENHANCE-M3"],
+                                // "policyNumber" => "570000/48/2026/290",
+                                "policyNumber" => "09823428509239",
+                                "source" => "NHANCE"
+                              ];
+        print_rr($this->visitOffBoard($params));
+    }
 
+    /**
+     * Executes the Delete Policy API call.
+     *
+     * @param array $params Contains 'memberIds', 'policyNumber', and 'source'.
+     * @return array
+     */
+    public function visitOffBoard(array $params)
+    {
+        // 1. Load credentials from .env
+        $apiUrl = env('WELLNESS_ONBOARD_ENDPOINT_URL').'delete-policy-with-dependents';
+        $apiToken = env('WELLNESS_ONBOARD_AUTHORIZATION');
+        // echo $apiUrl;die();
+        // 2. Initialize the CI4 CURL service
+        $client =  \Config\Services::curlrequest([
+            'base_uri' => $apiUrl,
+            'timeout'  => 30,
+        ]);
+        
+        // $client = Services::curlrequest([
+        //     'base_uri' => $apiUrl,
+        //     'timeout'  => 30,
+        // ]);
+        $params['source'] = 'NHANCE';
+        try {
+            // Log the start of the request for traceability
+             $this->myLogger->logme('error', 'VISIT_OFFBOARD: ' . ($params['policyNumber'] ?? 'N/A'));
+
+            // 3. Perform the POST request
+            $response = $client->request('POST', '', [
+                'headers' => [
+                    'Authorization' => 'JWT ' . $apiToken,
+                    'Content-Type'  => 'application/json',
+                    'Accept'        => 'application/json',
+                ],
+                'json' => [
+                    'memberIds'    => $params['memberIds'] ?? [],
+                    'policyNumber' => $params['policyNumber'] ?? '',
+                    'source'       => $params['source'] ?? '',
+                ],
+                'http_errors' => false, // Prevents throwing exceptions on 4xx/5xx responses
+            ]);
+
+            $statusCode = $response->getStatusCode();
+            $rawBody    = $response->getBody();
+            $result     = json_decode($rawBody, true);
+
+            // 4. Handle based on HTTP Status Code
+            if ($statusCode >= 200 && $statusCode < 300) {
+                $this->myLogger->logme('error', "VISIT_OFFBOARD API Success (Code $statusCode): Policy deleted.");
+                return [
+                    'status' => true,
+                    'data'   => $result
+                ];
+            }
+
+            // Log API-level errors (4xx or 5xx)
+            $this->myLogger->logme('error', "VISIT_OFFBOARD API Failure (Code $statusCode): " . json_encode($rawBody));
+            return [
+                'status'  => false,
+                'message' => 'The API returned an error response.',
+                'code'    => $statusCode,
+                'details' => $result
+            ];
+
+        } catch (\Exception $e) {
+            // 5. Catch network or system exceptions
+            $this->myLogger->logme('error', 'VISIT_OFFBOARD API Exception: ' . $e->getMessage());
+            return [
+                'status'  => false,
+                'message' => 'A critical error occurred while contacting the API.',
+                'error'   => $e->getMessage()
+            ];
+        }
+    }
+
+    public function insufficientCdBalanceHrMailSend()
+    {
+        $post_data = $this->request->getJson(true);
+
+        if(empty($post_data) || (!isset($post_data['mails']) && !empty($post_data['mails'])) || (!isset($post_data['client_id']) && !empty($post_data['client_id']))){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No data send mail'], 200);
+        }
+
+        $client_data = $this->clientModel->where('is_active', 1)->where('id', $post_data['client_id'])->first();
+
+        if(empty($client_data)){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No client found'], 200);
+        }
+
+        $notificationModal = new NotificationModel();
+        $notification_data = $notificationModal
+                ->where('client_id', $post_data['client_id'])
+                ->where('template_name', 'hr_cd_insufficient_balance_mail')
+                ->first();
+
+        if(empty($notification_data)){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No template found'], 200);
+        }
+
+        if(empty($notification_data['subject']) || empty($notification_data['mail_content'])){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Template subject or mail content is empty'], 200);
+        }
+    
+        if(empty($notification_data['enabled']) || $notification_data['enabled'] != 1){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Template is disabled'], 200);
+
+        }
+
+        $common['mail_type'] = "hr_cd_insufficient_balance_mail";
+        $common['client_id'] = $post_data['client_id'];
+        $subject = $notification_data['subject'];
+        $mail_content = $notification_data['mail_content'];
+
+        foreach ($post_data['mails'] as $hr_id => $hr_data) {
+
+            $mail_content = str_ireplace('{{hr_name}}', $hr_data['name'], $mail_content);
+            $mail_content = str_ireplace('{{client_name}}', $client_data['client_name'], $mail_content);
+            $res = MailHelper::send_email(['mail' => $hr_data['mail'], 'subject' => $subject, 'message' => $mail_content, 'common' => $common]);
+        }
+
+        return $this->respond(['status' => true, 'code' => 200, 'message' => 'Mail send successfully'], 200);
+
+    }
+
+    public function clearCdSession() 
+    {
+        clear_cd_balance_session();
+        return $this->response->setJSON(['status' => 'cleared']);
+    }
+
+    public function checkSessionStatus()
+    {
+        // Uses your existing get_cd_balance() helper
+        $data = get_cd_balance();
+
+        // Return as JSON so JavaScript can read it
+        return $this->response->setJSON($data);
+    }
+
+    public function bulkEcardDownloadAsZipFromS3($params)
+    {
+        try {
+            $limit = $params['limit'] ?? 100;
+            $batch_no = $params['batch_no'] ?? 1;
+            $last_id = $params['last_emp_policy_id'] ?? 0;
+
+            // Fetch batch data
+            $employee_data = $this->employeePolicyModel->getEmployeeDataWithPolicyUsingClientPolicyIdOrEmployeePolicyIds($params, $limit, $last_id);
+
+            if (empty($employee_data)) {
+
+                if(!empty($last_id)){
+                    $this->myLogger->logme('error', "bulkEcardDownloadAsZipFromS3 - No more records after last_emp_policy_id: {$last_id}");
+                    $this->myLogger->logme('error', "getEmployeeEcardFromTmpFolderAndZipToS3 - Queuing ZIP creation for folder: " . ($params['folder_name'] ?? 'N/A'));
+                    $r = Jobs::addJob(['job_name' => 'getEmployeeEcardFromTmpFolderAndZipToS3', 'payload'  => $params]);
+                }
+
+                return ['status' => true, 'message' => 'Proceeding to Zip'];
+            }
+
+            // Use a consistent folder name across batches (passed in params)
+            $folderName = $params['folder_name'] ?? 'bulk_ecards_' . $employee_data[0]['policy_no'] . '_' . date('Y-m-d_H-i-s');
+            $tempPath = FCPATH . 'tmp/' . $folderName . '/';
+
+            if (!is_dir($tempPath)) {
+                mkdir($tempPath, 0777, true);
+            }
+
+            $s3 = \Config\Services::getS3Service();
+            $pdf_count = 0;
+            $current_last_id = end($employee_data)['emp_policy_id'];
+
+            foreach ($employee_data as $emp_value) {
+                // Track the last ID in this batch
+                $current_last_id = $emp_value['emp_policy_id'];
+
+                $s3_key = 'ecard_' . $emp_value['name'] . '(' . $emp_value['emp_code'] . ')' . '_' . $emp_value['tpa_id'] . '.pdf';
+                $s3_key = $this->sanitizeFilePart($s3_key);
+
+                if ($s3->exists($s3_key)) {
+                    $s3_url = $s3->getPresignedUrl($s3_key);
+                    $pdf_content = file_get_contents($s3_url['url']);
+
+                    if ($pdf_content !== false) {
+                        file_put_contents($tempPath . $s3_key, $pdf_content);
+                        $pdf_count++;
+                    }
+                }
+            }
+
+            $hasMore = count($employee_data) == $limit;
+
+            $payload = [
+                'batch_no' => $batch_no + 1,
+                'last_emp_policy_id' => $current_last_id,
+                'folder_name' => $folderName,
+                'processed_in_this_batch_data_count' => count($employee_data),
+                'pdf_count' => $pdf_count,
+                'hr_id' => $params['hr_id'] ?? null
+            ];
+
+            if ($hasMore) {
+                $this->myLogger->logme('error', "bulkEcardDownloadAsZipFromS3 - Queuing next batch: " . json_encode($payload));
+                $r = Jobs::addJob(['job_name' => 'bulkEcardDownloadAsZipFromS3', 'payload'  => $payload]);
+                $message = "Queuing next batch";
+            } else {
+                $this->myLogger->logme('error', "bulkEcardDownloadAsZipFromS3 - No more records after this batch. Next proceeding with getEmployeeEcardFromTmpFolderAndZipToS3");
+                $r = Jobs::addJob(['job_name' => 'getEmployeeEcardFromTmpFolderAndZipToS3', 'payload'  => $payload]);
+                $message = "All batch completed. Next proceeding with getEmployeeEcardFromTmpFolderAndZipToS3";
+            }
+
+            return ['status' => true, 'message' => $message];
+
+        } catch (\Throwable $e) {
+
+            $mail_response = $this->sendMailToHrWithZipAttachments($params);
+
+            $context = [
+                'error_message' => $e->getMessage(),
+                'exception_class' => get_class($e),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+                'trace' => $e->getTraceAsString(),
+                'mail_response' => $mail_response,
+                'params' => $params,
+            ];
+
+            // Log detailed context for debugging
+            $this->myLogger->logme('error', 'bulkEcardDownloadAsZipFromS3 - Exception' . json_encode($context, JSON_PRETTY_PRINT));
+
+            // Return a detailed, structured error response
+            return [
+                'status'  => false,
+                'message' => 'Exception occurred during bulk e-card download and ZIP creation.',
+                'error'   => $context,
+            ];
+        }
+    }
+
+    public function getEmployeeEcardFromTmpFolderAndZipToS3($params)
+    {
+        try {
+
+            $zipService = new \App\Libraries\ZipService();
+
+            $source = FCPATH . 'tmp/' . $params['folder_name'];
+            $destination = '/';
+            $zipName = $params['folder_name'] . '.zip' ?? '';
+
+            $result = $zipService->zipAndUploadS3($source, $destination, $zipName);
+
+            if($result['status'] === false){
+                $this->myLogger->logme('error', "getEmployeeEcardFromTmpFolderAndZipToS3 - ZIP creation/upload failed: " . json_encode($result));
+                $params['url'] = null; // Indicate failure
+            }else{
+                $params['url'] = $result['presigned_url']['url'] ?? null;
+            }
+
+
+
+
+            $mail_response = $this->sendMailToHrWithZipAttachments($params);
+
+            return ['zip_responce' => $result, 'mail_response' => $mail_response];
+
+        } catch (\Throwable $e) {
+
+            $mail_response = $this->sendMailToHrWithZipAttachments($params);
+
+            $context = [
+                'error_message' => $e->getMessage(),
+                'exception_class' => get_class($e),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+                'trace' => $e->getTraceAsString(),
+                'mail_response' => $mail_response,
+                'params' => $params,
+            ];
+
+            // Log detailed context for debugging
+            $this->myLogger->logme('error', 'getEmployeeEcardFromTmpFolderAndZipToS3 - Exception' . json_encode($context, JSON_PRETTY_PRINT));
+
+            // Return a detailed, structured error response
+            return [
+                'status'  => false,
+                'message' => 'Exception occurred during bulk e-card download and ZIP creation.',
+                'error'   => $context,
+            ];
+
+        }
+    }
+
+    public function sendMailToHrWithZipAttachments($params)
+    {
+        $hr_id = $params['hr_id'] ?? null;
+        $url = $params['url'] ?? null;
+
+        if (empty($hr_id)) {
+            $this->myLogger->logme('error', "sendMailToHrWithZipAttachments - No HR ID provided.");
+            return ['status' => false, 'message' => 'No HR ID provided.'];
+        }
+
+        $hr_data = $this->LevelContactModel->where('id', $hr_id)->where('is_active', 1)->first();
+
+        if (empty($hr_data) || empty($hr_data['email'])) {
+            $this->myLogger->logme('error', "sendMailToHrWithZipAttachments - No valid HR data found for ID: {$hr_id}");
+            return ['status' => false, 'message' => 'No valid HR data found for ID: ' . $hr_id];
+        }
+
+        if(empty($url)){
+            $subject = "Employee Bulk E-Card Download Failed";
+            $message = "Dear {$hr_data['name']},<br><br>We were unable to generate the bulk e-card ZIP file. Please re-initialize the process or contact support to retry.";
+        }else{
+            $subject = "Employee Bulk E-Cards Download";
+            $message = "Dear {$hr_data['name']},<br><br>Please find the employee e-cards attached below.<br><br>Download Link: <a href='{$url}'>Download E-Cards</a><br><br>Note : This link valid for 2 days only.";
+        }
+
+        $bbc = 'venkateshraman786@gmail.com';
+
+        $mail_response = MailHelper::send_email([
+            'mail' => $hr_data['email'],
+            'subject' => $subject,
+            'message' => $message,
+            'bcc' => $bbc,
+            'common' => [
+                'mail_type' => 'employee_bulk_ecard_download_by_hr',
+            ]
+        ]);
+
+        $this->myLogger->logme('error', "sendMailToHrWithZipAttachments - Email sent to HR ID: {$hr_id}, Email Response: " . json_encode($mail_response));
+        return $mail_response;
+    }
+
+    public function downloadZip(){
+
+    }
 
 }
diff --git a/app/Controllers/EmployeeMultiEventServiceController.php b/app/Controllers/EmployeeMultiEventServiceController.php
index 3c8846e9..634af029 100644
--- a/app/Controllers/EmployeeMultiEventServiceController.php
+++ b/app/Controllers/EmployeeMultiEventServiceController.php
@@ -1018,7 +1018,7 @@ class EmployeeMultiEventServiceController extends BaseController
         $this->myLogger->logme('error', 'Excel Multievent File Formate Validation function START: ' . json_encode(['params' => $params]));
         helper('excel_util_helper');
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
 
         if (!isset($file)) {
             //file not found in DB
@@ -1182,7 +1182,7 @@ class EmployeeMultiEventServiceController extends BaseController
 
         helper('excel_util_helper');
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
 
         if (!isset($file)) {
             //file not found in DB
@@ -1291,7 +1291,7 @@ class EmployeeMultiEventServiceController extends BaseController
         helper('excel_util_helper');
 
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
 
         if (!isset($file)) {
             //file not found in DB
@@ -1387,7 +1387,7 @@ class EmployeeMultiEventServiceController extends BaseController
         // dd($params);
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $file['action'] = $params['action'];
         // dd($file);
 
@@ -1604,7 +1604,7 @@ class EmployeeMultiEventServiceController extends BaseController
 
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $file['action'] = $params['action'];
         // Kint::dump($file);
 
@@ -1805,7 +1805,7 @@ class EmployeeMultiEventServiceController extends BaseController
         {
             //get file name
             $file_id = $params['file_id'];
-            $file = $this->fileModel->find($file_id);
+            $file = $this->fileModel->find((int)$file_id);
             $file['action'] = $params['action'];
             // dd($file);
             $return = [];
@@ -1910,7 +1910,7 @@ class EmployeeMultiEventServiceController extends BaseController
             // $this->setPullNotification($this->getFileMetaDataByFileId($file_id, 'success'));
         } else if (isset($params['client_policy_id'])) //handle data from enrollment to inception
         {
-            $client_policy_id = $params['client_policy_id'];
+            $client_policy_id = (int)$params['client_policy_id'];
             //get client id
             $client_id = ($this->clientPolicyModel->select('client_id')->find($client_policy_id))['client_id'];
             // dd($client_id);
@@ -1956,7 +1956,7 @@ class EmployeeMultiEventServiceController extends BaseController
 
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $file['action'] = $params['action'];
         // dd($file);
 
@@ -1975,7 +1975,7 @@ class EmployeeMultiEventServiceController extends BaseController
         $endorsement_data = [];
         $policy_terms = $this->clientPolicyModel->getPolicyDetails($file['client_id'], $file['policy_id']);
         $insurer = new InsurerModel();
-        $insurer = ($insurer->find($policy_terms[0]->insurer_id));
+        $insurer = ($insurer->find((int)$policy_terms[0]->insurer_id));
         // kint::dump($insurer);
 
         //make closure funciton which is going to use only by this method
@@ -2095,7 +2095,7 @@ class EmployeeMultiEventServiceController extends BaseController
         helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $file['action'] = $params['action'];
         
 
@@ -2173,7 +2173,7 @@ class EmployeeMultiEventServiceController extends BaseController
         helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         $file['action'] = $params['action'];
 
         // $file_name_with_path = WRITEPATH . "/uploads/excel/" . $file['file_name'];
@@ -2470,7 +2470,7 @@ class EmployeeMultiEventServiceController extends BaseController
     {
 
         try {
-            $file = $this->fileModel->find($file_id);
+            $file = $this->fileModel->find((int)$file_id);
             // $error_data = json_decode($file['reason'], true);
             $error_data = $res;
             // dd($error_data);
@@ -2632,7 +2632,7 @@ class EmployeeMultiEventServiceController extends BaseController
         // dd($this->request);
         helper('excel_util_helper');
         //get file name
-        $file_id = $params['file_id'];
+        $file_id = (int)$params['file_id'];
         $file = $this->fileModel->find($file_id);
         // dd($file);
         $return = [];
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 8f141d28..a187e819 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -40,6 +40,9 @@ use App\Models\HRAccessControlModel;
 use App\Models\InsurerModel;
 use App\Models\HrFileUploadModel;
 use App\Models\EmployeeRetailPolicy;
+use App\Models\BatchFileModel;
+use App\Models\ClientDepositModel;
+use App\Models\PTFileModel;
 
 
 
@@ -66,6 +69,8 @@ use Kreait\Firebase\Messaging\CloudMessage;
 use Kreait\Firebase\Messaging\Notification;
 use Kreait\Firebase\Exception\MessagingException;
 
+use Firebase\JWT\JWT;
+
 
 class EmployeeRestController extends AdminController
 {
@@ -100,6 +105,7 @@ class EmployeeRestController extends AdminController
     protected $hrFileUploadModel;
     protected $ticketMailTemplateModel;
     protected $employeeRetailPolicy;
+    protected $batchFileModel;
 
 
     public function __construct()
@@ -134,6 +140,7 @@ class EmployeeRestController extends AdminController
         $this->insurerModel    = new InsurerModel();
         $this->hrFileUploadModel = new HrFileUploadModel();
         $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
+        $this->batchFileModel  = new BatchFileModel();
     }
 
 
@@ -159,9 +166,9 @@ class EmployeeRestController extends AdminController
                     ->where('employees.client_branch_id', $client_branch_id)
                     ->where('employees.is_active', 1)
                     ->where('employees.relationship', $relationship)
-                    ->where('employee_polices.status', ['active'])
+                    ->whereIn('employee_polices.status', ['active', 'expired'])
                     ->where('employees.is_active', 1)
-                    ->where('employees.emp_status', ['active'])
+                    ->whereIn('employees.emp_status', ['active', 'expired'])
                     ->first();
 
                 if (null !== $this->request->getGet('client_policy_id')) {
@@ -178,7 +185,7 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'AccountManagerDetails' => isset($AccountManagerDetails[0]) ? $AccountManagerDetails[0] : null], 200);
             } else {
                 $result = "No Match's";
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
             }
         } catch (\Throwable $th) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
@@ -199,7 +206,7 @@ class EmployeeRestController extends AdminController
                     return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
                 } else {
                     $result = "No Match's";
-                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
                 }
             }
         } catch (\Throwable $th) {
@@ -225,7 +232,7 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $employee], 200);
             } else {
 
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
         } catch (\Throwable $th) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
@@ -254,7 +261,7 @@ class EmployeeRestController extends AdminController
                     return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
                 } else {
                     $result = "No Matches";
-                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
                 }
             }
         } catch (\Exception $e) {
@@ -270,7 +277,7 @@ class EmployeeRestController extends AdminController
 
             $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id);
             if ($openForEnrollment == false) {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 200);
             }
 
             if ($data) {
@@ -319,7 +326,7 @@ class EmployeeRestController extends AdminController
                     return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
                 } else {
                     $result = "No Matches";
-                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
                 }
             }
         } catch (\Exception $e) {
@@ -520,7 +527,7 @@ class EmployeeRestController extends AdminController
                     ->update();
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
@@ -536,7 +543,7 @@ class EmployeeRestController extends AdminController
 
             $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id);
             if ($openForEnrollment == false) {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 200);
             }
 
             foreach ($requestData as $key => $value) {
@@ -599,12 +606,13 @@ class EmployeeRestController extends AdminController
     public function getEmployeeAndDependenceByClientId()
     {
         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'));
+
+            $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'), status_type: 'inactive');
 
             if ($empData) {
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
@@ -705,7 +713,7 @@ class EmployeeRestController extends AdminController
             if ($ClientPolicyData) {
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
@@ -1046,7 +1054,7 @@ class EmployeeRestController extends AdminController
                 $this->fileModel->where('id', $file_id)->set(['status' => 'success', 'reason' => '', 'error_data' => ''])->update();
                 return $this->respond(['status' => 'success', 'code' => 200, 'message' => "Success"], 200);
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Client id and Client Policy id is Not Match!"], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Client id and Client Policy id is Not Match!"], 200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
@@ -1665,14 +1673,14 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $client = $this->clientModel->where('id', $this->request->getGet('client_id'))->first();
+            $client = $this->clientModel->where('md5(id)', $this->request->getGet('client_id'))->first();
             if (!empty($client)) {
                 $client['client_logo'] = base_url() . 'public/uploads/logo/' . $client['client_logo'];
-                $clientPolicy = $this->clientPolicyModel->where('client_id', $this->request->getGet('client_id'))
+                $clientPolicy = $this->clientPolicyModel->where('md5(client_id)', $this->request->getGet('client_id'))
                     ->where('client_branch_id', $this->request->getGet('client_branch_id'))->findAll();
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['client' => $client, 'client_policy' => $clientPolicy]], 200);
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
@@ -2220,7 +2228,7 @@ class EmployeeRestController extends AdminController
         // dd($client_policy_id);
 
 
-        $client_id = ($this->clientPolicyModel->select('client_id')->find($client_policy_id))['client_id'];
+        $client_id = ($this->clientPolicyModel->select('client_id')->find((int)$client_policy_id))['client_id'];
         // get policy and rack details
         $policy_terms = $this->clientPolicyModel->getPolicyDetails($client_id, $client_policy_id);
         $policy_type = $policy_terms[0]->is_addon;
@@ -2305,9 +2313,36 @@ class EmployeeRestController extends AdminController
         }
 
 
+        if($this->request->getGet('policy_status') == 0){
+            $emp_policy_status = 'expired';
+        }else{
+            $emp_policy_status = 'active';
+        }
 
-        $ClientPolicyData = $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id,  client_policy.policy_type_id as policy_type_id,  client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type  as inception_type, client_policy.policy_no as policy_no, client_policy.insurer_id as insurer_id, DATE_FORMAT(client_policy.policy_end_date, "%d-%m-%Y") AS policy_expiry_date ')
-            ->where('client_policy.client_id', $this->request->getGet('client_id'))
+        $db = \Config\Database::connect();
+        $emp_policy_status = $db->escape($emp_policy_status);
+
+        $ClientPolicyData = $this->clientPolicyModel
+            ->select("
+                client_policy.id as client_policy_id , 
+                client_policy.client_id as client_id,  
+                client_policy.policy_type_id as policy_type_id,  
+                client_policy.is_addon as is_addon , 
+                client_policy.open_for_enrollment as OpenForEnrollment , 
+                client_policy.inception_type  as inception_type, 
+                client_policy.policy_no as policy_no, 
+                client_policy.insurer_id as insurer_id, 
+                DATE_FORMAT(client_policy.policy_start_date, '%d-%m-%Y') AS policy_start_date,
+                DATE_FORMAT(client_policy.policy_end_date, '%d-%m-%Y') AS policy_expiry_date,
+                (
+                    select COALESCE(ROUND(SUM(rata_premimum + gst)), 0) 
+                    from employee_polices 
+                    where is_active = 1 
+                    and status = $emp_policy_status
+                    and client_policy_id = client_policy.id
+                ) as total_premium
+            ", false)
+            ->where('md5(client_policy.client_id)', $this->request->getGet('client_id'))
             ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id'))
             ->where('client_policy.is_active', 1)
             ->where('client_policy.policy_status', $this->request->getGet('policy_status'))
@@ -2325,15 +2360,15 @@ class EmployeeRestController extends AdminController
             $value['policy_name'] = $policyTypeData->long_name;
             $value['insurer_name'] = $insurerData->name;
             $value['insurer_short_name'] = $insurerData->short_name;
-            $employeeDetails = $this->employeePolicyModel->getEmployeePolicy(client_id: $value['client_id'], policy_id: $value['client_policy_id'], status: 0, branch_id: $this->request->getGet('client_branch_id'));
+            $employeeDetails = $this->employeePolicyModel->getEmployeePolicy(client_id: $value['client_id'], policy_id: $value['client_policy_id'], status: 0, branch_id: $this->request->getGet('client_branch_id'), status_type: 'inactive');
             // dd($employeeDetails);
             $activeCount = 0;
             $inactiveCount = 0;
-            if (count($employeeDetails)) {
+            if (count($employeeDetails)) {  
                 foreach ($employeeDetails as $item) {
-                    if ($item['emp_status'] === 'active') {
+                    if ($item['status'] === 'active') {
                         $activeCount++;
-                    } elseif ($item['emp_status'] === 'inactive') {
+                    } elseif ($item['status'] === 'inactive') {
                         $inactiveCount++;
                     }
                 }
@@ -2342,6 +2377,8 @@ class EmployeeRestController extends AdminController
             $value['totalMembersCount'] = count($employeeDetails);
             $value['membersCountOfActive'] = $activeCount;
             $value['membersCountOfInactive'] = $inactiveCount;
+            $value['is_ecard_bulk_download'] = 0;
+            $value['is_ecard_bulk_download_for_employee'] = 0;
 
 
             array_push($result, $value);
@@ -2420,6 +2457,7 @@ class EmployeeRestController extends AdminController
         $result = $clientController->view_Deposit($insurerId, $requestFrom = 'rest', $param = ['client_id' => $clientId, 'cd_ac_pk' => $cdAccountPrimaryKey]);
 
         $data['insurer_name'] = $result['insurerName']->name;
+        $data['insurer_short_name'] = $result['insurerName']->short_name;
         $data['account_number'] = $result['insurerName']->cd_master_account_no;
         $data['total_deposit'] = $result['deposiamount']->total_credit;
         $data['total_consumed'] = $result['deposiamount']->total_withdraw;
@@ -2443,7 +2481,13 @@ class EmployeeRestController extends AdminController
 
         if ($this->request->is('get')) {
 
-            $data['claim_status'] = $this->claimStatusModel->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
+            $data['claim_status'] = $this->claimStatusModel
+                        ->select('id,ticket_type, display_name as claim_status')
+                        ->where('is_active', 1)
+                        ->where('display_name IS NOT NULL OR display_name <> ""')
+                        ->groupBy('display_name')
+                        ->findAll();
+           
             $data['ticket_type'] =  [
                 ["ticket_type" => "1", "type_name" => "Claim-GMC"],
                 ["ticket_type" => "2", "type_name" => "Claim-GPA"],
@@ -2458,12 +2502,21 @@ class EmployeeRestController extends AdminController
 
         $search_data = $this->request->getJSON(true); // Get JSON as associative array
 
+        if ( isset($search_data['client_id']) &&is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+            $client_data = $this->clientModel->where('MD5(id)', $search_data['client_id'])->first();
+            $search_data['client_id'] = $client_data['id'] ?? null;
+        } 
+
+
         $client_id = isset($search_data['client_id']) ? (int) $search_data['client_id'] : 0;
         unset($search_data['client_id']);
+        unset($search_data['client_branch_id']);
+        $policy_number = isset($search_data['policy_no']) ? $search_data['policy_no'] : null;
 
         $from_date = isset($search_data['from_date']) ? $search_data['from_date'] : null;
         $to_date   = isset($search_data['to_date']) ? $search_data['to_date'] : null;
-        unset($search_data['from_date'], $search_data['to_date']);
+        $claim_status_id   = isset($search_data['claim_status_id']) ? $search_data['claim_status_id'] : null;
+        unset($search_data['from_date'], $search_data['to_date'], $search_data['claim_status_id'], $search_data['policy_no']);
 
         $where = [];
 
@@ -2474,6 +2527,11 @@ class EmployeeRestController extends AdminController
             }
         }
 
+        $claim_status_ids = [];
+        if(!empty($claim_status_id)){
+            $claim_status_ids = $this->getTicketClaimStatusIdBasedOnTheDisplayName($claim_status_id);
+        }
+
         $builder = $db->table('ticket_master tm');
         $builder->select([
             'tm.id',
@@ -2485,6 +2543,12 @@ class EmployeeRestController extends AdminController
                 ELSE UPPER(tcs.display_name)
                 END AS status
             ",
+            "CASE 
+                WHEN tm.tpa_claim_type IS NOT NULL OR tm.tpa_claim_type != '' 
+                    THEN tm.tpa_claim_type
+                ELSE 'Reimbursement'
+                END AS cl_type
+            ",
             'tm.claim_number AS claim_no',
             'tm.claim_status_id',
             'tm.is_head_approved',
@@ -2568,6 +2632,14 @@ class EmployeeRestController extends AdminController
             $builder->where($where);
         }
 
+        if (!empty($claim_status_ids)) {
+            $builder->whereIn('claim_status_id', $claim_status_ids);
+        }
+
+        if (!empty($policy_number)) {
+            $builder->where('cp.policy_no', $policy_number);
+        }
+
         $builder->orderBy('tm.id', 'DESC');
 
         $data = $builder->get()->getResultArray();
@@ -2929,6 +3001,7 @@ class EmployeeRestController extends AdminController
                     $data['claim_subject'] = "Claim GTLI";
                     $data['sum_insured_label'] = "Sum Assured";
                 } else if ($ClientPolicyValue['policy_type_id'] == 72){
+                    $policyGroup = 'other';
                     $data['ticket_type_id'] = 72;
                     $data['ticket_settled_status_id'] = 76;
                     $data['claim_subject'] = "Claim OPD";
@@ -3175,7 +3248,7 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $feContentData], 200);
             } else {
 
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 200);
             }
         } catch (\Throwable $th) {
             return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
@@ -3200,7 +3273,7 @@ class EmployeeRestController extends AdminController
     //             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
     //         } else {
 
-    //             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 404);
+    //             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 200);
     //         }
     //     } catch (\Throwable $th) {
     //         return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
@@ -3273,7 +3346,7 @@ class EmployeeRestController extends AdminController
                         // Check if the update was successful
                         if ($db->affectedRows() > 0) {
                             // Fetch the updated employee data
-                            $updated_employee = $this->employeeModel->find($id);
+                            $updated_employee = $this->employeeModel->find((int)$id);
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $updated_employee], 200);
                         } else {
                             log_message('error', 'Update failed. No rows affected.');
@@ -3286,7 +3359,7 @@ class EmployeeRestController extends AdminController
                     return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Firebase Token is required'], 400);
                 }
             } else {
-                return $this->respond(['status' => 'failed', 'code' => 404, 'message' => 'Employee not found'], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'message' => 'Employee not found'], 200);
             }
         } catch (\Throwable $th) {
             log_message('error', 'An error occurred: ' . $th->getMessage());
@@ -3571,6 +3644,26 @@ class EmployeeRestController extends AdminController
         $get_docs_name = $this->request->getPost('claim_doc_names') ?? [];
         $policy_transaction_id = $this->request->getPost('policy_transaction_id') ?? null;
 
+
+        if (is_string($received_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $received_data['client_id'])) {
+            $client_data = $this->clientModel->where('MD5(id)', $received_data['client_id'])->first();
+            $received_data['client_id'] = $client_data['id'] ?? null;
+        } 
+
+        $client_policy_data = $this->clientPolicyModel->where('id', $received_data['client_policy_id'] ?? null)->first();
+
+        $isduplicate = checkDuplicateClaim([
+            'doa' => change_date_format($received_data['doa'] ?? '') ?? null, 
+            'emp_code' => $received_data['emp_code'] ?? null, 
+            'claim_amount' => $received_data['claim_amount'] ?? null, 
+            'policy_no' => $client_policy_data['policy_no'] ?? null
+        ]);
+
+        if($isduplicate){
+            $response = ['status' => false, 'code' => 404, 'message' => 'Claim already exist'];
+            return $this->respond($response, 200);
+        }
+
         if(!empty($policy_transaction_id)){
            $response = $this->retailClaimInitiate($received_data);
             return $this->respond($response, 200);
@@ -3635,19 +3728,21 @@ class EmployeeRestController extends AdminController
 
             from employees emp 
 
-            left join employees empl on empl.id = $insured_emp_id and empl.is_active = 1 and empl.emp_status = 'active'
-            left join employee_polices emp_pol on empl.id = emp_pol.employee_id and emp_pol.client_policy_id = $client_policy_id and emp_pol.is_active = 1 
+            left join employees empl on empl.id = :insured_emp_id: and empl.is_active = 1 and empl.emp_status = 'active'
+            left join employee_polices emp_pol on empl.id = emp_pol.employee_id and emp_pol.client_policy_id = :client_policy_id: and emp_pol.is_active = 1 
             left join client_policy cp on cp.id = emp_pol.client_policy_id and cp.is_active = 1
             left join client_rm cl_rm on cl_rm.client_id = empl.client_id and cl_rm.is_active = 1 and cl_rm.level = 3 
 
-        where emp.id = $employee_id and emp.is_active = 1 and emp.emp_status = 'active'
+        where emp.id = :employee_id: and emp.is_active = 1 and emp.emp_status = 'active'
         limit 1 ";
 
-        $emp_ticket_data = $this->employeeModel->query($sql)->getResultArray();
+        $binds = ['insured_emp_id'=>$insured_emp_id,'client_policy_id'=>(int)$client_policy_id,'employee_id'=>$employee_id ];
+        $emp_ticket_data = $this->employeeModel->query($sql,$binds)->getResultArray();
         // print_r(db_connect()->getLastQuery()); die;
 
         if (!empty($emp_ticket_data)) {
 
+            unset($received_data['relationship']);
             $fetchData = $emp_ticket_data[0];
 
             $claimStatusQuery = $this->claimStatusModel
@@ -3671,7 +3766,9 @@ class EmployeeRestController extends AdminController
             $fetchData['claim_type'] = 1;
             $fetchData = array_merge($fetchData, $received_data);
 
-            $fetchData['relationship'] = strtolower($fetchData['relationship']) ?? $fetchData['relationship'];
+            // $fetchData['relationship'] = strtolower($fetchData['relationship']) ?? $fetchData['relationship'];
+            $fetchData['relationship'] = isset($fetchData['relationship']) ? strtolower($fetchData['relationship']) : null;
+
             // print_r($fetchData); die;
             $insert_status = $this->ticketMaster->insert($fetchData);
             $ticket_id = $this->ticketMaster->insertID();
@@ -3728,7 +3825,7 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status' => false, 'code' => 400, 'message' => $message], 200);
             }
         } else {
-            return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'The employee is not active.'])->setStatusCode(404);
+            return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'The employee is not active.'])->setStatusCode(200);
         }
     }
 
@@ -3840,10 +3937,14 @@ class EmployeeRestController extends AdminController
             log_message('error', 'Ticket validation | Ticket ID: ' . $ticket_id . ' | Matching active tickets with NULL TPA reference: ' . $count);
 
             if ($count > 0 && $pdf_exist_in_the_file && $tpa_claim_push == true) {
-                // this call for TPA integration
-                $apiServiceController = new ApiServiceController();
-                $apiServiceController->pushClaims($ticket_id);
-                log_message('error', "pushClaims function called with Ticket ID: {$ticket_id}, In Employee Rest Controller");
+                try {
+                    // this call for TPA integration
+                    $apiServiceController = new ApiServiceController();
+                    $apiServiceController->pushClaims($ticket_id);
+                    log_message('error', "pushClaims function called with Ticket ID: {$ticket_id}, In Employee Rest Controller");
+                } catch (\Throwable $e) {
+                    log_message('error', "Error in TPA Claim Push via Benifits or HR : ApiServiceController pushClaims function call for Ticket ID: {$ticket_id}. Error: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
+                }
             } else {
                 if($tpa_claim_push == false){
                     log_message('error', 'Skip the TPA claim push for IR DOCUMENTS');
@@ -3910,7 +4011,7 @@ class EmployeeRestController extends AdminController
                     'status'  => false,
                     'code'    => 404,
                     'message' => 'No policy types found'
-                ])->setStatusCode(404);
+                ])->setStatusCode(200);
             }
 
             $this->myLogger->logme('error', "Policy type IDs fetched: " . json_encode($policy_type_ids));
@@ -3983,7 +4084,7 @@ class EmployeeRestController extends AdminController
         // dd($emp_id);
 
         if (empty($emp_id)) {
-            return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'emp_id is required.'])->setStatusCode(404);
+            return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'emp_id is required.'])->setStatusCode(200);
         }
 
         $retail_ticket_data = [];
@@ -4434,60 +4535,122 @@ class EmployeeRestController extends AdminController
     public function hrFileUpload()
     {
         try {
-            // Check file
-            $file = $this->request->getFile('file_name');
-            if (!$file) {
-                return $this->response->setJSON([
-                    'status' => false,
-                    'message' => "Invalid file or file not uploaded.",
-                    'data'    => "No Data"
-                ]);
-            }
 
-            // Upload folder path
-            $uploadPath = WRITEPATH . 'uploads/hr_files/';
-
-            // If directory not exists, create it
-            if (!is_dir($uploadPath)) {
-                mkdir($uploadPath, 0777, true);
-            }
-
-            // New file name with timestamp
-            $newFileName = time() . '_' . $file->getRandomName();
-
-            // Move file
-            $file->move($uploadPath, $newFileName);
-
-            // Prepare data
-            $data = [
-                'client_id'        => $this->request->getPost('client_id'),
-                'client_branch_id' => $this->request->getPost('client_branch_id'),
-                'policy_id'        => $this->request->getPost('policy_id'),
-                'policy_no'        => $this->request->getPost('policy_no'),
-                'file_name'        => $newFileName,
-                'file_action'      => $this->request->getPost('file_action'),
-                'status'           => 'Yet to start',
-                'created_by'       => $this->request->getPost('created_by'),
-                'updated_by'       => $this->request->getPost('created_by'),
+            $post_data = [
+                'client_id'        => $this->request->getPost('client_id') ?? null,
+                'client_branch_id' => $this->request->getPost('client_branch_id') ?? null,
+                'policy_id'        => $this->request->getPost('policy_id') ?? null,
+                'file_action'      => $this->request->getPost('file_action') ?? null,
+                'created_by'       => $this->request->getPost('created_by') ?? null,
+                'file_name'        => $this->request->getFile('file_name') ?? null,
+                'policy_no'        => $this->request->getPost('policy_no') ?? null,
             ];
+            // print_r($post_data); die;
 
-            // Save into DB
-            $result = $this->hrFileUploadModel->insert($data);
-
-            if ($result) {
-                $this->giveNotificationToClientsAccountManager($data);
+            if(empty($post_data['client_id'])){
+                return $this->respondCreated(['status' => false, 'message' => 'Client is required', 'data' => []]);
             }
 
-            return $this->respondCreated([
+             // Handle raw client_id vs MD5
+            if (is_string($post_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $post_data['client_id'])) {
+                $client_data = $this->clientModel->where('MD5(id)',  $post_data['client_id'])->first();
+                $post_data['client_id'] = $client_data['id'];
+            } else {
+                $client_data = $this->clientModel->where('id',  $post_data['client_id'])->first();
+            }
+
+            if(empty($client_data)){
+                return $this->respondCreated(['status' => false, 'message' => 'Invalid Client Id', 'data' => []]);
+            }
+
+            // print_r($client_data); die;
+
+            if($client_data['hr_file_processed_by'] == 1){
+                $responce = $this->fileUploadInFilesTable($post_data);
+            }else{
+                $responce = $this->fileUploadInHrFileUploadTable($post_data);
+            }
+
+            return $this->respondCreated($responce);
+
+        } catch (\Exception $e) {
+           // return $this->failServerError($e->getMessage());
+            return $this->respondCreated(['status' => false, 'message' => $e->getMessage(), 'data' => []]);
+        }
+    }
+
+    public function fileUploadInHrFileUploadTable($post_data)
+    {
+        // Check file
+        $file = $post_data['file_name'];
+
+        if (!$file) {
+            return [
+                'status' => false,
+                'message' => "Invalid file or file not uploaded.",
+                'data'    => []
+            ];
+        }
+
+        // Upload folder path
+        $uploadPath = WRITEPATH . 'uploads/hr_files/';
+
+        // If directory not exists, create it
+        if (!is_dir($uploadPath)) {
+            mkdir($uploadPath, 0777, true);
+        }
+
+        // New file name with timestamp
+        $newFileName = time() . '_' . $file->getRandomName();
+
+        // Move file
+        $file->move($uploadPath, $newFileName);
+
+        // Prepare data
+        $data = [
+            'client_id'        => $post_data['client_id'],
+            'client_branch_id' => $post_data['client_branch_id'],
+            'policy_id'        => $post_data['policy_id'],
+            'policy_no'        => $post_data['policy_no'],
+            'file_name'        => $newFileName,
+            'file_action'      => $post_data['file_action'],
+            'status'           => 'Yet to start',
+            'created_by'       => $post_data['created_by'],
+            'updated_by'       => $post_data['created_by'],
+        ];
+
+        // Save into DB
+        $result = $this->hrFileUploadModel->insert($data);
+
+        if ($result) {
+            $this->giveNotificationToClientsAccountManager($data);
+            $response = [
                 'status'  => true,
                 'message' => 'File uploaded successfully',
                 'data'    => $data
-            ]);
-        } catch (\Exception $e) {
-            return $this->failServerError($e->getMessage());
+            ];
+            return $response;
         }
     }
 
+    public function fileUploadInFilesTable($post_data)
+    {
+        $employeeController = new EmployeeController();
+        $responce = $employeeController->employeesUplodWithEvents($post_data);
+        // print_r($responce); die;
+
+        return $responce;
+
+        // if(isset($responce['file_id'])){
+        //     $file_data = $this->getDataFromHrFilesTable(['hr_id' => $responce['created_by']]);
+        //     $responce['data'] = $file_data;
+        //     return $responce;
+        // }else{
+        //     $responce['data'] = [];
+        //     return $responce;
+        // }
+    }
+
     private function giveNotificationToClientsAccountManager($data)
     {
 
@@ -4548,7 +4711,7 @@ class EmployeeRestController extends AdminController
             ];
 
             // Check if record exists
-            $record = $this->hrFileUploadModel->find($id);
+            $record = $this->hrFileUploadModel->find((int)$id);
             if (!$record) {
                 return $this->failNotFound("Record with ID {$id} not found.");
             }
@@ -4572,28 +4735,40 @@ class EmployeeRestController extends AdminController
         try {
 
             $file_id = $this->request->getGet('id') ?? $id;
+            $client_id = $this->request->getGet('cliend_id') ?? null;
+
+            $client_data = [];
+            if(!empty($client_id)){
+                if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
+                    $client_data = $this->clientModel->where('MD5(id)',  $client_id)->first();
+                } else {
+                    $client_data = $this->clientModel->where('id',  $client_id)->first();
+                }
+            }
 
             // Find record
-            $record = $this->hrFileUploadModel->where('id', $file_id)->find();
-
-            // print_rr( $record);die;
+            if($client_data && $client_data['hr_file_processed_by'] == 1){
+                $record = $this->fileModel->where('id', (int)$file_id)->find();
+                $uploadPath = WRITEPATH . 'uploads/excel/';
+            }else{
+                $record = $this->hrFileUploadModel->where('id', (int)$file_id)->find();
+                $uploadPath = WRITEPATH . 'uploads/hr_files/';
+            }
 
             if (!$record) {
                 return $this->failNotFound("File record not found");
             }
 
-            $uploadPath = WRITEPATH . 'uploads/hr_files/';
-            $filePath   = $uploadPath . $record[0]['file_name'];
+            $filePath = $uploadPath . $record[0]['file_name'];
 
             if (!file_exists($filePath)) {
-                // return $this->failNotFound("File not found on server");
-                $data['message'] = 'The Physical File Not Found';
-                return view('errors/404', $data);
+                return $this->failNotFound("File not found on server");
             }
 
             // Force file download
             return $this->response->download($filePath, null)
                 ->setFileName($record[0]['file_name']);
+
         } catch (\Exception $e) {
             return $this->failServerError($e->getMessage());
         }
@@ -4643,17 +4818,68 @@ class EmployeeRestController extends AdminController
     public function hrFileList()
     {
         try {
+
             $request = service('request');
+            $search_data = $request->getGetPost() ?? []; // supports both GET and POST
+            $table = "";
 
-            // Start builder from model
-            // $builder = $this->hrFileUploadModel
-            //     ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name')
-            //     ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
-            //     ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
-            //     ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+            if(isset($search_data['hr_file_type']) && $search_data['hr_file_type'] == "CRM"){
+                $data = $this->getDataFromHrFileUploadTable($search_data);
+                $table = "hr_file_upload";
+            }else{
 
-            $builder = $this->hrFileUploadModel
-                ->select('
+                if (is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+                    $client_data = $this->clientModel->where('MD5(id)',  $search_data['client_id'])->first();
+                    $search_data['client_id'] = $client_data['id'];
+                } else {
+                    $client_data = $this->clientModel->where('id',  $search_data['client_id'])->first();
+                }
+
+                if($client_data['hr_file_processed_by'] == 1){
+                    $data = $this->getDataFromHrFilesTable($search_data);
+                    $table = "files";
+                }else{
+                    $data = $this->getDataFromHrFileUploadTable($search_data);
+                    $table = "hr_file_upload 2";
+
+                }
+            }
+
+            return $this->respond([
+                'status'  => "success",
+                'message' => 'File list fetched successfully',
+                'data'    => $data,
+                'table'   => $table
+            ]);
+
+        } catch (\Exception $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return $this->failServerError($th->getMessage());
+        }
+    }
+
+    public function getDataFromHrFileUploadTable($search_data)
+    {
+        // Start builder from model
+        // $builder = $this->hrFileUploadModel
+        //     ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name')
+        //     ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
+        //     ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
+        //     ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+
+        $builder = $this->hrFileUploadModel
+            ->select("
                     hr_file_upload.id, 
                     hr_file_upload.client_id, 
                     hr_file_upload.client_branch_id, 
@@ -4672,51 +4898,119 @@ class EmployeeRestController extends AdminController
                         WHEN f.status IS NULL 
                         THEN hr_file_upload.status 
                         ELSE CONCAT(UCASE(LEFT(f.status, 1)), LCASE(SUBSTRING(f.status, 2))) 
-                    END AS status
-                ', false)
-                ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
-                ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
-                ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left')
-                ->join(
-                    '(SELECT f1.* 
+                    END AS status,
+                    '0' as file_error_status,
+                    '' as file_error_status
+                ", false)
+            ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
+            ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
+            ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left')
+            ->join(
+                '(SELECT f1.* 
                     FROM files f1 
                     WHERE f1.is_active = 1 
                     ORDER BY f1.id DESC 
                     LIMIT 1) f',
-                    'f.hr_file_id = hr_file_upload.id',
-                    'left'
-                );
+                'f.hr_file_id = hr_file_upload.id',
+                'left'
+            );
 
-            // Allowed filter keys
-            $filters = [
-                'client_id',
-                'client_branch_id',
-                'policy_id',
-                'policy_no',
-                'file_action',
-                'status',
-                'created_by'
-            ];
+        // Allowed filter keys
+        $filters = [
+            'client_id',
+            'client_branch_id',
+            'policy_id',
+            'policy_no',
+            'file_action',
+            'status',
+            'created_by'
+        ];
 
-            // Apply filters dynamically
-            foreach ($filters as $key) {
-                $value = $request->getGetPost($key); // supports both GET and POST
-                if (!empty($value)) {
-                    $builder->where("hr_file_upload.$key", $value);
-                }
+        // Apply filters dynamically
+        foreach ($filters as $key) {
+            $value = $search_data[$key] ?? null; // supports both GET and POST
+            if (!empty($value)) {
+                $builder->where("hr_file_upload.$key", $value);
             }
-
-            // Execute query
-            $data = $builder->get()->getResultArray();
-
-            return $this->respond([
-                'status'  => "success",
-                'message' => 'File list fetched successfully',
-                'data'    => $data
-            ]);
-        } catch (\Exception $e) {
-            return $this->failServerError($e->getMessage());
         }
+
+        // Execute query
+        $builder->orderBy('hr_file_upload.id', 'DESC');
+        $data = $builder->get()->getResultArray();
+
+        if(!empty($data)){
+            return $data;
+        }
+
+        return [];
+    }
+
+    public function getDataFromHrFilesTable($search_data)
+    {   
+        $file_download_base = base_url('downloadFileTableFile/');
+        $builder = $this->fileModel
+            ->select("
+                    files.id, 
+                    files.client_id, 
+                    files.client_branch_id, 
+                    files.policy_id, 
+                    cp.policy_no, 
+                    files.file_name, 
+                    files.action as file_action, 
+                    files.created_at, 
+                    files.created_by, 
+                    files.updated_at, 
+                    files.updated_by,
+                    c.short_name, 
+                    cb.branch_name, 
+                    lc.name as first_name,
+                    CONCAT(UCASE(LEFT(files.status, 1)), LCASE(SUBSTRING(files.status, 2))) as status,
+                    CASE 
+                        WHEN status = 'failed' THEN 1 
+                        ELSE 0 
+                    END AS file_error_status,
+                    CONCAT('{$file_download_base}', files.id, '/api') AS file_download_link
+                ", false)
+            ->join('clients c', 'files.client_id = c.id AND c.is_active = 1', 'left')
+            ->join('client_branch cb', 'files.client_branch_id = cb.id AND cb.is_active = 1', 'left')
+            ->join('client_policy cp', 'files.policy_id = cp.id AND cp.is_active = 1', 'left')
+            ->join('level_contacts lc', 'files.hr_id = lc.id AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+
+
+        if (isset($search_data['policy_id']) && !empty($search_data['policy_id'])) {
+            $builder->where("files.policy_id", $search_data['policy_id']);
+        }
+
+        if (isset($search_data['created_by']) && !empty($search_data['created_by'])) {
+            $builder->where("files.hr_id", $search_data['created_by']);
+        }
+
+        if (isset($search_data['policy_no']) && !empty($search_data['policy_no'])) {
+            $builder->where("cp.policy_no", $search_data['policy_no']);
+        }
+
+        if (isset($search_data['client_id']) && !empty($search_data['client_id'])) {
+            if (is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+                $builder->where("MD5(files.client_id)", $search_data['client_id']);
+            } else {
+                $builder->where("files.client_id", $search_data['client_id']);
+            }
+        }
+
+        if (isset($search_data['file_id']) && !empty($search_data['file_id'])) {
+            $builder->where("files.id", $search_data['file_id']);
+        }
+
+
+        // Execute query
+        $builder->orderBy('files.id', 'DESC');
+        $data = $builder->get()->getResultArray();
+
+        if (!empty($data)) {
+            return $data;
+        }
+
+        return [];
     }
 
     public function hrFileUploadMasters()
@@ -5132,6 +5426,209 @@ class EmployeeRestController extends AdminController
             return $this->respond(['status' => false, 'code' => 400, 'message' => 'Failed to upload the file'], 200);
         }
     }
+
+    public function getTicketClaimStatusIdBasedOnTheDisplayName($claim_status_id)
+    {
+        $claim_status_data_display_name = $this->claimStatusModel->where('is_active', 1)->where('id', $claim_status_id)->first();
+        $claim_status_data_id = $this->claimStatusModel
+                    ->select('id')
+                    ->where('is_active', 1)
+                    ->where('display_name', $claim_status_data_display_name['display_name'])
+                    ->findAll();
+
+        $claim_status_data_id = array_column($claim_status_data_id, 'id');
+        return $claim_status_data_id;
+    }
+
+    public function downloadCdSplitUpFile()
+    {
+        try {
+
+            $file_id = $this->request->getGet('id');
+
+            // Find record
+            $record =  $this->batchFileModel->where('MD5(id)', $file_id)->first();
+            if (!$record) {
+                $data['message'] = 'File record not found';
+                return view('errors/404', $data);
+            }
+
+            $uploadPath = WRITEPATH . 'uploads/import_excel/';
+            $filePath   = $uploadPath . $record['file_name'];
+
+            if (!file_exists($filePath)) {
+                // return $this->failNotFound("File not found on server");
+                $data['message'] = 'The Physical File Not Found';
+                return view('errors/404', $data);
+            }
+
+            // Force file download
+            return $this->response->download($filePath, null)->setFileName($record['file_name']);
+        } catch (\Exception $e) {
+            $data['message'] = 'File record not found';
+            return view('errors/404', $data);
+        }
+    }
+
+
+    public function getHrDashboad()
+    {
+        // $dashboard_id = $this->request->getGet('dashboard_id') ?? null;
+        $client_id = $this->request->getPost('client_id') ?? null;
+        $client_policy_id = $this->request->getPost('client_policy_id') ?? null;
+        $received_data = $this->request->getJSON(true) ?? null;
+         // 🔐 Move this to .env in real projects
+        $METABASE_SECRET_KEY = getenv('METABASE_SECRET_KEY');
+
+        $payload = [
+            'resource' => [
+                // 'dashboard' => 1
+                'dashboard' => 2
+            ],
+            'params' => (object)['client_policy' => $received_data['client_policy_id']],   // MUST be object for Metabase
+            'exp'    => time() + (10 * 60) // 10 minutes
+        ];
+
+        $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
+
+        // // You can either return token only
+        // return $this->response->setJSON([
+        //     'token' => $token,
+        //     'iframe_url' => "https://your-metabase-domain/embed/dashboard/{$token}#bordered=true&titled=true"
+        // ]);
+        // if($this->request->getGet('api') == 1)
+        // {
+             return $this->respond([
+                'status' => 'success',
+                'message' => 'Form data received successfully!',
+                'data' => [
+                'metabaseToken' => $token,
+                'metabaseUrl'   => 'https://nsights.nhanceindia.in']
+            ]);
+        // }
+
+       return view('meta_dashboard_demo_one', [
+            'metabaseToken' => $token,
+            'metabaseUrl'   => 'https://nsights.nhanceindia.in',
+        ]);
+    }
           
 
+    // get policy files
+    public function getPolicyAndEndorsementFiles()
+    {
+        $cd_ac_pk = $this->request->getGet('cd_ac_pk') ?? null;
+
+        $cdModel = new ClientDepositModel();
+        $cd_data = $cdModel->where('id', $cd_ac_pk)
+                            ->where('is_active', 1)
+                            ->where('client_policy_id IS NOT NULL')
+                            ->first();
+
+        if(empty($cd_data)){
+            $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Client Deposit data found for cd_ac_pk=' . $cd_ac_pk);
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
+        }
+
+        $client_policy_data = $this->clientPolicyModel
+                                    ->where('id', $cd_data['client_policy_id'])
+                                    ->where('is_active', 1)
+                                    ->first();
+
+        if(empty($client_policy_data)){
+            $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Client Policy data found for client_policy_id=' . $cd_data['client_policy_id']);
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
+        }
+
+        $policyTransactionModel = new PolicyTransactionModel();        
+        $builder = $policyTransactionModel
+            ->where('is_active', 1)
+            ->where('policy_no', $client_policy_data['policy_no'])
+            ->where('action_type', $cd_data['event_name']);
+
+        if (!empty($cd_data['endorsement_no']) && $cd_data['event_name'] != 'inception') {
+            $builder->where('endorsement_no', $cd_data['endorsement_no']);
+        }
+
+        $policy_transaction_data = $builder->findAll();
+
+        if(empty($policy_transaction_data)){
+            $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Policy Transaction data found for policy_no=' . $client_policy_data['policy_no']);
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
+        }
+
+        $policy_transaction_ids = array_column($policy_transaction_data, 'id');
+
+
+        $ptFilesModel = new PTFileModel();
+        $pt_files_data = $ptFilesModel->where('is_active', 1)->whereIn('pt_id', $policy_transaction_ids)->findAll();
+
+        if(empty($pt_files_data)){
+            $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No PT Files data found for pt_ids=' . implode(',', $policy_transaction_ids));
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
+        }
+
+                   
+        return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files found', 'data' => $pt_files_data], 200);
+ 
+    }
+
+    // download policy file
+    public function downloadPolicyFiles()
+    {   
+        $pt_file_id = $this->request->getGet('file_id') ?? null;
+
+        if(empty($pt_file_id)){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'File ID is required'], 200);
+        }
+
+        $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
+
+        $ptFilesModel = new PTFileModel();
+        $pt_files_data = $ptFilesModel->where('is_active', 1)->where('id', $pt_file_id)->first();
+
+        if(empty($pt_files_data)){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'The Physical File Not Found in server'], 200);
+        }
+
+        $filePath = $uploadFilePath . '/' . $pt_files_data['file_name'];
+
+        if (!file_exists($filePath)) {
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'The Physical File Not Found in server'], 200);
+        }
+
+        // Force file download
+        return $this->response->download($filePath, null)->setFileName($pt_files_data['file_name']);
+    }
+
+    public function bulkEcardDownloadAsZip()
+    {
+        $received_data = $this->request->getJSON(true) ?? null;
+        $this->myLogger->logme('error', 'bulkEcardDownloadAsZip: Received payload = ' . json_encode($received_data ?? []));
+
+        if(empty($received_data['client_policy_id']) && empty($received_data['emp_policy_ids'])){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'client_policy_id or employee_policy_ids is required'], 200);
+        }
+
+        if(empty($received_data['hr_id'])){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'hr_id is required'], 200);
+        }
+
+        $employee_data = $this->employeePolicyModel->getEmployeeDataWithPolicyUsingClientPolicyIdOrEmployeePolicyIds($received_data);
+
+        if(empty($employee_data)){
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No employee data found for the policy'], 200);
+        }
+        
+        $received_data['folder_name'] = 'bulk_ecards_' . $employee_data[0]['policy_no'] . '_' . date('Y-m-d_H-i-s');
+
+        // Dispatch background job to process the bulk e-card download
+        $r = Jobs::addJob(['job_name' => 'bulkEcardDownloadAsZipFromS3', 'payload'  => $received_data]);
+        $this->myLogger->logme('error', 'bulkEcardDownloadAsZip: Job dispatched with result = ' . json_encode($r ?? []));
+        
+        return $this->respond(['status' => true, 'code' => 200, 'message' => 'Bulk E-card download process started. Link share your mail'], 200);
+
+    }        
+
+
 }
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 0547b05f..bc4bfa7c 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -784,7 +784,7 @@ class EmployeeServiceController extends AdminController
         //get file name
         // check_dob_diff('4-APr-1990');die();
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // dd($file);
         $return = [];
         if(!isset($file))
@@ -866,6 +866,14 @@ class EmployeeServiceController extends AdminController
 
         // get policy and rack details
         $policy_details = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
+
+        if(empty($policy_details)){
+            $message = "Policy configuration is incomplete. Cannot proceed.";
+            $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+            $this->fileModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message); 
+        }
+
         $policy_terms = json_decode($policy_details[0]->policy_terms);
         $policy_terms = (array) $policy_terms;// convert obj to array
         $default_age_ratio = isset($policy_terms['age_ratio']) ? json_decode(json_encode($policy_terms['age_ratio']),true) : [];
@@ -876,6 +884,13 @@ class EmployeeServiceController extends AdminController
         $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']);
         // dd($slab_details);
 
+        if(empty($slab_details) || (isset($slab_details['slab_rates']) && empty($slab_details['slab_rates']))){
+            $message = "Policy configuration is incomplete. Cannot proceed.";
+            $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+            $this->fileModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message); 
+        }
+
         //remove header
         unset($excel_data[0]);
         $relationship = $this->general_relationships;
@@ -1062,7 +1077,7 @@ class EmployeeServiceController extends AdminController
         helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // dd($file);
         $return = [];
         if(!isset($file))
@@ -1322,7 +1337,7 @@ class EmployeeServiceController extends AdminController
         {
                     //get file name
                     $file_id = $params['file_id'];
-                    $file = $this->fileModel->find($file_id);
+                    $file = $this->fileModel->find((int)$file_id);
                     // dd($file);
                     $return = [];
                     if(!isset($file))
@@ -1387,6 +1402,8 @@ class EmployeeServiceController extends AdminController
 
                     $employee_data_group_by_family = data_group_by_family($excel_data, 'excel', '', $current_column_action);
                     // dd($employee_data_group_by_family);
+
+                    $employee_insert_count = 0;
                     foreach ($employee_data_group_by_family as $emp_id => $family) 
                     {
 
@@ -1410,11 +1427,25 @@ class EmployeeServiceController extends AdminController
                         $data = calculate_premium_new(family_data:$family,policy_terms: $policy_terms,slab_details : $slab_details,fileArr: $file, existing_units:$existing_units);
                         // dd($data);
                         $employee_data_group_by_family[$emp_id] = $data;
-                        $this->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]);
+                        $res = $this->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]);
+
+                        if($res > 0){
+                            $employee_insert_count++;
+                        }
                     }
 
-                    $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update();
-                    $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]);
+                    if($employee_insert_count > 0){
+                        $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update();
+                        $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]);
+                    }else{
+                        $reason = json_encode([
+                            'error_summary' => [5 => 1],
+                            'error_data'    => "Rack rate configuration issue: Please check the slab rates configuration"
+                        ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                        $this->fileModel->where('id', $file_id)->set(['status' => 'failed','reason' => $reason])->update();
+                        $this->myLogger->logme("error",'{file_id} uploaded failed with reason: Rack rate configuration issue: Please check the slab rates configuration',['file_id' => $file_id]);
+
+                    }
 
                     $this->setPullNotification($this->getFileMetaDataByFileId($file_id,'success'));
 
@@ -1424,7 +1455,7 @@ class EmployeeServiceController extends AdminController
          {
             $client_policy_id = $params['client_policy_id'];
             //get client id
-            $client_id = ($this->clientPolicyModel->select('client_id')->find($client_policy_id))['client_id'];
+            $client_id = ($this->clientPolicyModel->select('client_id')->find((int)$client_policy_id))['client_id'];
             // dd($client_id);
 
             // get policy and rack details
@@ -1470,7 +1501,7 @@ class EmployeeServiceController extends AdminController
          helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // dd($file);
 
         $file_name_with_path = WRITEPATH."/uploads/excel/".$file['file_name'];
@@ -1489,7 +1520,7 @@ class EmployeeServiceController extends AdminController
         $endorsement_data = [];
         $policy_terms = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
         $insurer = new InsurerModel();
-        $insurer = ($insurer->find($policy_terms[0]->insurer_id));
+        $insurer = ($insurer->find((int)$policy_terms[0]->insurer_id));
         // kint::dump($insurer);
         //make closure funciton which is going to use only by this method
         $endorsement = function($data,$file,$row) use ($insurer){
@@ -1621,7 +1652,7 @@ class EmployeeServiceController extends AdminController
          helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // dd($file);
 
         $file_name_with_path = WRITEPATH."/uploads/excel/".$file['file_name'];
@@ -1700,7 +1731,7 @@ class EmployeeServiceController extends AdminController
         helper('excel_util_helper');
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->fileModel->find($file_id);
+        $file = $this->fileModel->find((int)$file_id);
         // dd($file);
 
         $file_name_with_path = WRITEPATH . "/uploads/excel/" . $file['file_name'];
@@ -1827,6 +1858,7 @@ class EmployeeServiceController extends AdminController
         $policy_details = $this->clientPolicyModel->where('id', $file['policy_id'])->first();
         // dd($policy_details);
 
+        $employee_insert_count = 0;
         foreach($familiy_data as $fkey => $value)
         {
             if(is_array($value))
@@ -1959,6 +1991,7 @@ class EmployeeServiceController extends AdminController
                                 // else{ $emp_policy_id = $employee_policy[0]['id']; }
                     
                                  $this->myLogger->logme('error',$log_message);
+                                 $employee_insert_count++;
 
                 }// if end
             }// is array check end
@@ -1967,6 +2000,8 @@ class EmployeeServiceController extends AdminController
                 $this->myLogger->logme('error','######Incoming value is not an array');
             }
         }// for end   
+
+        return $employee_insert_count;
     }//function end
 
 
@@ -2028,7 +2063,7 @@ class EmployeeServiceController extends AdminController
     {
 
         try {
-            $file = $this->fileModel->find($file_id);
+            $file = $this->fileModel->find((int)$file_id);
             $error_data = json_decode($file['reason']);
             // dd($error_data);
             //  return $error_data;
@@ -2187,7 +2222,7 @@ class EmployeeServiceController extends AdminController
             helper('excel_util_helper');
             //get file name
             $file_id = $params['file_id'];
-            $file = $this->fileModel->find($file_id);
+            $file = $this->fileModel->find((int)$file_id);
             // dd($file);
             $return = [];
             if(!isset($file))
diff --git a/app/Controllers/FhplApiController.php b/app/Controllers/FhplApiController.php
new file mode 100644
index 00000000..f2ac8b17
--- /dev/null
+++ b/app/Controllers/FhplApiController.php
@@ -0,0 +1,790 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use App\Models\BatchFileModel;
+use App\Models\EmployeePolicyModel;
+use App\Models\TpaApiDataModel;
+use App\Models\ClientPolicyModel;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\API\ResponseTrait;
+use App\Controllers\Jobs;
+
+class FhplApiController extends BaseController
+{   
+    use ResponseTrait;
+    protected $db;
+    protected $fhplTpaId;
+
+    public function __construct()
+    {
+        $this->db = \Config\Database::connect();
+        $this->fhplTpaId = getenv('FHPL_PRIMARY_KEY_CONSTANT');
+    }
+
+    public function generateAuthToken()
+    {
+        $url = env('FHPL_TOKEN_URL'); 
+
+        // x-www-form-urlencoded body
+        $postData = http_build_query([
+            'UserName'   => env('FHPL_USER_NAME'),  
+            'Password'   => env('FHPL_PASSWORD'),
+            'grant_type' => env('FHPL_GRANT_TYPE'),
+        ]);
+
+        $ch = curl_init();
+
+        curl_setopt_array($ch, [
+            CURLOPT_URL            => $url,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_CUSTOMREQUEST  => 'GET', // SAME AS POSTMAN
+            CURLOPT_POSTFIELDS     => $postData,
+            CURLOPT_HTTPHEADER     => [
+                'Content-Type: application/x-www-form-urlencoded',
+                'Accept: application/json',
+            ],
+            CURLOPT_TIMEOUT        => 30,
+        ]);
+
+        $response = curl_exec($ch);
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        if (curl_errno($ch)) {
+            return $this->response->setJSON([
+                'status' => false,
+                'error'  => curl_error($ch),
+            ]);
+        }
+
+        curl_close($ch);
+
+        return $this->response->setJSON([
+            'status'    => $httpCode === 200,
+            'http_code' => $httpCode,
+            'data'  => json_decode($response, true),
+        ]);
+    }
+
+    public function SubmitClaim($claimId = null) // 515
+    {
+        helper('api');
+
+        $data = $this->db->table('ticket_master tm')
+            ->select('
+                tm.id,
+                tm.emp_mobile as mobileNo,
+                tm.emp_mail as emailId,
+                tm.doa as admissionDate,
+                tm.dod as dischargeDate,
+                tm.hospital_name as hospitalName,
+                tm.claim_amount as requestedAmount,
+                tm.tpa_no as dependentUniqueId,
+                cp.policy_no as policyNo,
+                e.emp_code as memberId,
+                tn.note as disease,
+                cf.url as filePath
+            ')
+            ->join('employees e', 'e.id = tm.emp_id', 'left')
+            ->join('client_policy cp', 'tm.client_policy_id = cp.id', 'left')
+            ->join('ticket_notes tn', 'tn.ticket_id = tm.id', 'left')
+            ->join('claim_files cf', "cf.ticket_id = tm.id AND cf.file_type = 2 AND cf.mime_type='application/pdf'", 'left')
+            ->where('tm.id', $claimId)
+            ->get()
+            ->getRowArray();
+
+
+        if (count($data) && $data['filePath'] == null) {
+            log_message('error', "TPA CLAIM PUSH FAILED FHPL | claimId: '.$claimId.' - Claim or File Missing");
+            return;
+        }
+
+        // Build absolute file path
+        $filename = basename($data['filePath']);
+        $pdfPath = WRITEPATH . 'uploads/claim_files/' . $filename;
+
+        if (!file_exists($pdfPath)) {
+            log_message('error', "TPA CLAIM PUSH FAILED FHPL | claimId: '.$claimId.' - PDF not found on server");
+            return;
+        }
+
+        // Convert PDF to Base64
+        $fileContent = base64_encode(file_get_contents($pdfPath));
+
+        // Generate FHPL Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+        if (empty($tokenResponse['data']['access_token'])) {
+            log_message('error', "TPA CLAIM PUSH FAILED FHPL | claimId: '.$claimId.' - FHPL Token generation failed");
+            return;
+        }
+        $token = $tokenResponse['data']['access_token'];
+
+        // Build FHPL Request
+        $body = [
+            "IssueID"        => $data['dependentUniqueId'], // this key added after seeing the error in responce have to click with fhpl team
+            "Userid"         => getenv('FHPL_USER_NAME'),
+            "PolicyNo"       => $data['policyNo'], // "111700-TATAMTORS", 
+            "UhidNo"         => $data['dependentUniqueId'], // "OIC40830846",
+            "ClaimID"        => (string) $data['id'],
+            "DOA"            => date('Y-m-d', strtotime($data['admissionDate'])), //"2025-10-11",
+            "DateofDischarge"=> $data['dischargeDate'] ? date('Y-m-d', strtotime($data['dischargeDate'])) : null,
+            "ClaimedAmount"  => (float) $data['requestedAmount'],
+            "DocumentType"   => 20, // Fresh Claim
+            "PayeeName"      => $data['memberId'],
+            "HospitalName"  => $data['hospitalName'],
+            "MobileNo"      => $data['mobileNo'],
+            "Documents"     => [
+                [
+                    "documentName"     => $filename,
+                    "documentCategory" => "IRR",
+                    "filecontent"      => $fileContent
+                ]
+            ]
+        ];
+
+        $url = getenv('FHPL_BASE_URL') . "/api/ClaimSubmission";
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        log_message('error', 'TPA CLAIM PUSH  FHPL | claimId: '.$claimId.' | payload: '.json_encode($body));
+
+        $response = call_third_party_api($url, 'POST', $headers, $body);
+
+        log_message('error', 'TPA CLAIM PUSH FHPL RESPONSE | ' . json_encode($response));
+
+        if($response['status'] != true){
+            log_message('error', 'TPA CLAIM PUSH FAILED FHPL | claimId: '.$claimId.' | response: '.json_encode($response));
+            $this->db->table('ticket_master')
+            ->where('id',$claimId)
+            ->update([ 'tpa_push_response' => json_encode($response) ]);
+            return;
+        }
+
+
+        if ($response['status'] === true && !empty($response['data'][0]['ClaimsInfo']))
+        {
+            $claimsInfo = json_decode($response['data'][0]['ClaimsInfo'], true);
+
+            if (!empty($claimsInfo[0]['ClaimID'])) {
+
+                $fhplClaimNo = $claimsInfo[0]['ClaimID'];
+
+                $this->db->table('ticket_master')
+                    ->where('id', $claimId)
+                    ->update([
+                        'claim_number'                => $fhplClaimNo,
+                        'tpa_claim_id'                => $fhplClaimNo,
+                        'tpa_claim_push_reference_no' => $fhplClaimNo,
+                        'updated_at'                  => date('Y-m-d H:i:s')
+                    ]);
+                    
+                log_message('error', 'TPA CLAIM PUSH SUCCESS FHPL | claimId: '.$claimId.' | claimNO: '.$fhplClaimNo);
+                
+            }else {
+                log_message('error', 'TPA CLAIM PUSH API SUCCESS BUT  claimsInfo EMPTY  | response: '.json_encode($response));
+                return;
+            }
+        }
+
+        return;
+        // return $this->response->setJSON($response);
+    }
+
+    public function ClaimDetail($claimId = null) //515
+    {
+        helper('api');
+
+        $ticket = $this->db->table('ticket_master tm')
+            ->select("tm.id, tm.tpa_claim_id as claimNo, cp.policy_no , cp.policy_start_date ,  cp.policy_end_date")
+            ->join('client_policy cp','tm.client_policy_id=cp.id')
+            ->where('tm.id',$claimId)
+            ->get()->getRowArray();
+
+
+        if(!$ticket) return ['status'=>false,'message'=>'Invalid claim'];
+
+        // Generate FHPL Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+        if (empty($tokenResponse['data']['access_token'])) {
+            return ['status' => false,'message' => 'FHPL Token generation failed'];
+        }
+
+        $token = $tokenResponse['data']['access_token'];
+
+        $url = getenv('FHPL_BASE_URL')."/api/GetTPA_ClaimsDetails";
+
+        $body = [
+            "UserName"     => getenv('FHPL_USER_NAME'),
+            "Password"     => getenv('FHPL_PASSWORD'),
+            "PolicyNumber" => $ticket['policy_no'], //"GHI-81-25-00087313-000",
+            "Fromdate"     => $ticket['policy_start_date'],//"2025-04-26",
+            "Todate"       => $ticket['policy_end_date'],//"2025-04-27",
+        ];
+
+        $headers = ["Authorization: Bearer ".$token,"Content-Type: application/json"];
+
+        $response = call_third_party_api($url,'POST',$headers,$body);
+
+        // dd($response);
+
+        if (empty($response['data'][0])) {
+            log_message('error', 'CLAIM STATUS FAILED | for ticket ID: ' . $claimId.' | response: '.json_encode($response));
+            return ['status'  => false,'message' => 'API call failed.','data'    => $response ];
+        }
+
+
+        $status = null;
+
+        // find this claim
+        foreach($response['data'] as $row){
+            if($row['CLAIM_ID']==$ticket['claimNo']){
+                $status = $row['CLAIM_STATUS'];
+            }
+        }
+
+        $map = [
+            "In-Progress"           => 5,
+            "Under Process"         => 5,
+            "Query"                 => 4,
+            "Paid"                  => 11,
+            "Rejected"              => 8,
+            "Approved"              => 8,
+            "Required Information"  => 4,
+        ];
+
+        if( $status != null && isset($map[$status]))
+        {
+            $this->db->table('ticket_master')->where('id',$claimId)->update(['claim_status_id'=>$map[$status],'tpa_claim_status'=>$status]);
+            log_message('error', "CLAIM STATUS SUCCESS | Updated ticket ID $claimId with claim status: $status");
+        }
+
+
+        return ['status' => true,'message' => 'Claim status updated.','updated_status' => $status,'api_response' => $response];
+
+    }
+
+    public function ClaimStatusUpdate()
+    {
+        helper('api');
+
+        $tickets = $this->db->table('ticket_master tm')
+            ->select("tm.id,tm.tpa_claim_id,cp.policy_no")
+            ->join('client_policy cp','tm.client_policy_id=cp.id')
+            ->where('tm.tpa_claim_id IS NOT NULL')
+            ->get()->getResultArray();
+
+        $count=0;
+
+        foreach($tickets as $t){
+            $this->ClaimDetail($t['id']);
+            $count++;
+        }
+
+        return $this->response->setJSON(['status'=>true,'updated'=>$count]);
+    }
+
+    public function EcardRequest($employeeId = null,$policyNo = null,$uhid = null)
+    {
+        helper('api');
+
+        // Generate FHPL Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+        if (empty($tokenResponse['data']['access_token'])) {
+            log_message('error', 'Ecard Request FAILED | employeeId: '.$employeeId.' | policyNo: '.$policyNo.' | Message: FHPL Token generation failed');
+            return null;
+        }
+        $token = $tokenResponse['data']['access_token'];
+
+        $url = getenv('FHPL_BASE_URL')."/api/GetEcard";
+
+        $body = [
+            "UserName"     => getenv('FHPL_USER_NAME'),
+            "Password"     => getenv('FHPL_PASSWORD'),
+            "PolicyNumber" => $policyNo, //'10/12/2025/16/17', 
+            "EmployeeID"   => $employeeId, //'101225', 
+        ];
+
+        $headers = ["Authorization: Bearer ".$token,"Content-Type: application/json"];
+
+        $response = call_third_party_api($url,'POST',$headers,$body);
+        // dd($response);
+
+        if (($response['status'] ?? false) !== true) {
+            log_message('error', 'Ecard Request FAILED | response: ' . json_encode($response));
+            return null;
+        }
+
+        if (empty($response['data'][0])) {
+            log_message('error', 'Ecard Request FAILED | Empty data | response: ' . json_encode($response));
+            return null;
+        }
+
+        $apiData = $response['data'][0];
+
+        if (($apiData['STATUS'] ?? '') === 'SUCCESS') {
+
+            $ecardUrl = $apiData['E_Card'] ?? '';
+
+            if (!empty($ecardUrl)) {
+                log_message(
+                    'info',
+                    'Ecard Request PUSH SUCCESS | employeeId: ' . $employeeId .
+                    ' | policyNo: ' . $policyNo .
+                    ' | ecardUrl: ' . $ecardUrl
+                );
+                return $ecardUrl;
+            }
+        }
+
+        log_message('error', 'Ecard Request FAILED | response: ' . json_encode($response));
+        return null;
+    }
+
+    public function FhplGetBenefDetails($requestData = null)
+    {
+
+        $function_calling_type = $requestData['return_type'] ?? 'job';
+
+        try {
+            
+            helper('api');
+
+            $policyNo = $requestData['policy_no'] ?? null;
+            $client_policy_id = $requestData['client_policy_id'] ?? null;
+
+            if (empty($policyNo)) {
+                log_message('error', 'TPA ID PULL | policy_no missing in request');
+                if($function_calling_type == "job"){
+                    return ['status' => false, 'message' => 'policy_no required'];
+                }else{
+                    return $this->respond(['status' => false, 'message' => 'policy_no required']);
+                }
+            }
+
+            if (empty($client_policy_id)) {
+                log_message('error', 'TPA ID PULL | client_policy_id missing in request');
+                if($function_calling_type == "job"){
+                    return ['status' => false, 'message' => 'client_policy_id required'];
+                }else{
+                    return $this->respond(['status' => false, 'message' => 'client_policy_id required']);
+                }
+            }
+
+            log_message('error', "TPA ID PULL | called for policy_no: {$policyNo} , client_policy_id: {$client_policy_id}");
+
+            // Fetch file download dates
+            $batchFiles = $this->db->table('batch_files f')
+                ->select("f.created_at")
+                ->where('f.client_policy_id', $client_policy_id)
+                ->where('f.insurer_or_tpa', 'tpa')
+                ->where('f.actions', 'export')
+                ->get()
+                ->getResultArray();
+
+            if (empty($batchFiles)) {
+                log_message('error', 'TPA ID PULL FAILED | batchFiles is empty  for this tpa id pull request');
+                if($function_calling_type == "job"){
+                    return ['status' => false, 'message' => 'batchFiles not found'];
+                }else{
+                    return $this->respond(['status' => false, 'message' => 'batchFiles not found']);
+                }
+            }
+
+            // Generate FHPL Token
+            $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+            if (empty($tokenResponse['data']['access_token'])) {
+                log_message('error', 'TPA ID PULL | FHPL Token generation failed');
+                if($function_calling_type == "job"){
+                    return ['status' => false, 'message' => 'FHPL Token generation failed'];
+                }else{
+                    return $this->respond(['status' => false, 'message' => 'FHPL Token generation failed']);
+                }
+            }
+            $token = $tokenResponse['data']['access_token'];
+
+            $url = getenv('FHPL_BASE_URL') . "/api/GetEnrollmentDetailsPolicy";
+
+            $headers = [
+                "Authorization: Bearer " . $token,
+                "Content-Type: application/json"
+            ];
+
+            $startIndex = 0;
+            $range = 100;
+            $allMembers = [];
+
+            while (true) {
+
+                $body = [
+                    "UserName"     => getenv('FHPL_USER_NAME'),
+                    "Password"     => getenv('FHPL_PASSWORD'),
+                    "PolicyNumber" => $policyNo,
+                    "StartIndex"   => $startIndex,
+                    "Range"        => $range
+                ];
+
+                log_message('error', "TPA ID PULL | API parems " . json_encode([$url, 'POST', $headers, $body]));
+
+                $response = call_third_party_api($url, 'POST', $headers, $body);
+
+                if (($response['status'] ?? false) !== true) {
+                    log_message('error', 'FHPL API FAILED | response: ' . json_encode($response));
+                    break;
+                }
+
+                if (
+                    !isset($response['data']) ||
+                    !is_array($response['data']) ||
+                    count($response['data']) === 0 ||
+                    !array_is_list($response['data'])   // PHP 8+ safe check
+                ) {
+                    //  STOP when data is not a valid list
+                    break;
+                }
+
+                $allMembers = array_merge($allMembers, $response['data']);
+
+                //  Move to next page
+                $startIndex += $range;
+            }
+
+            if(empty($allMembers))
+            {
+
+                // update file table status after the tpa id failed to update
+                if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                    $file_model = new BatchFileModel();
+                    $file_model->where('id', $requestData['file_id'])->set('status', 'failed-8')->update();
+                    log_message('error', "Files table status updated for the file id : {$requestData['file_id']}");
+                } else {
+                    log_message('error', "Failed to update file table status.");
+                }
+
+                log_message('error', 'TPA ID PULL API FAILED | API failed: Empty menber data for this pull request');
+
+                if($function_calling_type == "job"){
+                    return ['status' => false, 'message' => 'API call failed', 'data' => 'Empty menber data for this pull request'];
+                }else{
+                    return $this->respond(['status' => false, 'message' => 'API call failed', 'data' => 'Empty menber data for this pull request']);
+                }
+
+            }
+
+            // dd($allMembers);
+
+            //save API data as JSON for analysis
+            $json = json_encode($allMembers, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+            // $filename = time() . '.json';
+            $filePath = WRITEPATH . 'tmp/'.time().'_'.$requestData['file_id'].'.json';
+            file_put_contents($filePath, $json);
+
+            //call a job for dump JSON data to DB
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'saveFhplAPIData', 'payload' => [ 'file_id' => $requestData['file_id'],'json_file_path'    => $filePath ]]);
+
+            // ================= MATCHING LOGIC =================
+
+            $employeePolicyModel = new EmployeePolicyModel();
+
+            $employeePolicyData = $employeePolicyModel
+                ->join('employees', 'employees.id = employee_polices.employee_id')
+                ->where('employee_polices.client_policy_id', $client_policy_id)
+                ->where('employee_polices.tpa_id IS NULL')
+                ->findAll();
+
+            $updated = 0;
+
+            foreach ($employeePolicyData as $policy) {
+                $hasMatchForThisPolicy = false;
+                foreach ($allMembers as $m) {
+
+                    if (
+                        strtolower(trim($policy['name'])) === strtolower(trim($m['EMPLOYEE_NAME'] ?? '')) &&
+                        ($policy['emp_code'] ?? '') == ($m['EMPLOYEE_ID'] ?? '') &&
+                        strtolower($policy['relationship']) === strtolower($m['RELATION'] ?? '')
+                    ) {
+                        
+                        $hasMatchForThisPolicy = true;
+                        
+
+                        $sql = "UPDATE employee_polices SET tpa_id = ?  WHERE id = ?";
+                        $this->db->query($sql, [$m['TPA_TPADETAIL_ID'], $policy['emp_policy_id']]);
+
+                        // for e-card send
+                        if(strtolower(trim($policy['relationship'])) == 'self'){
+                            $employee_policy_ids[] = $policy['emp_policy_id'];
+                        }
+ 
+                        if ($this->db->affectedRows() > 0) {
+                           $updated++;
+                           log_message('error', "✅ Updated tpa_id={$m['TPA_TPADETAIL_ID']} for emp_policy_id={$policy['emp_policy_id']} policy={$policyNo}");
+                        } else {
+                           log_message('error', "⚠️ No update (already set or not matched) for emp_policy_id={$policy['emp_policy_id']} policy={$policyNo}");
+                        }
+                    }
+                }
+            }
+
+            // Handle NO MATCH for this policy
+            if (!$hasMatchForThisPolicy) {
+
+                $nhanceSideData = [
+                    'name'         => $policy_data['name'] ?? null,
+                    'emp_code'     => $policy_data['emp_code'] ?? null,
+                    'relationship' => $policy_data['relationship'] ?? null,
+                    'gender'       => $policy_data['gender'] ?? null,
+                    'dob'          => $policy_data['dob'] ?? null,
+                ];
+                $batch_file_success = 'partially success';
+
+                log_message(
+                    'error',
+                    "❌ No match for Nhance = " . json_encode($nhanceSideData)
+                );
+            }
+
+            // send e-card
+            if(!empty($employee_policy_ids)){
+                log_message('error', "sendMailForDownloadingECard JOB PUSHED.");
+                Jobs::addJob(['job_name' => 'sendMailForDownloadingECard', 'payload' => ['ids' => $employee_policy_ids, 'client_policy_id' => $client_policy_id]]);
+            }
+
+            // update file table status after the tpa id successfully updated 
+            if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                $file_model = new BatchFileModel();
+
+                $file_model->where('id', $requestData['file_id'])->set('status', $batch_file_success)->update();
+                log_message('error', "Files table status updated for the file id : {$requestData['file_id']}");
+            } else {
+                log_message('error', "Failed to update file table status.");
+            }
+
+            $totalCount = count($allMembers);
+
+            log_message('error', "TPA ID PULL SUCCESS | completed. Total fetched={$totalCount}, updated={$updated}");
+
+            if($function_calling_type == "job"){
+                return [
+                    'status' => true,
+                    'message' => 'Updated successfully',
+                    'total_fetched' => $totalCount,
+                    'total_updated' => $updated
+                ];
+            }else{
+                return $this->respond([
+                    'status' => true,
+                    'message' => 'Updated successfully',
+                    'total_fetched' => $totalCount,
+                    'total_updated' => $updated
+                ]);
+            }
+        } catch (\Throwable $th) {
+
+            // update file table status after the tpa id failed to update
+            if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                $file_model = new BatchFileModel();
+                $file_model->where('id', $requestData['file_id'])->set('status', 'failed-8')->update();
+                log_message('error', "Files table status updated for the file id : {$requestData['file_id']}");
+            } else {
+                log_message('error', "Failed to update file table status.");
+            }
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            log_message('error', 'Exception thrown while calling GetBenefDetails API: ' . json_encode($errorData));
+            if($function_calling_type == "job"){
+                return ['status' => false, 'message' => 'API call failed', 'data' => $errorData];
+            }else{
+                return $this->respond(['status' => false, 'message' => 'API call failed', 'data' => $errorData]);
+            }
+        }
+    }
+
+
+    // public function FhplGetBenefDetails($requestData = null)
+    // {
+    //     helper('api');
+
+    //     $policyNo = $requestData['policy_no'] ?? "10/12/2025/16/17";
+    //     $client_policy_id = $requestData['client_policy_id'] ?? 0;
+
+    //     // Generate FHPL Token
+    //     $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+    //     if (empty($tokenResponse['data']['access_token'])) {
+    //         return $this->response->setJSON(['status' => false,'message' => 'FHPL Token generation failed']);
+    //     }
+    //     $token = $tokenResponse['data']['access_token'];
+
+    //     $url = getenv('FHPL_BASE_URL')."/api/GetEnrollmentDetailsPolicy";
+
+    //     $headers = [
+    //         "Authorization: Bearer ".$token,
+    //         "Content-Type: application/json"
+    //     ];
+
+    //     $startIndex = 0;
+    //     $range = 100;
+    //     $allMembers = [];
+
+    //     do {
+    //         $body = [
+    //             "UserName"     => getenv('FHPL_USER_NAME'),
+    //             "Password"     => getenv('FHPL_PASSWORD'),
+    //             "PolicyNumber" => $policyNo,
+    //             "StartIndex"   => $startIndex,
+    //             "Range"       => $range
+    //         ];
+
+    //         $response = call_third_party_api($url,'POST',$headers,$body);
+
+    //         dd($response);
+
+    //         if(empty($response['data']['Members'])){
+    //             break;
+    //         }
+
+    //         $allMembers = array_merge($allMembers,$response['data']['Members']);
+
+    //         $startIndex += $range;
+
+    //     } while($startIndex < ($response['data']['Total'] ?? 0));
+
+
+    //     dd($allMembers);
+
+    //     // Now same matching logic you already have
+    //     $employeePolicyModel = new EmployeePolicyModel();
+
+    //     $employeePolicyData = $employeePolicyModel
+    //         ->join('employees','employees.id=employee_polices.employee_id')
+    //         ->where('employee_polices.client_policy_id',$client_policy_id)
+    //         ->where('employee_polices.tpa_id IS NULL')
+    //         ->findAll();
+
+    //     $updated = 0;
+
+    //     foreach($employeePolicyData as $policy){
+    //         foreach($allMembers as $m){
+
+    //             if(
+    //                 strtolower(trim($policy['name']))==strtolower(trim($m['Name'])) &&
+    //                 $policy['emp_code']==$m['MemberID'] &&
+    //                 strtolower($policy['relationship'])==strtolower($m['Relation'])
+    //             ){
+    //                 $this->db->table('employee_polices')
+    //                     ->where('id',$policy['emp_policy_id'])
+    //                     ->update(['tpa_id'=>$m['UHID']]);
+
+    //                 $updated++;
+    //             }
+    //         }
+    //     }
+
+    //     return [
+    //         'status'=>true,
+    //         'total_fetched'=>count($allMembers),
+    //         'updated'=>$updated
+    //     ];
+    // }
+
+    public function syncFhplClaimsToNhance()
+    {
+        helper('api');
+
+        // Generate FHPL Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+        if (empty($tokenResponse['data']['access_token'])) {
+            return $this->response->setJSON(['status' => false,'message' => 'FHPL Token generation failed']);
+        }
+
+        $token = $tokenResponse['data']['access_token'];
+
+        $url = getenv('FHPL_BASE_URL')."/api/GetTPA_ClaimsDetails";
+
+        $headers = [
+            "Authorization: Bearer ".$token,
+            "Content-Type: application/json"
+        ];
+
+        $policies = $this->db->table('client_policy')
+            ->where('tpa_id',$this->fhplTpaId)
+            ->get()->getResultArray();
+
+        $finalResult=[];
+
+        foreach($policies as $policy){
+
+            $body = [
+                "UserName"     => getenv('FHPL_USER_NAME'),
+                "Password"     => getenv('FHPL_PASSWORD'),
+                "PolicyNumber" => $policy['policy_no'],
+                "Fromdate"     => $policy['policy_start_date'],
+                "Todate"       => $policy['policy_end_date']
+            ];
+
+            $response = call_third_party_api($url,'POST',$headers,$body);
+
+            if(!empty($response['data'])){
+                $finalResult = array_merge($finalResult,$response['data']);
+            }
+        }
+
+        // Insert / update ticket_master same way you already do for MediAssist
+        foreach($finalResult as $row){
+
+            $status = $row['CLAIM_STATUS'];
+
+            $map = [
+                "Under Process"=>5,
+                "Paid"=>11,
+                "Rejected"=>8,
+                "Approved"=>8
+            ];
+
+            $claimStatus = $map[$status] ?? 1;
+
+            $this->db->table('ticket_master')->insert([
+                'policy_no'=>$row['POLICY_NO'],
+                'claim_number'=>$row['CLAIM_ID'],
+                'tpa_claim_id'=>$row['CLAIM_ID'],
+                'emp_code'=>$row['EMPLOYEE_NO'],
+                'insured_name'=>$row['PATIENT_NAME'],
+                'claim_amount'=>$row['CLAIM_AMOUNT'],
+                'hospital_name'=>$row['HOSPITAL_NAME'],
+                'doa'=>$row['DATE_OF_ADMISSION'],
+                'dod'=>$row['DATE_OF_DISCHARGE'],
+                'claim_status_id'=>$claimStatus,
+                'tpa_id'=>$this->fhplTpaId
+            ]);
+        }
+
+        return ['status'=>true,'total'=>count($finalResult)];
+    }
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/app/Controllers/GoogleDriveController.php b/app/Controllers/GoogleDriveController.php
index bf689112..31c0a6a7 100644
--- a/app/Controllers/GoogleDriveController.php
+++ b/app/Controllers/GoogleDriveController.php
@@ -116,7 +116,7 @@ class GoogleDriveController extends BaseController
             }
 
         //if not in cache then get it from grdrive    
-        $client = $this->clientModel->find($client_id);
+        $client = $this->clientModel->find((int)$client_id);
         $clientShortName = $client['short_name']; // Assuming short_name is the column for client's short name
         }
         else if($client_policy_id)
diff --git a/app/Controllers/HealthIndiaApiController.php b/app/Controllers/HealthIndiaApiController.php
new file mode 100644
index 00000000..9ac26461
--- /dev/null
+++ b/app/Controllers/HealthIndiaApiController.php
@@ -0,0 +1,785 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use App\Models\BatchFileModel;
+use App\Models\EmployeePolicyModel;
+use App\Models\TpaApiDataModel;
+use App\Models\ClientPolicyModel;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\API\ResponseTrait;
+use App\Controllers\Jobs;
+
+class HealthIndiaApiController extends BaseController
+{   
+    use ResponseTrait;
+    protected $db;
+    protected $healthIndiaTpaId;
+
+    public function __construct()
+    {
+        $this->db = \Config\Database::connect();
+        $this->healthIndiaTpaId = getenv('HEALTH_INDIA_PRIMARY_KEY_CONSTANT');
+    }
+
+    public function generateAuthToken()
+    {
+        $url = getenv('HEALTH_INDIA_TOKEN_URL'); // https://software.healthindiatpa.com/HIITPABROKERAPI/JWT/GenerateJWTAuth
+
+        // Basic Authentication credentials
+        $username = getenv('HEALTH_INDIA_USERNAME'); // /MU4gwfBYC71M1QnczasegH0vPM5IMbESO4iy4wbUrQ=
+        $password = getenv('HEALTH_INDIA_PASSWORD'); // KoVi+w2WGA+ET6fHN3kdBamHNsDKbA+kUtuF++4jWcg=
+        
+        $ch = curl_init();
+
+         curl_setopt_array($ch, [
+            CURLOPT_URL            => $url,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_POST           => true,
+            CURLOPT_USERPWD        => $username . ':' . $password,
+            CURLOPT_POSTFIELDS     => '{}',
+
+            CURLOPT_HTTPHEADER     => [
+                'Content-Type: application/json',
+                'Accept: application/json',
+            ],
+
+            CURLOPT_TIMEOUT        => 30,
+        ]);
+
+        $response = curl_exec($ch);
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        if (curl_errno($ch)) {
+            log_message('error', 'HEALTH_INDIA TOKEN GENERATION FAILED | Error: ' . curl_error($ch));
+            curl_close($ch);
+            return $this->response->setJSON([
+                'status' => false,
+                'error'  => curl_error($ch),
+            ]);
+        }
+
+        curl_close($ch);
+
+        $responseData = json_decode($response, true);
+
+        if ($httpCode === 200 && isset($responseData['status']) && $responseData['status'] === true) {
+            log_message('error', 'HEALTH_INDIA TOKEN GENERATION SUCCESS | Token: ' . ($responseData['result'][0]['access_token'] ?? 'N/A'));
+        } else {
+            log_message('error', 'HEALTH_INDIA TOKEN GENERATION FAILED | Response: ' . $response);
+        }
+
+        return $this->response->setJSON([
+            'status'    => $httpCode === 200,
+            'http_code' => $httpCode,
+            'data'      => $responseData,
+        ]);
+    }
+
+    public function SubmitClaim($claimId = 515)
+    {
+        helper('api');
+
+        log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA | Started for claimId: ' . $claimId);
+
+        $data = $this->db->table('ticket_master tm')
+            ->select('
+                tm.id,
+                tm.emp_mobile as mobileNo,
+                tm.emp_mail as emailId,
+                tm.doa as admissionDate,
+                tm.dod as dischargeDate,
+                tm.hospital_pin_code as hospitalCode,
+                tm.hospital_name as hospitalName,
+                tm.hospital_address as hospitalAddress,
+                tm.hospital_phone_no as hospitalNumber,
+                tm.claim_amount as claimedAmount,
+                tm.tpa_no as memberId,
+                tm.claim_description as ailmentDescription,
+                cp.policy_no as policyNumber,
+                e.emp_code as employeeCode,
+                tn.note as disease,
+                cf.url as filePath,
+                tm.claim_type as claimType,
+                tm.claim_type as benefitType
+            ')
+            ->join('employees e', 'e.id = tm.emp_id', 'left')
+            ->join('client_policy cp', 'tm.client_policy_id = cp.id', 'left')
+            ->join('ticket_notes tn', 'tn.ticket_id = tm.id', 'left')
+            ->join('claim_files cf', "cf.ticket_id = tm.id AND cf.file_type = 2 AND cf.mime_type='application/pdf'", 'left')
+            ->where('tm.id', $claimId)
+            ->get()
+            ->getRowArray();
+
+        // dd($data);
+
+        if (!$data) {
+            log_message('error', "TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: {$claimId} - Claim not found");
+            return;
+        }
+
+        if ($data['filePath'] == null) {
+            log_message('error', "TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: {$claimId} - File Missing");
+            return;
+        }
+
+        // Build absolute file path
+        $filename = basename($data['filePath']);
+        $pdfPath = WRITEPATH . 'uploads/claim_files/' . $filename;
+
+        if (!file_exists($pdfPath)) {
+            log_message('error', "TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: {$claimId} - PDF not found on server at path: {$pdfPath}");
+            return;
+        }
+
+        // Convert PDF to Base64
+        $fileContent = base64_encode(file_get_contents($pdfPath));
+
+        // Generate Health India Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+        if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+            log_message('error', "TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: {$claimId} - Token generation failed");
+            return;
+        }
+        $token = $tokenResponse['data']['result'][0]['access_token'];
+
+        // Map claim type: Reimbursement or Cashless
+        $claimTypeMap = [
+            'reimbursement' => 'Reimbursement',
+            'cashless' => 'Cashless',
+        ];
+        $mappedClaimType = $claimTypeMap[strtolower($data['claimType'] ?? 'reimbursement')] ?? 'Reimbursement';
+
+        // Map benefit type: IPD or OPD
+        $benefitTypeMap = [
+            'ipd' => 'IPD',
+            'opd' => 'OPD',
+        ];
+        $mappedBenefitType = $benefitTypeMap[strtolower($data['benefitType'] ?? 'ipd')] ?? 'IPD';
+
+        // Build Health India Claim Submission Request (API Section 5)
+        $body = [
+            "policY_NUMBER"         => $data['policyNumber'],
+            "employeE_CODE"         => $data['employeeCode'],
+            "membeR_ID"             => $data['memberId'],
+            "claiM_TYPE"            => $mappedClaimType,
+            "benefiT_TYPE"          => $mappedBenefitType,
+            "claimeD_AMOUNT"        => (string) $data['claimedAmount'],
+            "datE_OF_ADMISSION"     => date('Y-m-d', strtotime($data['admissionDate'])),
+            "ailmenT_DESCRIPTION"   => $data['ailmentDescription'] ?? 'NA',
+            "hospitaL_CODE"         => $data['hospitalCode'] ?? '',
+            "hospitaL_NAME"         => $data['hospitalName'] ?? '',
+            "hospitaL_ADDRESS"      => $data['hospitalAddress'] ?? '',
+            "hospitaL_NUMBER"       => $data['hospitalNumber'] ?? '',
+            "pdF_BYTES"             => [$fileContent]
+        ];
+
+        // $body = [
+        //     'policY_NUMBER'        => '141600_POLICY_AWAITED',
+        //     'employeE_CODE'        => 'DECP000',
+        //     'membeR_ID'            => '10662420SE',
+        //     'claiM_TYPE'           => 'Reimbursement',
+        //     'benefiT_TYPE'         => 'IPD',
+        //     'claimeD_AMOUNT'       => '102',
+        //     'datE_OF_ADMISSION'    => '2026-01-19',
+        //     'ailmenT_DESCRIPTION'  => 'Fever',
+        //     'hospitaL_CODE'        => '100900',
+        //     'hospitaL_NAME'        => 'Test',
+        //     'hospitaL_ADDRESS'     => 'YEst',
+        //     'hospitaL_NUMBER'      => '2233445566',
+        //     "pdF_BYTES"             => [$fileContent]
+        // ];
+
+
+        $url = getenv('HEALTH_INDIA_BASE_URL') . "/Intimation/GetClaimIntimation";
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA | claimId: ' . $claimId . ' | URL: ' . $url  );
+
+        $response = call_third_party_api($url, 'POST', $headers, $body);
+
+        dd($response);
+
+        log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA RESPONSE | claimId: ' . $claimId . ' | response: ' . json_encode($response));
+
+        if ($response['status'] != true) {
+            log_message('error', 'TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: ' . $claimId . ' | response: ' . json_encode($response));
+            $this->db->table('ticket_master')
+                ->where('id', $claimId)
+                ->update(['tpa_push_response' => json_encode($response)]);
+            return;
+        }
+
+        if ($response['status'] === true && !empty($response['data']['result'][0]['ccn'])) {
+            $ccn = $response['data']['result'][0]['ccn'];
+            $ccnExt = $response['data']['result'][0]['ccN_EXT'] ?? '0';
+
+            $this->db->table('ticket_master')
+                ->where('id', $claimId)
+                ->update([
+                    'claim_number'                => $ccn,
+                    'tpa_claim_id'                => $ccn,
+                    'tpa_claim_push_reference_no' => $ccn . '(' . $ccnExt . ')',
+                    'updated_at'                  => date('Y-m-d H:i:s')
+                ]);
+
+            log_message('error', 'TPA CLAIM PUSH SUCCESS HEALTH_INDIA | claimId: ' . $claimId . ' | CCN: ' . $ccn . ' | CCN_EXT: ' . $ccnExt);
+        } else {
+            log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA API SUCCESS BUT CCN EMPTY | claimId: ' . $claimId . ' | response: ' . json_encode($response));
+            return;
+        }
+
+        return;
+    }
+
+    public function ClaimDetail($claimId = null)
+    {
+        helper('api');
+
+        log_message('error', 'CLAIM STATUS HEALTH_INDIA | Started for claimId: ' . $claimId);
+
+        $ticket = $this->db->table('ticket_master tm')
+            ->select("tm.id, tm.tpa_claim_id as ccn, cp.policy_no, cp.policy_start_date, cp.policy_end_date, tm.emp_code")
+            ->join('client_policy cp', 'tm.client_policy_id=cp.id')
+            ->where('tm.id', $claimId)
+            ->get()->getRowArray();
+
+        if (!$ticket) {
+            log_message('error', 'CLAIM STATUS FAILED HEALTH_INDIA | claimId: ' . $claimId . ' - Invalid claim');
+            return ['status' => false, 'message' => 'Invalid claim'];
+        }
+
+        // Generate Health India Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+        if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+            log_message('error', 'CLAIM STATUS FAILED HEALTH_INDIA | claimId: ' . $claimId . ' - Token generation failed');
+            return ['status' => false, 'message' => 'Token generation failed'];
+        }
+
+        $token = $tokenResponse['data']['result'][0]['access_token'];
+
+        $url = getenv('HEALTH_INDIA_BASE_URL') . "/Claims/GetClaims";
+
+        // Using claim number wise approach (Section 7.3 - option 3)
+        $body = [
+            "policY_NUMBER" => $ticket['policy_no'],
+            "CCN"           => $ticket['ccn'],
+            "CCN_EXT"       => "0"
+        ];
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        log_message('error', 'CLAIM STATUS HEALTH_INDIA | claimId: ' . $claimId . ' | Request: ' . json_encode($body));
+
+        $response = call_third_party_api($url, 'POST', $headers, $body);
+
+        log_message('error', 'CLAIM STATUS HEALTH_INDIA | claimId: ' . $claimId . ' | Response: ' . json_encode($response));
+
+        if (empty($response['data']['result'][0])) {
+            log_message('error', 'CLAIM STATUS FAILED HEALTH_INDIA | claimId: ' . $claimId . ' | Empty response data');
+            return ['status' => false, 'message' => 'API call failed.', 'data' => $response];
+        }
+
+        $claimData = $response['data']['result'][0];
+        $status = $claimData['claiM_STATUS'] ?? null;
+
+        // Status mapping based on API documentation
+        $map = [
+            "Under Process"         => 5,
+            "Pending for Bill Entry" => 5,
+            "Query"                 => 4,
+            "Paid"                  => 11,
+            "Rejected"              => 8,
+            "Approved"              => 8,
+            "Outstanding"           => 5,
+        ];
+
+        if ($status != null && isset($map[$status])) {
+            $this->db->table('ticket_master')
+                ->where('id', $claimId)
+                ->update([
+                    'claim_status_id' => $map[$status],
+                    'tpa_claim_status' => $status
+                ]);
+            log_message('error', "CLAIM STATUS SUCCESS HEALTH_INDIA | Updated claimId: {$claimId} with status: {$status}");
+        } else {
+            log_message('error', "CLAIM STATUS HEALTH_INDIA | claimId: {$claimId} | Unknown status: {$status}");
+        }
+
+        return [
+            'status'         => true,
+            'message'        => 'Claim status updated.',
+            'updated_status' => $status,
+            'api_response'   => $response
+        ];
+    }
+
+    public function ClaimStatusUpdate()
+    {
+        helper('api');
+
+        log_message('error', 'CLAIM STATUS UPDATE BULK HEALTH_INDIA | Started');
+
+        $tickets = $this->db->table('ticket_master tm')
+            ->select("tm.id, tm.tpa_claim_id, cp.policy_no")
+            ->join('client_policy cp', 'tm.client_policy_id=cp.id')
+            ->where('tm.tpa_claim_id IS NOT NULL')
+            ->where('cp.tpa_id', $this->healthIndiaTpaId)
+            ->get()->getResultArray();
+
+        $count = 0;
+
+        foreach ($tickets as $t) {
+            $this->ClaimDetail($t['id']);
+            $count++;
+        }
+
+        log_message('error', 'CLAIM STATUS UPDATE BULK HEALTH_INDIA | Completed | Updated: ' . $count);
+
+        return $this->response->setJSON(['status' => true, 'updated' => $count]);
+    }
+
+    public function EcardRequest($employeeId = null, $policyNo = null, $memberId = null)
+    {
+        helper('api');
+
+        log_message('error', "ECARD REQUEST HEALTH_INDIA | Started | employeeId: {$employeeId} | policyNo: {$policyNo} | memberId: {$memberId}");
+
+        // Generate Health India Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+        if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+            log_message('error', "ECARD REQUEST FAILED HEALTH_INDIA | employeeId: {$employeeId} | policyNo: {$policyNo} | Message: Token generation failed");
+            return null;
+        }
+        $token = $tokenResponse['data']['result'][0]['access_token'];
+
+        // API Section 3.3 - Individual member e-card
+        $url = getenv('HEALTH_INDIA_BASE_URL') . "/Member/GetMemberEcard";
+
+        $body = [
+            "policY_NUMBER" => $policyNo,
+            "employeE_CODE" => $employeeId,
+            "membeR_ID"     => $memberId
+        ];
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        log_message('error', 'ECARD REQUEST HEALTH_INDIA | Request: ' . json_encode($body));
+
+        $response = call_third_party_api($url, 'POST', $headers, $body);
+
+        log_message('error', 'ECARD REQUEST HEALTH_INDIA | Response: ' . json_encode($response));
+
+        if (($response['status'] ?? false) !== true) {
+            log_message('error', 'ECARD REQUEST FAILED HEALTH_INDIA | response: ' . json_encode($response));
+            return null;
+        }
+
+        if (empty($response['data']['result'][0])) {
+            log_message('error', 'ECARD REQUEST FAILED HEALTH_INDIA | Empty data | response: ' . json_encode($response));
+            return null;
+        }
+
+        $apiData = $response['data']['result'][0];
+
+        if (($apiData['message'] ?? '') === 'SUCCESS') {
+            $ecardUrl = $apiData['membeR_ECARD'] ?? '';
+
+            if (!empty($ecardUrl)) {
+                log_message('error', "ECARD REQUEST SUCCESS HEALTH_INDIA | employeeId: {$employeeId} | policyNo: {$policyNo} | memberId: {$memberId} | ecardUrl: {$ecardUrl}");
+                return $ecardUrl;
+            }
+        }
+
+        log_message('error', 'ECARD REQUEST FAILED HEALTH_INDIA | response: ' . json_encode($response));
+        return null;
+    }
+
+    public function HealthIndiaGetBenefDetails($requestData = null)
+    {
+        $function_calling_type = $requestData['return_type'] ?? 'job';
+
+        try {
+            helper('api');
+
+            $policyNo = $requestData['policy_no'] ?? '141600_POLICY_AWAITED';
+            $client_policy_id = $requestData['client_policy_id'] ?? 6473;
+
+
+
+            if (empty($policyNo)) {
+                log_message('error', 'TPA ID PULL HEALTH_INDIA | policy_no missing in request');
+                if ($function_calling_type == "job") {
+                    return ['status' => false, 'message' => 'policy_no required'];
+                } else {
+                    return $this->respond(['status' => false, 'message' => 'policy_no required']);
+                }
+            }
+
+            if (empty($client_policy_id)) {
+                log_message('error', 'TPA ID PULL HEALTH_INDIA | client_policy_id missing in request');
+                if ($function_calling_type == "job") {
+                    return ['status' => false, 'message' => 'client_policy_id required'];
+                } else {
+                    return $this->respond(['status' => false, 'message' => 'client_policy_id required']);
+                }
+            }
+
+            log_message('error', "TPA ID PULL HEALTH_INDIA | called for policy_no: {$policyNo}, client_policy_id: {$client_policy_id}");
+
+            // Fetch file download dates
+            // $batchFiles = $this->db->table('batch_files f')
+            //     ->select("f.created_at")
+            //     ->where('f.client_policy_id', $client_policy_id)
+            //     ->where('f.insurer_or_tpa', 'tpa')
+            //     ->where('f.actions', 'export')
+            //     ->get()
+            //     ->getResultArray();
+
+
+
+            // if (empty($batchFiles)) {
+            //     log_message('error', 'TPA ID PULL FAILED HEALTH_INDIA | batchFiles is empty for this tpa id pull request');
+            //     if ($function_calling_type == "job") {
+            //         return ['status' => false, 'message' => 'batchFiles not found'];
+            //     } else {
+            //         return $this->respond(['status' => false, 'message' => 'batchFiles not found']);
+            //     }
+            // }
+
+            // Generate Health India Token
+            $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+            if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+                log_message('error', 'TPA ID PULL HEALTH_INDIA | Token generation failed');
+                if ($function_calling_type == "job") {
+                    return ['status' => false, 'message' => 'Token generation failed'];
+                } else {
+                    return $this->respond(['status' => false, 'message' => 'Token generation failed']);
+                }
+            }
+            $token = $tokenResponse['data']['result'][0]['access_token'];
+
+            // API Section 2.3 - Bulk Enrolment data Fetch
+            $url = getenv('HEALTH_INDIA_BASE_URL') . "/Enrollment/GetEnrollmentData";
+
+            $headers = [
+                "Authorization: Bearer " . $token,
+                "Content-Type: application/json"
+            ];
+
+            $body = [
+                "policY_NUMBER" => $policyNo
+            ];
+
+            log_message('error', "TPA ID PULL HEALTH_INDIA | API params: " . json_encode(['url' => $url, 'method' => 'POST', 'body' => $body]));
+
+            $response = call_third_party_api($url, 'POST', $headers, $body);
+
+             dd($response);
+
+            log_message('error', "TPA ID PULL HEALTH_INDIA | API Response: " . json_encode($response));
+
+            if (($response['status'] ?? false) !== true) {
+                log_message('error', 'HEALTH_INDIA API FAILED | response: ' . json_encode($response));
+
+                // update file table status after the tpa id failed to update
+                if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                    $file_model = new BatchFileModel();
+                    $file_model->where('id', $requestData['file_id'])->set('status', 'failed-8')->update();
+                    log_message('error', "Files table status updated for the file id: {$requestData['file_id']}");
+                } else {
+                    log_message('error', "Failed to update file table status.");
+                }
+
+                if ($function_calling_type == "job") {
+                    return ['status' => false, 'message' => 'API call failed', 'data' => $response];
+                } else {
+                    return $this->respond(['status' => false, 'message' => 'API call failed', 'data' => $response]);
+                }
+            }
+
+            if (
+                !isset($response['data']['result']) ||
+                !is_array($response['data']['result']) ||
+                count($response['data']['result']) === 0
+            ) {
+                log_message('error', 'TPA ID PULL API FAILED HEALTH_INDIA | Empty member data for this pull request');
+
+                // update file table status after the tpa id failed to update
+                if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                    $file_model = new BatchFileModel();
+                    $file_model->where('id', $requestData['file_id'])->set('status', 'failed-8')->update();
+                    log_message('error', "Files table status updated for the file id: {$requestData['file_id']}");
+                } else {
+                    log_message('error', "Failed to update file table status.");
+                }
+
+                if ($function_calling_type == "job") {
+                    return ['status' => false, 'message' => 'API call failed', 'data' => 'Empty member data for this pull request'];
+                } else {
+                    return $this->respond(['status' => false, 'message' => 'API call failed', 'data' => 'Empty member data for this pull request']);
+                }
+            }
+
+            $allMembers = $response['data']['result'];
+
+            // Save API data as JSON for analysis
+            $json = json_encode($allMembers, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+            $filePath = WRITEPATH . 'tmp/' . time() . '_' . $requestData['file_id'] . '.json';
+            file_put_contents($filePath, $json);
+
+            log_message('error', "TPA ID PULL HEALTH_INDIA | Saved JSON to: {$filePath}");
+
+            // Call a job for dump JSON data to DB
+            $job_details = new Jobs();
+            $r = Jobs::addJob([
+                'job_name' => 'saveHealthIndiaAPIData',
+                'payload' => [
+                    'file_id' => $requestData['file_id'],
+                    'json_file_path' => $filePath
+                ]
+            ]);
+
+            log_message('error', "TPA ID PULL HEALTH_INDIA | Job added for saving API data");
+
+            // ================= MATCHING LOGIC =================
+
+            $employeePolicyModel = new EmployeePolicyModel();
+
+            $employeePolicyData = $employeePolicyModel
+                ->join('employees', 'employees.id = employee_polices.employee_id')
+                ->where('employee_polices.client_policy_id', $client_policy_id)
+                ->where('employee_polices.tpa_id IS NULL')
+                ->findAll();
+
+            $updated = 0;
+            $batch_file_success = 'success';
+            $employee_policy_ids = [];
+
+            foreach ($employeePolicyData as $policy) {
+                $hasMatchForThisPolicy = false;
+
+                foreach ($allMembers as $m) {
+                    // Match based on: employee name, employee code, and relation
+                    if (
+                        strtolower(trim($policy['name'])) === strtolower(trim($m['insured_Name'] ?? '')) &&
+                        ($policy['emp_code'] ?? '') == ($m['employeeCode'] ?? '') &&
+                        strtolower($policy['relationship']) === strtolower($m['relation'] ?? '')
+                    ) {
+                        $hasMatchForThisPolicy = true;
+
+                        $sql = "UPDATE employee_polices SET tpa_id = ? WHERE id = ?";
+                        $this->db->query($sql, [$m['memberId'], $policy['emp_policy_id']]);
+
+                        // For e-card send
+                        if (strtolower(trim($policy['relationship'])) == 'self') {
+                            $employee_policy_ids[] = $policy['emp_policy_id'];
+                        }
+
+                        if ($this->db->affectedRows() > 0) {
+                            $updated++;
+                            log_message('error', "✅ HEALTH_INDIA | Updated tpa_id={$m['memberId']} for emp_policy_id={$policy['emp_policy_id']} policy={$policyNo}");
+                        } else {
+                            log_message('error', "⚠️ HEALTH_INDIA | No update (already set or not matched) for emp_policy_id={$policy['emp_policy_id']} policy={$policyNo}");
+                        }
+                    }
+                }
+
+                // Handle NO MATCH for this policy
+                if (!$hasMatchForThisPolicy) {
+                    $nhanceSideData = [
+                        'name'         => $policy['name'] ?? null,
+                        'emp_code'     => $policy['emp_code'] ?? null,
+                        'relationship' => $policy['relationship'] ?? null,
+                        'gender'       => $policy['gender'] ?? null,
+                        'dob'          => $policy['dob'] ?? null,
+                    ];
+                    $batch_file_success = 'partially success';
+
+                    log_message('error', "❌ HEALTH_INDIA | No match for Nhance = " . json_encode($nhanceSideData));
+                }
+            }
+
+            // Send e-card
+            if (!empty($employee_policy_ids)) {
+                log_message('error', "HEALTH_INDIA | sendMailForDownloadingECard JOB PUSHED.");
+                Jobs::addJob([
+                    'job_name' => 'sendMailForDownloadingECard',
+                    'payload' => [
+                        'ids' => $employee_policy_ids,
+                        'client_policy_id' => $client_policy_id
+                    ]
+                ]);
+            }
+
+            // Update file table status after the tpa id successfully updated
+            if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                $file_model = new BatchFileModel();
+                $file_model->where('id', $requestData['file_id'])->set('status', $batch_file_success)->update();
+                log_message('error', "Files table status updated for the file id: {$requestData['file_id']} with status: {$batch_file_success}");
+            } else {
+                log_message('error', "Failed to update file table status.");
+            }
+
+            $totalCount = count($allMembers);
+
+            log_message('error', "TPA ID PULL SUCCESS HEALTH_INDIA | completed. Total fetched={$totalCount}, updated={$updated}");
+
+            if ($function_calling_type == "job") {
+                return [
+                    'status' => true,
+                    'message' => 'Updated successfully',
+                    'total_fetched' => $totalCount,
+                    'total_updated' => $updated
+                ];
+            } else {
+                return $this->respond([
+                    'status' => true,
+                    'message' => 'Updated successfully',
+                    'total_fetched' => $totalCount,
+                    'total_updated' => $updated
+                ]);
+            }
+        } catch (\Throwable $th) {
+            // Update file table status after the tpa id failed to update
+            if (isset($requestData['file_id']) && !empty($requestData['file_id'])) {
+                $file_model = new BatchFileModel();
+                $file_model->where('id', $requestData['file_id'])->set('status', 'failed-8')->update();
+                log_message('error', "Files table status updated for the file id: {$requestData['file_id']}");
+            } else {
+                log_message('error', "Failed to update file table status.");
+            }
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(),
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            log_message('error', 'Exception thrown while calling HealthIndiaGetBenefDetails API: ' . json_encode($errorData));
+
+            if ($function_calling_type == "job") {
+                return ['status' => false, 'message' => 'API call failed', 'data' => $errorData];
+            } else {
+                return $this->respond(['status' => false, 'message' => 'API call failed', 'data' => $errorData]);
+            }
+        }
+    }
+
+    public function syncHealthIndiaClaimsToNhance()
+    {
+        helper('api');
+
+        log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Started');
+
+        // Generate Health India Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+        if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+            log_message('error', 'SYNC CLAIMS FAILED HEALTH_INDIA | Token generation failed');
+            return $this->response->setJSON(['status' => false, 'message' => 'Token generation failed']);
+        }
+
+        $token = $tokenResponse['data']['result'][0]['access_token'];
+
+        $url = getenv('HEALTH_INDIA_BASE_URL') . "/ClaimsMIS/GetClaimsMIS";
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        $policies = $this->db->table('client_policy')
+            ->where('tpa_id', $this->healthIndiaTpaId)
+            ->get()->getResultArray();
+
+        $finalResult = [];
+
+        foreach ($policies as $policy) {
+            $body = [
+                "policY_NUMBER" => $policy['policy_no']
+            ];
+
+            log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Fetching for policy: ' . $policy['policy_no']);
+
+            $response = call_third_party_api($url, 'POST', $headers, $body);
+
+            if (!empty($response['data']['result'])) {
+                $finalResult = array_merge($finalResult, $response['data']['result']);
+                log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Fetched ' . count($response['data']['result']) . ' claims for policy: ' . $policy['policy_no']);
+            }
+        }
+
+        log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Total claims fetched: ' . count($finalResult));
+
+        // Insert / update ticket_master
+        $insertedCount = 0;
+        foreach ($finalResult as $row) {
+            $status = $row['Claim_Status'] ?? 'Under Process';
+
+            $map = [
+                "Under Process"         => 5,
+                "Pending for Bill Entry" => 5,
+                "Paid"                  => 11,
+                "Rejected"              => 8,
+                "Approved"              => 8,
+                "Outstanding"           => 5,
+            ];
+
+            $claimStatus = $map[$status] ?? 1;
+
+            // Check if claim already exists
+            $existing = $this->db->table('ticket_master')
+                ->where('tpa_claim_id', $row['CLAIM_NUMBER'])
+                ->get()->getRowArray();
+
+            if (!$existing) {
+                $this->db->table('ticket_master')->insert([
+                    'policy_no'       => $row['Policy_No'] ?? '',
+                    'claim_number'    => $row['CLAIM_NUMBER'] ?? '',
+                    'tpa_claim_id'    => $row['CLAIM_NUMBER'] ?? '',
+                    'emp_code'        => $row['Employee_Code'] ?? '',
+                    'insured_name'    => $row['PATIENT_NAME'] ?? '',
+                    'claim_amount'    => $row['INTIMATED_AMOUNT'] ?? 0,
+                    'hospital_name'   => $row['HOSPITAL_NAME'] ?? '',
+                    'doa'             => !empty($row['DATEOF_ADMISSION']) ? date('Y-m-d', strtotime($row['DATEOF_ADMISSION'])) : null,
+                    'dod'             => !empty($row['DATEOF_DISCHARGE']) ? date('Y-m-d', strtotime($row['DATEOF_DISCHARGE'])) : null,
+                    'claim_status_id' => $claimStatus,
+                    'tpa_id'          => $this->healthIndiaTpaId,
+                    'created_at'      => date('Y-m-d H:i:s')
+                ]);
+                $insertedCount++;
+                log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Inserted claim: ' . ($row['CLAIM_NUMBER'] ?? 'N/A'));
+            } else {
+                log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Skipped existing claim: ' . ($row['CLAIM_NUMBER'] ?? 'N/A'));
+            }
+        }
+
+        log_message('error', 'SYNC CLAIMS HEALTH_INDIA | Completed | Total: ' . count($finalResult) . ' | Inserted: ' . $insertedCount);
+
+        return $this->response->setJSON([
+            'status' => true,
+            'total' => count($finalResult),
+            'inserted' => $insertedCount
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/app/Controllers/ICICILombardController.php b/app/Controllers/ICICILombardController.php
index a91cc147..e9cbdf32 100644
--- a/app/Controllers/ICICILombardController.php
+++ b/app/Controllers/ICICILombardController.php
@@ -86,33 +86,64 @@ class ICICILombardController extends AdminController
         // dd($body); 
 
 
-          $body = [
-            "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
+        //   $body = [
+        //     "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
+        //     "CDBGAccountNumber" => "CD-MUM-0026",
+        //     "CorrelationId" => "550e8400-e29b-41d4-a716-446655440016",
+        //     "MemberDetails" => [
+        //         [
+        //             "MemberEmpId" => "EMPID3625562",
+        //             "DOJ" => "21-MAR-2019",
+        //             "InsuredName" => "Jeeva",
+        //             "DOB" => "7-JUL-1993",
+        //             "Relationship" => "SELF",
+        //             "Gender" => "MALE",
+        //             "DOC" => '28-Oct-2025',
+        //             "SumInsured" => "500000",
+        //             "EmailId" => "Jeeva@GMAIL.COM",
+        //             "FlagStatus" => "A"
+        //         ],
+        //         [
+        //             "MemberEmpId" => "EMPID3625562",
+        //             "DOJ" => "21-MAR-2019",
+        //             "InsuredName" => "Muthu",
+        //             "DOB" => "8-AUG-1970",
+        //             "Relationship" => "MOTHER",
+        //             "Gender" => "FEMALE",
+        //             "DOC" => '28-Oct-2025',
+        //             "EmailId" => "Muthu@GMAIL.COM",
+        //             "FlagStatus" => "A"
+        //         ],
+        //     ]
+        // ];
+
+
+         $body = [
+            "PolicyNumber" => "4016/PPN/A/O/53185987/00/000",
             "CDBGAccountNumber" => "CD-MUM-0026",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440012",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440021",
             "MemberDetails" => [
                 [
-                    "MemberEmpId" => "EMPID3625559",
+                    "MemberEmpId" => "EMPID3625564",
                     "DOJ" => "21-MAR-2019",
-                    "InsuredName" => "Gowtham",
+                    "InsuredName" => "Jeeva",
                     "DOB" => "7-JUL-1993",
                     "Relationship" => "SELF",
                     "Gender" => "MALE",
-                    "DOC" => '2025-10-27',
-                    "SumInsured" => "400000",
-                    "EmailId" => "Gowtham@GMAIL.COM",
+                    "DOC" => '18-Nov-2025',
+                    "SumInsured" => "500000",
+                    "EmailId" => "Jeeva@GMAIL.COM",
                     "FlagStatus" => "A"
                 ],
                 [
-                    "MemberEmpId" => "EMPID3625559",
+                    "MemberEmpId" => "EMPID3625564", 
                     "DOJ" => "21-MAR-2019",
-                    "InsuredName" => "Lavanya",
+                    "InsuredName" => "Muthu",
                     "DOB" => "8-AUG-1970",
                     "Relationship" => "MOTHER",
                     "Gender" => "FEMALE",
-                    "DOC" => '2025-10-27',
-                    "SumInsured" => "400000",
-                    "EmailId" => "Lavanya@GMAIL.COM",
+                    "DOC" => '18-Nov-2025',
+                    "EmailId" => "Muthu@GMAIL.COM",
                     "FlagStatus" => "A"
                 ],
             ]
@@ -147,10 +178,10 @@ class ICICILombardController extends AdminController
 
         // dd($headers);
 
-         $body = [
-            "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
-            "BatchId" => "3672146",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440012"
+        $body = [
+            "PolicyNumber" => "4016/PPN/A/O/53185987/00/000",
+            "BatchId" => "3727144",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440021"
         ];
 
         $response = call_third_party_api($url, 'POST', $headers, $body, true);
@@ -181,10 +212,10 @@ class ICICILombardController extends AdminController
             'Content-Type: application/json'
         ];
 
-        $body = [
-            "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
-            "IMID" => "3672145",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440011"
+         $body = [
+            "PolicyNumber" => "4016/PPN/A/O/53185987/00/000",
+            "IMID" => "201580517901",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440020"
         ];
 
         $response = call_third_party_api($url, 'POST', $headers, $body, true);
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 9cc001dd..d6ae550f 100755
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -155,6 +155,14 @@ class JobWorker extends AdminController
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\TicketServiceController',
     ],
+    'tpaClaimDumpImporter' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\TicketServiceController',
+    ],
+    'tpaClaimDumpToTicketMasterImporters' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\TicketServiceController',
+    ],
     'excelMultieventFileFormateValidation' => [
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\EmployeeMultiEventServiceController',
@@ -183,6 +191,10 @@ class JobWorker extends AdminController
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\VidalApiController',
     ],
+    'FhplGetBenefDetails' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\FhplApiController',
+    ],
     'bdsDumpExcelFileFormatValidation' => [
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\PolicyTransactionController',
@@ -201,6 +213,14 @@ class JobWorker extends AdminController
      'bulkGenerateEcardAndStoreinS3' => [
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\EmployeeController',
+     ],
+     'bulkEcardDownloadAsZipFromS3' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\EmployeeController',
+     ],
+     'getEmployeeEcardFromTmpFolderAndZipToS3' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\EmployeeController',
     ]
 ];
 
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index a3ebe469..2deca1f1 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -378,7 +378,154 @@ class LeadsController extends BaseController
 
     private function prepareLeadData()
     {
-        $data = $this->request->getPost();
+        $rules = [
+            
+            'lead_type' => [
+                'rules'  => 'integer',
+                'errors' => ['required' => 'Lead Type is required']
+            ],
+            'issuer' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Issuer is required']
+            ],
+            'entity_type_id' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Entity Type is required']
+            ],
+            'client_name' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]',
+                'errors' => [
+                    'required'    => 'Client Name is required',
+                    'regex_match' => 'Client Name only letters, numbers and characters _ - and space are allowed'
+                ]
+            ],
+            'client_short_name' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                'errors' => ['required' => 'Client Short Name is required','regex_match' => 'Client Short Name only letters, numbers and characters _ and - are allowed']
+            ],
+            'gst' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'GST Number is required']
+            ],
+            'gst' => [
+                'rules'  => 'required|regex_match[/^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$/]',
+                'errors' => [
+                    'required'    => 'GST Number is required.',
+                    'regex_match' => 'Invalid GST format. Example: 22AAAAA0000A1Z5'
+                ]
+            ],
+            'branch_name' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9\s_-]+$/]|min_length[3]',
+                'errors' => [
+                    'required'    => 'Branch Name is required.',
+                    'regex_match' => 'Branch Name can only contain letters, numbers, spaces, - and _.',
+                    'min_length'  => 'Branch Name must be at least 3 characters long.'
+                ]
+            ],
+            'branch_code' => [    
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                'errors' => [
+                    'required'    => 'Branch Code is required.',
+                    'regex_match' => 'Branch Code can only contain letters, numbers, - and _.'
+                ]
+            ],
+            'contact_person_name' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]',
+                'errors' => [
+                    'required'    => 'Contact Person Name is required',
+                    'regex_match' => 'Contact person name only letters, numbers and spaces, - and _.'
+                ]
+            ],
+            'contact_person_mobile' => [
+                'rules'  => 'required',
+                'rules'  => 'required|regex_match[/^[0-9]+$/]',
+                'errors' => ['required' => 'Contact Person Mobile is required' , 
+                'regex_match' => 'Contact Person Mobile Only numbers'
+                ]
+            ],
+            'contact_person_email' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Contact Person Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                ]
+                // 'rules'  => 'required|valid_email|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                    // 'regex_match' => 'Contact Person Email Only letters, numbers and characters _ - @ . are allowed'
+                
+            ],
+            'salse_person_id' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Sales Person is required']
+            ],
+            'status' => [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Status is required']
+            ]
+        ];
+        $request_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_data);
+        if (isset($data['lead_form_type']) && (int)$data['lead_form_type'] === 2) {
+            $rules['client_type'] = [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Client Type is required']
+            ];
+            $rules['policy_type_id'] = [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Policy Type is required']
+            ];
+            $rules['policy_start_date'] = [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Date of Commencement is required']
+            ];
+            $rules['policy_end_date'] = [
+                'rules'  => 'required',
+                'errors' => ['required' => 'Date of Expiry is required']
+            ];
+        }
+
+        // 1. MANUALLY VALIDATE FILES BEFORE PROCESSING
+        // $allFiles = $this->request->getFiles();
+        // foreach ($allFiles as $inputName => $files) {
+        //     // If it's a single file, wrap it in an array to use the same logic
+        //     $fileArray = is_array($files) ? $files : [$files];
+            
+        //     foreach ($fileArray as $index => $file) {
+        //         if ($file->isValid() && !$file->hasMoved()) {
+        //             $extension = strtolower($file->getExtension());
+                    
+        //             // Logic: index 0 is Excel only, others are mixed
+        //             if ($index === 0) {
+        //                 $allowed = ['xls', 'xlsx'];
+        //             } else {
+        //                 $allowed = ['xls', 'xlsx', 'pdf', 'jpg', 'jpeg', 'png'];
+        //             }
+
+        //             if (!in_array($extension, $allowed)) {
+        //                 // Return 400 Error immediately
+        //                 return $this->response->setStatusCode(400)->setJSON([
+        //                     'status' => false,
+        //                     'message' => 'Input validation failed',
+        //                     'code' => 400,
+        //                     'errors' => [
+        //                         $inputName => "File " . ($index + 1) . " has an invalid extension ($extension). Allowed: " . implode(',', $allowed)
+        //                     ]
+        //                 ]);
+        //             }
+        //         }
+        //     }
+        // }
+        
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        
+
         $data['client_type'] = 1;
         $data['pan'] = "";
 
@@ -1136,7 +1283,7 @@ class LeadsController extends BaseController
 
         // 12. Conditional rendering based on lead_form_type
         if ($lead_data['lead_form_type'] == 1) {
-            $data['demogrphy_html_data'] = $this->generateDemographyDataTable(['lead_id' => $id]);
+            // $data['demogrphy_html_data'] = $this->generateDemographyDataTable(['lead_id' => $id]);
             $this->loadLayout('view_rfq.php', $data);
         } else if ($lead_data['lead_form_type'] == 2) {
             $data['occupancy'] = $this->occupancyModel->findAll();
@@ -2538,7 +2685,7 @@ class LeadsController extends BaseController
     public function calculateMembersDemography($params, $returnType = null)
     {
         $lead_id = $params['lead_id'];
-        $lead_data = $this->leadsModel->find($lead_id);
+        $lead_data = $this->leadsModel->find((int)$lead_id);
         $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $lead_data['file_name'];
 
         if (!$lead_data) {
@@ -2999,7 +3146,7 @@ class LeadsController extends BaseController
 
         // print_r($params); die;
 
-        $lead_id = $params['lead_id'];
+        $lead_id = (int)$params['lead_id'];
         $file_type  = $params['file_type']; //rfq or qcr
         $recipient_type = $params['recipient_type']; //insurer or client or internal or placement  
         $recipient_mail = $params['recipient_mail']; // - only primary key of contacts
@@ -3033,7 +3180,7 @@ class LeadsController extends BaseController
 
         if ($recipient_type === 'placement') {
 
-            $lead_data = $this->leadsModel->find($lead_id);
+            $lead_data = $this->leadsModel->find((int)$lead_id);
 
             $data = [];
 
@@ -5320,7 +5467,7 @@ class LeadsController extends BaseController
     public function handleMemberDataGPATotalSumInsurerFromExcel($params)
     {
         $lead_id = $params['lead_id'];
-        $lead_data = $this->leadsModel->find($lead_id);
+        $lead_data = $this->leadsModel->find((int)$lead_id);
         // dd($lead_data);
         $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $lead_data['file_name'];
         //  dd($file_name_with_path);
@@ -5384,8 +5531,13 @@ class LeadsController extends BaseController
         return [];
     }
 
-    public function generateDemographyDataTable($param)
-    {
+    public function generateDemographyDataTable($param = [])
+    {   
+
+        if ($this->request !== null) {
+            $param['lead_id'] = $this->request->getGet('lead_id');
+        }
+
         $returnData = $this->calculateMembersDemography($param, "internal");
 
         $html = "";
@@ -5431,6 +5583,14 @@ class LeadsController extends BaseController
             }
         }
 
+        if ($this->request !== null) {
+            if(!empty($html)){
+                return $this->respond(['status' => true, 'data' => $html], 200);
+            }else{
+                return $this->respond(['status' => false, 'data' => $html], 200);
+            }
+        }
+
         return $html;
     }
 
@@ -5726,7 +5886,7 @@ class LeadsController extends BaseController
                 $first_file_name = $isFirstField ? 'Member List' : '';
                 $member_data_link = $isFirstField ? $sample_dwn_link : '';
                 $read_only = $isFirstField ? 'readonly' : '';
-                $accept = $isFirstField ? '.xls,.xlsx' : '';
+                $accept = $isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
                 $displayIndex = $index + 1;
 
                 $html .= '
diff --git a/app/Controllers/LoginController.php b/app/Controllers/LoginController.php
index 451765c2..fb073f21 100755
--- a/app/Controllers/LoginController.php
+++ b/app/Controllers/LoginController.php
@@ -11,6 +11,8 @@ use CodeIgniter\API\ResponseTrait;
 use App\Models\UserModel;
 use App\Models\AuthHistoryModel;
 
+use App\Libraries\AuthLogout;
+
 class LoginController extends BaseController
 {   
     use ResponseTrait;
@@ -45,7 +47,7 @@ class LoginController extends BaseController
 
                         $user_team = $UserModel->getUserTeamsByUserID($user->id);
                         // dd($user_team); 
-
+                        session()->regenerate(true);
                         $session_data = [
                             'isLoggedIn'  => True ,
                             'userid'      => $user->id, 
@@ -56,9 +58,12 @@ class LoginController extends BaseController
                         $path = getenv('cookie.Path');
                         $domain = getenv('cookie.Domain');
                         $https = getenv('ccokie.secure');
-                        setcookie('session_data', json_encode($session_data), time() + 12 * 60 * 60, $path, $domain, $https, true);
+                        // setcookie('session_data', json_encode($session_data), time() + 12 * 60 * 60, $path, $domain, $https, true);
                         set_session_data($session_data);
 
+                        // Bind session to device
+                        set_session_data(['fingerprint' =>  generateFingerprint()]);
+
                         log_message('error', 'Set The UserId : `'. $user->id .'` in Session');
                         log_message('error', 'User Login Sucessfully');
 
@@ -91,14 +96,23 @@ class LoginController extends BaseController
 
     public function logout()
     {
-        $path = getenv('cookie.Path');
-        session()->destroy();
-        // setcookie('session_data', '', time() - 3600, $path);
-        $path = getenv('cookie.Path');
-        $domain = getenv('cookie.Domain');
-        $https = getenv('cookie.secure');
-        setcookie('session_data',null, time() -3600, $path, $domain, $https, true);
-        return redirect()->to(base_url('login'));
+        // $path = getenv('cookie.Path');
+        // session()->regenerate(true);
+        // session()->destroy();
+
+        // $path = getenv('cookie.Path');
+        // $domain = getenv('cookie.Domain');
+        // $https = getenv('cookie.secure');
+
+        // setcookie('session_data',null, time() - 42000, $path, $domain, $https, true);
+        // // return redirect()->to(base_url('login'));
+        // return redirect()->to(base_url('login'))
+        // ->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+        // ->setHeader('Pragma', 'no-cache')
+        // ->setHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
+
+
+        return AuthLogout::logout();
     }
 
     public function getUserDeviceInfo($userId, $type_of_user)
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 79f5753b..cff68f18 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -283,26 +283,53 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Insurer general info function called');
+        $rules = [
+            'name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Name is required'
+                ]
+            ],
+            'short_name' => [
+                'rules'  => 'required|min_length[3]|max_length[8]',
+                'errors' => [
+                    'required'   => 'Short name is required',
+                    'min_length' => 'Short name must be at least 3 characters',
+                    'max_length' => 'Short name cannot exceed 8 characters'
+                ]
+            ],
+            'insurer_logo' => [
+                'rules' => 'if_exist|is_image[insurer_logo]|max_size[insurer_logo,200]|ext_in[insurer_logo,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'The uploaded file must be an image',
+                    'max_size' => 'File size should not exceed 200 KB',
+                    'ext_in'   => 'Allowed file types: jpg, jpeg, png',
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
         $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
         $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
 
-        if($this->request->getPost('addition_add_day')){
-            $data['addition_add_day'] = 1;
-        }
-
-        if($this->request->getPost('deletion_add_day')){
-            $data['deletion_add_day'] = 1;
-        }
-
-        if($this->request->getPost('is_multi_event')){
-            $data['is_multi_event'] = 1;
-        }
-
-        $data['created_by'] = get_session_userid();
-        $data['insurer_logo'] = $file_name;
+        $sanitized_post_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0;
+        $sanitized_post_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0;
+        $sanitized_post_data['is_multi_event'] = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0;
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $sanitized_post_data['insurer_logo'] = $file_name;
         
-        $insert = $this->insurerModel->insert($data);
+        $insert = $this->insurerModel->insert($sanitized_post_data);
+
         if($insert){
             $insurer_data = $this->insurerModel->where(['id' => $insert, 'is_active' => 1])->first();
             $insurer_templete_count = $this->insurerTemplateModel->where(['insurer_id' => $insert, 'is_active' => 1])->countAllResults();
@@ -316,28 +343,130 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Client branch CREATE function called');
+        $rules = [
+
+            // ======================
+            // Branch Details
+            // ======================
+            'branch_name' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch name is required'
+                ]
+            ],
+
+            'branch_code' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch code is required'
+                ]
+            ],
+
+            'address1' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Address Line 1 is required'
+                ]
+            ],
+
+            'state' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'State is required'
+                ]
+            ],
+
+            'district' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'District is required'
+                ]
+            ],
+
+            'city' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'City is required'
+                ]
+            ],
+
+            'pincode' => [
+                'rules'  => 'required|numeric|exact_length[6]',
+                'errors' => [
+                    'required'      => 'Pincode is required',
+                    'numeric'       => 'Pincode must contain only numbers',
+                    'exact_length'  => 'Pincode must be exactly 6 digits'
+                ]
+            ],
+
+            // ======================
+            // Contact Details (Array)
+            // ======================
+            'name.*' => [
+                'rules'  => 'required|trim|min_length[2]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                'errors' => [
+                    'required'   => 'Contact name is required',
+                    'min_length' => 'Contact name must be at least 2 characters',
+                    'regex_match' => 'Contact name is invalid Format'
+                ]
+            ],
+
+            'designation.*' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Designation is required'
+                ]
+            ],
+
+            'email.*' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+
+            'mobile.*' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'     => 'Mobile number is required',
+                    'numeric'      => 'Mobile must contain only digits',
+                    'exact_length' => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data   = $this->request->getPost();
-        $data['created_by'] = get_session_userid();
-        $insert = $this->insurerBranchModel->insert($data);
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $insert = $this->insurerBranchModel->insert($sanitized_post_data);
         
         if($insert){
-            for ($i = 0; $i < count($this->request->getPost('name')); $i++) {
+            for ($i = 0; $i < count($sanitized_post_data['name']); $i++) {
                 // Prepare data to insert
-                $data = [
+                $sanitized_post_data_for_level = [
                     'contact_type' => 'insurer',
                     'ref_id'       => $insert,
                     'created_by'   => get_session_userid(),
-                    'name'         => $this->request->getPost('name')[$i],
-                    'email'        => $this->request->getPost('email')[$i],
-                    'mobile'       => $this->request->getPost('mobile')[$i],
-                    'designation'  => $this->request->getPost('designation')[$i]
+                    'name'         => $sanitized_post_data['name'][$i] ?? null,
+                    'email'        => $sanitized_post_data['email'][$i] ?? null,
+                    'mobile'       => $sanitized_post_data['mobile'][$i] ?? null,
+                    'designation'  => $sanitized_post_data['designation'][$i] ?? null
                 ];
-                $contacts = $this->levelContactModel->insert($data);
+                $contacts = $this->levelContactModel->insert($sanitized_post_data_for_level);
             }
         }
 
         if($insert){
-            $branchData = $this->insurerBranchModel->where('insurer_id', $this->request->getPost('insurer_id'))->findAll();
+            $branchData = $this->insurerBranchModel->where('insurer_id', $sanitized_post_data['insurer_id'])->findAll();
             echo json_encode(array("status" => true , 'data' => $branchData));
         }else{
             echo json_encode(array("status" => false));
@@ -367,40 +496,72 @@ class MasterController extends AdminController
 
     public function editInsurerGeneralInfo()
     {
-        $this->myLogger->logme('error','edit Insurer general info function called');
+
+        $this->myLogger->logme('error','Edit Insurer general info function called');
+        $postData = $this->request->getPost();
+        $logoFile = $this->request->getFile('insurer_logo');
+        
+        $rules = [
+            'name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Name is required'
+                ]
+            ],
+            'short_name' => [
+                'rules'  => 'required|min_length[3]|max_length[8]',
+                'errors' => [
+                    'required'   => 'Short name is required',
+                    'min_length' => 'Short name must be at least 3 characters',
+                    'max_length' => 'Short name cannot exceed 8 characters'
+                ]
+            ],
+            'insurer_logo' => [
+                'rules' => 'permit_empty|is_image[insurer_logo]|max_size[insurer_logo,200]|ext_in[insurer_logo,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'The uploaded file must be an image',
+                    'max_size' => 'File size should not exceed 200 KB',
+                    'ext_in'   => 'Only JPG, JPEG, and PNG files are allowed.',
+                ]
+            ],
+        ];
+
+        if (!$this->validateData($postData, $rules)) {
+                $errors = $this->validator->getErrors();
+        
+                $mainMessage = 'Input validation failed';
+    
+                if (isset($errors['insurer_logo']) && (strpos($errors['insurer_logo'], 'Security') !== false || strpos($errors['insurer_logo'], 'Forbidden') !== false)) {
+                    $mainMessage = 'File upload rejected: Security policy violation.';
+                }
+
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => $mainMessage, // This will change based on the error
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+        }
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
-
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data               = $this->request->getPost();
-        $data['updated_by'] = get_session_userid();
-
+        $file_name      = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
+        $data           = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id                  = $sanitized_post_data['PrimaryKey'];
+        
+        $sanitized_post_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0;
+        $sanitized_post_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0;
+        $sanitized_post_data['is_multi_event']   = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0;
+        $sanitized_post_data['updated_by']       = get_session_userid();
+        
         if(!empty($file_name)){
-            $data['insurer_logo'] = $file_name;
+            $sanitized_post_data['insurer_logo'] = $file_name;
         }
 
-        if($this->request->getPost('addition_add_day')){
-            $data['addition_add_day'] = 1;
-        }else{
-            $data['addition_add_day'] = 0;
-        }
+        $update = $this->insurerModel->update($id,$sanitized_post_data);
 
-        if($this->request->getPost('deletion_add_day')){
-            $data['deletion_add_day'] = 1;
-        }else{
-            $data['deletion_add_day'] = 0;
-        }
-
-        if($this->request->getPost('is_multi_event')){
-            $data['is_multi_event'] = 1;
-        }else{
-            $data['is_multi_event'] = 0;
-        }
-
-        $update             = $this->insurerModel->update($id,$data);
         if($update){
-            echo json_encode(array("status" => true , 'data' => $data));
+            echo json_encode(array("status" => true , 'data' => $sanitized_post_data));
         }else{
             echo json_encode(array("status" => false));
         }
@@ -422,33 +583,133 @@ class MasterController extends AdminController
 
     public function editInsurerBranch()
     {
-        $this->myLogger->logme('error','Insurer branch CREATE function called');
-        $id     = $this->request->getPost('PrimaryKey');
-        $data   = $this->request->getPost();
-        $update = $this->insurerBranchModel->update($id, $data);
+        $this->myLogger->logme('error','Insurer branch EDIT function called');
+        $rules = [
+
+            // ======================
+            // Branch Details
+            // ======================
+            'branch_name' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch name is required'
+                ]
+            ],
+
+            'branch_code' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch code is required'
+                ]
+            ],
+
+            'address1' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Address Line 1 is required'
+                ]
+            ],
+
+            'state' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'State is required'
+                ]
+            ],
+
+            'district' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'District is required'
+                ]
+            ],
+
+            'city' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'City is required'
+                ]
+            ],
+
+            'pincode' => [
+                'rules'  => 'required|numeric|exact_length[6]',
+                'errors' => [
+                    'required'      => 'Pincode is required',
+                    'numeric'       => 'Pincode must contain only numbers',
+                    'exact_length'  => 'Pincode must be exactly 6 digits'
+                ]
+            ],
+
+            // ======================
+            // Contact Details (Array)
+            // ======================
+            'name.*' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'Contact name is required',
+                    'min_length' => 'Contact name must be at least 2 characters'
+                ]
+            ],
+
+            'designation.*' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Designation is required'
+                ]
+            ],
+
+            'email.*' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+
+            'mobile.*' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'     => 'Mobile number is required',
+                    'numeric'      => 'Mobile must contain only digits',
+                    'exact_length' => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $data           = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id                  = $sanitized_post_data['PrimaryKey'] ?? null;
+        $update = $this->insurerBranchModel->update($id, $sanitized_post_data);
 
         if($update){
             $contactsToDelete = $this->levelContactModel->where(['ref_id' => $id,'contact_type' => 'insurer', 'is_active' => 1])->get()->getResult();
             foreach ($contactsToDelete as $contact) {
                 $this->levelContactModel->delete($contact->id);
             }
-            for ($i = 0; $i < count($this->request->getPost('name')); $i++) {
+            for ($i = 0; $i < count($sanitized_post_data['name']); $i++) {
                 // Prepare data to update
-                $data = [
+                $sanitized_post_data_for_level = [
                     'contact_type' => 'insurer',
                     'ref_id'       => $id,
                     'created_by'   => get_session_userid(),
-                    'name'         => $this->request->getPost('name')[$i],
-                    'email'        => $this->request->getPost('email')[$i],
-                    'mobile'       => $this->request->getPost('mobile')[$i],
-                    'designation'  => $this->request->getPost('designation')[$i]
-                ];
-                $contacts = $this->levelContactModel->insert($data);
+                    'name'         => $sanitized_post_data['name'][$i] ?? null,
+                    'email'        => $sanitized_post_data['email'][$i] ?? null,
+                    'mobile'       => $sanitized_post_data['mobile'][$i] ?? null,
+                    'designation'  => $sanitized_post_data['designation'][$i] ?? null                
+                    ];
+                $contacts = $this->levelContactModel->insert($sanitized_post_data_for_level);
             }
         }
 
         if($update){
-            $branchData = $this->insurerBranchModel->where('insurer_id', $this->request->getPost('insurer_id'))->findAll();
+            $branchData = $this->insurerBranchModel->where('insurer_id', $sanitized_post_data['insurer_id'])->findAll();
             echo json_encode(array("status" => true , 'data' => $branchData, 'edit'));
         }else{
             echo json_encode(array("status" => false, 'edit'));
@@ -594,6 +855,74 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','TPA general info function called');
+        $rules = [
+
+            // ======================
+            // TPA Basic Details
+            // ======================
+            'name' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'TPA name is required',
+                    'min_length' => 'TPA name must be at least 2 characters'
+                ]
+            ],
+
+            'short_name' => [
+                'rules'  => 'required|trim|min_length[3]',
+                'errors' => [
+                    'required'   => 'TPA short name is required',
+                    'min_length' => 'Short name must be at least 3 characters',
+                ]
+            ],
+
+            'network_hospitals' => [
+                'rules'  => 'required|valid_url',
+                'errors' => [
+                    'required'  => 'Network hospitals URL is required',
+                    'valid_url' => 'Please enter a valid URL'
+                ]
+            ],
+            'tpa_logo' => [
+                'rules' => 'if_exist|is_image[tpa_logo]|max_size[tpa_logo,200]|ext_in[tpa_logo,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'TPA logo must be an image',
+                    'max_size' => 'TPA logo should not exceed 200 KB',
+                    'ext_in'   => 'Allowed logo types: jpg, jpeg, png'
+                ]
+            ],
+
+            'fc' => [
+                'rules' => 'if_exist|is_image[fc]|max_size[fc,500]|ext_in[fc,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'Front card must be an image',
+                    'max_size' => 'Front card image should not exceed 500 KB',
+                    'ext_in'   => 'Allowed types: jpg, jpeg, png'
+                ]
+            ],
+
+            'bc' => [
+                'rules' => 'if_exist|is_image[bc]|max_size[bc,500]|ext_in[bc,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'Back card must be an image',
+                    'max_size' => 'Back card image should not exceed 500 KB',
+                    'ext_in'   => 'Allowed types: jpg, jpeg, png'
+                ]
+            ],
+        ];
+
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
         $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath);
@@ -603,18 +932,18 @@ class MasterController extends AdminController
         $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path);
 
 
-        $eCardTemplate = $this->request->getPost('ecard_content');
-        $data   = $this->request->getPost();
-        $data['created_by'] = get_session_userid();
-        $data['tpa_logo'] = $file_name;
-        $data['front_card'] = $front_card_file_name;
-        $data['back_card'] = $back_card_file_name;
-        $data['network_hospitals'] = $this->request->getPost('network_hospitals');
+        $eCardTemplate = $sanitized_post_data['ecard_content'];
         
-        $insert = $this->tpaModel->insert($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $sanitized_post_data['tpa_logo'] = $file_name;
+        $sanitized_post_data['front_card'] = $front_card_file_name;
+        $sanitized_post_data['back_card'] = $back_card_file_name;
+        $sanitized_post_data['network_hospitals'] = $sanitized_post_data['network_hospitals'];
+        
+        $insert = $this->tpaModel->insert($sanitized_post_data);
 
-        $tpa_name = (string) $this->request->getPost('name');
-        $short_name = (string) $this->request->getPost('short_name');
+        $tpa_name = ((string) $sanitized_post_data['name']) ?? null;
+        $short_name = ((string) $sanitized_post_data['short_name']) ?? null;
 
         $filename = strtolower(str_replace(' ', '_', $short_name)) . '.html';
         $file_directory = WRITEPATH . 'e_card_template/';
@@ -629,10 +958,10 @@ class MasterController extends AdminController
         header('Content-type:text/html; charset=utf-8');
         
         // Write the HTML content to the file
-        $data = file_put_contents($file_path, $eCardTemplate);
+        $html_data = file_put_contents($file_path, $eCardTemplate);
         
         
-        if ($data !== false) {
+        if ($html_data !== false) {
             $this->myLogger->logme('error', 'TPA: {tpa}, e-Card HTML template file saved successfully: {data}, filepath is: {path}', ['data' => $filename, 'tpa' => $tpa_name, 'path' => $file_path]);
         } else {
             $this->myLogger->logme('error', 'TPA: {tpa}, e-Card HTML template file unable to save: {data}', ['data' => $filename, 'tpa' => $tpa_name]);
@@ -651,28 +980,129 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','TPA branch CREATE function called');
+        $rules = [
+
+            // ======================
+            // Branch Details
+            // ======================
+            'branch_name' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch name is required'
+                ]
+            ],
+
+            'branch_code' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch code is required'
+                ]
+            ],
+
+            'address1' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Address Line 1 is required'
+                ]
+            ],
+
+            'state' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'State is required'
+                ]
+            ],
+
+            'district' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'District is required'
+                ]
+            ],
+
+            'city' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'City is required'
+                ]
+            ],
+
+            'pincode' => [
+                'rules'  => 'required|numeric|exact_length[6]',
+                'errors' => [
+                    'required'      => 'Pincode is required',
+                    'numeric'       => 'Pincode must contain only numbers',
+                    'exact_length'  => 'Pincode must be exactly 6 digits'
+                ]
+            ],
+
+            // ======================
+            // Contact Details (Array)
+            // ======================
+            'name.*' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'Contact name is required',
+                    'min_length' => 'Contact name must be at least 2 characters'
+                ]
+            ],
+
+            'designation.*' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Designation is required'
+                ]
+            ],
+
+            'email.*' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+
+            'mobile.*' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'     => 'Mobile number is required',
+                    'numeric'      => 'Mobile must contain only digits',
+                    'exact_length' => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data   = $this->request->getPost();
-        $data['created_by'] = get_session_userid();
-        $insert = $this->tpaBranchModel->insert($data);
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $insert = $this->tpaBranchModel->insert($sanitized_post_data);
         
         if($insert){
-            for ($i = 0; $i < count($this->request->getPost('name')); $i++) {
+            for ($i = 0; $i < count($sanitized_post_data['name']); $i++) {
                 // Prepare data to insert
-                $data = [
+                $sanitized_post_data_for_level = [
                     'contact_type' => 'tpa',
                     'ref_id'       => $insert,
                     'created_by'   => get_session_userid(),
-                    'name'         => $this->request->getPost('name')[$i],
-                    'email'        => $this->request->getPost('email')[$i],
-                    'mobile'       => $this->request->getPost('mobile')[$i],
-                    'designation'  => $this->request->getPost('designation')[$i]
+                    'name'         => $sanitized_post_data['name'][$i] ?? null,
+                    'email'        => $sanitized_post_data['email'][$i] ?? null,
+                    'mobile'       => $sanitized_post_data['mobile'][$i] ?? null,
+                    'designation'  => $sanitized_post_data['designation'][$i] ?? null
                 ];
-                $contacts = $this->levelContactModel->insert($data);
+                $contacts = $this->levelContactModel->insert($sanitized_post_data_for_level);
             }
         }
 
         if($insert){
-            $branchData = $this->tpaBranchModel->where('tpa_id', $this->request->getPost('tpa_id'))->findAll();
+            $branchData = $this->tpaBranchModel->where('tpa_id', $sanitized_post_data['tpa_id'])->findAll();
             echo json_encode(array("status" => true , 'data' => $branchData));
         }else{
             echo json_encode(array("status" => false));
@@ -715,6 +1145,74 @@ class MasterController extends AdminController
     public function editTPAGeneralInfo()
     {
         $this->myLogger->logme('error','edit TPA general info function called');
+        $rules = [
+
+            // ======================
+            // TPA Basic Details
+            // ======================
+            'name' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'TPA name is required',
+                    'min_length' => 'TPA name must be at least 2 characters'
+                ]
+            ],
+
+            'short_name' => [
+                'rules'  => 'required|trim|min_length[3]',
+                'errors' => [
+                    'required'   => 'TPA short name is required',
+                    'min_length' => 'Short name must be at least 3 characters',
+                ]
+            ],
+
+            'network_hospitals' => [
+                'rules'  => 'required|valid_url',
+                'errors' => [
+                    'required'  => 'Network hospitals URL is required',
+                    'valid_url' => 'Please enter a valid URL'
+                ]
+            ],
+            'tpa_logo' => [
+                'rules' => 'if_exist|is_image[tpa_logo]|max_size[tpa_logo,200]|ext_in[tpa_logo,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'TPA logo must be an image',
+                    'max_size' => 'TPA logo should not exceed 200 KB',
+                    'ext_in'   => 'Allowed logo types: jpg, jpeg, png'
+                ]
+            ],
+
+            'fc' => [
+                'rules' => 'if_exist|is_image[fc]|max_size[fc,500]|ext_in[fc,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'Front card must be an image',
+                    'max_size' => 'Front card image should not exceed 500 KB',
+                    'ext_in'   => 'Allowed types: jpg, jpeg, png'
+                ]
+            ],
+
+            'bc' => [
+                'rules' => 'if_exist|is_image[bc]|max_size[bc,500]|ext_in[bc,jpg,jpeg,png]',
+                'errors' => [
+                    'is_image' => 'Back card must be an image',
+                    'max_size' => 'Back card image should not exceed 500 KB',
+                    'ext_in'   => 'Allowed types: jpg, jpeg, png'
+                ]
+            ],
+        ];
+
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
         $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath);
@@ -723,29 +1221,29 @@ class MasterController extends AdminController
         $front_card_file_name = file_Upload($this->request->getFile('fc'), $template_bg_path);
         $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path);
 
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data               = $this->request->getPost();
-        $data['updated_by'] = get_session_userid();
+        $id                 = $sanitized_post_data['PrimaryKey'] ?? null;
+        
+        $sanitized_post_data['updated_by'] = get_session_userid();
 
         if(!empty($file_name)){
-            $data['tpa_logo'] = $file_name;
+            $sanitized_post_data['tpa_logo'] = $file_name;
         }
 
         if(!empty($front_card_file_name)){
-            $data['front_card'] = $front_card_file_name;
+            $sanitized_post_data['front_card'] = $front_card_file_name;
         }
 
         if(!empty($back_card_file_name)){
-            $data['back_card'] = $back_card_file_name;
+            $sanitized_post_data['back_card'] = $back_card_file_name;
         }
 
-        $data['network_hospitals'] = $this->request->getPost('network_hospitals');
-        $update             = $this->tpaModel->update($id,$data);
+        $sanitized_post_data['network_hospitals'] = $sanitized_post_data['network_hospitals'] ?? null;
+        $update             = $this->tpaModel->update($id,$sanitized_post_data);
 
 
-        $tpa_name = (string) $this->request->getPost('name');
-        $short_name = (string) $this->request->getPost('short_name');
-        $eCardTemplate = $this->request->getPost('ecard_content');
+        $tpa_name = ((string) $sanitized_post_data['name']) ?? null;
+        $short_name = ((string) $sanitized_post_data['short_name']) ?? null;
+        $eCardTemplate = $sanitized_post_data['ecard_content'] ?? null;
 
         $filename = strtolower(str_replace(' ', '_', $short_name)) . '.html';
         $file_directory = WRITEPATH . 'e_card_template/';
@@ -760,10 +1258,10 @@ class MasterController extends AdminController
         header('Content-type:text/html; charset=utf-8');
         
         // Write the HTML content to the file
-        $data = file_put_contents($file_path, $eCardTemplate);
+        $html_data = file_put_contents($file_path, $eCardTemplate);
         
         
-        if ($data !== false) {
+        if ($html_data !== false) {
             $this->myLogger->logme('error', 'TPA: {tpa}, e-Card HTML template file saved successfully: {data}, filepath is: {path}', ['data' => $filename, 'tpa' => $tpa_name, 'path' => $file_path]);
         } else {
             $this->myLogger->logme('error', 'TPA: {tpa}, e-Card HTML template file unable to save: {data}', ['data' => $filename, 'tpa' => $tpa_name]);
@@ -772,7 +1270,7 @@ class MasterController extends AdminController
 
 
         if($update){
-            echo json_encode(array("status" => true , 'data' => $data));
+            echo json_encode(array("status" => true , 'data' => $sanitized_post_data));
         }else{
             echo json_encode(array("status" => false));
         }
@@ -795,9 +1293,110 @@ class MasterController extends AdminController
     public function editTPABranch()
     {
         $this->myLogger->logme('error','TPA branch CREATE function called');
-        $id     = $this->request->getPost('PrimaryKey');
+        $rules = [
+
+            // ======================
+            // Branch Details
+            // ======================
+            'branch_name' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch name is required'
+                ]
+            ],
+
+            'branch_code' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Branch code is required'
+                ]
+            ],
+
+            'address1' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Address Line 1 is required'
+                ]
+            ],
+
+            'state' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'State is required'
+                ]
+            ],
+
+            'district' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'District is required'
+                ]
+            ],
+
+            'city' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'City is required'
+                ]
+            ],
+
+            'pincode' => [
+                'rules'  => 'required|numeric|exact_length[6]',
+                'errors' => [
+                    'required'      => 'Pincode is required',
+                    'numeric'       => 'Pincode must contain only numbers',
+                    'exact_length'  => 'Pincode must be exactly 6 digits'
+                ]
+            ],
+
+            // ======================
+            // Contact Details (Array)
+            // ======================
+            'name.*' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'Contact name is required',
+                    'min_length' => 'Contact name must be at least 2 characters'
+                ]
+            ],
+
+            'designation.*' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Designation is required'
+                ]
+            ],
+
+            'email.*' => [
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+
+            'mobile.*' => [
+                'rules'  => 'required|numeric|exact_length[10]',
+                'errors' => [
+                    'required'     => 'Mobile number is required',
+                    'numeric'      => 'Mobile must contain only digits',
+                    'exact_length' => 'Mobile number must be exactly 10 digits'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data   = $this->request->getPost();
-        $update = $this->tpaBranchModel->update($id, $data);
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id     = $sanitized_post_data['PrimaryKey'] ?? null;
+        $update = $this->tpaBranchModel->update($id, $sanitized_post_data);
 
         // print_r($this->request->getPost('name[]'));
         // print_r($this->request->getPost('email[]'));
@@ -809,18 +1408,18 @@ class MasterController extends AdminController
             foreach ($contactsToDelete as $contact) {
                 $this->levelContactModel->delete($contact->id);
             }
-            for ($i = 0; $i < count($this->request->getPost('name')); $i++) {
+            for ($i = 0; $i < count($sanitized_post_data['name']); $i++) {
                 // Prepare data to update
-                $data = [
+                $sanitized_post_data_for_level = [
                     'contact_type' => 'tpa',
                     'ref_id'       => $id,
                     'created_by'   => get_session_userid(),
-                    'name'         => $this->request->getPost('name')[$i],
-                    'email'        => $this->request->getPost('email')[$i],
-                    'mobile'       => $this->request->getPost('mobile')[$i],
-                    'designation'  => $this->request->getPost('designation')[$i]
+                    'name'         => $sanitized_post_data['name'][$i] ?? null,
+                    'email'        => $sanitized_post_data['email'][$i] ?? null,
+                    'mobile'       => $sanitized_post_data['mobile'][$i] ?? null,
+                    'designation'  => $sanitized_post_data['designation'][$i] ?? null
                 ];
-                $contacts = $this->levelContactModel->insert($data);
+                $contacts = $this->levelContactModel->insert($sanitized_post_data_for_level);
             }
         }
 
@@ -926,10 +1525,28 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','KYC Entity Type general info function called');
+        $rules = [
+            'name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'KYC Entity Type Name is required'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data   = $this->request->getPost();
-        $data['created_by'] = get_session_userid();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
         
-        $insert = $this->kycEntityTypeModel->insert($data);
+        $insert = $this->kycEntityTypeModel->insert($sanitized_post_data);
         if($insert){
             $kyc_data = $this->kycEntityTypeModel->where(['id' => $insert, 'is_active' => 1])->first();
             echo json_encode(array("status" => true , 'data' => $kyc_data));
@@ -942,20 +1559,40 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Kyc Docs CREATE function called');
+        $rules = [
+            'file_name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'KYC Docs File Name is required'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        
         $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        
         // print_r($data);die;
 
-        if($data['kyc_type_id'] == ''){
+        if($sanitized_post_data['kyc_type_id'] == ''){
             // PrimaryKey
-            $data['kyc_type_id'] =$data['PrimaryKey'];
+            $sanitized_post_data['kyc_type_id'] =$data['PrimaryKey'];
         }
         // print_r($data);die;
 
-        $data['created_by'] = get_session_userid();
-        $insert = $this->kycDocsModel->insert($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $insert = $this->kycDocsModel->insert($sanitized_post_data);
 
         if($insert){
-            $kycDocsData = $this->kycDocsModel->where('kyc_type_id', $data['kyc_type_id'])->where('is_active',1)->findAll();
+            $kycDocsData = $this->kycDocsModel->where('kyc_type_id', $sanitized_post_data['kyc_type_id'])->where('is_active',1)->findAll();
             echo json_encode(array("status" => true , 'data' => $kycDocsData));
         }else{
             echo json_encode(array("status" => false));
@@ -999,12 +1636,31 @@ class MasterController extends AdminController
     public function editKYCInfo()
     {
         $this->myLogger->logme('error','edit KYC general info function called');
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data               = $this->request->getPost();
-        $data['updated_by'] = get_session_userid();
-        $update             = $this->kycEntityTypeModel->update($id,$data);
+        $rules = [
+            'file_name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'KYC Docs File Name is required'
+                ]
+            ],
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id                 = $sanitized_post_data['PrimaryKey'] ?? null;
+        $sanitized_post_data['updated_by'] = get_session_userid();
+        $update             = $this->kycEntityTypeModel->update($id,$sanitized_post_data);
         if($update){
-            echo json_encode(array("status" => true , 'data' => $data));
+            echo json_encode(array("status" => true , 'data' => $sanitized_post_data));
         }else{
             echo json_encode(array("status" => false));
         }
@@ -1138,11 +1794,97 @@ class MasterController extends AdminController
     public function createPolicyType()
     {
         $this->myLogger->logme('error','Policy Type CREATE function called');
+        $rules = [
+            'policy_type' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'Policy type name is required',
+                    'min_length' => 'Policy type name must be at least 2 characters'
+                ]
+            ],
+
+            'bap' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'BAP is required'
+                ]
+            ],
+
+            'allocg' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Category is required'
+                ]
+            ],
+
+            'alloci' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'BAP category is required'
+                ]
+            ],
+
+    
+                'ebp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group base premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'etp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group third-party premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'etep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group terrorism premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'iep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual base premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'itp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual third-party premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'itep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual terrorism premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         $data   = $this->request->getPost();
-
-        $data['created_by'] = get_session_userid();
-        $insert = $this->policyTypeModel->insert($data);
-
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $sanitized_post_data['created_by'] = get_session_userid();
+        $insert = $this->policyTypeModel->insert($sanitized_post_data);
         if($insert){
             $policyTypeData = $this->policyTypeModel->where('id', $insert)->first();
             echo json_encode(array("status" => true , 'data' => $policyTypeData));
@@ -1175,12 +1917,101 @@ class MasterController extends AdminController
     public function editPolicyType()
     {
         $this->myLogger->logme('error','edit Policy general info function called');
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data               = $this->request->getPost();
-        $data['updated_by'] = get_session_userid();
-        $update             = $this->policyTypeModel->update($id,$data);
+        $rules = [
+            'policy_type' => [
+                'rules'  => 'required|trim|min_length[2]',
+                'errors' => [
+                    'required'   => 'Policy type name is required',
+                    'min_length' => 'Policy type name must be at least 2 characters'
+                ]
+            ],
+
+            'bap' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'BAP is required'
+                ]
+            ],
+
+            'allocg' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Category is required'
+                ]
+            ],
+
+            'alloci' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'BAP category is required'
+                ]
+            ],
+
+    
+                'ebp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group base premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'etp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group third-party premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'etep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Group terrorism premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'iep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual base premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'itp' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual third-party premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+
+                'itep' => [
+                    'rules'  => 'permit_empty|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'numeric' => 'Individual terrorism premium must be numeric',
+                        'greater_than_equal_to' => 'Value cannot be negative'
+                    ]
+                ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        
+        $id                 = $sanitized_post_data['PrimaryKey'] ?? null;
+        $sanitized_post_data['updated_by'] = get_session_userid();
+        $update             = $this->policyTypeModel->update($id,$sanitized_post_data);
         if($update){
-            echo json_encode(array("status" => true , 'data' => $data));
+            echo json_encode(array("status" => true , 'data' => $sanitized_post_data));
         }else{
             echo json_encode(array("status" => false));
         }
@@ -1197,7 +2028,7 @@ class MasterController extends AdminController
         // print_r($id);die;
             foreach ($policies as $policy) {
                 // Retrieve the insurer information
-                $insurer = $this->insurerModel->find($policy['insurer_id']);
+                $insurer = $this->insurerModel->find((int)$policy['insurer_id']);
 
                 // print_r($insurer);die;
                 // Add the insurer information to the editData array
@@ -1229,8 +2060,10 @@ class MasterController extends AdminController
     public function editPolicies()
     {
         $this->myLogger->logme('error','edit Policy general info function called');
-        $id                 = $this->request->getPost('PrimaryKey');
-        $data               = $this->request->getPost();
+        $request_post_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_post_data);
+
+        $id                 = $data['PrimaryKey'] ?? null;
         $data['updated_by'] = get_session_userid();
         $update             = $this->policesModel->update($id,$data);
         if($update){
@@ -1347,12 +2180,76 @@ class MasterController extends AdminController
     public function createCDMasterData()
     {   
         $this->myLogger->logme("error", 'Create CD Master Data API called.');
-        $data = $this->request->getPost();
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id = $sanitized_post_data['PrimaryKey'] ?? null;
+        if($id === null){
+            $rules = [
+
+                // ======================
+                // Client / Insurer Mapping
+                // ======================
+                'client_id' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Client is required'
+                    ]
+                ],
+
+                'insurer_id' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Insurer is required'
+                    ]
+                ],
+
+                'insurer_branch_id' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Insurer branch is required'
+                    ]
+                ],
+
+                // ======================
+                // CD Account Details
+                // ======================
+                'opening_date' => [
+                    'rules'  => 'required|valid_date[d-m-Y]',
+                    'errors' => [
+                        'required'   => 'Opening date is required',
+                        'valid_date' => 'Opening date must be in DD-MM-YYYY format'
+                    ]
+                ],
+
+                'cd_ac_no' => [
+                    'rules'  => 'required|trim',
+                    'errors' => [
+                        'required' => 'CD account number is required'
+                    ]
+                ],
+
+                'opening_bal' => [
+                    'rules'  => 'required|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'required' => 'Opening amount is required',
+                        'numeric'  => 'Opening amount must be numeric',
+                        'greater_than_equal_to' => 'Opening amount cannot be negative'
+                    ]
+                ],
+            ];
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+        }
         $this->myLogger->logme("error", 'Received POST data: ' . json_encode($data));
 
-        $id = $data['PrimaryKey'] ?? null;
-        $date = (string) ($data['opening_date'] ?? '');
-        $data['opening_date'] = date('Y-m-d', strtotime($date));
+        $date = (string) ($sanitized_post_data['opening_date'] ?? '');
+        $sanitized_post_data['opening_date'] = date('Y-m-d', strtotime($date));
         $this->myLogger->logme("error", 'Formatted opening_date: ' . $data['opening_date']);
 
         $loggedInUserID = get_session_userid();
@@ -1362,9 +2259,9 @@ class MasterController extends AdminController
         if (empty($id)) {
 
             $cd_acc_count = $this->CDMasterModel->where('is_active', 1)
-                ->where('client_id', $data['client_id'])
-                ->where('insurer_id', $data['insurer_id'])
-                ->where('insurer_branch_id', $data['insurer_branch_id'])
+                ->where('client_id', $sanitized_post_data['client_id'])
+                ->where('insurer_id', $sanitized_post_data['insurer_id'])
+                ->where('insurer_branch_id', $sanitized_post_data['insurer_branch_id'])
                 ->countAllResults();
         
             if($cd_acc_count > 0){
@@ -1372,19 +2269,19 @@ class MasterController extends AdminController
             }
 
             $this->myLogger->logme("error", 'Performing INSERT operation.');
-            $insert = $this->CDMasterModel->insert($data);
+            $insert = $this->CDMasterModel->insert($sanitized_post_data);
             $this->myLogger->logme("error", 'Insert result: ' . json_encode($insert));
 
             if ($insert) {
 
                 $cd_tranction_data = [
-                    'amount' => $data['opening_bal'],
+                    'amount' => $sanitized_post_data['opening_bal'] ?? null,
                     'sub_type_id' => 7,
-                    'client_id' => $data['client_id'],
+                    'client_id' => $sanitized_post_data['client_id'] ?? null,
                     'client_policy_id' => null,
-                    'cd_ac_no' => $data['cd_ac_no'],
+                    'cd_ac_no' => $sanitized_post_data['cd_ac_no'] ?? null,
                     'endorsement_no' => null,
-                    'insurer_id' => $data['insurer_id'],
+                    'insurer_id' => $sanitized_post_data['insurer_id'] ?? null,
                     'description' => 'Opening Amount',
                     'transaction_type' => 'Credit',
                     'event_name' => null,
@@ -1400,9 +2297,9 @@ class MasterController extends AdminController
                 $this->myLogger->logme("error", 'Inserted CD Master data: ' . json_encode($cd_master_data));
 
                 $cd_master_full_data = $this->CDMasterModel->where('is_active', 1)
-                                        ->where('client_id', $data['client_id'])
-                                        ->where('insurer_id', $data['insurer_id'])
-                                        ->where('insurer_branch_id', $data['insurer_branch_id'])
+                                        ->where('client_id', $sanitized_post_data['client_id'])
+                                        ->where('insurer_id', $sanitized_post_data['insurer_id'])
+                                        ->where('insurer_branch_id', $sanitized_post_data['insurer_branch_id'])
                                         ->findAll();
 
                 return $this->respond([
@@ -1427,7 +2324,7 @@ class MasterController extends AdminController
         // === UPDATE ===
         $this->myLogger->logme("error", 'Performing UPDATE operation for ID: ' . $id);
 
-        $updated = $this->CDMasterModel->where('id', $id)->set($data)->update();
+        $updated = $this->CDMasterModel->where('id', $id)->set($sanitized_post_data)->update();
         $this->myLogger->logme("error", 'Update result: ' . json_encode($updated));
 
         $existingData = $this->CDMasterModel->where('is_active', 1)->where('id', $id)->first();
@@ -1465,27 +2362,89 @@ class MasterController extends AdminController
 
     public function editCDMasterData($id = null)
     {
+        $this->myLogger->logme("error", 'Edit CD Master Data API called.');
+        $rules = [
 
-        $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));
+            // ======================
+            // Client / Insurer Mapping
+            // ======================
+            'client_id' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Client is required'
+                ]
+            ],
+
+            'insurer_id' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Insurer is required'
+                ]
+            ],
+
+            'insurer_branch_id' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Insurer branch is required'
+                ]
+            ],
+
+            // ======================
+            // CD Account Details
+            // ======================
+            'opening_date' => [
+                'rules'  => 'required|valid_date[d-m-Y]',
+                'errors' => [
+                    'required'   => 'Opening date is required',
+                    'valid_date' => 'Opening date must be in DD-MM-YYYY format'
+                ]
+            ],
+
+            'cd_ac_no' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'CD account number is required'
+                ]
+            ],
+
+            'opening_bal' => [
+                'rules'  => 'required|numeric|greater_than_equal_to[0]',
+                'errors' => [
+                    'required' => 'Opening amount is required',
+                    'numeric'  => 'Opening amount must be numeric',
+                    'greater_than_equal_to' => 'Opening amount cannot be negative'
+                ]
+            ],
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+        $data   = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+        $id = $sanitized_post_data['PrimaryKey'] ?? null;
+        $date = ((string) $sanitized_post_data['opening_date']) ?? null;
+        $sanitized_post_data['opening_date'] = date('Y-m-d', strtotime($date));
 
         if ($data) {
 
-            $insert = $this->CDMasterModel->where('id', $id)->set($data)->update();
+            $insert = $this->CDMasterModel->where('id', $id)->set($sanitized_post_data)->update();
 
-            $data = $this->CDMasterModel->where('id', $id)->first();
+            $get_data = $this->CDMasterModel->where('id', $id)->first();
 
             $cd_transaction_updated_data = [
-                'balance' => $data['opening_bal'],
-                'amount' => $data['opening_bal']
+                'balance' => $get_data['opening_bal'],
+                'amount' => $get_data['opening_bal']
             ];
 
             $cd_tranction = $this->clientDepositModel
-                ->where('client_id', $data['client_id'])
-                ->where('insurer_id', $data['insurer_id'])
-                ->where('cd_ac_no', $data['cd_ac_no'])
+                ->where('client_id', $sanitized_post_data['client_id'])
+                ->where('insurer_id', $sanitized_post_data['insurer_id'])
+                ->where('cd_ac_no', $sanitized_post_data['cd_ac_no'])
                 ->where('sub_type', 7)
                 ->set($cd_transaction_updated_data)->update();
                         
@@ -1731,35 +2690,72 @@ class MasterController extends AdminController
     {   
         // return $this->respond($this->request->getPost());
         $template_id = $this->request->getPost('template_id');
+
+        $rules = [
+            'policy_type' => [
+                'rules'  => 'required|is_natural_no_zero',
+                'errors' => [
+                    'required' => 'Policy type is required'
+                ]
+            ],
+
+            'event' => [
+                'rules'  => 'required|trim',
+                'errors' => [
+                    'required' => 'Event is required'
+                ]
+            ],
+
+    
+            'json_data' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Template mapping data is required'
+                ]
+            ],
+        ];
+
+        if (! $this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status'  => false,
+                'message' => 'Input validation failed',
+                'code'    => 400,
+                'errors'  => $this->validator->getErrors()
+            ]);
+        }
+        $data           = $this->request->getPost();
+        $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+
+
        
-        $data = [
-            'insurer_id' => $this->request->getPost('insurer_id'),
-            'policy_type_id' => $this->request->getPost('policy_type'),
-            'event_name' => $this->request->getPost('event'),
+        $fetch_data = [
+            'insurer_id' => $sanitized_post_data['insurer_id'] ?? null ,
+            'policy_type_id' => $sanitized_post_data['policy_type'] ?? null,
+            'event_name' => $sanitized_post_data['event'] ?? null,
             'type_name' => 'export',
-            'jsoncolumns' => $this->request->getPost('json_data'),
+            'jsoncolumns' => $sanitized_post_data['json_data'] ?? null,
             'is_active' => 1,
             'created_by' => get_session_userid(),
         ];
 
         if($template_id){
 
-            $update = $this->insurerTemplateModel->where('id', $template_id)->set($data)->update();
+            $update = $this->insurerTemplateModel->where('id', $template_id)->set($fetch_data)->update();
 
             if($update){
-                return $this->respond(['status' => true, 'message' => 'Template updated successfully',  $data]);
+                return $this->respond(['status' => true, 'message' => 'Template updated successfully',  $fetch_data]);
             }else{
-                return $this->respond(['status' => true, 'message' => 'Failed to update template',  $data]);
+                return $this->respond(['status' => true, 'message' => 'Failed to update template',  $fetch_data]);
             }
 
         }else{
 
-            $insert = $this->insurerTemplateModel->insert($data);
+            $insert = $this->insurerTemplateModel->insert($fetch_data);
 
             if($insert){
-                return $this->respond(['status' => true, 'message' => 'Template created successfully',  $data]);
+                return $this->respond(['status' => true, 'message' => 'Template created successfully',  $fetch_data]);
             }else{
-                return $this->respond(['status' => true, 'message' => 'Failed to create template',  $data]);
+                return $this->respond(['status' => true, 'message' => 'Failed to create template',  $fetch_data]);
             }
         }
 
@@ -1983,7 +2979,9 @@ class MasterController extends AdminController
             'files' => WRITEPATH . 'uploads/commission/files',
             'rules' => WRITEPATH . 'uploads/commission/rules',
             'claim_sample_forms' => ROOTPATH . 'public/claim_sample_forms/',
+            'tmp' => ROOTPATH . 'public/tmp/',
             'bds_dump_excel' => WRITEPATH . 'uploads/bds_dump_excel/',
+            'claims_mis' => WRITEPATH . 'uploads/claims_mis/',
         ];
 
         foreach ($folders as $folderName => $folderPath) {
@@ -2160,13 +3158,34 @@ class MasterController extends AdminController
         
         if ($method === 'post') {
 
-            $id = $this->request->getPost('pk') ?? null;
-            $data = $this->request->getPost();
+            
+            $rules = [
+                'branch_name' => [
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required' => 'Branch Name is required'
+                    ]
+                ]
+            ];
 
+            if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+            }
+
+            $data           = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+            $id = $sanitized_post_data['pk'] ?? null;
+            unset($sanitized_post_data['pk']); 
+            
             if (empty($id)) {
-                $update_status = $nhanceBranchModel->insert($data);
+                $update_status = $nhanceBranchModel->insert($sanitized_post_data);
             } else {
-                $update_status = $nhanceBranchModel->where('id', $id)->set($data)->update();
+                $update_status = $nhanceBranchModel->where('id', $id)->set($sanitized_post_data)->update();
             }
 
             if ($update_status) {
@@ -2242,13 +3261,34 @@ class MasterController extends AdminController
         
         if ($method === 'post') {
 
-            $id = $this->request->getPost('pk') ?? null;
-            $data = $this->request->getPost();
+
+            $rules = [
+                'vehicle_type' => [
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required' => 'Vehicle Type is required'
+                    ]
+                ]
+            ];
+
+            if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+            }
+
+            $data           = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+            $id = $sanitized_post_data['pk'] ?? null;
+            unset($sanitized_post_data['pk']); 
 
             if (empty($id)) {
-                $update_status = $vehicleTypeModel->insert($data);
+                $update_status = $vehicleTypeModel->insert($sanitized_post_data);
             } else {
-                $update_status = $vehicleTypeModel->where('id', $id)->set($data)->update();
+                $update_status = $vehicleTypeModel->where('id', $id)->set($sanitized_post_data)->update();
             }
 
             if ($update_status) {
@@ -2256,14 +3296,14 @@ class MasterController extends AdminController
                     'status'  => true,
                     'code'    => 200,
                     'message' => 'Vehicle Type Master updated successfully',
-                    'data'    => $data
+                    'data'    => $sanitized_post_data
                 ], 200);
             } else {
                 return $this->respond([
                     'status'  => false,
                     'code'    => 400,
                     'message' => 'Failed to update',
-                    'data'    => $data
+                    'data'    => $sanitized_post_data
                 ], 200);
             }
 
@@ -2323,13 +3363,62 @@ class MasterController extends AdminController
 
         if ($method === 'post') {
 
-            $id = $this->request->getPost('pk') ?? null;
-            $data = $this->request->getPost();
+            $rules = [
+                // ======================
+                // RTO Office Name
+                // ======================
+                'rto_name' => [
+                    'rules'  => 'required|trim|min_length[3]|max_length[100]|alpha_numeric_space',
+                    'errors' => [
+                        'required' => 'RTO Office Name is required',
+                        'min_length' => 'RTO Office Name must be at least 3 characters'
+                    ]
+                ],
+                // ======================
+                // RTO Code (2 digits only)
+                // ======================
+                'rto_code' => [
+                    'rules'  => 'required|exact_length[2]|numeric',
+                    'errors' => [
+                        'required'     => 'RTO Code is required',
+                        'exact_length' => 'RTO Code must be exactly 2 digits',
+                        'numeric'      => 'RTO Code must contain only numbers'
+                    ]
+                ],
+                // ======================
+                // RTO State (2 letters only)
+                // ======================
+                'rto_state' => [
+                    'rules'  => 'required|exact_length[2]|alpha',
+                    'errors' => [
+                        'required'     => 'RTO State is required',
+                        'exact_length' => 'RTO State must be exactly 2 letters',
+                        'alpha'        => 'RTO State must contain only alphabets'
+                    ]
+                ],
+
+            ];
+
+            if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+            }
+
+            
+            $data           = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+            $id = $sanitized_post_data['pk'] ?? null;
+            unset($sanitized_post_data['pk']); 
+            
 
             if (empty($id)) {
-                $update_status = $rtoModel->insert($data);
+                $update_status = $rtoModel->insert($sanitized_post_data);
             } else {
-                $update_status = $rtoModel->where('id', $id)->set($data)->update();
+                $update_status = $rtoModel->where('id', $id)->set($sanitized_post_data)->update();
             }
 
             if ($update_status) {
@@ -2337,14 +3426,14 @@ class MasterController extends AdminController
                     'status'  => true,
                     'code'    => 200,
                     'message' => 'RTO Master updated successfully',
-                    'data'    => $data
+                    'data'    => $sanitized_post_data
                 ], 200);
             } else {
                 return $this->respond([
                     'status'  => false,
                     'code'    => 400,
                     'message' => 'Failed to update',
-                    'data'    => $data
+                    'data'    => $sanitized_post_data
                 ], 200);
             }
 
@@ -2404,47 +3493,172 @@ class MasterController extends AdminController
         
         if ($this->request->getMethod() === 'post') {
 
-            $id   = $this->request->getPost('pk');
-            $data = $this->request->getPost();
+            $rules = [
+                'manager_id' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'Manager is required',
+                        'integer'  => 'Invalid Manager selected'
+                    ]
+                ],
+                'name' => [
+                    'rules'  => 'required|min_length[3]|max_length[100]|alpha_space',
+                    'errors' => [
+                        'required'   => 'Name is required',
+                        'min_length' => 'Name must be at least 3 characters',
+                        'max_length' => 'Name cannot exceed 100 characters',
+                        'alpha_space'=> 'Name can contain only letters and spaces'
+                    ]
+                ],
+                'pos_code' => [
+                    'rules'  => 'required|alpha_numeric|max_length[20]',
+                    'errors' => [
+                        'required'      => 'POS Code is required',
+                        'alpha_numeric' => 'POS Code must be alphanumeric',
+                        'max_length'    => 'POS Code cannot exceed 20 characters'
+                    ]
+                ],
+                'email' => [
+                    'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                    'errors' => [
+                        'required'    => 'Email address is required.',
+                        'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                    ]
+                ],
+                'mobile' => [
+                    'rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required'     => 'Mobile number is required',
+                        'numeric'      => 'Mobile number must contain only digits',
+                        'exact_length' => 'Mobile number must be exactly 10 digits'
+                    ]
+                ],
+                'address' => [
+                    'rules'  => 'required|min_length[5]',
+                    'errors' => [
+                        'required'   => 'Address is required',
+                        'min_length' => 'Address must be at least 5 characters'
+                    ]
+                ],
+                'city' => [
+                    'rules'  => 'required|alpha_space',
+                    'errors' => [
+                        'required'    => 'City is required',
+                        'alpha_space' => 'City must contain only letters and spaces'
+                    ]
+                ],
+                'state' => [
+                    'rules'  => 'required|alpha_space',
+                    'errors' => [
+                        'required'    => 'State is required',
+                        'alpha_space' => 'State must contain only letters and spaces'
+                    ]
+                ],
+                'pincode' => [
+                    'rules'  => 'required|numeric|exact_length[6]',
+                    'errors' => [
+                        'required'     => 'Pincode is required',
+                        'numeric'      => 'Pincode must contain only digits',
+                        'exact_length' => 'Pincode must be exactly 6 digits'
+                    ]
+                ],
+                'aadhar' => [
+                    'rules'  => 'required|numeric|exact_length[12]',
+                    'errors' => [
+                        'required'     => 'Aadhaar number is required',
+                        'numeric'      => 'Aadhaar must contain only digits',
+                        'exact_length' => 'Aadhaar must be exactly 12 digits'
+                    ]
+                ],
+                'pan' => [
+                    'rules'  => 'required|regex_match[/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/]',
+                    'errors' => [
+                        'required'      => 'PAN number is required',
+                        'regex_match'   => 'Enter a valid PAN number (ABCDE1234F)'
+                    ]
+                ],
+                'gst' => [
+                    'rules'  => 'permit_empty|max_length[15]',
+                    'errors' => [
+                        'max_length' => 'GST number cannot exceed 15 characters'
+                    ]
+                ],
+                'aadhar_file_name' => [
+                    'rules'  => 'permit_empty|uploaded[aadhar_file_name]|max_size[aadhar_file_name,5120]|ext_in[aadhar_file_name,pdf,jpg,jpeg,png]',
+                    'errors' => [
+                        'uploaded' => 'Invalid Aadhaar file',
+                        'max_size' => 'Aadhaar file size should not exceed 5MB',
+                        'ext_in'   => 'Aadhaar must be PDF or image (jpg, jpeg, png)'
+                    ]
+                ],
+                'pan_file_name' => [
+                    'rules'  => 'permit_empty|uploaded[pan_file_name]|max_size[pan_file_name,5120]|ext_in[pan_file_name,pdf,jpg,jpeg,png]',
+                    'errors' => [
+                        'uploaded' => 'Invalid PAN file',
+                        'max_size' => 'PAN file size should not exceed 5MB',
+                        'ext_in'   => 'PAN must be PDF or image (jpg, jpeg, png)'
+                    ]
+                ],
+                'certificate_file_name' => [
+                    'rules'  => 'permit_empty|uploaded[certificate_file_name]|max_size[certificate_file_name,5120]|ext_in[certificate_file_name,pdf,jpg,jpeg,png]',
+                    'errors' => [
+                        'uploaded' => 'Invalid Certificate file',
+                        'max_size' => 'Certificate file size should not exceed 5MB',
+                        'ext_in'   => 'Certificate must be PDF or image (jpg, jpeg, png)'
+                    ]
+                ],
+            ];
 
-            unset($data['pk']); 
+            if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+            }
+
+            $data           = $this->request->getPost();
+            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+            $id = $sanitized_post_data['pk'] ?? null;
+            unset($sanitized_post_data['pk']); 
 
             try {
                 // Certificate
                 $certificate = $this->uploadPOSFile('certificate_file_name', 'pos_certificate_files');
-                if ($certificate !== null) { $data['certificate_file_name'] = $certificate; } else { unset($data['certificate_file_name']); }
+                if ($certificate !== null) { $sanitized_post_data['certificate_file_name'] = $certificate; } else { unset($sanitized_post_data['certificate_file_name']); }
 
                 // PAN file
                 $panFile = $this->uploadPOSFile('pan_file_name', 'pos_certificate_files');
-                if ($panFile !== null) { $data['pan_file_name'] = $panFile; } else { unset($data['pan_file_name']);}
+                if ($panFile !== null) { $sanitized_post_data['pan_file_name'] = $panFile; } else { unset($sanitized_post_data['pan_file_name']);}
 
                 // Aadhaar file
                 $aadharFile = $this->uploadPOSFile('aadhar_file_name', 'pos_certificate_files');
-                if ($aadharFile !== null) { $data['aadhar_file_name'] = $aadharFile; } else { unset($data['aadhar_file_name']);}
+                if ($aadharFile !== null) { $sanitized_post_data['aadhar_file_name'] = $aadharFile; } else { unset($sanitized_post_data['aadhar_file_name']);}
 
             } catch (\RuntimeException $e) {
-                return $this->respond([ 'status' => false, 'code' => 400, 'message' => $e->getMessage(), 'data' => $data ], 400);
+                return $this->respond([ 'status' => false, 'code' => 400, 'message' => $e->getMessage(), 'data' => $sanitized_post_data ], 400);
             }
 
-                foreach ($data as $k => $v) {
+                foreach ($sanitized_post_data as $k => $v) {
                     if ($v === '' || $v === null) {
-                        unset($data[$k]);
+                        unset($sanitized_post_data[$k]);
                     }
                 }
             
 
             // INSERT / UPDATE
             if (empty($id)) {
-                $status = $posModel->insert($data);
+                $status = $posModel->insert($sanitized_post_data);
             } else {
-                $status = $posModel->update($id, $data);
+                $status = $posModel->update($id, $sanitized_post_data);
             }
 
             if ($status) {
-                return $this->respond([ 'status' => true, 'code' => 200, 'message' => 'POS updated successfully', 'data' => $data ], 200);
+                return $this->respond([ 'status' => true, 'code' => 200, 'message' => 'POS updated successfully', 'data' => $sanitized_post_data ], 200);
             }
 
-            return $this->respond([ 'status' => false, 'code' => 400, 'message' => 'Failed to update', 'data' => $data ], 400);
+            return $this->respond([ 'status' => false, 'code' => 400, 'message' => 'Failed to update', 'data' => $sanitized_post_data ], 400);
             }
             elseif ($method === 'get') {
 
diff --git a/app/Controllers/MediAssistApiController.php b/app/Controllers/MediAssistApiController.php
index b019850a..0452c797 100644
--- a/app/Controllers/MediAssistApiController.php
+++ b/app/Controllers/MediAssistApiController.php
@@ -138,6 +138,9 @@ class MediAssistApiController extends BaseController
         if($response['status'] != true){
 
             log_message('error', 'TPA CLAIM PUSH FAILED | claimId: '.$claimId.' | response: '.json_encode($response));
+            $this->db->table('ticket_master')
+            ->where('id',$claimId)
+            ->update([ 'tpa_push_response' => json_encode($response) ]);
             return;
         }
 
@@ -515,7 +518,7 @@ class MediAssistApiController extends BaseController
             ->getRowArray();
 
         if (!$ticket) {
-            return $this->response->setJSON(['status' => false,'message' => 'Invalid Claim ID' ]);
+            return ['status' => false,'message' => 'Invalid Claim ID' ];
         }
 
         // REQUEST BODY
@@ -545,8 +548,6 @@ class MediAssistApiController extends BaseController
 
         }
 
-
-
         //  $body = [ 
         //         "policyNo" => "97000063250400000031", 
         //         "startDate" => "01/11/2025", 
@@ -565,11 +566,7 @@ class MediAssistApiController extends BaseController
         if ($response['status'] != true || empty($response['data']['claimsData'][0])) {
             log_message('error', 'CLAIM STATUS FAILED | for ticket ID: ' . $claimId.' | response: '.json_encode($response));
 
-            return $this->response->setJSON([
-                'status'  => false,
-                'message' => 'API call failed.',
-                'data'    => $response
-            ]);
+            return ['status'  => false,'message' => 'API call failed.','data'    => $response ];
         }
 
         // Extract claim status
@@ -631,12 +628,7 @@ class MediAssistApiController extends BaseController
         // LOG UPDATE
         log_message('error', "CLAIM STATUS SUCCESS | Updated ticket ID $claimId with claim status: $currentStatus");
 
-        return $this->response->setJSON([
-            'status' => true,
-            'message' => 'Claim status updated.',
-            'updated_status' => $currentStatus,
-            'api_response' => $response
-        ]);
+        return ['status' => true,'message' => 'Claim status updated.','updated_status' => $currentStatus,'api_response' => $response];
     }
 
     public function IRSubmission($claimId = null) // 585 this id for test
@@ -1106,7 +1098,9 @@ class MediAssistApiController extends BaseController
             $ticket = $this->db->table('ticket_master tm')->select("tm.id")
                                ->where('tm.policy_no', $value['policY_NUMBER'])
                                ->where('tm.emp_code', $value['employeE_NO'])
-                               ->where('tm.claim_number', $value['tpA_CLAIM_NO'])
+                               ->where('tm.claim_amount', $value['estimateD_CLAIM_AMOUNT'])
+                               ->where('tm.doa', $this->mediDate($value['datE_OF_ADMISSION'] ?? null))
+                            // ->where('tm.claim_number', $value['tpA_CLAIM_NO'])
                                ->get()
                                ->getRowArray();
 
@@ -1173,6 +1167,7 @@ class MediAssistApiController extends BaseController
                                 ")
                                ->join('client_rm', 'client_rm.client_id = cp.client_id AND client_rm.level = 3', 'left')
                                ->where('cp.policy_no', $value['policY_NUMBER'])
+                               ->orderBy('client_rm.id','DESC')
                                ->get()
                                ->getRowArray();
 
@@ -1181,12 +1176,14 @@ class MediAssistApiController extends BaseController
                                     e.id as emp_id,
                                     e.emp_code ,
                                     e2.id as insured_emp_id,
+                                    ep.tpa_id as tpa_no,
                                 ")
                                ->join(
                                     'employees e2',
                                     "e2.emp_code = e.emp_code AND e2.relationship = ".$this->db->escape($relationship),
                                     'left'
                                 )
+                               ->join( 'employee_polices ep',  "ep.employee_id = e2.id ",  'left' )
                                ->where('e.emp_code', $value['employeE_NO'])
                                ->where('e.relationship', 'self')
                                ->get()
@@ -1200,7 +1197,7 @@ class MediAssistApiController extends BaseController
                 'claim_status_id'  => $claimStatusId,
                 'policy_no'        => $value['policY_NUMBER'] ?? null,
                 'claim_number'     => $value['tpA_CLAIM_NO'] ?? null,
-                'tpa_claim_id' => $value['tpA_CLAIM_NO'] ?? null,
+                'tpa_claim_id'     => $value['tpA_CLAIM_NO'] ?? null,
 
                 // local promary id
                 'tpa_id'           => $clientpolicy['tpa_id'] ?? null,
@@ -1212,6 +1209,7 @@ class MediAssistApiController extends BaseController
                 // Employee / Insured
                 'emp_id'           => $employee['emp_id'] ?? null,
                 'insured_emp_id'   => $employee['insured_emp_id'] ?? null,
+                'tpa_no'           => $employee['tpa_no'] ?? null,
                 'emp_code'         => $value['employeE_NO'] ?? null,
                 'emp_name'         => $value['employeE_NAME'] ?? null,
                 'insured_name'     => $value['beneficiarY_NAME'] ?? null,
@@ -1250,9 +1248,8 @@ class MediAssistApiController extends BaseController
             $this->db->table('ticket_master')->insert($claimData);
 
             log_message(
-                'info',
-                'New claim created | Policy: '.$claimData['policy_no'].
-                ' | Claim: '.$claimData['claim_number']
+                'error',
+                'New claim created | Policy: '.$claimData['policy_no'].' | Claim: '.$claimData['claim_number']
             );
 
             }
diff --git a/app/Controllers/NotificationController.php b/app/Controllers/NotificationController.php
index 0d85df18..8014f0c5 100755
--- a/app/Controllers/NotificationController.php
+++ b/app/Controllers/NotificationController.php
@@ -52,6 +52,7 @@ class NotificationController extends AdminController
     // Create Or Update the Notification 
     public function createNotification()
     {
+        
         $form_data['template_name'] = $this->camelCaseToSnakeCase($this->request->getPost('template_name'));
         $form_data['subject'] = $this->request->getPost('subject');
         $form_data['mail_content'] = $this->request->getPost('mailContent');
@@ -93,7 +94,8 @@ class NotificationController extends AdminController
             'member_ecard_mail_btn',
             'member_review_and_summary_mail_btn',
             'account_maneger_summary_mail_btn',
-            'client_hr_summary_mail_btn'
+            'client_hr_summary_mail_btn',
+            'hr_cd_insufficient_balance_mail_btn',
         ];
         $data = [];
         $emptyTemplate = [];
diff --git a/app/Controllers/PayoutController.php b/app/Controllers/PayoutController.php
index 90d501dc..bf992d88 100644
--- a/app/Controllers/PayoutController.php
+++ b/app/Controllers/PayoutController.php
@@ -147,7 +147,7 @@ class PayoutController extends BaseController
                 $summary_data = $this->invoiceModel->utrSummary($invoice_id);
                 if($summary_data['invoice_amount'] == $summary_data['total_utr_amount']){
                     $sql = "UPDATE partner_invoice SET payout_status = 2 WHERE id = ?";
-                    db_connect()->query($sql, [$invoice_id]);
+                    db_connect()->query($sql, [(int)$invoice_id]);
                 }
 
                 return $this->respond(['status' => true, 'code' => 200, 'data' => $payout_edit_data, "message" => "UTR successfully updated"], 200);
@@ -166,7 +166,7 @@ class PayoutController extends BaseController
                 $summary_data = $this->invoiceModel->utrSummary($invoice_id);
                 if($summary_data['invoice_amount'] == $summary_data['total_utr_amount']){
                     $sql = "UPDATE partner_invoice SET payout_status = 2 WHERE id = ?";
-                    db_connect()->query($sql, [$invoice_id]);
+                    db_connect()->query($sql, [(int)$invoice_id]);
                 }
 
                 return $this->respond(['status' => true, 'code' => 200, 'data' => $payout_data, "message" => "UTR added successfully"], 200);
@@ -281,13 +281,17 @@ class PayoutController extends BaseController
     //... Payout-invoice Mapping -  Save/update/soft Delete/Hard Delete Data
     public function saveInvoice()
     {
-        $json = $this->request->getJSON(true);
-        // print_rr($json);die();
-        
-        if (!$json) {
+        $raw_json = $this->request->getJSON(true);
+
+        // 1. Check if the JSON was actually valid/parsed before sanitizing
+        if (is_null($raw_json)) {
             return $this->response->setJSON(['error' => 'Invalid JSON','message' => 'Invalid JSON received.'])->setStatusCode(400);
         }
 
+        // 2. Sanitize the data
+        $json = sanitizeInputArrayAdvanced($raw_json);
+
+        // 3. Now you can safely use $json (even if it is an empty array)
         $id = $json['invoice_id'] ?? null;
         try {
 
@@ -335,7 +339,7 @@ class PayoutController extends BaseController
 
                             $invoiceData = [
                                 'invoice_no'     => $json['invoice_no'],
-                                'agent_id'       => $json['agent_id'],
+                                // 'agent_id'       => $json['agent_id'] ?? null,
                                 'invoice_date'   => $json['invoice_date'],
                                 'invoice_amount' => $json['invoice_amount'],
                             ];
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index f106f274..4a5d3d04 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -309,7 +309,7 @@
                     'format' => null,
                     'allowed_values' => null,
                     'custom' => 'check_agent_exist',
-                    'params' => ['row', 'agent_data']
+                    'params' => ['row', 'pos_data']
                 ],
 
                 'base_premium' => [
@@ -917,12 +917,152 @@
         // policy Transaction Create function start
         public function createInceptionPolicy()
         {   
-            $post_data = $this->request->getPost() ?? [];
+            $post_data = $this->request->getPost();
+
+            $rules = [
+                // ==========================================
+                // 1. CLIENT SECTION (5 Fields)
+                // ==========================================
+                'client_id'     => ['label'  => 'Client','rules'  => 'required','errors' => ['required' => 'Please select a Client.']],
+                'client_type'   => ['label'  => 'Client Type','rules'  => 'required','errors' => ['required' => 'Client Type must be selected.']],
+                'industry_type' => ['label'  => 'Industry','rules'  => 'permit_empty','errors' => []], // No errors needed for permit_empty unless adding other rules
+                'gst_no'        => ['label'  => 'GST Number','rules'  => 'permit_empty|regex_match[/^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$/]','errors' => ['alpha_numeric' => 'GST Number should only contain letters and numbers.','regex_match' => 'Invalid GST format. (Example: 22AAAAA0000A1Z5)']],
+                'pan_no'        => ['label'  => 'PAN Number','rules'  => 'permit_empty|regex_match[/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/]','errors' => ['alpha_numeric' => 'PAN Number should only contain letters and numbers.','regex_match' => 'Invalid PAN format. (Example: ABCDE1234F)']],
+                // ==========================================
+                // 2. PRE-SALES SECTION (3 Fields)
+                // ==========================================
+                'lead_source'       => ['label' => 'Lead Source', 'rules' => 'permit_empty', 'errors' => []],
+                'opportunity_id'    => ['label' => 'Opportunity', 'rules' => 'permit_empty', 'errors' => []],
+                'quotation_ref'     => ['label' => 'Quotation Ref', 'rules' => 'permit_empty', 'errors' => []],
+
+                // ==========================================
+                // 3. POLICY DOCUMENT (2 Fields)
+                // ==========================================
+                'policy_copy'       => ['label' => 'Policy Copy', 'rules' => 'permit_empty', 'errors' => []],
+                'proposal_form'     => ['label' => 'Proposal Form', 'rules' => 'permit_empty', 'errors' => []],
+
+                // ==========================================
+                // 4. VEHICLE DOCUMENT (2 Fields)
+                // ==========================================
+                'rc_copy'           => ['label' => 'RC Copy', 'rules' => 'permit_empty', 'errors' => []],
+                'inspection_report' => ['label' => 'Inspection Report', 'rules' => 'permit_empty', 'errors' => []],
+
+                // ==========================================
+                // 5. SALES SECTION (12 Fields)
+                // ==========================================
+                'base_policy'        => ['label' => 'Base Policy', 'rules' => 'permit_empty','errors' => []],
+                'policy_no'          => ['label' => 'Policy Number', 'rules'  => 'required|regex_match[/^[a-zA-Z0-9\/_-]+$/]',
+                                        'errors' => [
+                                            'required'    => 'Policy Number is Must.',
+                                            'regex_match' => 'Policy Number can only contain letters, numbers, and symbols like / - or _'
+                                        ]],
+                'policy_issue_date'  => ['label' => 'Issue Date', 'rules'  => 'required|valid_date[Y-m-d]|regex_match[/^\d{4}-\d{2}-\d{2}$/]',
+                                        'errors' => [
+                                            'required'    => 'Policy Issue Date is required.',
+                                            'valid_date'  => 'Please provide a valid Policy Issue Date.',
+                                            'regex_match' => 'The Policy Issue Date format is incorrect. '
+                                        ]],
+                'month'              => ['label' => 'Issue Month', 'rules' => 'required','errors' => [
+                        'required' => 'Please select or enter the Policy Issue Month.'
+                    ]],
+                'policy_start_date'  => ['label' => 'D.O.C', 
+                            'rules'  => 'required|valid_date[Y-m-d]|regex_match[/^\d{4}-\d{2}-\d{2}$/]',
+                            'errors' => [
+                                'required'   => 'D.O.C (Start Date) is required.',
+                                'valid_date'  => 'Please provide a valid D.O.C date.',
+                                'regex_match' => 'The D.O.C date format is incorrect. '
+                ]],
+                'policy_end_date'    => ['label' => 'D.O.E', 'rules' => 'required|valid_date[Y-m-d]|regex_match[/^\d{4}-\d{2}-\d{2}$/]','errors' => [
+                        'required'   => 'D.O.E (Expiry Date) is required.',
+                        'valid_date'  => 'Please provide a valid D.O.E date.',
+                        'regex_match' => 'The D.O.E date format is incorrect. '
+                    ]],
+                'emp_count'          => ['label' => 'No of Insured', 'rules' => 'permit_empty|numeric','errors' => [
+                        'numeric' => 'No of Insured must contain only numbers.'
+                    ]],
+                'dependent_count'    => ['label' => 'No of Dependents', 'rules' => 'permit_empty|numeric','errors' => [
+                        'numeric' => 'No of Dependents must contain only numbers.'
+                    ]],
+                'installment'        => ['label' => 'Installment', 'rules' => 'permit_empty','errors' => []],
+                'installment_data'   => ['label' => 'Installment Data', 'rules' => 'permit_empty','errors' => []],
+                'co_share'           => ['label' => 'CoP Yes', 'rules' => 'permit_empty','errors' => []],
+                'bro_payable_by'     => ['label' => 'Remuneration Pay By', 'rules' => 'permit_empty','errors' => []],
+                'renewal_date'       => ['label' => 'Renewal Date', 'rules' => 'required|valid_date[Y-m-d]|regex_match[/^\d{4}-\d{2}-\d{2}$/]','errors' => [
+                        'required'   => 'Renewal Date is required.',
+                        'valid_date'  => 'Please provide a valid Renewal Date.',
+                        'regex_match' => 'The Renewal Date format is incorrect. '
+                    ]],
+                'sales_generated_by' => ['label' => 'Sales Generated By', 'rules' => 'permit_empty','errors' => [
+                        // 'required' => 'Please select the person who generated this sale.'
+                    ]],
+                'serviced_by'        => ['label' => 'Serviced By', 'rules' => 'permit_empty','errors' => [
+                        // 'required' => 'Please select the service person for this policy.'
+                    ]],
+                'pos_id'             => ['label' => 'POS', 'rules' => 'permit_empty','errors' => []],
+
+                    // ==========================================
+                    // 6. PREMIUM DETAILS (Array Fields - 25 Fields)
+                    // Use .* because these come from the dynamic table
+                    // ==========================================
+                    'follow_insurer_id.*'      => ['label' => 'Insurer', 'rules' => 'required','errors' => ['required' => 'Please select an Insurer.']],
+                    'co_share_type.*'          => ['label' => 'Is Leader', 'rules' => 'permit_empty','errors' => []],
+                    'cd_ac_no_for_child.*'     => ['label' => 'CD Acc No', 'rules' => 'permit_empty','errors' => []],
+                    'cd_current_balance.*'     => ['label' => 'CD Amount', 'rules' => 'permit_empty','errors' => []],
+                    'follower_policy_no.*'     => ['label' => 'Follower Policy No', 'rules' => 'permit_empty','errors' => []],
+                    'calc_policy_issue_date.*' => ['label' => 'Policy Issue Date', 'rules' => 'required','errors' => [ 'required' => 'Policy Issue Date is required' ]],
+                    'co_share_per.*'           => ['label' => 'Co-Share %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Co-Share % must be a valid decimal.']],
+                    'non_comm_per_amt.*'       => ['label' => 'Non-Comm Premium', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Amount must be numeric.']],
+                    'base_premium.*'           => ['label' => 'Base Premium', 'rules' => 'permit_empty|regex_match[/^-?\d+(\.\d+)?$/]|differs[0]',
+                                                'errors' => [
+                                                    'regex_match' => 'Base Premium must be a valid positive or negative number.',
+                                                    'differs'     => 'Base Premium cannot be zero.'
+                                                ]],
+                    'tp_premium.*'             => ['label' => 'TP Premium', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'TP Premium must be numeric.']],
+                    'ter_premium.*'            => ['label' => 'TEP Premium', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'TEP Premium must be numeric.']],
+                    'co_premium.*'             => ['label' => 'Co-Premium', 'rules' => 'permit_empty|decimal','errors'=> ['decimal' => 'Co-Premium must be numeric.']],
+                    'co_tp_premium.*'          => ['label' => 'Co-TP Premium', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Co-TP Premium must be numeric.']],
+                    'co_ter_premium.*'         => ['label' => 'Co-TEP Premium', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Co-TEP Premium must be numeric.']],
+                    'cgst.*'                   => ['label' => 'CGST', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'CGST must be numeric.']],
+                    'sgst.*'                   => ['label' => 'SGST', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'SGST must be numeric.']],
+                    'igst.*'                   => ['label' => 'IGST', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'IGST must be numeric.']],
+                    'gst_amount.*'             => ['label' => 'GST Amount', 'rules'  => 'permit_empty|decimal|greater_than[0]','errors' => [
+                        'decimal'      => 'GST Amount must be a valid numeric value.',
+                        'greater_than' => 'GST Amount cannot be zero; please enter a value greater than 0.'
+                    ]],
+                    'stamp_duty.*'             => ['label' => 'Stamp Duty', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Stamp Duty must be numeric.']],
+                    'total.*'                  => ['label' => 'Total', 'rules' => 'permit_empty|decimal','errors' => ['decimal'  => 'Total must be a numeric value.']],
+                    'agreed_bp.*'              => ['label' => 'Agreed BP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Agreed BP % must be numeric.']],
+                    'agreed_tp.*'              => ['label' => 'Agreed TP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Agreed TP % must be numeric.']],
+                    'agreed_ter.*'             => ['label' => 'Agreed TEP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Agreed TEP % must be numeric.']],
+                    'agreed_amount.*'          => ['label' => 'Agreed Amount', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Agreed Amount must be numeric.']],
+                    'actual_bp_amt.*'          => ['label' => 'Actual BP Amount', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual BP Amount must be numeric.']],
+                    'actual_tp_amt.*'          => ['label' => 'Actual TP Amount', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual TP Amount must be numeric.']],
+                    'actual_tep_amt.*'         => ['label' => 'Actual TEP Amount', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual TEP Amount must be numeric.']],
+                    'actual_bp_per.*'          => ['label' => 'Actual BP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual BP % must be numeric.']],
+                    'actual_tp_per.*'          => ['label' => 'Actual TP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual TP % must be numeric.']],
+                    'actual_tep_per.*'         => ['label' => 'Actual TEP %', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'Actual TEP % must be numeric.']],
+                    'actual_bp_brokerage_amt.*'=> ['label' => 'BP Remuneration', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'BP Remuneration must be numeric.']],
+                    'actual_tp_brokerage_amt.*'=> ['label' => 'TP Remuneration', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'TP Remuneration must be numeric.']],
+                    'actual_tep_brokerage_amt.*'=>['label' => 'TEP Remuneration', 'rules' => 'permit_empty|decimal','errors' => ['decimal' => 'TEP Remuneration must be numeric.']],
+                    'exp_amt.*'                => ['label' => 'Expected Amount', 'rules' => 'permit_empty|decimal','errors' => ['decimal'=> 'The Expected Amount field must contain a valid number.']]
+            ];
+
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+
+            $post_data = $post_data ? sanitizeInputArrayAdvanced($post_data) : [];
+
             $this->myLogger->logme('error', 'Policy Trancaction form data : '. json_encode($post_data));
 
-            $id = $this->request->getPost('id');
+            $id = $post_data['id'] ?? null;
             $data = $this->preparePolicyData();
-            $data['cd_ac_pk'] = $this->request->getPost('cd_ac_no');
+            $data['cd_ac_pk'] = $post_data['cd_ac_no'];
             $data['issuer'] = 2;
             $data['status'] = 'completed';
             $this->myLogger->logme('error', 'Policy Trancaction modified form data ( insert data ) : '. json_encode($data));
@@ -937,7 +1077,8 @@
 
         private function preparePolicyData()
         {
-            $data = $this->request->getPost();
+            $request_data = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($request_data);
 
             $file_data = $this->request->getFiles() ?? null;
             $data['file_data'] = $file_data ?? null;
@@ -1094,6 +1235,7 @@
         private function updateInceptionPolicy($id, $data)
         {
             // print_r($data); die;
+            $data['updated_by']  = get_session_userid();
             $old_pt_data = $this->policyTransactionModel->where('is_active', 1)->where("id", $id)->first();
             $old_pt_co_share_data = $this->PTCOShareDetailsModel->where('is_active', 1)->where("id", $id)->first();
             if ($this->policyTransactionModel->update($id, $data)) {
@@ -2007,6 +2149,7 @@
         {   
             if ($id) {
                 $data['is_active']  = 0;
+                $data['updated_by']  = get_session_userid();
                 $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first();
                 if($policy_transaction_data['policy_type_id'] > 7 && $type == 0){
 
@@ -2247,26 +2390,277 @@
 
         public function createEndorsementPolicy()
         {
-            $id = $this->request->getPost('id');
+            // $id = $this->request->getPost('id');
+            $rules = [
+                    // ==========================================
+                    // 1. CLIENT SECTION
+                    // ==========================================
+                    'client_id' => [
+                        'label'  => 'Client',
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Client selection is mandatory.']
+                    ],
+                    'client_policy_id' => [
+                        'label'  => 'Policy',
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Please select the policy to endorse.']
+                    ],
+                    'client_type'      => ['rules' => 'permit_empty','errors' => []],
+                    'client_branch_id' => ['rules' => 'permit_empty','errors' => []],
+
+                    // ==========================================
+                    // 2. ENDORSEMENT SECTION
+                    // ==========================================
+                    'action_type' => [
+                        'label'  => 'Endorsement Type',
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Select an Endorsement Type.']
+                    ],
+                    'endorsement_no' => ['label'  => 'Endorsement No','rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9\/_-]+$/]',
+                                         'errors' => [ 'regex_match' => 'Endorsement No can only contain letters, numbers, and symbols like / - or _' ]],
+                    'data_received_date' => [
+                        'label'  => 'Data Received Date',
+                        'rules'  => 'required|valid_date[d/m/Y]',
+                        'errors' => ['required' => 'Data Received Date is required.', 'valid_date'  => 'Please provide a valid Data Received Date.']
+                    ],
+                    'policy_issue_date' => [
+                        'label'  => 'Endorsement Issue Date',
+                        'rules'  => 'required|valid_date[d/m/Y]',
+                        'errors' => ['required' => 'Endorsement Issue Date is required.', 'valid_date'  => 'Please provide a valid Endorsement Issue Date.']
+                    ],
+                    // ==========================================
+                    // ENDORSEMENT SECTION
+                    // ==========================================
+                    'month' => [
+                        'label'  => 'Endorsement Issue Month',
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Endorsement Issue Month (MM/YYYY) is required.']
+                    ],
+                    'endorse_eff_date' => [
+                        'label'  => 'Endorsement Effective Date',
+                        'rules'  => 'permit_empty|valid_date[d/m/Y]',
+                        'errors' => ['valid_date'  => 'Please provide a valid Endorsement Effective Date.']
+                    ],
+                    'emp_count' => [
+                        'label'  => 'No of Insured',
+                        'rules'  => 'permit_empty|numeric',
+                        'errors' => ['numeric' => 'No of Insured must be a number.']
+                    ],
+                    'dependent_count' => [
+                        'label'  => 'No of Dependents',
+                        'rules'  => 'permit_empty|numeric',
+                        'errors' => ['numeric' => 'No of Dependents must be a number.']
+                    ],
+                    'last_action_date' => [
+                        'label'  => 'Latest Action Date',
+                        'rules'  => 'permit_empty|valid_date[d/m/Y]',
+                        'errors' => ['valid_date'  => 'Please provide a valid Latest Action Date.']
+                    ],
+                    'install_due_date' => [
+                        'label'  => 'Installment Due Date',
+                        'rules'  => 'permit_empty|valid_date[d/m/Y]',
+                        'errors' => ['valid_date'  => 'Please provide a valid Installment Due Date.']
+                    ],
+
+                    // ==========================================
+                    // PREMIUM DETAILS (ARRAY FIELDS .*)
+                    // ==========================================
+                    'follow_insurer_id.*' => [
+                        'label'  => 'Insurer',
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Please select an Insurer.']
+                    ],
+                    'calc_policy_issue_date.*' => [
+                        'label' => 'Premium Endorsement Issue Date', 
+                        'rules'  => 'required',
+                        'errors' => ['required' => 'Endorsement Issue Date is required.']
+                    ],
+                    'co_share_per.*' => [
+                        'label'  => 'Co-Share %',
+                        'rules'  => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Co-Share % must be a valid decimal.']
+                    ],
+                    'base_premium.*' => [
+                        'label'  => 'Base Premium',
+                        'rules' => 'permit_empty|regex_match[/^-?\d+(\.\d+)?$/]|differs[0]',
+                                                'errors' => [
+                                                    'regex_match' => 'Base Premium must be a valid positive or negative number.',
+                                                    'differs'     => 'Base Premium cannot be zero.'
+                        ]
+                    ],
+                    'total.*' => [
+                        'label'  => 'Total Premium',
+                        'rules'  => 'permit_empty|decimal',
+                        'errors' => ['decimal'  => 'Total Premium must be a valid amount.'],
+                    ],
+
+                    // Decimal validation with Labels
+                    'non_comm_per_amt.*' => [
+                        'label' => 'Non-Comm Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Non-Comm Premium must be numeric.']
+                    ],
+                    'tp_premium.*' => [
+                        'label' => 'TP Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'TP Premium must be numeric.']
+                    ],
+                    'ter_premium.*' => [
+                        'label' => 'TEP Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'TEP Premium must be numeric.']
+                    ],
+                    'co_premium.*' => [
+                        'label' => 'Co-Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Co-Premium must be numeric.']
+                    ],
+                    'co_tp_premium.*' => [
+                        'label' => 'Co-TP Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Co-TP Premium must be numeric.']
+                    ],
+                    'co_ter_premium.*' => [
+                        'label' => 'Co-TEP Premium',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Co-TEP Premium must be numeric.']
+                    ],
+                    'cgst.*' => [
+                        'label' => 'CGST',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'CGST must be numeric.']
+                    ],
+                    'sgst.*' => [
+                        'label' => 'SGST',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'SGST must be numeric.']
+                    ],
+                    'igst.*' => [
+                        'label' => 'IGST',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'IGST must be numeric.']
+                    ],
+                    'gst_amount.*' => [
+                        'label' => 'GST Amount',
+                        'rules' => 'permit_empty|decimal|greater_than[0]',
+                        'errors' => ['decimal' => 'GST Amount must be numeric.','greater_than' => 'GST Amount cannot be zero; please enter a value greater than 0.']
+                    ],
+                    'stamp_duty.*' => [
+                        'label' => 'Stamp Duty',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Stamp Duty must be numeric.']
+                    ],
+                    'agreed_bp.*' => [
+                        'label' => 'Agreed BP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Agreed BP % must be numeric.']
+                    ],
+                    'agreed_tp.*' => [
+                        'label' => 'Agreed TP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Agreed TP % must be numeric.']
+                    ],
+                    'agreed_ter.*' => [
+                        'label' => 'Agreed TEP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Agreed TEP % must be numeric.']
+                    ],
+                    'agreed_amount.*' => [
+                        'label' => 'Agreed Amount',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Agreed Amount must be numeric.']
+                    ],
+
+                    // Finance/Management Specific Labels
+                    'actual_bp_amt.*' => [
+                        'label' => 'Actual BP Amount',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual BP Amount must be numeric.']
+                    ],
+                    'actual_tp_amt.*' => [
+                        'label' => 'Actual TP Amount',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual TP Amount must be numeric.']
+                    ],
+                    'actual_tep_amt.*' => [
+                        'label' => 'Actual TEP Amount',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual TEP Amount must be numeric.']
+                    ],
+                    'actual_bp_per.*' => [
+                        'label' => 'Actual BP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual BP % must be numeric.']
+                    ],
+                    'actual_tp_per.*' => [
+                        'label' => 'Actual TP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual TP % must be numeric.']
+                    ],
+                    'actual_tep_per.*' => [
+                        'label' => 'Actual TEP %',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Actual TEP % must be numeric.']
+                    ],
+                    'actual_bp_brokerage_amt.*' => [
+                        'label' => 'BP Remuneration',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'BP Remuneration must be numeric.']
+                    ],
+                    'actual_tp_brokerage_amt.*' => [
+                        'label' => 'TP Remuneration',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'TP Remuneration must be numeric.']
+                    ],
+                    'actual_tep_brokerage_amt.*' => [
+                        'label' => 'TEP Remuneration',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'TEP Remuneration must be numeric.']
+                    ],
+                    'exp_amt.*' => [
+                        'label' => 'Expected Amount',
+                        'rules' => 'permit_empty|decimal',
+                        'errors' => ['decimal' => 'Expected Amount must be numeric.']
+                    ],
+                    'co_share_type.*'      => ['label' => 'Is Leader', 'rules' => 'permit_empty','errors' => []],
+                    'follower_policy_no.*' => ['label' => 'Follower Policy No', 'rules' => 'permit_empty','errors' => []],
+                    'co_share_id.*'        => ['label' => 'Record ID', 'rules' => 'permit_empty','errors' => []],
+                ];
+
+                if (!$this->validate($rules)) {
+                    return $this->response->setStatusCode(400)->setJSON([
+                        'status' => false,
+                        'message' => 'Input validation failed',
+                        'code' => 400,
+                        'errors' => $this->validator->getErrors()
+                    ]);
+                }
+
             $data = $this->preparePolicyTransactionData();
+    
+            $id = (isset($data['id']) && !empty($data['id'])) ? $data['id'] : null;
+
             $data['status'] = 'completed';
-            // print_r($data); die;
 
             if (!$id) {
                 return $this->insertEndorsementTransaction($data);
             } else {
                 return $this->updateEndorsementTransaction($id, $data);
             }
+
         }
 
         private function preparePolicyTransactionData()
         {
-            $data = $this->request->getPost();
-
+            $request_post_data   = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($request_post_data);
             // echo '<pre>';
             // print_r($data); 
             // die;
 
+            $file_data = $this->request->getFiles() ?? null;
+            $data['file_data'] = $file_data ?? null;
+
             if (!isset($data['policy_with_corr'])) {
                 $data['policy_with_corr'] = 0;
             } elseif ($data['policy_with_corr']) {
@@ -2410,6 +2804,11 @@
                 $this->handleCompletedStatus($data, $insert);
                 $this->insertOrUpdateCoShareDetails($data, $insert);
 
+                // policy file upload 
+                if(isset($data['doc_name']) && isset($data['file_data']) && !empty($data['doc_name']) && !empty($data['file_data'])){
+                    $this->uploadFile($data['doc_name'], $data['file_data'], $insert);
+                }
+
                 return $this->respond(['status' => true, 'message' => 'Endorsement transaction created successfully'], 200);
             }
 
@@ -2418,6 +2817,7 @@
 
         private function updateEndorsementTransaction($id, $data)
         {   
+            $data['updated_by']  = get_session_userid();
             $old_endorse_data =  $this->policyTransactionModel->where('id', $id)->where('is_active', 1)->first();
             $update = $this->policyTransactionModel->where('id', $id)->set($data)->update();
 
@@ -2681,6 +3081,20 @@
             // dd(db_connect()->getLastQuery() ,$pt_bp_amt);
             $data['base_cd_amount'] = $pt_bp_amt['amount'] ?? null;
 
+            $ptFileQuery = $this->PTFileModel
+                ->join('policy_transaction', 'pt_files.pt_id = policy_transaction.id')
+                ->where('pt_files.pt_id', $id)
+                ->where('pt_files.is_active', 1);
+
+            if (!in_array(get_role_id(), [1, 5]) && empty(array_intersect(user_team(), [MANAGEMENT_TEAM_ID, FINANCE_TEAM_ID, BUSINESS_TEAM_ID]))) {
+
+                if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                    $ptFileQuery->where('pt_files.created_by', get_session_userid());
+                }
+            }
+
+            $data['pt_files'] = $ptFileQuery->findAll();
+
             if ($data) {
                 return $this->respond(['status' => true, 'data' => $data, 'pt_id' => $pt_id], 200);
             } else {
@@ -3250,10 +3664,12 @@
             $client_policy_id = (!isset($client_policy_id) || $client_policy_id === '' || $client_policy_id === null) ? 0 : $client_policy_id;
             $user_id = (!isset($user_id) || $user_id === '' || $user_id === null) ? 0 : $user_id;
             if ($this->request->is('post')) {
-                $isFromDashboard = $this->request->getPost("is_dashboard");
+                $request_post_data   = $this->request->getPost();
+                $sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data);
+                $isFromDashboard = $sanitized_post_data["is_dashboard"];
 
                 if (isset($isFromDashboard) && !empty($isFromDashboard) && $isFromDashboard == 1) {
-                    $ids = $this->request->getPost('ids');
+                    $ids = $sanitized_post_data['ids'];
 
                     $ids = array_filter(explode(',', $ids));
 
@@ -3639,7 +4055,7 @@
             helper('excel_util_helper');
             //get file info
             $file_id = $params['file_id'];
-            $file = $this->insurerStatements->find($file_id);
+            $file = $this->insurerStatements->find((int)$file_id);
             // dd($file);
             $date = new \DateTime($file['month']);
 
@@ -3757,7 +4173,7 @@
             try {
 
                 //get file info
-                $file = $this->insurerStatements->find($file_id);
+                $file = $this->insurerStatements->find((int)$file_id);
                 // dd($file);
 
                 $date = new \DateTime($file['month']);
@@ -3910,7 +4326,7 @@
             helper('excel_util_helper');
             //get file info
             $file_id = $params['file_id'];
-            $file = $this->insurerStatements->find($file_id);
+            $file = $this->insurerStatements->find((int)$file_id);
             // dd($file);
             $date = new \DateTime($file['month']);
 
@@ -4075,7 +4491,7 @@
         {
             $statement_id = $this->request->getUri()->getSegment(4);
 
-            $inv_details = $this->insurerStatements->find($statement_id);
+            $inv_details = $this->insurerStatements->find((int)$statement_id);
             $inv_payment_details = $this->invPaymentDetailsModel
                 ->where('statement_id', $statement_id)
                 ->where('is_active', 1)
@@ -4212,7 +4628,7 @@
         public function getFileErr()
         {
             $file_id = $this->request->getUri()->getSegment(4);
-            $file = $this->insurerStatements->find($file_id);
+            $file = $this->insurerStatements->find((int)$file_id);
             return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $file['reason']], 200);
         }
 
@@ -4221,10 +4637,12 @@
             // echo 'scbsc';die();
             if ($this->request->is('post')) {
                 // $jsonData = (array)$this->request->getJSON();
-                $customer_id = $this->request->getPost('customer_id');
-                $policy_id = $this->request->getPost('policy_id');
-                $cus_doc_name = $this->request->getPost('cus_doc_name');
-                $policy_doc_name = $this->request->getPost('policy_doc_name');
+                $request_data   = $this->request->getPost();
+                $data = sanitizeInputArrayAdvanced($request_data);
+                $customer_id = $data['customer_id'];
+                $policy_id = $data['policy_id'];
+                $cus_doc_name = $data['cus_doc_name'];
+                $policy_doc_name = $data['policy_doc_name'];
                 $pt_files = [];
                 $kyc_files = [];
                 $batch_files = [];
@@ -4933,6 +5351,7 @@
             $pt_data = $this->policyTransactionModel->where('is_active', 1)->findAll();
             $user_data = $this->userModel->where('is_active', 1)->findAll();
             $agent_data = db_connect()->table('partner_agent')->where('is_active', 1)->get()->getResultArray();
+            $pos_data = db_connect()->table('partner_pos')->where('is_active', 1)->get()->getResultArray();
             $rto_master = db_connect()->table('rto_master')->where('is_active', 1)->get()->getResultArray();
             $vehicle_type = db_connect()->table('vehicle_type')->where('is_active', 1)->get()->getResultArray();
             $nhance_branch_data = db_connect()->table('nhance_branch')->where('is_active', 1)->get()->getResultArray();
@@ -5098,6 +5517,7 @@
             $vehicle_data = $this->vehicleModel->where('is_active', 1)->findAll();
             $user_data = $this->userModel->where('is_active', 1)->findAll();
             $agent_data = db_connect()->table('partner_agent')->where('is_active', 1)->get()->getResultArray();
+            $pos_data = db_connect()->table('partner_pos')->where('is_active', 1)->get()->getResultArray();
             $rto_master = db_connect()->table('rto_master')->where('is_active', 1)->get()->getResultArray();
             $vehicle_type_data = db_connect()->table('vehicle_type')->where('is_active', 1)->get()->getResultArray();
             $nhance_branch_data = db_connect()->table('nhance_branch')->where('is_active', 1)->get()->getResultArray();
@@ -5180,7 +5600,8 @@
                     $current_insurer_branch_data = check_insurer_branch_exist($row, $insurer_branch_data, $current_insurer_data)['branch'] ?? null;
 
                     $current_nhance_branch = check_nhance_branch($row, $nhance_branch_data)['branch'] ?? null;
-                    $current_agent_data = check_agent_exist($row, $agent_data)['agent'] ?? null;
+                    // $current_agent_data = check_agent_exist($row, $agent_data)['agent'] ?? null;
+                    $current_agent_data = check_agent_exist($row, $pos_data)['agent'] ?? null;
 
                     $salse = check_user_exist($row, 13, $user_data)['user'] ?? null;
                     $service = check_user_exist($row, 14, $user_data)['user'] ?? null;
@@ -5218,8 +5639,9 @@
                         'salse_person_manager_id'   => $salse['rm_id'] ?? null,
                         'service_person_manager_id' => $service['rm_id'] ?? null,
                         'service_person_branch_id'  => $service['nhance_branch_id'] ?? null,
-                        'agent_id'              => $current_agent_data['id'] ?? null,
-                        'agent_code'            => $current_agent_data['agent_code'] ?? null,
+                        // 'agent_id'              => $current_agent_data['id'] ?? null,
+                        // 'agent_code'            => $current_agent_data['agent_code'] ?? null,
+                        'pos_id'                => $current_agent_data['id'] ?? null,
                         'file_id'               => $params['file_id'],
                         'endorsement_no'        => null,
                         'client_branch_id'      => null,
diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index bad20540..e4c474a1 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -110,6 +110,14 @@ class RestAuthenticationController extends AdminController
         
             if (isset($employeeData['employee_id'])) 
             {
+
+                //check the resend otp (with in 60 seconds don't allow another otp to send)
+                $check = canSendOtp($employeeData);
+                if (!$check['allowed']) {
+                    return $this->respond(['status'  => false,'message' => 'OTP already sent. Please wait before retrying.','retry_after_seconds' => $check['retry_after']], 429); // Too Many Requests
+
+                }
+
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Employee verified with ID = " . $employeeData['employee_id']);
                 log_message('error', '  ');
                 log_message('error', '************************ POST END ********************************');
@@ -217,6 +225,12 @@ class RestAuthenticationController extends AdminController
 
             if (isset($employeeData['employee_id'])) {
 
+                //check the resend otp (with in 60 seconds don't allow another otp to send)
+                $check = canSendOtp($employeeData);
+                if (!$check['allowed']) {
+                    return $this->respond(['status'  => false,'message' => 'OTP already sent. Please wait before retrying.','retry_after_seconds' => $check['retry_after']], 429); // Too Many Requests
+                }
+
 
                 $builder = $this->employeeModel
                     ->where('email_corporate', $email)
@@ -518,6 +532,12 @@ class RestAuthenticationController extends AdminController
 
 
             if ($HrData) {
+
+                    //check the resend otp (with in 60 seconds don't allow another otp to send)
+                    $check = canSendOtp($HrData);
+                    if (!$check['allowed']) {
+                        return $this->respond(['status'  => false,'message' => 'OTP already sent. Please wait before retrying.','retry_after_seconds' => $check['retry_after']], 429); // Too Many Requests
+                    }
                 
                     $sql = "UPDATE level_contacts SET otp = ? WHERE mobile = ? AND contact_type = 'client' AND is_active = 1";
 
@@ -569,6 +589,12 @@ class RestAuthenticationController extends AdminController
           
             if ($HrData) {
 
+                //check the resend otp (with in 60 seconds don't allow another otp to send)
+                $check = canSendOtp($HrData);
+                if (!$check['allowed']) {
+                    return $this->respond(['status'  => false,'message' => 'OTP already sent. Please wait before retrying.','retry_after_seconds' => $check['retry_after']], 429); // Too Many Requests
+                }
+
                 $sql = "
                         UPDATE level_contacts
                         SET otp = ?
@@ -734,6 +760,8 @@ class RestAuthenticationController extends AdminController
 
                             $decoded = json_decode($HRAccessData['allowed_modules'], true);
                             $getAllhrData[$key]['allowed_modules'] = $decoded;
+                            $HRAccessData['pre_client_id'] = md5($HRAccessData['pre_client_id']);
+                            $HRAccessData['post_client_id'] = md5($HRAccessData['post_client_id']);
 
                             $token = JWTToken::encode($HRAccessData);
                             $getAllhrData[$key]['token'] = $token;
@@ -749,7 +777,7 @@ class RestAuthenticationController extends AdminController
 
                 }else {
 
-                    return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'User not found' ],200);
+                    return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'Invalid OTP' ],200);
                 }
 
                
@@ -759,7 +787,7 @@ class RestAuthenticationController extends AdminController
 
             } else {
 
-                return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'User not found' ],200);
+                return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'message' => 'Invalid OTP' ],200);
             }
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);
@@ -919,6 +947,12 @@ class RestAuthenticationController extends AdminController
             $mpin = $this->request->getJSON()->new_mpin;
             $client_id = $this->request->getJSON()->client_id ?? null;
 
+            if($old_mpin == $mpin)
+            {
+                $result = ['mpin_verification' => false , 'message' => "New MPIN must be different from the old MPIN"];
+                return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
+            }
+
             // if (isset($mobile_number)) 
             // {
             //     $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('mpin', $old_mpin)->where('relationship', 'self')->first();
@@ -990,11 +1024,11 @@ class RestAuthenticationController extends AdminController
                
                
             } else {
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateMpin: Employee not found in the POST. Wrong MPIN");
+                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateMpin: Employee not found in the POST. Old MPIN is incorrect");
                 log_message('error', '  ');
                 log_message('error', ' ************************************* POST END **************************************** ');
                 log_message('error', '  ');
-                $result = ['mpin_verification' => false , 'message' => "Wrong Mpin"];
+                $result = ['mpin_verification' => false , 'message' => "Old MPIN is incorrect"];
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
 
             }
@@ -1237,7 +1271,7 @@ class RestAuthenticationController extends AdminController
                 log_message('error', '  ');
                 log_message('error', ' ************************************* POST END **************************************** ');
                 log_message('error', '  ');
-                return $this->respond(['status' => 'success','code' => 200,'data' => "", 'message' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'], 'is_biometric_enabled' => $employeeData['is_biometric_enabled']],200);
+                return $this->respond(['status' => 'success','code' => 200,'data' => "", 'message' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'] ?? 0, 'is_biometric_enabled' => $employeeData['is_biometric_enabled'] ?? 0],200);
             } else {
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - checkMpin: Mpin - not found");
                 log_message('error', '  ');
@@ -2289,4 +2323,53 @@ class RestAuthenticationController extends AdminController
         }
     }
 
+    public function logout()
+    {
+        $authHeader = $this->request->getHeaderLine('Authorization');
+
+        if (!$authHeader) {
+            return $this->respond([
+                'status'  => false,
+                'message' => 'Authorization token missing'
+            ], 401);
+        }
+
+        // Validate JWT (your hardened function)
+        $result = JWTToken::validateJWT($authHeader);
+
+        if ($result['status'] !== true) {
+            return $this->respond([
+                'status'  => false,
+                'message' => 'Invalid or expired token'
+            ], 401);
+        }
+
+        $decoded = $result['decoded'];
+        $userId  = $decoded['id'] ?? null;
+
+        if (!$userId) {
+            return $this->respond([
+                'status'  => false,
+                'message' => 'Invalid token payload'
+            ], 401);
+        }
+
+        // Identify user type
+        if (isset($decoded['emp_code'])) {
+            $model = new EmployeeModel();
+        } else {
+            $model = new LevelContactModel();
+        }
+
+        // Invalidate token server-side
+        $model->update($userId, [
+            'token_time_out' => null
+        ]);
+
+        return $this->respond([
+            'status'  => true,
+            'message' => 'Logged out successfully'
+        ], 200);
+    }
+
 }
\ No newline at end of file
diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index 17a60b0e..33a422f6 100644
--- a/app/Controllers/SalesController.php
+++ b/app/Controllers/SalesController.php
@@ -128,7 +128,7 @@ class SalesController extends BaseController
     public function updateLead($id)
     {
         try {
-            if (!$this->leadModel->find($id)) {
+            if (!$this->leadModel->find((int)$id)) {
                 return $this->failNotFound('Lead not found');
             }
 
@@ -158,7 +158,7 @@ class SalesController extends BaseController
     public function deleteLead($id)
     {
         try {
-            if (!$this->leadModel->find($id)) {
+            if (!$this->leadModel->find((int)$id)) {
                 return $this->failNotFound('Lead not found');
             }
 
@@ -228,7 +228,7 @@ class SalesController extends BaseController
             }
 
             $contactId = $this->contactModel->getInsertID();
-            $contact = $this->contactModel->find($contactId);
+            $contact = $this->contactModel->find((int)$contactId);
 
             return $this->respondCreated([
                 'status' => 'success',
@@ -247,18 +247,18 @@ class SalesController extends BaseController
     public function updateContact($id)
     {
         try {
-            if (!$this->contactModel->find($id)) {
+            if (!$this->contactModel->find((int)$id)) {
                 return $this->failNotFound('Contact not found');
             }
 
             $data = $this->request->getJSON(true);
             $data['updated_by'] = $this->getUserId();
 
-            if (!$this->contactModel->update($id, $data)) {
+            if (!$this->contactModel->update((int)$id, $data)) {
                 return $this->fail($this->contactModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
 
-            $contact = $this->contactModel->find($id);
+            $contact = $this->contactModel->find((int)$id);
 
             return $this->respond([
                 'status' => 'success',
@@ -277,11 +277,11 @@ class SalesController extends BaseController
     public function deleteContact($id)
     {
         try {
-            if (!$this->contactModel->find($id)) {
+            if (!$this->contactModel->find((int)$id)) {
                 return $this->failNotFound('Contact not found');
             }
 
-            $this->contactModel->delete($id);
+            $this->contactModel->delete((int)$id);
 
             return $this->respondDeleted([
                 'status' => 'success',
@@ -299,7 +299,7 @@ class SalesController extends BaseController
     public function setPrimaryContact($id)
     {
         try {
-            $contact = $this->contactModel->find($id);
+            $contact = $this->contactModel->find((int)$id);
             
             if (!$contact) {
                 return $this->failNotFound('Contact not found');
@@ -425,7 +425,7 @@ class SalesController extends BaseController
             }
 
             $activityId = $this->activityModel->getInsertID();
-            $activity = $this->activityModel->find($activityId);
+            $activity = $this->activityModel->find((int)$activityId);
 
             return $this->respondCreated([
                 'status' => 'success',
@@ -444,7 +444,7 @@ class SalesController extends BaseController
     public function updateActivity($id)
     {
         try {
-            if (!$this->activityModel->find($id)) {
+            if (!$this->activityModel->find((int)$id)) {
                 return $this->failNotFound('Activity not found');
             }
 
@@ -455,7 +455,7 @@ class SalesController extends BaseController
                 return $this->fail($this->activityModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
 
-            $activity = $this->activityModel->find($id);
+            $activity = $this->activityModel->find((int)$id);
 
             return $this->respond([
                 'status' => 'success',
@@ -474,7 +474,7 @@ class SalesController extends BaseController
     public function completeActivity($id)
     {
         try {
-            $activity = $this->activityModel->find($id);
+            $activity = $this->activityModel->find((int)$id);
             
             if (!$activity) {
                 return $this->failNotFound('Activity not found');
@@ -487,7 +487,7 @@ class SalesController extends BaseController
             $data = $this->request->getJSON(true);
             $data['updated_by'] = $this->getUserId();
 
-            $this->activityModel->completeActivity($id, $data);
+            $this->activityModel->completeActivity((int)$id, $data);
 
             // Create follow-up activity if requested
             if (!empty($data['create_followup']) && $data['create_followup'] === true) {
@@ -505,7 +505,7 @@ class SalesController extends BaseController
                 $this->activityModel->insert($followupData);
             }
 
-            $updatedActivity = $this->activityModel->find($id);
+            $updatedActivity = $this->activityModel->find((int)$id);
 
             return $this->respond([
                 'status' => 'success',
@@ -524,11 +524,11 @@ class SalesController extends BaseController
     public function deleteActivity($id)
     {
         try {
-            if (!$this->activityModel->find($id)) {
+            if (!$this->activityModel->find((int)$id)) {
                 return $this->failNotFound('Activity not found');
             }
 
-            $this->activityModel->delete($id);
+            $this->activityModel->delete((int)$id);
 
             return $this->respondDeleted([
                 'status' => 'success',
@@ -595,7 +595,7 @@ class SalesController extends BaseController
             }
 
             $noteId = $this->noteModel->getInsertID();
-            $note = $this->noteModel->find($noteId);
+            $note = $this->noteModel->find((int)$noteId);
 
             return $this->respondCreated([
                 'status' => 'success',
@@ -614,7 +614,7 @@ class SalesController extends BaseController
     public function updateNote($id)
     {
         try {
-            $note = $this->noteModel->find($id);
+            $note = $this->noteModel->find((int)$id);
             
             if (!$note) {
                 return $this->failNotFound('Note not found');
@@ -632,7 +632,7 @@ class SalesController extends BaseController
                 return $this->fail($this->noteModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
 
-            $updatedNote = $this->noteModel->find($id);
+            $updatedNote = $this->noteModel->find((int)$id);
 
             return $this->respond([
                 'status' => 'success',
@@ -651,7 +651,7 @@ class SalesController extends BaseController
     public function deleteNote($id)
     {
         try {
-            $note = $this->noteModel->find($id);
+            $note = $this->noteModel->find((int)$id);
             
             if (!$note) {
                 return $this->failNotFound('Note not found');
@@ -662,7 +662,7 @@ class SalesController extends BaseController
                 return $this->failUnauthorized('You are not authorized to delete this note');
             }
 
-            $this->noteModel->delete($id);
+            $this->noteModel->delete((int)$id);
 
             return $this->respondDeleted([
                 'status' => 'success',
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index 75d4d578..7cfc5ab2 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -17,6 +17,8 @@ use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 
+use Firebase\JWT\JWT;
+
 class TestingController extends BaseController
 {
     use ResponseTrait;
@@ -983,5 +985,46 @@ class TestingController extends BaseController
     }
 
 
+    public function metaDashboardDemo()
+    {
+
+        // 🔐 Move this to .env in real projects
+        $METABASE_SECRET_KEY = getenv('METABASE_SECRET_KEY');
+        $policy_id = $this->request->getGet('client_policy');
+        $policy_id = $policy_id ? $policy_id : 4687;
+        $payload = [
+            'resource' => [
+                // 'dashboard' => 1
+                'dashboard' => 2
+            ],
+            'params' => (object)['client_policy' => $policy_id],   // MUST be object for Metabase
+            'exp'    => time() + (10 * 60) // 10 minutes
+        ];
+        // dd($payload);
+        $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
+
+        // // You can either return token only
+        // return $this->response->setJSON([
+        //     'token' => $token,
+        //     'iframe_url' => "https://your-metabase-domain/embed/dashboard/{$token}#bordered=true&titled=true"
+        // ]);
+        if($this->request->getGet('api') == 1)
+        {
+             return $this->respond([
+                'status' => 'success',
+                'message' => 'Form data received successfully!',
+                'data' => [
+                'metabaseToken' => $token,
+                'metabaseUrl'   => 'https://nsights.nhanceindia.in']
+            ]);
+        }
+
+       return view('meta_dashboard_demo_one', [
+            'metabaseToken' => $token,
+            'metabaseUrl'   => 'https://nsights.nhanceindia.in',
+        ]);
+    }
+
+
 
 }
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index a2427b07..a4bde6dd 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -62,8 +62,108 @@ class ThzController extends BaseController
 
     public function ticketSave()
     {
+            $rules = [
+                    'client_id' => [
+                        'rules'  => 'permit_empty|integer',
+                        'errors' => [
+                            'integer' => 'Invalid client selected'
+                        ]
+                    ],
+                    
+
+                    'mobile' => [
+                        'rules'  => 'required|regex_match[/^[0-9]{10}$/]',
+                        'errors' => [
+                            'required'     => 'Mobile number is required',
+                            'regex_match'  => 'Mobile number must be exactly 10 digits'
+                        ]
+                    ],
+
+                    'name' => [
+                        'rules'  => 'required|min_length[3]|max_length[100]|alpha_space',
+                        'errors' => [
+                            'required'   => 'Name is required',
+                            'min_length' => 'Name must be at least 3 characters',
+                            'alpha_space'=> 'Name can contain only letters and spaces'
+                        ]
+                    ],
+
+                    'email' => [
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                        ]
+                    ],
+
+                    'empcode' => [
+                        'rules'  => 'permit_empty|alpha_numeric_punct|max_length[50]',
+                        'errors' => [
+                            'alpha_numeric_punct' => 'Employee code contains invalid characters.',
+                            'max_length' => 'Employee code is too long'
+                        ]
+                    ],
+
+                    'ticket_type' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Please select a Ticket Type.'
+                        ]
+                    ],
+
+                    'ticket_type' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Ticket Type is required',
+                        ]
+                    ],
+
+                    'assign_to' => [
+                        'rules'  => 'permit_empty|integer',
+                        'errors' => [
+                            'integer' => 'Invalid assignee selected'
+                        ]
+                    ],
+
+                    'subject' => [
+                        'rules'  => 'required|min_length[3]|max_length[150]|regex_match[/^[a-zA-Z0-9 .,\-_()&\/\?]+$/]',
+                        'errors' => [
+                            'required'    => 'Subject is required.',
+                            'min_length'  => 'Subject must be at least 3 characters long.',
+                            'max_length'  => 'Subject cannot exceed 150 characters',
+                            'regex_match' => 'Subject contains invalid characters (Avoid quotes and special symbols).'
+                        ]
+                    ],
+
+                    'message' => [
+                        'rules'  => 'required|min_length[10]|max_length[1500]',
+                        'errors' => [
+                            'required'   => 'Message is required',
+                            'min_length' => 'Message must be at least 10 characters',
+                            'max_length' => 'Message cannot exceed 1500 characters'
+                        ]
+                    ],
+                    'status' => [
+                        'rules'  => 'permit_empty|in_list[Open,In Progress,Resolved,Closed]',
+                        'errors' => [
+                            'in_list' => 'Invalid ticket status'
+                        ]
+                    ],
+            ];
+
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
         try {
-            $data = $this->request->getPost();
+
+            $request_post_data = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($request_post_data);
+                
             $references   = "";
             if (!empty($data['thz_id'])) {
 
@@ -157,7 +257,30 @@ class ThzController extends BaseController
     {
 
         try {
-            $data = $this->request->getPost();
+            
+            $rules = [
+                'notes' => [
+                    'rules'  => 'required|string|min_length[1]|max_length[1500]',
+                    'errors' => [
+                        'required'   => 'Notes is required',
+                        'string'     => 'Notes must be valid text',
+                        'min_length' => 'Notes cannot be empty',
+                        'max_length' => 'Notes cannot exceed 1500 characters'
+                    ]
+                ],
+            ];
+
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+
+            $request_post_data = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($request_post_data);
 
             $data['notes_type'] = $data['notes_type'] ?? 'External';
 
@@ -238,7 +361,7 @@ class ThzController extends BaseController
                 
                 $accManagerId = $this->getAcmIdUsingClientId($clientId ?? null);
                
-                $accManager = $this->userModel->find($accManagerId);
+                $accManager = $this->userModel->find((int)$accManagerId);
 
             if (!empty($result['master'])) {
                 $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 07b8db0e..2a265f4c 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -24,6 +24,7 @@ use App\Models\ClaimFilesModel;
 use App\Models\ClaimDumpFileModel;
 use App\Models\VehicleModel;
 use App\Models\PartnerPolicyModel;
+use App\Models\ClaimMisFileModel;
 
 use DOMDocument;
 use DOMXPath;
@@ -67,6 +68,7 @@ class TicketController extends BaseController
     protected $claimDumpFileModel;
     protected $vehicleModel;
     protected $partnerPolicyModel;
+    protected $claimmisFileModel;
 
     public function __construct()
     {
@@ -398,6 +400,7 @@ class TicketController extends BaseController
         $this->claimDumpFileModel = new ClaimDumpFileModel();
         $this->vehicleModel = new VehicleModel();
         $this->partnerPolicyModel = new PartnerPolicyModel();
+        $this->claimmisFileModel = new ClaimMisFileModel();
     }
 
     public function ticketList()
@@ -421,7 +424,6 @@ class TicketController extends BaseController
 
             return $this->loadLayout('ticket_search', $data);
         } else {
-
             $isFromDashboard = $this->request->getPost("is_dashboard");
             log_message('error', 'Is From Dashboard: ' . $isFromDashboard);
 
@@ -443,7 +445,6 @@ class TicketController extends BaseController
                 }
                 $data['claim_status'] = $this->claimStatus->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
                 $data['client_list'] = $this->clientModel->select('id,client_name')->where('is_active', 1)->findAll();
-                // dd($data);
                 return $this->loadLayout('ticket_search', $data);
 
             }
@@ -951,6 +952,13 @@ class TicketController extends BaseController
     {     
         // $ticket_data = $this->ticketMasterModel->where('id', $ticket_id)->where('is_active', 1)->first();
         $ticket_data = $this->ticketMasterModel->getTicketDataByTicketID($ticket_id);
+     
+
+        // Security Check: Verify if record exists
+        if (empty($ticket_data)) {
+            // Redirect or show a 404 to prevent "Undefined array key" errors
+            return redirect()->to(base_url('ticket/list'))->with('error', 'Ticket not found');
+        }
     
         $ticket_data = $this->formatDateForClaim($ticket_data, 'd/m/Y');
 
@@ -1119,11 +1127,307 @@ class TicketController extends BaseController
 
     public function createTicket()
     {
-        $ticket_data = $this->request->getPost();
-        $ticket_data = $this->formatDateForClaim($ticket_data);
+        $request_data = $this->request->getPost();
+        $selected_ticket_type = $this->request->getPost('ticket_type_id');
+
+        // 1. Initialize an empty rules array
+        $rules = [];
+        if ($selected_ticket_type == 1 || $selected_ticket_type == 72) {
+            $rules = [
+                // --- EMPLOYEE DETAILS ---
+                'emp_code' => [
+                    'label'  => 'Employee Code',
+                    'rules'  => 'required|min_length[2]|max_length[20]|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Code is required.',
+                        'regex_match' => 'Employee Code cannot contain spaces or special characters (only letters, numbers, - and _ allowed).'
+                    ]
+                ],
+                'emp_name' => [
+                    'label'  => 'Employee Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Name is required',
+                        'min_length'  => 'Employee Name must be at least 3 characters long',
+                        'regex_match' => 'Employee Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                'insured_name' => [
+                    'label'  => 'Insured Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Insured Name is required',
+                        'min_length'  => 'Insured Name must be at least 3 characters long',
+                        'regex_match' => 'Insured Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                'relationship' => ['label'  => 'Relationship','rules'  => 'required',
+                      'errors' => ['required' => 'Please select a Relationship']
+                ],
+                'policy_no' => [
+                    'label'  => 'Policy Number',
+                    // Allows: A-Z, a-z, 0-9, spaces (\s), hyphens (\-), underscores (_), and slashes (\/)
+                    'rules'  => 'permit_empty|min_length[3]|max_length[50]|regex_match[/^[a-zA-Z0-9\s\-\/_]+$/]',
+                    'errors' => [
+                        'min_length'  => 'Policy Number appears too short (min 5 characters).',
+                        'regex_match' => 'Policy Number can only contain letters, numbers, spaces, hyphens(-), underscores(_), and slashes(/).'
+                    ]
+                ],
+                'tpa_no'    => ['label'  => 'TPA ID','rules'  => 'permit_empty','errors' => []],
+                'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'emp_personal_mail' => ['label'  => 'Personal Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Personal Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required',
+                    'errors' => ['required' => 'Please select a Policy']
+                ],
+                'acm_id' => ['label'  => 'Account Manager','rules'  => 'required',
+                    'errors' => ['required' => 'Select an Account Manager']
+                ],
+
+                // --- CLAIM DETAILS ---
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required',
+                    'errors' => ['required' => 'Claim Status is required']
+                ],
+                'priority' => ['label'  => 'Priority','rules'  => 'required',
+                    'errors' => ['required' => 'Priority is required']
+                ],
+                'mode_of_intimation' => ['label'  => 'Mode of Submission','rules'  => 'required',
+                    'errors' => ['required' => 'Mode of Submission is required']
+                ],
+                'claim_type' => ['label'  => 'Claim Type','rules'  => 'required',
+                    'errors' => ['required' => 'Claim Type is required']
+                ],
+                'hospital_name' => ['label'  => 'Hospital Name','rules'  => 'required',
+                    'errors' => ['required' => 'Hospital Name is required']
+                ],
+                'hospital_address' => ['label'  => 'Hospital Address','rules'  => 'required',
+                    'errors' => ['required' => 'Hospital Address is required']
+                ],
+                'hospital_city' => ['label'  => 'Hospital City','rules'  => 'required',
+                    'errors' => ['required' => 'City is required']
+                ],
+                'hospital_state' => ['label'  => 'Hospital State','rules'  => 'required',
+                    'errors' => ['required' => 'State is required']
+                ],
+                'hospital_pin_code' => ['label'  => 'Hospital Pincode','rules'  => 'required|numeric|exact_length[6]',
+                    'errors' => ['exact_length' => 'Pincode must be 6 digits']
+                ],
+                'hospital_phone_no' => ['label'  => 'Hospital Phone','rules'  => 'required|numeric|min_length[10]',
+                    'errors' => ['min_length' => 'Phone number too short']
+                ],
+                'doa' => ['label'  => 'DOA', 'rules'  => 'required',
+                    'errors' => ['required' => 'Date of Admission is required']
+                ],
+                'dod' => [ 'label'  => 'DOD', 'rules'  => 'required',
+                    'errors' => ['required' => 'Date of Discharge is required']
+                ],
+                'claim_amount' => [
+                    'label'  => 'Claim Amount',
+                    'rules'  => 'permit_empty|numeric',
+                    'errors' => ['numeric' => 'Claim Amount must contain only numbers.']
+                ],
+                'pod_no' => ['label'  => 'POD No','rules'  => 'permit_empty','errors' => []],
+
+                // --- ADDITIONAL / CONDITIONAL FIELDS ---
+                'claim_number' => ['label'  => 'Claim Number','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'Invalid Claim Number.']],
+                'denial_date' => ['label'  => 'Denial Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Denial Date must be dd/mm/yyyy.']],
+                'approved_amount' => ['label'  => 'Approved Amount','rules'  => 'permit_empty|numeric',
+                    'errors' => ['numeric' => 'Approved amount must be numeric']
+                ],
+                'approved_date' => ['label'  => 'Approved Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']],
+                'approved_letter' => ['label'  => 'Approved Letter','rules'  => 'permit_empty','errors' => []],
+                'approved_description' => ['label'  => 'Approved Description','rules'  => 'permit_empty','errors' => []],
+                'utr_details' => ['label'  => 'UTR Details','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']],
+                'settled_date' => ['label'  => 'Settled Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']],
+                'settle_letter' => ['label'  => 'Settle Letter','rules'  => 'permit_empty','errors' => []],
+                'pay_initiate_date' => ['label'  => 'Payment Initiate Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']],
+                'cancel_remark' => ['label'  => 'Cancel Remark','rules'  => 'permit_empty','errors' => []],
+                'return_remark' => ['label'  => 'Return Remark','rules'  => 'permit_empty','errors' => []],
+                'awb_no_courier_name' => ['label'  => 'AWB No','rules'  => 'permit_empty','errors' => []],
+                'non_id_reason' => ['label'  => 'Non ID Reason','rules'  => 'permit_empty','errors' => []],
+                'client_id' => ['rules'  => 'required','errors' => ['required' => 'Client ID is required']],
+                'insurer_id' => ['rules'  => 'required','errors' => ['required' => 'Insurer is required'],
+                'si_amt' => [ 'label'  => 'Sum Insured', 'rules'  => 'permit_empty|numeric', 'errors' => ['numeric' => 'Sum Insured must be a valid number.']],
+                'registration_date' => ['label'  => 'Registration Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Registration Date must be dd/mm/yyyy.']],
+                'denial_reason' => ['label'  => 'Denial Reason', 'rules'  => 'permit_empty|string','errors' => ['string' => 'Invalid characters in Denial Reason.']],
+                ],
+            ];   
+        } else if ($selected_ticket_type == 8) {
+            $rules = [
+                // --- GENERAL DETAILS ---
+                'client_name' => ['label'  => 'Client Name','rules'  => 'required|is_not_list[0]',
+                    'errors' => [
+                        'required'    => 'Please select a Client Name.',
+                        'is_not_list' => 'Please select a valid Client from the list.'
+                    ]
+                ],
+                'vehicle_id' => ['label'  => 'Vehicle',
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required'    => 'Vehicle selection is required.'
+                    ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required',
+                    'errors' => ['required'    => 'Please select a Policy.',]
+                ],
+                'insurer_id' => ['label'  => 'Insurer ID','rules'  => 'required',
+                    'errors' => ['required' => 'Insurer data is missing. Please re-select the policy.']
+                ],
+                'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                // --- CLAIM DETAILS ---
+                'ticket_type_id' => ['label'  => 'Policy Type','rules'  => 'required','errors' => ['required' => 'Policy Type is required.']],
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required','errors' => ['required'    => 'Status is required.']],
+
+                // --- HIDDEN KEYS (Integrity Checks) ---
+                'ticket_master_id' => ['label'  => 'Ticket Master ID','rules'  => 'permit_empty','errors' => []],
+                'client_id' => ['label'  => 'Client ID','rules'  => 'required','errors' => ['required' => 'System error: Client ID is missing.']]
+            ];
+        } else {
+            $rules = [
+                // --- EMPLOYEE DETAILS ---
+                'emp_code' => [
+                    'label'  => 'Employee Code',
+                    'rules'  => 'required|min_length[2]|max_length[20]|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Code is required.',
+                        'regex_match' => 'Employee Code cannot contain spaces or special characters (only letters, numbers, - and _ allowed).',
+                    ]
+                ],
+                'emp_name' => [
+                    'label'  => 'Employee Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Name is required',
+                        'min_length'  => 'Employee Name must be at least 3 characters long',
+                        'regex_match' => 'Employee Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                 'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'emp_personal_mail' => ['label'  => 'Personal Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Personal Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required','errors' => ['required' => 'Please select a Policy']],
+                'acm_id' => ['label'  => 'Account Manager','rules'  => 'required','errors' => ['required' => 'Account Manager must be selected']],
+
+                // --- CLAIM DETAILS ---
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required','errors' => ['required' => 'Claim status is required']],
+                'claim_type' => ['label'  => 'Claim Type','rules'  => 'required','errors' => ['required' => 'Claim type is required']],
+                'dob' => ['label'  => 'Date of Birth','rules'  => 'required','errors' => ['required' => 'Date of Birth is required']],
+                'date_of_intimat' => ['label'  => 'Date of Intimation','rules'  => 'required','errors' => ['required' => 'Intimation date is required']],
+                'si_amt' => ['label'  => 'Sum Insured','rules'  => 'required|numeric','errors' => ['numeric' => 'Sum insured must be a number']],
+                'approved_amount' => ['label'  => 'Approved Amount','rules'  => 'permit_empty|numeric','errors' => ['numeric' => 'Approved amount must be numeric']],
+                'approved_date' => ['label'  => 'Approved Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']],
+                'approved_letter' => ['label'  => 'Approved Letter','rules'  => 'permit_empty','errors' => []],
+                'approved_description' => ['label'  => 'Approved Description','rules'  => 'permit_empty','errors' => []],
+                'utr_details' => ['label'  => 'UTR Details','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']],
+                'settled_date' => ['label'  => 'Settled Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']],
+                'settle_letter' => ['label'  => 'Settle Letter','rules'  => 'permit_empty','errors' => []],
+                'pay_initiate_date' => ['label'  => 'Payment Initiate Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']],
+                'cancel_remark' => ['label'  => 'Cancel Remark','rules'  => 'permit_empty','errors' => []],
+                'return_remark' => ['label'  => 'Return Remark','rules'  => 'permit_empty','errors' => []],
+            ];
+        }
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $request_data = $this->request->getPost();
+        $sanitized_data = sanitizeInputArrayAdvanced($request_data);
+        $ticket_data = $this->formatDateForClaim($sanitized_data);
         // $ticket_data = $this->getLastMatchedStatus($ticket_data, );
         // print_rr($ticket_data); die;
 
+        $isduplicate = checkDuplicateClaim([
+            'doa' => change_date_format($ticket_data['doa'] ?? '') ?? null, 
+            'emp_code' => $ticket_data['emp_code'] ?? null, 
+            'claim_amount' => $ticket_data['claim_amount'] ?? null, 
+            'policy_no' => $ticket_data['policy_no'] ?? null
+        ]);
+
+        if ($isduplicate) {
+
+            $errorDetails = [];
+
+            if (!empty($ticket_data['doa'])) {
+                $errorDetails[] = 'DOA: ' . change_date_format($ticket_data['doa']);
+            }
+
+            if (!empty($ticket_data['claim_amount'])) {
+                $errorDetails[] = 'Claim Amount: ₹' . number_format($ticket_data['claim_amount'], 2);
+            }
+
+            if (!empty($ticket_data['emp_code'])) {
+                $errorDetails[] = 'Emp Code: ' . $ticket_data['emp_code'];
+            }
+
+            if (!empty($ticket_data['policy_no'])) {
+                $errorDetails[] = 'Policy No: ' . $ticket_data['policy_no'];
+            }
+
+            $response = [
+                'status'  => false,
+                'code'    => 409,
+                'message' => 'Duplicate claim found for ' . implode(', ', $errorDetails)
+            ];
+
+            return $this->respond($response, 200);
+        }
+
+
         if ($ticket_data) {
             $return_value = $this->ticketMasterModel->insert($ticket_data);
             if ($return_value) {
@@ -1143,9 +1447,267 @@ class TicketController extends BaseController
 
     public function updateTicket()
     {
+        
+        $request_data = $this->request->getPost();
+        $selected_ticket_type = $this->request->getPost('ticket_type_id');
+
+        // 1. Initialize an empty rules array
+        $rules = [];
+        if ($selected_ticket_type == 1 || $selected_ticket_type == 72) {
+            $rules = [
+                // --- EMPLOYEE DETAILS ---
+                'emp_code' => [
+                    'label'  => 'Employee Code',
+                    'rules'  => 'required|min_length[2]|max_length[20]|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Code is required.',
+                        'regex_match' => 'Employee Code cannot contain spaces or special characters (only letters, numbers, - and _ allowed).',
+                    ]
+                ],
+                'emp_name' => [
+                    'label'  => 'Employee Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Name is required',
+                        'min_length'  => 'Employee Name must be at least 3 characters long',
+                        'regex_match' => 'Employee Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                'insured_name' => [
+                    'label'  => 'Insured Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Insured Name is required',
+                        'min_length'  => 'Insured Name must be at least 3 characters long',
+                        'regex_match' => 'Insured Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                'relationship' => ['label'  => 'Relationship','rules'  => 'required',
+                      'errors' => ['required' => 'Please select a Relationship']
+                ],
+                'policy_no' => [
+                    'label'  => 'Policy Number',
+                    // Allows: A-Z, a-z, 0-9, spaces (\s), hyphens (\-), underscores (_), and slashes (\/)
+                    'rules'  => 'permit_empty|min_length[3]|max_length[50]|regex_match[/^[a-zA-Z0-9\s\-\/_]+$/]',
+                    'errors' => [
+                        'min_length'  => 'Policy Number appears too short (min 5 characters).',
+                        'regex_match' => 'Policy Number can only contain letters, numbers, spaces, hyphens(-), underscores(_), and slashes(/).'
+                    ]
+                ],
+                'tpa_no'    => ['label'  => 'TPA ID','rules'  => 'permit_empty','errors' => []],
+                'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'emp_personal_mail' => ['label'  => 'Personal Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Personal Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required',
+                    'errors' => ['required' => 'Please select a Policy']
+                ],
+                'acm_id' => ['label'  => 'Account Manager','rules'  => 'required',
+                    'errors' => ['required' => 'Select an Account Manager']
+                ],
+
+                // --- CLAIM DETAILS ---
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required',
+                    'errors' => ['required' => 'Claim Status is required']
+                ],
+                'priority' => ['label'  => 'Priority','rules'  => 'required',
+                    'errors' => ['required' => 'Priority is required']
+                ],
+                'mode_of_intimation' => ['label'  => 'Mode of Submission','rules'  => 'required',
+                    'errors' => ['required' => 'Mode of Submission is required']
+                ],
+                'claim_type' => ['label'  => 'Claim Type','rules'  => 'required',
+                    'errors' => ['required' => 'Claim Type is required']
+                ],
+                'hospital_name' => ['label'  => 'Hospital Name','rules'  => 'required',
+                    'errors' => ['required' => 'Hospital Name is required']
+                ],
+                'hospital_address' => ['label'  => 'Hospital Address','rules'  => 'required',
+                    'errors' => ['required' => 'Hospital Address is required']
+                ],
+                'hospital_city' => ['label'  => 'Hospital City','rules'  => 'required',
+                    'errors' => ['required' => 'City is required']
+                ],
+                'hospital_state' => ['label'  => 'Hospital State','rules'  => 'required',
+                    'errors' => ['required' => 'State is required']
+                ],
+                'hospital_pin_code' => ['label'  => 'Hospital Pincode','rules'  => 'required|numeric|exact_length[6]',
+                    'errors' => ['exact_length' => 'Pincode must be 6 digits']
+                ],
+                'hospital_phone_no' => ['label'  => 'Hospital Phone','rules'  => 'required|numeric|min_length[10]',
+                    'errors' => ['min_length' => 'Phone number too short']
+                ],
+                'doa' => ['label'  => 'DOA', 'rules'  => 'required',
+                    'errors' => ['required' => 'Date of Admission is required']
+                ],
+                'dod' => [ 'label'  => 'DOD', 'rules'  => 'required',
+                    'errors' => ['required' => 'Date of Discharge is required']
+                ],
+                'claim_amount' => [
+                    'label'  => 'Claim Amount',
+                    'rules'  => 'permit_empty|numeric',
+                    'errors' => ['numeric' => 'Claim Amount must contain only numbers.']
+                ],
+                'pod_no' => ['label'  => 'POD No','rules'  => 'permit_empty','errors' => []],
+
+                // --- ADDITIONAL / CONDITIONAL FIELDS ---
+                'claim_number' => ['label'  => 'Claim Number','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'Invalid Claim Number.']],
+                'denial_date' => ['label'  => 'Denial Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Denial Date must be dd/mm/yyyy.']],
+                'approved_amount' => ['label'  => 'Approved Amount','rules'  => 'permit_empty|numeric',
+                    'errors' => ['numeric' => 'Approved amount must be numeric']
+                ],
+                'approved_date' => ['label'  => 'Approved Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']],
+                'approved_letter' => ['label'  => 'Approved Letter','rules'  => 'permit_empty','errors' => []],
+                'approved_description' => ['label'  => 'Approved Description','rules'  => 'permit_empty','errors' => []],
+                'utr_details' => ['label'  => 'UTR Details','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']],
+                'settled_date' => ['label'  => 'Settled Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']],
+                'settle_letter' => ['label'  => 'Settle Letter','rules'  => 'permit_empty','errors' => []],
+                'pay_initiate_date' => ['label'  => 'Payment Initiate Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']],
+                'cancel_remark' => ['label'  => 'Cancel Remark','rules'  => 'permit_empty','errors' => []],
+                'return_remark' => ['label'  => 'Return Remark','rules'  => 'permit_empty','errors' => []],
+                'awb_no_courier_name' => ['label'  => 'AWB No','rules'  => 'permit_empty','errors' => []],
+                'non_id_reason' => ['label'  => 'Non ID Reason','rules'  => 'permit_empty','errors' => []],
+                'client_id' => ['rules'  => 'required','errors' => ['required' => 'Client ID is required']],
+                'insurer_id' => ['rules'  => 'required','errors' => ['required' => 'Insurer is required'],
+                'si_amt' => [ 'label'  => 'Sum Insured', 'rules'  => 'permit_empty|numeric', 'errors' => ['numeric' => 'Sum Insured must be a valid number.']],
+                'registration_date' => ['label'  => 'Registration Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Registration Date must be dd/mm/yyyy.']],
+                'denial_reason' => ['label'  => 'Denial Reason', 'rules'  => 'permit_empty|string','errors' => ['string' => 'Invalid characters in Denial Reason.']],
+                ],
+            ];   
+        } else if ($selected_ticket_type == 8) {
+            $rules = [
+                // --- GENERAL DETAILS ---
+                'client_name' => ['label'  => 'Client Name','rules'  => 'required|is_not_list[0]',
+                    'errors' => [
+                        'required'    => 'Please select a Client Name.',
+                        'is_not_list' => 'Please select a valid Client from the list.'
+                    ]
+                ],
+                'vehicle_id' => ['label'  => 'Vehicle',
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required'    => 'Vehicle selection is required.'
+                    ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required',
+                    'errors' => ['required'    => 'Please select a Policy.',]
+                ],
+                'insurer_id' => ['label'  => 'Insurer ID','rules'  => 'required',
+                    'errors' => ['required' => 'Insurer data is missing. Please re-select the policy.']
+                ],
+                'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                // --- CLAIM DETAILS ---
+                'ticket_type_id' => ['label'  => 'Policy Type','rules'  => 'required','errors' => ['required' => 'Policy Type is required.']],
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required','errors' => ['required'    => 'Status is required.']],
+
+                // --- HIDDEN KEYS (Integrity Checks) ---
+                'ticket_master_id' => ['label'  => 'Ticket Master ID','rules'  => 'permit_empty','errors' => []],
+                'client_id' => ['label'  => 'Client ID','rules'  => 'required','errors' => ['required' => 'System error: Client ID is missing.']]
+            ];
+        } else {
+            $rules = [
+                // --- EMPLOYEE DETAILS ---
+                'emp_code' => [
+                    'label'  => 'Employee Code',
+                    'rules'  => 'required|min_length[2]|max_length[20]|regex_match[/^[a-zA-Z0-9_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Code is required.',
+                        'regex_match' => 'Employee Code cannot contain spaces or special characters (only letters, numbers, - and _ allowed).',
+                    ]
+                ],
+                'emp_name' => [
+                    'label'  => 'Employee Name',
+                    'rules'  => 'required|min_length[3]|regex_match[/^[a-zA-Z0-9\s_-]+$/]',
+                    'errors' => [
+                        'required'    => 'Employee Name is required',
+                        'min_length'  => 'Employee Name must be at least 3 characters long',
+                        'regex_match' => 'Employee Name can only contain letters, numbers, spaces, hyphens, and underscores.'
+                    ]
+                ],
+                 'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
+                    'errors' => [
+                        'required' => 'Mobile number is required',
+                        'numeric'  => 'Mobile must contain only numbers',
+                        'exact_length' => 'Mobile must be exactly 10 digits'
+                    ]
+                ],
+                'emp_mail' => ['label'  => 'Employee Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Employee Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'emp_personal_mail' => ['label'  => 'Personal Mail ID',
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Personal Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@domain.com).'
+                        ]
+                ],
+                'client_policy_id' => ['label'  => 'Policy','rules'  => 'required','errors' => ['required' => 'Please select a Policy']],
+                'acm_id' => ['label'  => 'Account Manager','rules'  => 'required','errors' => ['required' => 'Account Manager must be selected']],
+
+                // --- CLAIM DETAILS ---
+                'claim_status_id' => ['label'  => 'Status','rules'  => 'required','errors' => ['required' => 'Claim status is required']],
+                'claim_type' => ['label'  => 'Claim Type','rules'  => 'required','errors' => ['required' => 'Claim type is required']],
+                'dob' => ['label'  => 'Date of Birth','rules'  => 'required','errors' => ['required' => 'Date of Birth is required']],
+                'date_of_intimat' => ['label'  => 'Date of Intimation','rules'  => 'required','errors' => ['required' => 'Intimation date is required']],
+                'si_amt' => ['label'  => 'Sum Insured','rules'  => 'required|numeric','errors' => ['numeric' => 'Sum insured must be a number']],
+                'approved_amount' => ['label'  => 'Approved Amount','rules'  => 'permit_empty|numeric','errors' => ['numeric' => 'Approved amount must be numeric']],
+                'approved_date' => ['label'  => 'Approved Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']],
+                'approved_letter' => ['label'  => 'Approved Letter','rules'  => 'permit_empty','errors' => []],
+                'approved_description' => ['label'  => 'Approved Description','rules'  => 'permit_empty','errors' => []],
+                'utr_details' => ['label'  => 'UTR Details','rules'  => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']],
+                'settled_date' => ['label'  => 'Settled Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']],
+                'settle_letter' => ['label'  => 'Settle Letter','rules'  => 'permit_empty','errors' => []],
+                'pay_initiate_date' => ['label'  => 'Payment Initiate Date','rules'  => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']],
+                'cancel_remark' => ['label'  => 'Cancel Remark','rules'  => 'permit_empty','errors' => []],
+                'return_remark' => ['label'  => 'Return Remark','rules'  => 'permit_empty','errors' => []],
+            ];
+        }
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
+        $sanitized_data = sanitizeInputArrayAdvanced($request_data);
+        $ticket_data = $this->formatDateForClaim($sanitized_data);
         $ticket_id = $this->request->getPost('ticket_master_id');
-        $ticket_data = $this->request->getPost();
-        $ticket_data = $this->formatDateForClaim($ticket_data);
         $old_ticket_data = $this->ticketMasterModel->where('id', $ticket_id)->where('is_active', 1)->first();
         $ticket_data['claim_status_id'] = $this->getLastMatchedStatus($ticket_data, $old_ticket_data);
         // print_rr($ticket_data); die;
@@ -1210,7 +1772,49 @@ class TicketController extends BaseController
     {
         //action 1 is create. action 2 is edit and action 3 is delete
         if ($action == 1) {
-            $received_data = $this->request->getPost();
+                $rules = [
+                    'template_name' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Template Name is required'
+                        ]
+                    ],
+                    'ticket_type' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Policy Type is required'
+                        ]
+                    ],
+                    'trigger_type' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Trigger Type is required'
+                        ]
+                    ],
+                    'subject' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Subject is required'
+                        ]
+                    ],
+                    'mail_content' => [
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Mail Content is required'
+                        ]
+                    ]
+                ];
+                 if (!$this->validate($rules)) {
+                    return $this->response->setStatusCode(400)->setJSON([
+                        'status' => false,
+                        'message' => 'Input validation failed',
+                        'code' => 400,
+                        'errors' => $this->validator->getErrors()
+                    ]);
+                }
+                $data   = $this->request->getPost();
+                $received_data = sanitizeInputArrayAdvanced($data);
+
             if (isset($received_data['id']) && $received_data['id'] != '') {
                 $status = $this->ticketMailTemplateModel->save($received_data);
                 if ($status) {
@@ -1252,8 +1856,9 @@ class TicketController extends BaseController
         } elseif ($action == 3) {
             $table_id = (int)$this->request->getPost('id');
 
-            $sql = "update ticket_mail_template set is_active = 0 where id = $table_id ";
-            $status = $this->ticketMailTemplateModel->query($sql);
+            $sql = "update ticket_mail_template set is_active = 0 where id = :table_id: ";
+            $binds = ['table_id'=>$table_id];
+            $status = $this->ticketMailTemplateModel->query($sql,$binds);
             if ($status) {
                 return $this->respond(['status' => true], 200);
             } else {
@@ -1278,12 +1883,34 @@ class TicketController extends BaseController
                 }
             }
         } elseif ($action == 2) {
-            $data = $this->request->getPost();
+            $request_data = $this->request->getPost();
+            
+            $rules = [
+                'note' => [
+                    'label'  => 'Add Notes',
+                    'rules'  => 'required|min_length[3]|max_length[1000]',
+                    'errors' => [
+                        'required' => 'The note field cannot be empty.',
+                        'min_length' => 'The note is too short (minimum 3 characters).',
+                        'max_length' => 'The note cannot exceed 1000 characters.'
+                    ]
+                ],
+            ];
+        
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+
+            $data = sanitizeInputArrayAdvanced($request_data);
             // if (isset($data['id']) && $data['id'] != ''){
             // print_rr($data);die();
             $status = $this->ticketNoteModel->save($data);
             $id = isset($data['id']) ? $data['id'] : $this->ticketNoteModel->insertID();
-
             // }
             if ($status) {
                 return $this->respond(['status' => true, 'id' => $id], 200);
@@ -1297,6 +1924,33 @@ class TicketController extends BaseController
     {
 
         $received_data = $this->request->getPost();
+        $rules =  [
+            'emp_mail' => [
+                'label'  => 'To',
+                'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                'errors' => [
+                    'required'    => 'Email address is required.',
+                    'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                ]
+            ],
+            'mail_subject' => [
+                'label'  => 'Subject',
+                'rules'  => 'required|min_length[5]',
+                'errors' => [
+                    'required' => 'Please enter a Subject for the mail.',
+                    'min_length' => 'Subject should be at least 5 characters long.'
+                ]
+            ]
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
         // print_r($received_data); die;
         $received_data['sender'] = 'staff';
         $status = $this->ticketMessageModel->insert($received_data);
@@ -1734,11 +2388,12 @@ class TicketController extends BaseController
             
         
         WHERE 
-            th.ticket_id = $ticket_id
+            th.ticket_id = :ticket_id:
             AND th.is_active = 1
         ORDER BY 
             th.created_at DESC";
-        $data = $this->ticketHistoryModel->query($sql)->getResultArray();
+        $binds = ['ticket_id'=>(int)$ticket_id];
+        $data = $this->ticketHistoryModel->query($sql,$binds)->getResultArray();
         // dd(db_connect()->getLastQuery());
         $priorityType = $this->priorityType;
         $relationshipType = $this->relationshipType;
@@ -2446,7 +3101,45 @@ class TicketController extends BaseController
     public function upload_url()
     {
 
-        $data = $this->request->getPost();
+        
+        $request_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_data);
+
+        $rules = [
+                'ticket_id_url' => [
+                    'label'  => 'Ticket ID URL',
+                    'rules'  => 'required|numeric',
+                    'errors' => [
+                        'required' => 'System could not identify the Number.',
+                        'numeric'  => 'Invalid format.'
+                    ]
+                ],
+                'docs_name.*' => [
+                    'label'  => 'Required Documents',
+                    'rules'  => 'required|regex_match[/^[a-zA-Z0-9_\- ]+$/]',
+                    'errors' => [
+                        'required'    => 'Document Name is required',
+                        'regex_match' => 'Document Name can only contain letters, numbers, hyphens, and underscores'
+                    ]
+                ],
+                'url.*' => [
+                    'label'  => 'URL',
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required'    => 'URL is required',
+                    ]
+                ]
+            ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
+
         $get_file_data = $this->request->getFiles('file_upload') ?? [];
         $ticket_id = $data['ticket_id_url'];
 
@@ -2460,7 +3153,7 @@ class TicketController extends BaseController
 
                     $insertData = [
                         'doc_name' => $data['docs_name'][$key] ?? '',
-                        'url'      => $data['url'][$key] ?? '',
+                        'url'      => convertGoogleDriveToDownloadLink($data['url'][$key] ?? ''),
                         'ticket_id' => $data['ticket_id_url'] ?? '',
                         'created_by' => get_session_userid(),
                         'is_active'  => 1,
@@ -2769,8 +3462,10 @@ class TicketController extends BaseController
 
     public function claimDumpUpload()
     {   
-        $data['tab_name'] = "Claim Dupm Upload";
+        $data['tab_name'] = "Claim Dump Upload";
         $data['page_name'] = "Claims";
+        $data['tpa_list'] = $this->TPAModel->where('is_active', 1)->findAll();
+
 
         if($this->request->is('get')){
 
@@ -2835,17 +3530,25 @@ class TicketController extends BaseController
             $status = 'inprogress';
             $insert_data = [
                 'file_name' => $filename, 
-                'status' => $status
+                'status' => $status,
+                'client_id' => !empty($this->request->getPost('client_id')) ? $this->request->getPost('client_id') : null,
+                'client_policy_id' => !empty($this->request->getPost('client_policy_id')) ? $this->request->getPost('client_policy_id') : null,
+                'tpa_id' => !empty($this->request->getPost('tpa_id')) ? $this->request->getPost('tpa_id') : null,
             ];
             
             $file_id = $this->claimDumpFileModel->insert($insert_data); 
             $this->myLogger->logme("error", 'claim_dumb_file_id : {file_id}, uploaded success', ['file_id' => $file_id]);
 
             //after file upload success than call the file formate validation in service controller
-            $ticketServiceController = new TicketServiceController();
-            // $response = $ticketServiceController->claimDumpExcelFileFormatValidation(["file_id" => $file_id]);
-            $r = Jobs::addJob(['job_name' => 'claimDumpExcelFileFormatValidation', 'payload' => ['file_id' => $file_id]]);
 
+            // $ticketServiceController = new TicketServiceController();
+            if(!empty($insert_data['tpa_id'])){
+                $r = Jobs::addJob(['job_name' => 'tpaClaimDumpImporter', 'payload' => ['file_id' => $file_id]]);
+                // $response = $ticketServiceController->claimDumpExcelFileFormatValidation(["file_id" => $file_id]);
+            }else{
+                $r = Jobs::addJob(['job_name' => 'claimDumpExcelFileFormatValidation', 'payload' => ['file_id' => $file_id]]);
+                // $response = $ticketServiceController->claimDumpExcelFileFormatValidation(["file_id" => $file_id]);
+            }
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'File uploaded successfully. File being validated'], 200);
 
         }
@@ -2917,12 +3620,194 @@ class TicketController extends BaseController
     }
 
     // -------- END CLAIM DUMP UPLOAD ----------------------------------------------------------------------------------------------
-    
-
     public function saveIRDocsJson()
     {
-        $ticket_id = $this->request->getPost('ticket_id');
-        $required_docs = $this->request->getPost('required_docs');
+        // -----------------------------------------------------
+        // 1) GET INPUT
+        // -----------------------------------------------------
+        $request_data = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_data);
+
+        $ticket_id     = $data['ticket_id'] ?? '';
+        $required_docs = $data['required_docs'] ?? '';
+
+        // -----------------------------------------------------
+        // 2) BASIC VALIDATION (CI4)
+        // -----------------------------------------------------
+        $rules = [
+            'ticket_id' => [
+                'label'  => 'Ticket ID',
+                'rules'  => 'required|numeric',
+                'errors' => [
+                    'required' => 'System could not identify the Number.',
+                    'numeric'  => 'Invalid format.'
+                ]
+            ],
+
+            'required_docs' => [
+                'label'  => 'Required Documents',
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Document data is required'
+                ]
+            ]
+        ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status'  => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors'  => $this->validator->getErrors()
+            ]);
+        }
+
+        // -----------------------------------------------------
+        // 3) VALIDATE JSON FORMAT
+        // -----------------------------------------------------
+        $docsArray = json_decode($required_docs, true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status'  => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors'  => [
+                    'required_docs' => 'Invalid JSON format'
+                ]
+            ]);
+        }
+
+        // -----------------------------------------------------
+        // 4) VALIDATE JSON STRUCTURE
+        // -----------------------------------------------------
+        if (!isset($docsArray['docs']) || !is_array($docsArray['docs'])) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status'  => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors'  => [
+                    'required_docs' => 'Invalid document structure'
+                ]
+            ]);
+        }
+
+        // -----------------------------------------------------
+        // 5) VALIDATE EACH DOCUMENT NAME
+        // -----------------------------------------------------
+        foreach ($docsArray['docs'] as $index => $doc) {
+
+            // Check document_name exists
+            if (!isset($doc['document_name'])) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'code' => 400,
+                    'message' => 'Input validation failed',
+                    'errors'  => [
+                        'required_docs' =>
+                            "Document name missing at row " . ($index + 1)
+                    ]
+                ]);
+            }
+
+            // YOUR REQUIRED REGEX RULE
+            if (!preg_match('/^[a-zA-Z0-9_\- ]+$/', $doc['document_name'])) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'code' => 400,
+                    'message' => 'Input validation failed',
+                    'errors'  => [
+                        'required_docs' =>
+                            "Document name '{$doc['document_name']}' can only contain letters, numbers, hyphens and underscores"
+                    ]
+                ]);
+            }
+
+            // Check document_received exists
+            if (!array_key_exists('document_received', $doc)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'code' => 400,
+                    'message' => 'Input validation failed',
+                    'errors'  => [
+                        'required_docs' =>
+                            "document_received key missing at row " . ($index + 1)
+                    ]
+                ]);
+            }
+        }
+
+        // -----------------------------------------------------
+        // 6) EXTRA SAFETY CHECKS
+        // -----------------------------------------------------
+        if (empty($ticket_id) || empty($required_docs)) {
+            return $this->respond([
+                'status'  => false,
+                'code'    => 404,
+                'message' => 'Failed to save Docs'
+            ], 200);
+        }
+
+        // -----------------------------------------------------
+        // 7) UPDATE DATABASE
+        // -----------------------------------------------------
+        db_connect()->query(
+            "UPDATE ticket_master SET required_docs = ? WHERE id = ?",
+            [$required_docs, $ticket_id]
+        );
+
+        // -----------------------------------------------------
+        // 8) RETURN UPDATED DATA
+        // -----------------------------------------------------
+        $saved = $this->ticketMasterModel
+            ->select('required_docs')
+            ->where('id', $ticket_id)
+            ->first();
+
+        $savedDocs = json_decode($saved['required_docs'] ?? '{}', true) ?? [];
+
+        return $this->respond([
+            'status'  => true,
+            'code'    => 200,
+            'message' => 'IR docs saved successfully',
+            'data'    => $savedDocs
+        ], 200);
+    }
+
+    public function saveIRDocsJson_old()
+    {
+        $request_data   = $this->request->getPost();
+        $data = sanitizeInputArrayAdvanced($request_data);
+        $ticket_id = $data['ticket_id'];
+        $required_docs = $data['required_docs'];
+
+            $rules = [
+                'ticket_id' => [
+                    'label'  => 'Ticket ID',
+                    'rules'  => 'required|numeric',
+                    'errors' => [
+                        'required' => 'System could not identify the Number.',
+                        'numeric'  => 'Invalid format.'
+                    ]
+                ],
+                'required_docs' => [
+                    'label'  => 'Required Documents',
+                    'rules'  => 'required|regex_match[/^[a-zA-Z0-9_\- ]+$/]',
+                    'errors' => [
+                        'required'    => 'Document Name is required',
+                        'regex_match' => 'Document Name can only contain letters, numbers, hyphens, and underscores'
+                    ]
+                ]
+            ];
+
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'status' => false,
+                'message' => 'Input validation failed',
+                'code' => 400,
+                'errors' => $this->validator->getErrors()
+            ]);
+        }
 
         if(empty($ticket_id)){
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to save Docs'], 200);
@@ -2943,4 +3828,153 @@ class TicketController extends BaseController
         return $this->respond(['status' => true, 'code' => 200, 'message' => 'IR docs saved successfully', 'data' => $required_docs], 200);
 
     }
+
+
+    // -------- CLAIM MIS UPLOAD ----------------------------------------------------------------------------------------------
+
+    public function claimMisFileList()
+    {   
+        $data['tab_name'] = "Claim MIS Upload";
+        $data['page_name'] = "Cliam MIS Files";
+        $data['claim_mis_file_list'] = $this->claimmisFileModel
+                                ->select('claims_mis_files.*, user_profiles.first_name as user_name')
+                                ->join('user_profiles', 'claims_mis_files.created_by = user_profiles.id')
+                                ->where('claims_mis_files.is_active', 1)
+                                ->orderBy('claims_mis_files.id', 'desc')
+                                ->findAll();
+        $data['tpa_list'] = $this->TPAModel->where('is_active', 1)->findAll();
+
+        return $this->loadLayout('claim_mis_file_list', $data);
+    }
+
+    public function uploadClaimMisFile()
+    {
+
+        $filename = '';
+        $fileSize = '';
+
+            //validate uploaded file
+            $validated = $this->validate([
+                'file' => [
+                    'uploaded[file]',
+                    'mime_in[file,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet]',
+                    'max_size[file,16384]',
+                ],
+            ]);
+            
+            if ($validated) 
+            {
+                    
+                    $file = $this->request->getFile('file');
+                    if (!$file) {
+                        $this->myLogger->logme("error", 'File not found');
+                        return $this->respond(['status' => false, 'code' => 400, 'message' => 'File not found'], 400);
+                    }
+
+                    $is_moved = $file->move(WRITEPATH . 'uploads/claims_mis/');
+                
+                    if ($is_moved) {
+                        $file_path = WRITEPATH.'uploads/claims_mis';
+                        $filename = file_Upload_for_lead($file, $file_path);
+                        $fileSize = $file->getSize(); // File size in bytes
+                        $fileSize = $fileSize / (1024 * 1024); // Convert to MB
+
+                        $this->myLogger->logme("error", 'File move successful');
+                        
+                            $request_data   = $this->request->getPost();
+                            $data = sanitizeInputArrayAdvanced($request_data);
+
+                            if(isset($data['from_date']) && !empty($data['from_date'])){
+                                $data['from_date'] = change_date_format($data['from_date'], 'd/m/Y', 'Y-m-d');
+                            }
+
+                            if(isset($data['to_date']) && !empty($data['to_date'])){
+                                $data['to_date'] = change_date_format($data['to_date'], 'd/m/Y', 'Y-m-d');
+                            }
+                            if(!empty($file_name)){
+                                $data['file_name'] = $file;
+                            }
+
+                            $response = $this->claimmisFileModel->insert($data);
+                        
+                            if($response){
+                                return $this->respond(['status'=>true, 'code'=>200, 'message'=>'MIS file uploaded successfully'], 200);
+                            }else{
+                                return $this->respond(['status'=>true, 'code'=>500, 'message'=>'Failed to upload'], 200);
+                            }
+                        
+                    } else {
+                        $this->myLogger->logme("error", 'File move failed');
+                        return $this->respond(['status' => false, 'code' => 500, 'message' => 'File move failed'], 500);
+                    }
+
+            } else {
+                $this->myLogger->logme("error", 'Upload failed Invalid file');
+                return $this->respond(['status' => false, 'code' => 404, 'message' => 'Invalid file'], 404);
+            }
+
+        /*** OLD CODE KEEP it Safe 
+        $file = $this->request->getFile('file');
+        $data = $this->request->getPost();
+
+        if(isset($data['from_date']) && !empty($data['from_date'])){
+            $data['from_date'] = change_date_format($data['from_date'], 'd/m/Y', 'Y-m-d');
+        }
+
+        if(isset($data['to_date']) && !empty($data['to_date'])){
+            $data['to_date'] = change_date_format($data['to_date'], 'd/m/Y', 'Y-m-d');
+        }
+
+        $file_path = WRITEPATH.'uploads/claims_mis';
+        $file_name = file_Upload_for_lead($file, $file_path);
+
+        if(!empty($file_name)){
+            $data['file_name'] = $file_name;
+        }
+
+        $response = $this->claimmisFileModel->insert($data);
+    
+        if($response){
+            return $this->respond(['status'=>true, 'code'=>200, 'message'=>'MIS file uploaded successfully'], 200);
+        }else{
+            return $this->respond(['status'=>true, 'code'=>500, 'message'=>'Failed to upload'], 200);
+        }
+        ****/
+    }
+
+    public function downloadClaimMisFile()
+    {
+        try {
+
+            $file_id = $this->request->getGet('id');
+
+            // Find record
+            $record = $this->claimmisFileModel->where('id', $file_id)->first();
+            // dd($record);
+
+            if (!$record) {
+                $data['message'] = 'File record not found';
+                return view('errors/404', $data);
+            }
+
+            $uploadPath = WRITEPATH . 'uploads/claims_mis/';
+            $filePath   = $uploadPath . $record['file_name'];
+            // dd($filePath);
+
+            if (!file_exists($filePath)) {
+                $data['message'] = 'The Physical File Not Found';
+                return view('errors/404', $data);
+            }
+
+            // Force file download
+            return $this->response->download($filePath, null)->setFileName($record['file_name']);
+
+        } catch (\Exception $e) {
+            // return $this->failServerError($e->getMessage());
+            $this->myLogger->logme('error', 'Error occoured in downloadClaimMisFile : ' . $e->getMessage());
+            $data['message'] = 'File record not found';
+            return view('errors/404', $data);
+        }
+    }
+
 }
diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index d2265378..f95f547d 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -7,6 +7,14 @@ use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\API\ResponseTrait;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use Kint\Kint;
+use App\Libraries\TpaClaimsImportFactory;
+use App\Libraries\TPAClaimsImportServices\FhplClaimImportService;
+use App\Libraries\TPAClaimsImportServices\MediAssistClaimImportService;
+use App\Libraries\TPAClaimsImportServices\AbhiClaimImportService;
+use App\Libraries\TPAClaimsImportServices\RcareClaimImportService;
+use App\Libraries\TPAClaimsImportServices\VidalClaimImportService;
+use App\Libraries\TPAClaimsImportServices\IciciClaimImportService;
+use App\Libraries\TPAClaimsImportServices\BaseTpaClaimImportService;
 
 use App\Models\ClaimDumpFileModel;
 use App\Models\EmployeeModel;
@@ -15,10 +23,14 @@ use App\Models\TPAModel;
 use App\Models\ClientModel;
 use App\Models\TicketClaimStatusModel;
 use App\Models\ClientPolicyModel;
+use App\Models\ClaimsDumpFhplModel;
 
 use App\Helpers\ExcelSanitizeHelper;
 use App\Models\TicketMasterModel;
 
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
 class TicketServiceController extends BaseController
 {
     use ResponseTrait;
@@ -35,6 +47,10 @@ class TicketServiceController extends BaseController
     protected $ticketClaimStatusModel;
     protected $clientPolicyModel;
 
+    protected $medi_assist_primary_key;
+    protected $vidal_primary_key;
+    protected $icici_primary_key;
+
 
     public function __construct()
     {   
@@ -50,6 +66,11 @@ class TicketServiceController extends BaseController
         $this->ticketClaimStatusModel = new TicketClaimStatusModel();
         $this->clientPolicyModel = new ClientPolicyModel();
 
+        $this->medi_assist_primary_key = getenv('MEDI_ASSIST_PRIMARY_KEY_CONSTANT');
+        $this->vidal_primary_key = getenv('VIDAL_PRIMARY_KEY_CONSTANT');
+        $this->icici_primary_key = getenv('ICICI_PRIMARY_KEY_CONSTANT');
+
+
         $this->claim_dump_excel_columns = [
 
             // Mandatory Fields
@@ -1144,7 +1165,7 @@ class TicketServiceController extends BaseController
     {
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->claimDumpFileModel->find($file_id);
+        $file = $this->claimDumpFileModel->find((int)$file_id);
         $this->myLogger->logme('error', "Start the claim dump File Data Validataion with the file id : " . $file_id);
         // dd($file);
 
@@ -1329,7 +1350,7 @@ class TicketServiceController extends BaseController
     {
         //get file name
         $file_id = $params['file_id'];
-        $file = $this->claimDumpFileModel->find($file_id);
+        $file = $this->claimDumpFileModel->find((int)$file_id);
         $this->myLogger->logme('error', "Start the claim dump OnBoard Process with the file id : " . $file_id);
         // dd($file);
 
@@ -1819,5 +1840,176 @@ class TicketServiceController extends BaseController
     {
 
     }
+
+
+    // --------------------------------------------------------------------------------------------------------------------------------
+
+    public function tpaClaimDumpImporter($params)
+    {
+        $file_id = $params['file_id'] ?? null; // Move outside try to ensure catch can see it
+
+        try {
+            $file_path = WRITEPATH . 'uploads' . DIRECTORY_SEPARATOR . 'claim_dump_excel' . DIRECTORY_SEPARATOR;
+
+            if (!$file_id) {
+                return ['status' => false, 'message' => 'File ID is missing'];
+            }
+
+            $fileData = $this->claimDumpFileModel->find((int)$file_id);
+            if (!$fileData) {
+                return ['status' => false, 'message' => 'Invalid file ID. No file data found'];
+            }
+
+            $file_full_path = $file_path . $fileData['file_name'];
+            if (!is_file($file_full_path)) {
+                return ['status' => false, 'message' => 'Claim dump file not found'];
+            }
+
+            $handler = TpaClaimsImportFactory::make($fileData['tpa_id'] ?? 0);
+            $result  = $handler->runTpaClaimDumpInsert($file_full_path, $file_id);
+
+            if (!empty($result['status']) && $result['status'] === true) {
+                Jobs::addJob(['job_name' => 'tpaClaimDumpToTicketMasterImporters', 'payload' => ['file_id' => $file_id]]);
+            } else {
+                // FORCE FAIL LOGIC
+                $this->markAsFailed($file_id, $result['message'] ?? 'System error contact admin', $fileData['created_by'] ?? null);
+            }
+
+            return $result;
+        } catch (\Throwable $th) {
+            $this->myLogger->logme("error", 'TPA_CLAIM_IMPORTER_JOB : ' . $th->getMessage());
+
+            if (!empty($file_id)) {
+                $this->markAsFailed($file_id, 'System error contact admin');
+            }
+
+            return [
+                'status' => false,
+                'message' => 'TPA Claim dump import failed',
+                'error_data' => $th->getMessage()
+            ];
+        }
+    }
+
+    private function markAsFailed($file_id, $message, $user_id = null)
+    {
+        $reason = json_encode([
+            'error_summary' => [5 => 1],
+            'error_data'    => $message
+        ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+
+        $data = [
+            'status'     => 'failed',
+            'reason'     => $reason,
+            'updated_by' => $user_id
+        ];
+
+        // Using the direct update(id, data) method is often more reliable inside try/catch
+        return $this->claimDumpFileModel->update($file_id, $data);
+    }
+
+    public function tpaClaimDumpToTicketMasterImporters($params)
+    {
+        $file_id = $params['file_id'] ?? null;
+        $fileData = null;
+
+        try {
+            if (!$file_id) {
+                return ['status' => false, 'message' => 'File ID is missing'];
+            }
+
+            $fileData = $this->claimDumpFileModel->where('id', $file_id)->first();
+
+            if (!$fileData) {
+                return ['status' => false, 'message' => 'Invalid file ID. No file data found to import'];
+            }
+
+            $handler = TpaClaimsImportFactory::make($fileData['tpa_id'] ?? 0);
+            $result = $handler->runTicketMasterInsert($params);
+
+            if (!empty($result['status']) && $result['status'] === true) {
+                // Success: Update the status to success
+                $this->claimDumpFileModel->update($file_id, [
+                    'status' => 'success',
+                    'reason' => null
+                ]);
+            } else {
+                // Logic failure: The runTicketMasterInsert returned status false
+                $this->markAsFailed(
+                    $file_id,
+                    $result['message'] ?? 'System error contact admin',
+                    $fileData['created_by'] ?? null
+                );
+            }
+
+            return $result;
+        } catch (\Throwable $th) {
+            // Log the full error
+            $this->myLogger->logme("error", 'TICKET_MASTER_CLAIM_IMPORTER_JOB :' . $th->getMessage() . ' at line ' . $th->getLine());
+
+            // CRITICAL: Even if the code crashes, try to mark the file as failed
+            if ($file_id) {
+                $this->markAsFailed($file_id, 'Fatal Crash: ' . $th->getMessage(), $fileData['created_by'] ?? null);
+            }
+
+            return [
+                'status'  => false,
+                'message' => $th->getMessage(),
+                'error_data' => [
+                    'line' => $th->getLine(),
+                    'file' => $th->getFile()
+                ]
+            ];
+        }
+    }
+
+    public function readExcelBySheetName(string $filePath, string $sheetName): array
+    {
+        if (!file_exists($filePath)) {
+           return [];
+        }
+
+        $spreadsheet = IOFactory::load($filePath);
+
+        // Get sheet by name
+        $sheet = $spreadsheet->getSheetByName($sheetName);
+
+        if ($sheet === null) {
+            return [];
+        }
+
+        $rows = $sheet->toArray(null, true, true, true);
+
+        // Need at least header + one row
+        if (count($rows) < 2) {
+            return [];
+        }
+
+        // First row = headers
+        $headers = array_shift($rows);
+        $headers = array_map('trim', $headers);
+
+        $data = [];
+
+        foreach ($rows as $row) {
+            // Skip completely empty rows
+            if (!array_filter($row)) {
+                continue;
+            }
+
+            $item = [];
+
+            foreach ($headers as $key => $headerName) {
+                if ($headerName !== '') {
+                    $item[$headerName] = $row[$key] ?? null;
+                }
+            }
+
+            $data[] = $item;
+        }
+
+        return $data;
+    }
+
    
 }
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index f6b4cc60..44b44e51 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -83,7 +83,110 @@ class UserController extends AdminController
             return redirect()->to(base_url('/user/list'));
         } else {
 
-            $userData = $this->request->getPost();
+            // $userData = $this->request->getPost();
+            $data      = $this->request->getPost();
+            $userData  = sanitizeInputArrayAdvanced($data);
+            $rules = [
+
+                // ======================
+                // Nhance Branch
+                // ======================
+                'nhance_branch_id' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'Nhance Branch is required',
+                        'integer'  => 'Invalid Nhance Branch selected'
+                    ]
+                ],
+
+                // ======================
+                // Reporting Manager
+                // ======================
+                'rm_id' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'Reporting Manager is required',
+                        'integer'  => 'Invalid Reporting Manager selected'
+                    ]
+                ],
+
+                // ======================
+                // Employee Code
+                // ======================
+                'emp_code' => [
+                    'rules'  => 'required|min_length[3]|max_length[15]',
+                    'errors' => [
+                        'required'      => 'Employee Code is required',
+                        'min_length'    => 'Employee Code must be at least 3 characters',
+                        'max_length'    => 'Employee Code cannot exceed 15 characters',
+                    ]
+                ],
+
+                // ======================
+                // First Name
+                // ======================
+                'first_name' => [
+                    'rules'  => 'required|alpha_space|min_length[2]|max_length[100]',
+                    'errors' => [
+                        'required'    => 'Name is required',
+                        'alpha_space' => 'Name can contain only letters and spaces',
+                        'min_length'  => 'Name must be at least 2 characters',
+                        'max_length'  => 'Name cannot exceed 100 characters'
+                    ]
+                ],
+
+                // ======================
+                // Email
+                // ======================
+                'email' => [
+                    'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                    'errors' => [
+                        'required'    => 'Email address is required.',
+                        'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                    ]
+                ],
+
+                // ======================
+                // Mobile
+                // ======================
+                'mobile' => [
+                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]',
+                    'errors' => [
+                        'required'     => 'Mobile number is required',
+                        'regex_match'  => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
+                    ]
+                ],
+
+                // ======================
+                // Role
+                // ======================
+                'role' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'User Role is required',
+                        'integer'  => 'Invalid User Role selected'
+                    ]
+                ],
+
+                // ======================
+                // Team (Multiple select)
+                // ======================
+                'team' => [
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required' => 'At least one User Team must be selected'
+                    ]
+                ],
+            ];
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+
             $userData['created_by'] =  get_session_userid();
             $temp_team = $userData['team'];
             unset($userData['team']);
@@ -167,9 +270,112 @@ class UserController extends AdminController
             return redirect()->to(base_url('/user/list'));
         } else {
             // echo ":/ in 163";
-            $id = $this->request->getPost('PrimaryKey');
-            $teams = $this->request->getPost('team');
-            $userData = $this->request->getPost();
+            $rules = [
+
+                // ======================
+                // Nhance Branch
+                // ======================
+                'nhance_branch_id' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'Nhance Branch is required',
+                        'integer'  => 'Invalid Nhance Branch selected'
+                    ]
+                ],
+
+                // ======================
+                // Reporting Manager
+                // ======================
+                'rm_id' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'Reporting Manager is required',
+                        'integer'  => 'Invalid Reporting Manager selected'
+                    ]
+                ],
+
+                // ======================
+                // Employee Code
+                // ======================
+                'emp_code' => [
+                    'rules'  => 'required|min_length[3]|max_length[15]',
+                    'errors' => [
+                        'required'      => 'Employee Code is required',
+                        'min_length'    => 'Employee Code must be at least 3 characters',
+                        'max_length'    => 'Employee Code cannot exceed 15 characters',
+                    ]
+                ],
+
+                // ======================
+                // First Name
+                // ======================
+                'first_name' => [
+                    'rules'  => 'required|alpha_space|min_length[2]|max_length[100]',
+                    'errors' => [
+                        'required'    => 'Name is required',
+                        'alpha_space' => 'Name can contain only letters and spaces',
+                        'min_length'  => 'Name must be at least 2 characters',
+                        'max_length'  => 'Name cannot exceed 100 characters'
+                    ]
+                ],
+
+                // ======================
+                // Email
+                // ======================
+                'email' => [
+                    'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                    'errors' => [
+                        'required'    => 'Email address is required.',
+                        'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                    ]
+                ],
+
+                // ======================
+                // Mobile
+                // ======================
+                'mobile' => [
+                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]',
+                    'errors' => [
+                        'required'     => 'Mobile number is required',
+                        'regex_match'  => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
+                    ]
+                ],
+
+                // ======================
+                // Role
+                // ======================
+                'role' => [
+                    'rules'  => 'required|integer',
+                    'errors' => [
+                        'required' => 'User Role is required',
+                        'integer'  => 'Invalid User Role selected'
+                    ]
+                ],
+
+                // ======================
+                // Team (Multiple select)
+                // ======================
+                'team' => [
+                    'rules'  => 'required',
+                    'errors' => [
+                        'required' => 'At least one User Team must be selected'
+                    ]
+                ],
+            ];
+            if (!$this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status' => false,
+                    'message' => 'Input validation failed',
+                    'code' => 400,
+                    'errors' => $this->validator->getErrors()
+                ]);
+            }
+            
+            $data      = $this->request->getPost();
+            $userData  = sanitizeInputArrayAdvanced($data);
+            $id = $userData['PrimaryKey'];
+            $teams = $userData['team'];
+            
             unset($userData['csrf_test_name']);
             unset($userData['PrimaryKey']);
 
@@ -594,29 +800,100 @@ class UserController extends AdminController
             
             // add/update
             if ($method === 'post') {
-                $data = $this->request->getPost();
-                $id = !empty($data['PrimaryKey']) ? $data['PrimaryKey'] : null;
+
+                $rules = [
+                    // ======================
+                    // Partner Name
+                    // ======================
+                    'name' => [
+                        'rules'  => 'required|alpha_space|min_length[2]|max_length[100]',
+                        'errors' => [
+                            'required'    => 'Partner name is required',
+                            'alpha_space' => 'Partner name can contain only letters and spaces',
+                            'min_length'  => 'Partner name must be at least 2 characters',
+                            'max_length'  => 'Partner name cannot exceed 100 characters'
+                        ]
+                    ],
+                    // ======================
+                    // Mobile Number
+                    // ======================
+                    'mobile' => [
+                        'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]',
+                        'errors' => [
+                            'required'    => 'Mobile number is required',
+                            'regex_match' => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
+                        ]
+                    ],
+
+                    // ======================
+                    // Email
+                    // ======================
+                    'email' => [
+                        'rules'  => 'required|regex_match[/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/]',
+                        'errors' => [
+                            'required'    => 'Email address is required.',
+                            'regex_match' => 'Please enter a valid email format (e.g., name@company.com).'
+                        ]
+                    ],
+                    // ======================
+                    // Retention Rate
+                    // ======================
+                     'retention_rate' => [
+        'rules'  => [
+            'required',
+            'regex_match[/^(100(\.0{1,2})?|([0-9]{1,2})(\.[0-9]{1,2})?)$/]'
+        ],
+        'errors' => [
+            'required'    => 'Retention Rate is required',
+            'regex_match' => 'Retention Rate must be between 0 and 100 with up to 2 decimal places'
+        ]
+        ],
+                    // ======================
+                    // Nhance Branch
+                    // ======================
+                    'nhance_branch_id' => [
+                        'rules'  => 'required|integer',
+                        'errors' => [
+                            'required' => 'Nhance Branch is required',
+                            'integer'  => 'Invalid Nhance Branch selected'
+                        ]
+                    ],
+                ];
+                if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'code'    => 400,
+                    'errors'  => $this->validator->getErrors()
+                ]);
+            }
+
+
+                $data           = $this->request->getPost();
+                $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+                $id = !empty($sanitized_post_data['PrimaryKey']) ? $sanitized_post_data['PrimaryKey'] : null;
+                unset($sanitized_post_data['pk']); 
                 
                 // don't forgot same means just unset the key because partner_staff some UNIQUE KEY sets in table thats why
                 if ($id) {
-                    $existing = $this->partnerStaffModel->find($id);
+                    $existing = $this->partnerStaffModel->find((int)$id);
                     if ($existing) {
-                        if ($data['email'] === $existing['email']) { unset($data['email']); }
-                        if ($data['mobile'] === $existing['mobile']) { unset($data['mobile']); }
+                        if ($sanitized_post_data['email'] === $existing['email']) { unset($sanitized_post_data['email']); }
+                        if ($sanitized_post_data['mobile'] === $existing['mobile']) { unset($sanitized_post_data['mobile']); }
                     }
                 }
 
                 $errors = [];
 
                 // Check Email Duplicate (if it wasn't unset)
-                if (isset($data['email'])) {
-                    $count = $this->partnerStaffModel->where('email', $data['email'])->countAllResults();
+                if (isset($sanitized_post_data['email'])) {
+                    $count = $this->partnerStaffModel->where('email', $sanitized_post_data['email'])->countAllResults();
                     if ($count > 0) $errors['email'] = "This email is already taken by another user.";
                 }
 
                 // Check Mobile Duplicate (if it wasn't unset)
-                if (isset($data['mobile'])) {
-                    $count = $this->partnerStaffModel->where('mobile', $data['mobile'])->countAllResults();
+                if (isset($sanitized_post_data['mobile'])) {
+                    $count = $this->partnerStaffModel->where('mobile', $sanitized_post_data['mobile'])->countAllResults();
                     if ($count > 0) $errors['mobile'] = "This mobile is already taken by another user.";
                 }
 
@@ -632,14 +909,14 @@ class UserController extends AdminController
                 // --- Save/Update ---
                 if ($id) {
                     $text   = "update";            
-                    $data['updated_by'] =  get_session_userid();
+                    $sanitized_post_data['updated_by'] =  get_session_userid();
                     
-                    $result = $this->partnerStaffModel->update($id, $data);
+                    $result = $this->partnerStaffModel->update($id, $sanitized_post_data);
                 } else {
                     $text = "create";
-                    $data['role_id'] = 1;
-                    $data['created_by'] = get_session_userid();
-                    $id = $this->partnerStaffModel->insert($data);
+                    $sanitized_post_data['role_id'] = 1;
+                    $sanitized_post_data['created_by'] = get_session_userid();
+                    $id = $this->partnerStaffModel->insert($sanitized_post_data);
                     if($id){
                         $details['manager_id'] = $id;
                         $details['updated_by'] =  get_session_userid();
@@ -667,7 +944,7 @@ class UserController extends AdminController
                         return $this->response->setJSON(['status'  => 'error', 'message' => 'ID is required'])->setStatusCode(400);
                     }
 
-                    $staff = $this->partnerStaffModel->find($id);
+                    $staff = $this->partnerStaffModel->find((int)$id);
                     if (!$staff) {
                         return $this->response->setJSON(['status'  => 'error','message' => 'Staff not found'])->setStatusCode(404);
                     }
@@ -783,7 +1060,7 @@ class UserController extends AdminController
                         return $this->response->setJSON(['status'  => 'error', 'message' => 'ID is required'])->setStatusCode(400);
                     }
 
-                    $files = $this->partnerManagerIncentiveFileModel->find($id);
+                    $files = $this->partnerManagerIncentiveFileModel->find((int)$id);
                     if (!$files) {
                         return $this->response->setJSON(['status'  => 'error','message' => 'No Records found'])->setStatusCode(404);
                     }
diff --git a/app/Controllers/VidalApiController.php b/app/Controllers/VidalApiController.php
index 27a68399..eac51552 100644
--- a/app/Controllers/VidalApiController.php
+++ b/app/Controllers/VidalApiController.php
@@ -29,7 +29,7 @@ class VidalApiController extends BaseController
         $apiUrl    = getenv('VIDAL_API_BASE_URL').'/files/upload-url';
         $subscriptionKey = getenv('VIDAL_API_SUBSCRIPTION_KEY'); 
 
-        log_message('error', "Starting file upload process for filename: $filename | Path: $filePath");
+        log_message('error', "TPA CLAIM PUSH  | Starting file upload process for filename: $filename | Path: $filePath");
 
         // Step 1: Get signed URL from Vidal API
         // $filePath = '/opt/lampp/htdocs/nhance/writable/uploads/claim_files/1760013019_73d94af7b96ddc2e3d51.png';
@@ -39,7 +39,7 @@ class VidalApiController extends BaseController
             "Ocp-Apim-Subscription-Key: $subscriptionKey"
         ];
 
-        log_message('error', "Requesting signed URL from Vidal API: $apiUrl | Payload: $payload");
+        log_message('error', "TPA CLAIM PUSH  | Requesting signed URL from Vidal API: $apiUrl | Payload: $payload");
 
         $ch = curl_init($apiUrl);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -57,7 +57,7 @@ class VidalApiController extends BaseController
         $responseData = json_decode($response, true);
 
         if (!isset($responseData['data']['signedUrl']) || !isset($responseData['data']['fileId'])) {
-            log_message('error', "Invalid signed URL response received: " . json_encode($responseData));
+            log_message('error', "TPA CLAIM PUSH  | Invalid signed URL response received: " . json_encode($responseData));
             return ["status" => false, "message" => "Invalid signed URL response", "response" => $responseData];
         }
 
@@ -88,12 +88,12 @@ class VidalApiController extends BaseController
         curl_close($ch2);
 
          if ($curlErr) {
-            log_message('error', "Curl error during file upload: $curlErr");
+            log_message('error', "TPA CLAIM PUSH  | Curl error during file upload: $curlErr");
             return ["status" => false, "message" => "File upload failed", "data" => $curlErr];
         }
 
         if ($httpCode !== 200 && $httpCode !== 201) {
-            log_message('error', "File upload failed with HTTP Code: $httpCode | Response: $uploadResponse");
+            log_message('error', "TPA CLAIM PUSH  | File upload failed with HTTP Code: $httpCode | Response: $uploadResponse");
             return [
                 "status"   => false,
                 "message"  => "File upload failed",
@@ -112,7 +112,7 @@ class VidalApiController extends BaseController
         ];
     }
 
-    public function  SubmitClaim ($claimId = 515)
+    public function  SubmitClaim ($claimId = null) //515
     {
         helper('api');
 
@@ -153,7 +153,7 @@ class VidalApiController extends BaseController
             ->getRowArray(); // single record
 
         if (count($data) && $data['filePath'] == null) {
-            log_message('error', "Submit claim failed - Claim or File Missing");
+            log_message('error', "TPA CLAIM PUSH  | Submit claim failed - Claim or File Missing");
             return $this->response->setJSON(['status' => false,'message' => 'Claim or File Missing', ]);
         }
 
@@ -166,7 +166,7 @@ class VidalApiController extends BaseController
        
         $upload = $this->uploadFileToVidal($filePath,$filename);
         if ($upload['status'] !== true) {
-            log_message('error', "Submit claim failed - File upload failed");
+            log_message('error', "TPA CLAIM PUSH  | Submit claim failed - File upload failed");
             return $this->response->setJSON([
                 'status' => false,
                 'message' => 'File upload failed',
@@ -244,6 +244,9 @@ class VidalApiController extends BaseController
 
         if($response['status'] != true){
             log_message('error', 'TPA CLAIM PUSH FAILED | claimId: '.$claimId.' | response: '.json_encode($response));
+            $this->db->table('ticket_master')
+            ->where('id',$claimId)
+            ->update([ 'tpa_push_response' => json_encode($response) ]);
             return;
         }
 
@@ -251,8 +254,8 @@ class VidalApiController extends BaseController
 
         if($response['data']['status'] == 'SUCCESS')
         {
-            $claimNO = $response['data']['data']['claimNO'] ?? null;
-            $claimInwardNO = $response['data']['data']['claimInwardNO'] ?? null;
+            $claimNO = $response['data']['data']['claimNo'] ?? null;
+            $claimInwardNO = $response['data']['data']['claimInwardNo'] ?? null;
 
             if(!empty($claimNO) && !empty($claimInwardNO)){
 
@@ -260,7 +263,7 @@ class VidalApiController extends BaseController
 
                 $this->db->table('ticket_master')
                 ->where('id',$claimId)
-                ->update([ 'tpa_claim_push_reference_no' => $claimInwardNO , 'tpa_claim_id' => $claimNO ]);
+                ->update([ 'tpa_claim_push_reference_no' => $claimInwardNO , 'tpa_claim_id' => $claimNO , 'claim_number' => $claimNO ]);
 
                 return;
 
@@ -439,7 +442,7 @@ class VidalApiController extends BaseController
                         ->getRowArray();
 
         if (!$ticket) {
-            return $this->response->setJSON(['status' => false,'message' => 'Invalid Claim ID' ]);
+            return ['status' => false,'message' => 'Invalid Claim ID' ];
         }
 
         $body = [];
@@ -464,11 +467,7 @@ class VidalApiController extends BaseController
         if ($response['status'] != true || empty($response['data']['data']['claims'][0])) {
             log_message('error', 'CLAIM STATUS FAILED | for ticket ID: ' . $claimId.' | response: '.json_encode($response));
 
-            return $this->response->setJSON([
-                'status'  => false,
-                'message' => 'API call failed.',
-                'data'    => $response
-            ]);
+            return ['status'  => false, 'message' => 'API call failed.','data'    => $response];
         }
 
         // Extract claim status
@@ -501,12 +500,7 @@ class VidalApiController extends BaseController
         // LOG UPDATE
         log_message('error', "CLAIM STATUS SUCCESS | Updated ticket ID $claimId with claim status: $currentStatus");
 
-        return $this->response->setJSON([
-            'status' => true,
-            'message' => 'Claim status updated.',
-            'updated_status' => $currentStatus,
-            'api_response' => $response
-        ]);
+        return ['status' => true,'message' => 'Claim status updated.','updated_status' => $currentStatus,'api_response' => $response];
     }
 
     public function ClaimStatusUpdate()
@@ -801,7 +795,7 @@ class VidalApiController extends BaseController
 
             //call a job for dump JSON data to DB
             $job_details  = new Jobs();
-            $r = Jobs::addJob(['job_name' => 'saveMediAssitAPIData', 'payload' => [ 'file_id' => $requestData['file_id'],'json_file_path'    => $filePath ]]);
+            $r = Jobs::addJob(['job_name' => 'saveVidalAPIData', 'payload' => [ 'file_id' => $requestData['file_id'],'json_file_path'    => $filePath ]]);
 
 
             // now update DB
@@ -842,9 +836,9 @@ class VidalApiController extends BaseController
                         // log_message('error', "✅ Match found: emp_code={$row['empNo']} policy={$row['policyNumber']}");
 
                         $sql = "UPDATE employee_polices 
-                                SET tpa_id = ? 
-                                WHERE id = ?";
-                        $this->db->query($sql, [$row['enrollmentId'], $policy_data['emp_policy_id']]);
+                                SET tpa_id = :tpa_id:,
+                                WHERE id = :emp_policy_id:";
+                        $this->db->query($sql, ["tpa_id"=>$row['enrollmentId'], "emp_policy_id"=>$policy_data['emp_policy_id']]);
 
                         // for e-card send
                         if(strtolower(trim($policy_data['relationship'])) == 'self'){
diff --git a/app/Filters/AclFilter.php b/app/Filters/AclFilter.php
new file mode 100644
index 00000000..c3b052b8
--- /dev/null
+++ b/app/Filters/AclFilter.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Filters\FilterInterface;
+use Config\Acl;
+
+use App\Libraries\AuthLogout;
+
+class AclFilter implements FilterInterface
+{
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        // ===================== CLI BYPASS =====================
+        if (is_cli()) {
+            return;
+        }
+
+
+
+        // ===================== PATH NORMALIZATION =====================
+       $uri = service('uri');
+
+        // Raw path: /PHP828APPS/ruc/nhance/index.php/dashboard/view
+        $fullPath = '/' . ltrim($uri->getPath(), '/');
+
+        // Base path: /PHP828APPS/ruc/nhance
+        $basePath = rtrim(parse_url(base_url(), PHP_URL_PATH), '/');
+
+        // Remove base path
+        if ($basePath && str_starts_with($fullPath, $basePath)) {
+            $path = substr($fullPath, strlen($basePath));
+        } else {
+            $path = $fullPath;
+        }
+
+        // Remove index.php if present
+        if (str_starts_with($path, '/index.php')) {
+            $path = substr($path, strlen('/index.php'));
+        }
+
+        // Normalize
+        $path = '/' . ltrim($path, '/');
+
+        // Fallback
+        if ($path === '') {
+            $path = '/';
+        }
+
+        // echo'<br>BASH PATH: ' . base_url();
+        // echo'<br>ACL RAW PATH: ' . $fullPath;
+        // echo'<br>ACL BASE PATH: ' . $basePath;
+        // echo'<br>ACL FINAL PATH: ' . $path;
+        // ===================== LOAD ACL =====================
+        $acl = new Acl();
+        $rules = $acl->rules;
+        // print_rr($rules);die;
+        // ===================== MATCH RULE =====================
+        $matchedRule = null;
+
+        foreach ($rules as $pattern => $rule) {
+             // echo "$pattern".'---------<br>';
+            if (preg_match($pattern, $path)) {
+                // echo "matched - $pattern";
+                $matchedRule = $rule;
+                break; // FIRST MATCH WINS
+            }
+        }
+        
+         // print_r($matchedRule);//die;
+        // ===================== NO RULE = DENY =====================
+        if ($matchedRule === null) {
+            return $this->deny($path, 'No ACL rule matched');
+        }
+
+        // ===================== PUBLIC ROUTE =====================
+        if (!empty($matchedRule['public'])) {
+            return; // ALLOW
+        }
+
+        // ===================== AUTH CHECK =====================
+        if (!check_session()) {
+            // For API requests return 401 JSON
+            if ($request->isAJAX() || str_starts_with($path, '/api') || str_starts_with($path, '/employeeRest')) {
+                return service('response')
+                    ->setStatusCode(401)
+                    ->setJSON(['error' => 'Unauthorized Resource Access']);
+            }
+
+            // For web redirect to login
+           return AuthLogout::logout();
+        }
+
+        // ===================== GET USER CONTEXT =====================
+       
+        $userRole = check_role();   // 
+        $userTeams = user_team();    // must return array of TEAM IDs
+        
+        $allowedRoles = $matchedRule['roles'] ?? [];
+        $allowedTeams = $matchedRule['teams'] ?? [];
+        // ===================== ROLE FIRST =====================
+        if (!empty($allowedRoles) && in_array((int)$userRole, $allowedRoles, true)) {
+            return; // ALLOW
+        }
+        // ===================== TEAM FALLBACK =====================
+        if (!empty($allowedTeams) && is_array($userTeams)) {
+            foreach ($userTeams as $teamId) {
+                if (in_array($teamId, $allowedTeams, true)) {
+                    return; // ALLOW
+                }
+            }
+        }
+        // ===================== DENY =====================
+        return $this->deny($path, 'Role/Team not permitted');
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // nothing
+    }
+
+    // ===================== DENY HANDLER =====================
+    protected function deny(string $path, string $reason)
+    {
+        log_message('error', 'ACL BLOCKED: {user} {path} - {reason}', [
+            'user'   => session()->get('userid') ?? 'guest',
+            'path'   => $path,
+            'reason' => $reason,
+        ]);
+
+        // API / AJAX → JSON
+        $request = service('request');
+        if ($request->isAJAX() || str_starts_with($path, '/api') || str_starts_with($path, '/employeeRest')) {
+            return service('response')
+                ->setStatusCode(403)
+                ->setJSON([
+                    'error' => 'Forbidden',
+                    'message' => 'You do not have permission to access this resource'
+                ]);
+        }
+         
+         $response = service('response');
+         $response->setStatusCode(403);
+         $response->setBody(view('errors/404', [
+            'message' => '403 Access denied - You do not have permission to access this resource'
+        ]));
+
+        return $response;
+        // Web → nice 403 page or simple text
+        return service('response')
+            ->setStatusCode(403)
+            ->setBody('403 Forbidden - Access denied - You do not have permission to access this resource');
+    }
+}
diff --git a/app/Filters/AuthJWT.php b/app/Filters/AuthJWT.php
index 484372a7..ec34d902 100755
--- a/app/Filters/AuthJWT.php
+++ b/app/Filters/AuthJWT.php
@@ -18,67 +18,120 @@ use App\Models\LevelContactModel;
 
 class AuthJWT implements FilterInterface
 {
+    // public function before(RequestInterface $request, $arguments = null)
+    // {
+    //     $jwt = $request->getHeader('Authorization');
+
+    //     if ($jwt) {
+    //         if (JWTToken::validateJWT($jwt)) {
+    //             $data = JWTToken::validateJWT($jwt);
+    //             $data = json_decode($data);
+                
+    //             $id = $data->decoded->id; 
+    //             if(isset($data->decoded->emp_code)){
+    //                 $model = new EmployeeModel();
+    //                 $user_data = $model->where('id', $id)->first();
+
+    //                 if($user_data['token_time_out'] > time()){     
+    //                     $data =["token_time_out" => time() + getenv('TOKENTIMEOUT') ];
+    //                     $model->update($id, $data);
+    //                     return true;
+    //                 }else{
+
+    //                     // if($user_data['token_time_out'] != "" && $user_data['token_time_out'] != NULL)
+                            
+    //                     $data =["token_time_out" => ''];
+    //                     $model->update($id, $data);
+    //                     header('Content-Type: application/json');
+    //                     http_response_code(401);
+    //                     // $error = json_encode(["status" => 401, "message" => $data->message]);
+    //                     $error = json_encode(["status" => 401, "message" => "Token is Invalid"]);
+    //                     echo $error;
+    //                     exit;
+    //                 }
+    //             }else{
+    //                 $model = new LevelContactModel();
+    //                 $hr_data = $model->where('id', $id)->first();
+
+    //                 if($hr_data['token_time_out'] > time()){     
+    //                     $data =["token_time_out" => time() + getenv('TOKENTIMEOUT') ];
+    //                     $model->update($id, $data);
+    //                     return true;
+    //                 }else{
+    //                     $data =["token_time_out" => ''];
+    //                     $model->update($id, $data);
+    //                     header('Content-Type: application/json');
+    //                     http_response_code(401);
+    //                     // $error = json_encode(["status" => 401, "message" => $data->message]);
+    //                     $error = json_encode(["status" => 401, "message" => "Token is Invalid"]);
+    //                     echo $error;
+    //                     exit;
+    //                 }
+    //             }
+                
+    //         }
+    //     } else {
+    //         header('Content-Type: application/json');
+    //         http_response_code(403);
+    //         $error = json_encode(["status" => 403, "message" => "Access Forbidden!"]);
+    //         echo $error;
+    //         exit();
+    //     }
+    // }
+
     public function before(RequestInterface $request, $arguments = null)
     {
-        $jwt = $request->getHeader('Authorization');
+        $authHeader = $request->getHeaderLine('Authorization');
 
-        if ($jwt) {
-            if (JWTToken::validateJWT($jwt)) {
-                $data = JWTToken::validateJWT($jwt);
-                $data = json_decode($data);
-                
-                $id = $data->decoded->id; 
-                if(isset($data->decoded->emp_code)){
-                    $model = new EmployeeModel();
-                    $user_data = $model->where('id', $id)->first();
-
-                    if($user_data['token_time_out'] > time()){     
-                        $data =["token_time_out" => time() + getenv('TOKENTIMEOUT') ];
-                        $model->update($id, $data);
-                        return true;
-                    }else{
-
-                        // if($user_data['token_time_out'] != "" && $user_data['token_time_out'] != NULL)
-                            
-                        $data =["token_time_out" => ''];
-                        $model->update($id, $data);
-                        header('Content-Type: application/json');
-                        http_response_code(401);
-                        // $error = json_encode(["status" => 401, "message" => $data->message]);
-                        $error = json_encode(["status" => 401, "message" => "Token is Invalid"]);
-                        echo $error;
-                        exit;
-                    }
-                }else{
-                    $model = new LevelContactModel();
-                    $hr_data = $model->where('id', $id)->first();
-
-                    if($hr_data['token_time_out'] > time()){     
-                        $data =["token_time_out" => time() + getenv('TOKENTIMEOUT') ];
-                        $model->update($id, $data);
-                        return true;
-                    }else{
-                        $data =["token_time_out" => ''];
-                        $model->update($id, $data);
-                        header('Content-Type: application/json');
-                        http_response_code(401);
-                        // $error = json_encode(["status" => 401, "message" => $data->message]);
-                        $error = json_encode(["status" => 401, "message" => "Token is Invalid"]);
-                        echo $error;
-                        exit;
-                    }
-                }
-                
-            }
-        } else {
-            header('Content-Type: application/json');
-            http_response_code(403);
-            $error = json_encode(["status" => 403, "message" => "Access Forbidden!"]);
-            echo $error;
-            exit();
+        if (!$authHeader) {
+            return $this->reject(403, 'Access Forbidden');
         }
+
+        $result = JWTToken::validateJWT($authHeader);
+
+        if ($result['status'] !== true) {
+            return $this->reject(401, $result['message']);
+        }
+
+        $decoded = $result['decoded'];
+        $id      = $decoded['id'] ?? null;
+
+        if (!$id) {
+            return $this->reject(401, 'Invalid token payload');
+        }
+
+        if (isset($decoded['emp_code'])) {
+            $model = new EmployeeModel();
+        } else {
+            $model = new LevelContactModel();
+            $id    = $decoded['post_hr_id'] ?? null;
+        }
+
+        $user = $model->find($id);
+
+        if (!$user || $user['token_time_out'] <= time()) {
+            $model->update($id, ['token_time_out' => null]);
+            return $this->reject(401, 'Token expired');
+        }
+
+        // Refresh sliding expiration
+        $model->update($id, [
+            'token_time_out' => time() + getenv('TOKENTIMEOUT')
+        ]);
+
+        return true;
     }
 
+    private function reject(int $code, string $message)
+    {
+        return service('response')
+            ->setStatusCode($code)
+            ->setJSON(['status' => $code, 'message' => $message])
+            ->send();
+    }
+
+
+
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
         // Do something here after the response is sent
diff --git a/app/Filters/AuthMVC.php b/app/Filters/AuthMVC.php
index 1e0be969..ef2da046 100755
--- a/app/Filters/AuthMVC.php
+++ b/app/Filters/AuthMVC.php
@@ -5,13 +5,28 @@ use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 
+use App\Libraries\AuthLogout;
+
 class AuthMVC implements FilterInterface
 {
     public function before(RequestInterface $request, $arguments = null)
     {
-        if (!check_session() && !check_cookie()) {
-            
-          return redirect()->to(base_url('/login'));
+        
+        if (!check_session()) 
+        {
+          return AuthLogout::logout();
+        }
+
+        // if (!check_cookie()) 
+        // {
+        //   return AuthLogout::logout();
+        // }
+
+        // Fingerprint validation
+        $fp = generateFingerprint();
+        // log_message('error',$fp);
+        if (session()->get('fingerprint') !== $fp) {
+            return AuthLogout::logout();
         }
 
     }
diff --git a/app/Filters/Cors.php b/app/Filters/Cors.php
index 6aae35d9..60a97a89 100644
--- a/app/Filters/Cors.php
+++ b/app/Filters/Cors.php
@@ -38,7 +38,7 @@ class Cors implements FilterInterface
      * 
      * @var string
      */
-    protected string $allowedMethods = 'GET,POST,PUT,PATCH,DELETE,OPTIONS';
+    protected string $allowedMethods = 'GET,POST,OPTIONS';
 
     /**
      * HTTP headers allowed in CORS requests
@@ -143,7 +143,7 @@ class Cors implements FilterInterface
 
         // If wildcard present in configuration, allow any origin
         if (in_array('*', $this->allowedOrigins, true)) {
-            $this->log('Origin allowed: wildcard match', ['origin' => $origin]);
+            // $this->log('Origin allowed: wildcard match', ['origin' => $origin]);
             return true;
         }
 
@@ -159,10 +159,10 @@ class Cors implements FilterInterface
             // 1. Exact match (including scheme and port)
             // Example: https://example.com matches https://example.com
             if (strcasecmp($allowed, $origin) === 0) {
-                $this->log('Origin allowed: exact match', [
-                    'origin' => $origin,
-                    'matched_rule' => $allowed
-                ]);
+                // $this->log('Origin allowed: exact match', [
+                //     'origin' => $origin,
+                //     'matched_rule' => $allowed
+                // ]);
                 return true;
             }
 
@@ -178,11 +178,11 @@ class Cors implements FilterInterface
                     
                     // Check if origin host ends with the allowed root domain
                     if ($originHost === $allowedRoot || str_ends_with($originHost, '.' . $allowedRoot)) {
-                        $this->log('Origin allowed: wildcard subdomain match', [
-                            'origin' => $origin,
-                            'matched_rule' => $allowed,
-                            'origin_host' => $originHost
-                        ]);
+                        // $this->log('Origin allowed: wildcard subdomain match', [
+                        //     'origin' => $origin,
+                        //     'matched_rule' => $allowed,
+                        //     'origin_host' => $originHost
+                        // ]);
                         return true;
                     }
                 }
@@ -191,11 +191,11 @@ class Cors implements FilterInterface
                 // Example: example.com matches both http://example.com and https://example.com
                 else {
                     if (strcasecmp($allowed, $originHost) === 0) {
-                        $this->log('Origin allowed: host match (scheme-less)', [
-                            'origin' => $origin,
-                            'matched_rule' => $allowed,
-                            'origin_host' => $originHost
-                        ]);
+                        // $this->log('Origin allowed: host match (scheme-less)', [
+                        //     'origin' => $origin,
+                        //     'matched_rule' => $allowed,
+                        //     'origin_host' => $originHost
+                        // ]);
                         return true;
                     }
                 }
@@ -274,6 +274,7 @@ class Cors implements FilterInterface
 
         // Handle allowed headers
         if ($isPreflight) {
+             $response->setHeader('Access-Control-Allow-Methods', ['OPTIONS']);
             // For preflight: respect what the browser is asking for
             // The browser sends Access-Control-Request-Headers to ask permission
             $requestedHeaders = $request->getHeaderLine('Access-Control-Request-Headers');
@@ -320,11 +321,11 @@ class Cors implements FilterInterface
         // Preflight is sent by browsers before actual cross-origin requests
         // to check if the actual request is safe to send
         if ($method === 'OPTIONS') {
-            $this->log('Preflight request received', [
-                'origin' => $origin,
-                'method' => $method,
-                'uri' => (string) $request->getUri()
-            ]);
+            // $this->log('Preflight request received', [
+            //     'origin' => $origin,
+            //     'method' => $method,
+            //     'uri' => (string) $request->getUri()
+            // ]);
 
             // Validate origin - reject if not allowed
             if (empty($origin) || !$this->isOriginAllowed($origin)) {
@@ -346,10 +347,10 @@ class Cors implements FilterInterface
             $response->setStatusCode(204);
             $response->setBody('');
 
-            $this->log('Preflight approved', [
-                'origin' => $origin,
-                'allowed_methods' => $this->allowedMethods
-            ]);
+            // $this->log('Preflight approved', [
+            //     'origin' => $origin,
+            //     'allowed_methods' => $this->allowedMethods
+            // ]);
 
             return $response;
         }
@@ -392,10 +393,10 @@ class Cors implements FilterInterface
         // Add CORS headers to the response
         $this->addCorsHeaders($response, $request, $origin, false);
 
-        $this->log('CORS headers added to response', [
-            'origin' => $origin,
-            'status' => $response->getStatusCode()
-        ]);
+        // $this->log('CORS headers added to response', [
+        //     'origin' => $origin,
+        //     'status' => $response->getStatusCode()
+        // ]);
     }
 
     /**
diff --git a/app/Filters/GlobalPostFileUploadGuard.php b/app/Filters/GlobalPostFileUploadGuard.php
new file mode 100644
index 00000000..76117240
--- /dev/null
+++ b/app/Filters/GlobalPostFileUploadGuard.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Filters\FilterInterface;
+use Config\Services;
+use finfo;
+
+class GlobalPostFileUploadGuard implements FilterInterface
+{
+    /**
+     * Max file size (in bytes) → 25MB
+     */
+    protected int $maxFileSize = 25 * 1024 * 1024;
+
+    /**
+     * Allowed MIME types mapped to extensions
+     */
+    protected array $allowedMimeMap = [
+        'image/jpeg'      => ['jpg', 'jpeg'],
+        'image/png'       => ['png'],
+        'image/gif'       => ['gif'],
+        'image/webp'      => ['webp'],
+        'image/svg+xml'   => ['svg'],
+        'application/pdf' => ['pdf'],
+        'application/msword' => ['doc'],
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => ['docx'],
+        'application/vnd.oasis.opendocument.text' => ['odt'],
+        'text/rtf' => ['rtf'],
+        'application/rtf' => ['rtf'],
+        'application/vnd.ms-excel' => ['xls'],
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => ['xlsx'],
+        'application/vnd.oasis.opendocument.spreadsheet' => ['ods'],
+        'text/csv' => ['csv'],
+        'application/csv' => ['csv'],
+        'text/plain' => ['txt', 'csv'], 
+    ];
+
+    protected array $blockedExtensions = [
+        'php', 'phtml', 'html', 'pht', 'phar', 'php3', 'php4', 'php5', 'php7', 'php8', 'phps',
+        'cgi', 'fcgi', 'pl', 'py', 'rb', 'lua', 'tcl', 'go', 'rs', 'jar', 'class',
+        'exe', 'dll', 'com', 'bat', 'cmd', 'msi', 'vbs', 'ps1', 'scr',
+        'sh', 'bash', 'zsh', 'apk', 'app', 'deb', 'rpm', 'bin', 'run',
+        'js', 'mjs', 'jsp', 'asp', 'aspx', 'cer', 'swf',
+        'env', 'ini', 'user.ini', 'htaccess', 'htpasswd', 'conf', 'config', 'log', 'sql',
+        'zip', 'rar', '7z', 'tar', 'gz', 'bz2', 'xz', 'iso',
+        'lnk', 'url', 'reg', 'sys', 'drv', 'vxd', 'tmp', 'bak', 'old', 'backup', 'key', 'pem'
+    ];
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if ($request->getMethod() !== 'post') {
+            return;
+        }
+
+        $files = $request->getFiles();
+        if (empty($files)) {
+            return;
+        }
+
+        foreach ($files as $inputName => $fileData) {
+            $this->validateFileInput($fileData, $inputName);
+        }
+    }
+
+    private function validateFileInput($fileData, string $inputName): void
+    {
+        if (is_array($fileData)) {
+            foreach ($fileData as $file) {
+                $this->validateSingleFile($file, $inputName);
+            }
+        } else {
+            $this->validateSingleFile($fileData, $inputName);
+        }
+    }
+
+    private function validateSingleFile($file, string $inputName): void
+    {
+        $request = Services::request();
+        $clientIp = $request->getIPAddress();
+        $uri      = $request->getUri()->getPath();
+
+        if (!$file->isValid()) {
+            if ($file->getError() === UPLOAD_ERR_INI_SIZE || $file->getError() === UPLOAD_ERR_FORM_SIZE) {
+                $this->block("File exceeds server-side size limit", $clientIp, $uri, $inputName, $file->getClientName(), 'unknown', 'unknown', 0);
+            }
+            return; 
+        }
+
+        $originalName = $file->getClientName();
+        $extension    = strtolower($file->getExtension());
+        $mime         = $file->getMimeType(); 
+        $size         = $file->getSize();
+
+        // --- 1. Fixed Null Byte & Path Traversal Check ---
+        if (preg_match('/\0|[\/\\\]/', $originalName)) {
+            $this->block("Malicious filename characters", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+
+        // --- 2. Double Extension Attack Check ---
+        if (preg_match('/\.(php|html|phtml|phar|exe|sh|bat|cmd|js|jsp|asp|aspx|py|pl)\./i', $originalName)) {
+            $this->block("Double extension attack", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+
+        // --- 3. Forbidden Extension ---
+        if (in_array($extension, $this->blockedExtensions, true)) {
+            $this->block("Forbidden extension", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+
+        // --- 4. File Size Limit ---
+        if ($size > $this->maxFileSize) {
+            $this->block("File too large", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+
+        // --- 5. MIME Allow-list Check ---
+        if (!array_key_exists($mime, $this->allowedMimeMap)) {
+            $this->block("MIME type not allowed ($mime)", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+
+        // --- 6. MIME-Extension Consistency ---
+        if (!in_array($extension, $this->allowedMimeMap[$mime], true)) {
+            $this->block("MIME-extension mismatch", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
+        }
+    }
+
+    private function block(string $reason, string $ip, string $uri, string $field, string $filename, string $mime, string $ext, int $size): void
+    {
+        log_message('critical',
+            '[UPLOAD_BLOCKED] {reason} | IP: {ip} | URI: {uri} | Field: {field} | File: {file} | MIME: {mime} | EXT: {ext} | SIZE: {size}',
+            ['reason'=>$reason, 'ip'=>$ip, 'uri'=>$uri, 'field'=>$field, 'file'=>$filename, 'mime'=>$mime, 'ext'=>$ext, 'size'=>$size]
+        );
+
+        $response = Services::response();
+        $response->setStatusCode(403)
+                 ->setJSON([
+                     'status'  => 'error',
+                     'message' => 'File upload rejected: Security policy violation.',
+                     'debug'   => (ENVIRONMENT === 'development') ? $reason : null
+                 ])
+                 ->send();
+        exit;
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) {}
+}
\ No newline at end of file
diff --git a/app/Filters/RateLimitFilter.php b/app/Filters/RateLimitFilter.php
new file mode 100644
index 00000000..31efe81e
--- /dev/null
+++ b/app/Filters/RateLimitFilter.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Filters\FilterInterface;
+
+class RateLimitFilter implements FilterInterface
+{
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $throttler = service('throttler');
+
+        // sanitize IP for cache
+        $key = preg_replace('/[^a-zA-Z0-9_]/', '_', $request->getIPAddress());
+
+        if ($throttler->check($key, 25, MINUTE) === false) {
+            return service('response')
+                ->setStatusCode(429)
+                ->setJSON([
+                    'status'  => 'error',
+                    'message' => 'Too many requests. Try again later.'
+                ]);
+        }
+    }
+
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // nothing
+    }
+}
diff --git a/app/Filters/SecurityInputFilter.php b/app/Filters/SecurityInputFilter.php
new file mode 100644
index 00000000..c23f7907
--- /dev/null
+++ b/app/Filters/SecurityInputFilter.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+class SecurityInputFilter implements FilterInterface
+{
+    /**
+     * High-confidence XSS patterns only
+     * (low false-positive set) 
+     **/
+
+    protected array $xssPatterns = [
+            // Script execution
+            '/<\s*script\b/i',
+            '/<\/\s*script\s*>/i',
+
+            // JavaScript execution vectors
+            '/javascript\s*:/i',
+            '/vbscript\s*:/i',
+            '/data\s*:\s*text\/html/i',
+
+            // Inline event handlers (strong signal)
+            '/on\w+\s*=\s*["\']?/i',
+
+            // Dangerous HTML tags
+            '/<\s*iframe\b/i',
+            '/<\s*object\b/i',
+            '/<\s*embed\b/i',
+            '/<\s*applet\b/i',
+            '/<\s*img\b/i',
+
+            // Image-based execution
+            '/<\s*img\b[^>]*on\w+/i',
+
+            // SVG-based execution (modern bypass)
+            '/<\s*svg\b/i',
+            '/<\s*math\b/i',
+
+            // Meta refresh redirect
+            '/<\s*meta\b[^>]*http-equiv\s*=\s*["\']?refresh/i',
+
+            // HTML injection via src/href
+            '/<\s*\w+\b[^>]*(src|href)\s*=\s*["\']?\s*(javascript|data)\s*:/i'
+    ];
+
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $logger   = Services::mylogger();
+        $response = Services::response();
+
+        // Collect all user-controlled input
+        $inputs = array_merge(
+            $request->getGet(),
+            $request->getPost()
+        );
+
+        if (empty($inputs)) {
+            return;
+        }
+
+        foreach ($inputs as $field => $value) {
+            if (is_array($value)) {
+                $value = json_encode($value);
+            }
+
+            // Step 1: Canonicalization (VERY IMPORTANT)
+            $canonical = $this->canonicalize($value);
+
+            // Step 2: Trim (hygiene)
+            $canonical = trim($canonical);
+
+            // Step 3: Detection (signal-only)
+            if ($this->detectXss($canonical)) {
+
+                // 🔐 Log intent, not data
+                $logger->logme('critical','SECURITY_BLOCKED_REQUEST - '. json_encode([
+                    'ip'        => $request->getIPAddress(),
+                    'method'    => $request->getMethod(),
+                    'uri'       => current_url(),
+                    'field'     => $field,
+                    'attack'    => 'XSS_PATTERN',
+                    'length'    => strlen($canonical),
+                    'hash'      => hash('sha256', $canonical),
+                ]));
+
+                // ⛔ Block request
+                return $response
+                    ->setStatusCode(403)
+                    ->setJSON([
+                        'status'  => 403,
+                        'error'   => 'Forbidden',
+                        'message' => 'Malicious input detected'
+                    ]);
+            }
+        }
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // no-op
+    }
+
+    /**
+     * Canonicalization prevents encoded bypass
+     */
+    private function canonicalize(string $value): string
+    {
+        $value = urldecode($value);
+        $value = html_entity_decode($value, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+
+        // Remove invisible control characters
+        return preg_replace('/[\x00-\x1F\x7F]/u', '', $value);
+    }
+
+    private function detectXss(string $value): bool
+    {
+        foreach ($this->xssPatterns as $pattern) {
+            if (preg_match($pattern, $value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/Helpers/ChatbotHelper.php b/app/Helpers/ChatbotHelper.php
index 72632251..3947ef7e 100644
--- a/app/Helpers/ChatbotHelper.php
+++ b/app/Helpers/ChatbotHelper.php
@@ -59,7 +59,7 @@ class ChatbotHelper
         // $policy_id = 0;
         // $relationship ='Father';
         $EmployeeModel = new EmployeeModel();
-        $data = $EmployeeModel->find($emp_id);
+        $data = $EmployeeModel->find((int)$emp_id);
         if(isset($data) && isset($data['email_corporate']))
         {
             $message = SELF::ReimbursementProcessMailTemplate();
diff --git a/app/Helpers/DepositHelper.php b/app/Helpers/DepositHelper.php
index 495797f3..cc8fbde0 100755
--- a/app/Helpers/DepositHelper.php
+++ b/app/Helpers/DepositHelper.php
@@ -67,7 +67,8 @@ class DepositHelper
             'balance' => $newBalance, // Include the new balance in the data array
             'cd_ac_pk'=> isset($data['cd_ac_pk'])?$data['cd_ac_pk']:null,
             'record_date' => $data['record_date'] ?? null,
-            'policy_transaction_id' => $data['pt_id'] ?? null
+            'policy_transaction_id' => $data['pt_id'] ?? null,
+            'file_id' => $data['file_id'] ?? null,
         ];
 
         // Insert data and get the insert ID
diff --git a/app/Helpers/HttpRequestHelper.php b/app/Helpers/HttpRequestHelper.php
index a3a3da64..3e072e8a 100755
--- a/app/Helpers/HttpRequestHelper.php
+++ b/app/Helpers/HttpRequestHelper.php
@@ -4,24 +4,175 @@ namespace App\Helpers;
 
 class HttpRequestHelper
 {
-    public static function getRequestInfo()
+    public static function getRequestInfo(): array
     {
         $request = service('request');
+
+        $uaString = $request->getHeaderLine('User-Agent');
+
+        // Detect platform & browser using robust fallback logic
+        [$platform, $browser] = self::detectFromUserAgent($uaString);
+
         $data = [
-            'ip' => $request->getIPAddress(),
-            'platform' => $request->getUserAgent()->getPlatform(),
-            'browser' => ($request->getUserAgent()->getBrowser().' '.$request->getUserAgent()->getVersion()),
-            'method' => $request->getMethod(),
-            'endpoint' => $request->uri->getPath(),
-            'getparams' => $request->uri->getSegments(),
-            'postparams' => $request->getPost()
+            'ip'         => $request->getIPAddress(),
+            'platform'   => $platform,
+            'browser'    => $browser,
+            'method'     => strtoupper($request->getMethod()),
+            'endpoint'   => $request->uri->getPath(),
+            'getparams'  => json_encode($request->uri->getSegments(), JSON_UNESCAPED_UNICODE),
+            'postparams' => self::sanitizePostForLog($request->getPost()),
         ];
 
-        $data['method'] = (isset($data['method']) ? strtoupper($data['method']) : $data['method']);
-        $data['getparams'] = is_array($data['getparams']) ? json_encode($data['getparams']) : $data['getparams'];
-        $data['postparams'] = is_array($data['postparams']) ? json_encode($data['postparams']) : $data['postparams'];
         return $data;
     }
-     public static function add($payload)
-    {return $payload['a'] + $payload['b'];}
+
+    /**
+     * Detect platform & browser from UA string (reliable fallback)
+     */
+    private static function detectFromUserAgent(string $ua): array
+    {
+        $uaLower = strtolower($ua);
+
+        // =========================
+        // PLATFORM DETECTION
+        // =========================
+        $platform = 'Unknown';
+
+        if (str_contains($uaLower, 'windows nt 11') || str_contains($uaLower, 'windows 11')) {
+            $platform = 'Windows 11';
+        } elseif (str_contains($uaLower, 'windows nt 10')) {
+            $platform = 'Windows 10';
+        } elseif (str_contains($uaLower, 'windows nt 6.3')) {
+            $platform = 'Windows 8.1';
+        } elseif (str_contains($uaLower, 'windows nt 6.2')) {
+            $platform = 'Windows 8';
+        } elseif (str_contains($uaLower, 'windows nt 6.1')) {
+            $platform = 'Windows 7';
+        } elseif (str_contains($uaLower, 'windows nt 6.0')) {
+            $platform = 'Windows Vista';
+        } elseif (str_contains($uaLower, 'windows nt 5.1') || str_contains($uaLower, 'windows xp')) {
+            $platform = 'Windows XP';
+        } elseif (str_contains($uaLower, 'android')) {
+            $platform = 'Android';
+        } elseif (str_contains($uaLower, 'iphone')) {
+            $platform = 'iOS (iPhone)';
+        } elseif (str_contains($uaLower, 'ipad')) {
+            $platform = 'iOS (iPad)';
+        } elseif (str_contains($uaLower, 'ipod')) {
+            $platform = 'iOS (iPod)';
+        } elseif (str_contains($uaLower, 'mac os') || str_contains($uaLower, 'macintosh')) {
+            $platform = 'Mac OS';
+        } elseif (str_contains($uaLower, 'cros')) {
+            $platform = 'Chrome OS';
+        } elseif (str_contains($uaLower, 'linux')) {
+            $platform = 'Linux';
+        } elseif (str_contains($uaLower, 'freebsd')) {
+            $platform = 'FreeBSD';
+        } elseif (str_contains($uaLower, 'openbsd')) {
+            $platform = 'OpenBSD';
+        } elseif (str_contains($uaLower, 'netbsd')) {
+            $platform = 'NetBSD';
+        } elseif (str_contains($uaLower, 'unix')) {
+            $platform = 'Unix';
+        } elseif (str_contains($uaLower, 'symbian')) {
+            $platform = 'Symbian';
+        } elseif (str_contains($uaLower, 'blackberry')) {
+            $platform = 'BlackBerry';
+        } elseif (str_contains($uaLower, 'tizen')) {
+            $platform = 'Tizen';
+        } elseif (str_contains($uaLower, 'webos')) {
+            $platform = 'WebOS';
+        } elseif (str_contains($uaLower, 'kaios')) {
+            $platform = 'KaiOS';
+        } elseif (str_contains($uaLower, 'harmonyos')) {
+            $platform = 'HarmonyOS';
+        } elseif (str_contains($uaLower, 'watchos')) {
+            $platform = 'watchOS';
+        } elseif (str_contains($uaLower, 'tv os') || str_contains($uaLower, 'tvos')) {
+            $platform = 'tvOS';
+        }
+
+        // =========================
+        // BROWSER / CLIENT DETECTION
+        // =========================
+        $browser = 'Unknown';
+
+        // Bots & tools first
+        if (preg_match('/googlebot|bingbot|slurp|duckduckbot|baiduspider|yandexbot|sogou|exabot|facebot|ia_archiver/i', $ua)) {
+            $browser = 'Search Bot';
+        } elseif (preg_match('/postman/i', $ua)) {
+            $browser = 'Postman';
+        } elseif (preg_match('/insomnia/i', $ua)) {
+            $browser = 'Insomnia';
+        } elseif (preg_match('/curl/i', $ua)) {
+            $browser = 'curl';
+        } elseif (preg_match('/wget/i', $ua)) {
+            $browser = 'wget';
+        }
+
+        // Real browsers
+        elseif (preg_match('/edg\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Edge ' . $m[1];
+        } elseif (preg_match('/opr\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Opera ' . $m[1];
+        } elseif (preg_match('/vivaldi\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Vivaldi ' . $m[1];
+        } elseif (preg_match('/brave\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Brave ' . $m[1];
+        } elseif (preg_match('/chrome\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Chrome ' . $m[1];
+        } elseif (preg_match('/firefox\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Firefox ' . $m[1];
+        } elseif (preg_match('/safari\/([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Safari ' . $m[1];
+        } elseif (preg_match('/msie\s([\d\.]+)/i', $ua, $m) || preg_match('/trident\/.*rv:([\d\.]+)/i', $ua, $m)) {
+            $browser = 'Internet Explorer ' . $m[1];
+        }
+
+        // In-app browsers
+        elseif (preg_match('/fbav|fban/i', $ua)) {
+            $browser = 'Facebook In-App Browser';
+        } elseif (preg_match('/instagram/i', $ua)) {
+            $browser = 'Instagram In-App Browser';
+        } elseif (preg_match('/linkedinapp/i', $ua)) {
+            $browser = 'LinkedIn In-App Browser';
+        } elseif (preg_match('/twitter/i', $ua)) {
+            $browser = 'Twitter/X In-App Browser';
+        }
+
+        return [$platform, $browser];
+    }
+
+
+    /**
+     * Remove sensitive fields before logging POST
+     */
+    private static function sanitizePostForLog(array $post): string
+    {
+        if (empty($post)) {
+            return json_encode([]);
+        }
+
+        $sensitiveKeys = [
+            'password', 'pass', 'pwd',
+            'token', 'access_token', 'refresh_token',
+            'secret', 'api_key', 'authorization',
+            'otp', 'pin'
+        ];
+
+        foreach ($post as $k => $v) {
+            foreach ($sensitiveKeys as $sk) {
+                if (stripos($k, $sk) !== false) {
+                    $post[$k] = '***MASKED***';
+                }
+            }
+        }
+
+        return json_encode($post, JSON_UNESCAPED_UNICODE);
+    }
+
+    public static function add($payload)
+    {
+        return $payload['a'] + $payload['b'];
+    }
 }
diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php
index 41d76b5c..c964bac7 100755
--- a/app/Helpers/JWTToken.php
+++ b/app/Helpers/JWTToken.php
@@ -18,24 +18,28 @@ use App\Models\LevelContactModel;
 
 class JWTToken
 {
+
+    private const ALLOWED_ALG = 'HS512';
+
     public static function encode($data =null)
     {
-        $secret_Key ="secret";
+        $secret_Key = env('JWT_SECRET');
 
         $request_data = (array)$data;
 
         try{
             $token =  JWT::encode($request_data ,$secret_Key,'HS512');
             $id = $request_data['id'];
-            $data["token_time_out"] = time() + getenv('TOKENTIMEOUT');
+            $update["token_time_out"] = time() + getenv('TOKENTIMEOUT');
            
             if(isset($data['emp_code'])){
                 $model = new EmployeeModel();
-                $model->update($id, $data);
+                $model->update($id, $update);
            
             }else{
                 $models = new LevelContactModel();
-                $models->update($id, $data);
+                $id = $request_data['post_hr_id'];
+                $models->update($id, $update);
 
             }
             
@@ -47,30 +51,79 @@ class JWTToken
         }
     }
 
-    public static function validateJWT($jwt)
+    // public static function validateJWT($jwt)
+    // {
+    //         $jwtParts = explode(' ', $jwt);
+
+    //         // print_r($jwtParts);
+    //         if (count($jwtParts) != 2 || $jwtParts[0] == 'Bearer') {
+    //             return false;
+    //         }
+
+    //         $token = $jwtParts[1];
+
+    //         try {
+    //             $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
+    //             return json_encode(['status' => true, 'message' => 'Token is valid', 'decoded' => (array) $decoded]);
+    //         } catch (ExpiredException $e) {
+    //             return json_encode(['status' => false, 'message' => 'Token has expired']);
+    //         } catch (BeforeValidException $e) {
+    //             return json_encode(['status' => false, 'message' => 'Token is not yet valid']);
+    //         } catch (SignatureInvalidException $e) {
+    //             return json_encode(['status' => false, 'message' => 'Token signature is invalid']);
+    //         } catch (\Exception $e) {
+    //             return json_encode(['status' => false, 'message' => 'An error occurred while decoding the token']);
+    //         }           
+
+    // }
+
+    public static function validateJWT(string $authHeader)
     {
-            $jwtParts = explode(' ', $jwt);
+        // 1️⃣ Validate Authorization header
+        if (!preg_match('/^Bearer\s(\S+)$/', $authHeader, $matches)) {
+            return ['status' => false, 'message' => 'Invalid Authorization header'];
+        }
 
-            // print_r($jwtParts);
-            if (count($jwtParts) != 2 || $jwtParts[0] == 'Bearer') {
-                return false;
-            }
+        $token = $matches[1];
 
-            $token = $jwtParts[1];
+        // 2️⃣ Decode JWT header manually
+        $jwtParts = explode('.', $token);
+        if (count($jwtParts) !== 3) {
+            return ['status' => false, 'message' => 'Malformed JWT'];
+        }
 
-            try {
-                $decoded = JWT::decode($token, new Key("secret", 'HS512'));
-                return json_encode(['status' => true, 'message' => 'Token is valid', 'decoded' => (array) $decoded]);
-            } catch (ExpiredException $e) {
-                return json_encode(['status' => false, 'message' => 'Token has expired']);
-            } catch (BeforeValidException $e) {
-                return json_encode(['status' => false, 'message' => 'Token is not yet valid']);
-            } catch (SignatureInvalidException $e) {
-                return json_encode(['status' => false, 'message' => 'Token signature is invalid']);
-            } catch (\Exception $e) {
-                return json_encode(['status' => false, 'message' => 'An error occurred while decoding the token']);
-            }           
+        $header = json_decode(base64_decode(strtr($jwtParts[0], '-_', '+/')), true);
 
+        // 3️⃣ Reject missing or NONE algorithm
+        if (
+            empty($header['alg']) ||
+            $header['alg'] === 'none' ||
+            $header['alg'] !== self::ALLOWED_ALG
+        ) {
+            return ['status' => false, 'message' => 'Invalid or unsupported JWT algorithm'];
+        }
+
+        // 4️⃣ Enforce signature validation
+        try {
+            $decoded = JWT::decode(
+                $token,
+                new Key(env('JWT_SECRET'), self::ALLOWED_ALG)
+            );
+
+            return [
+                'status'  => true,
+                'decoded' => (array) $decoded
+            ];
+
+        } catch (ExpiredException $e) {
+            return ['status' => false, 'message' => 'Token expired'];
+        } catch (BeforeValidException $e) {
+            return ['status' => false, 'message' => 'Token not yet valid'];
+        } catch (SignatureInvalidException $e) {
+            return ['status' => false, 'message' => 'Invalid token signature'];
+        } catch (\Exception $e) {
+            return ['status' => false, 'message' => 'Token validation failed'];
+        }
     }
 
 
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 98b171e5..5b5d6b7b 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -1128,7 +1128,7 @@ if (!function_exists('premium_calculation_manager_old')) {
         //if curent action is dependent addition OR addition then pull insurer master to set whether add one day from employee date of coverage
         if ($emp_data['temp']['action'] == 'DA' || $emp_data['temp']['action'] == 'A') {
             $insurer = new InsurerModel();
-            $insurer = ($insurer->find($policy_terms['insurer_id']));
+            $insurer = ($insurer->find((int)$policy_terms['insurer_id']));
             if (isset($insurer['addition_add_day']) && $insurer['addition_add_day'] == true) {
                 // $emp_data['policy_details']['date_coverage'] = (new DateTime($emp_data['policy_details']['date_coverage']))->modify('+1 day')->format('Y-m-d');
 
@@ -1535,7 +1535,7 @@ if (!function_exists('premium_calculation_manager')) {
         //if curent action is dependent addition OR addition then pull insurer master to set whether add one day from employee date of coverage
         if ($emp_data['temp']['action'] == 'DA' || $emp_data['temp']['action'] == 'A') {
             $insurer = new InsurerModel();
-            $insurer = ($insurer->find($policy_terms['insurer_id']));
+            $insurer = ($insurer->find((int)$policy_terms['insurer_id']));
             if (isset($insurer['addition_add_day']) && $insurer['addition_add_day'] == true) {
                 // $emp_data['policy_details']['date_coverage'] = (new DateTime($emp_data['policy_details']['date_coverage']))->modify('+1 day')->format('Y-m-d');
 
@@ -1884,7 +1884,7 @@ if (!function_exists('premium_calculation_manager')) {
 
         }
         // if the family floater case first self add first the process completed, after spouse or any dependent add the rata premium not added this change will handle this
-        if (strtolower($emp_data['relationship']) != 'self' && $temp_slab_rates[0]['premium_type'] == 1 && $emp_data['temp']['action'] == 'DA') {
+        if (strtolower($emp_data['relationship']) != 'self' && empty($emp_data['temp']['acting_self']) && $temp_slab_rates[0]['premium_type'] == 1 && $emp_data['temp']['action'] == 'DA') {
             //set dependent si to 0
             $emp_data['policy_details']['basic_cover_si'] = 0;
             $emp_data['policy_details']['premium'] = 0;
@@ -1897,7 +1897,7 @@ if (!function_exists('premium_calculation_manager')) {
                 $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * ($gst / 100)), 2, '.', '');
             }
 
-        }else if(strtolower($emp_data['relationship']) != 'self' && $temp_slab_rates[0]['premium_type'] == 1 && ($emp_data['temp']['action'] == 'I' || $emp_data['temp']['action'] == 'A' || $emp_data['temp']['action'] == 'MI')){
+        }else if(strtolower($emp_data['relationship']) != 'self' && empty($emp_data['temp']['acting_self']) && $temp_slab_rates[0]['premium_type'] == 1 && ($emp_data['temp']['action'] == 'I' || $emp_data['temp']['action'] == 'A' || $emp_data['temp']['action'] == 'MI')){
 
             $emp_data['policy_details']['basic_cover_si'] = 0;
             $emp_data['policy_details']['premium'] = 0;
@@ -2000,8 +2000,9 @@ if (!function_exists('get_emp_records_from_audit_history')) {
     function get_emp_records_from_audit_history($employee_id)
     {
         $db = db_connect();
-        $query = "SELECT min(id) as id,pk,table_name,field_name,old_value FROM auditing_history where pk  = $employee_id and table_name = 'employees' and field_name in ('name','dob','gender','mobile','email_corporate','relationship') group by field_name order by id asc";
-        $res = $db->query($query);
+        $query = "SELECT min(id) as id,pk,table_name,field_name,old_value FROM auditing_history where pk  = :employee_id: and table_name = 'employees' and field_name in ('name','dob','gender','mobile','email_corporate','relationship') group by field_name order by id asc";
+        $binds = ['employee_id'=>(int)$employee_id];
+        $res = $db->query($query,$binds);
         // echo $db->getLastQuery();
         $res = $res->getResultArray();
         if (count($res)) {
@@ -2019,8 +2020,9 @@ if (!function_exists('get_emp_policy_records_from_audit_history')) {
     function get_emp_policy_records_from_audit_history($emp_policy_id)
     {
         $db = db_connect();
-        $query = "SELECT min(id) as id,pk,table_name,field_name,old_value FROM auditing_history where pk  = $emp_policy_id and table_name = 'employee_polices' and field_name in ('basic_cover_si','premium','gst') group by field_name order by id asc";
-        $res = $db->query($query);
+        $query = "SELECT min(id) as id,pk,table_name,field_name,old_value FROM auditing_history where pk  = :emp_policy_id: and table_name = 'employee_polices' and field_name in ('basic_cover_si','premium','gst') group by field_name order by id asc";
+        $binds = ['emp_policy_id'=>(int)$emp_policy_id];
+        $res = $db->query($query,$binds);
         // echo $db->getLastQuery();
         $res = $res->getResultArray();
         if (count($res)) {
@@ -3147,7 +3149,7 @@ if (!function_exists('check_agent_exist')) {
         // Loop agent data from DB
         foreach ($agent_data as $agent) {
             // Assuming DB keys: agent_code
-            if (isset($agent['agent_code']) && $agent['agent_code'] == $agent_code) {
+            if (isset($agent['pos_code']) && (strtolower($agent['pos_code']) == strtolower($agent_code))) {
                 return [
                     'status' => true,
                     'error'  => null,
@@ -3171,6 +3173,24 @@ if (!function_exists('check_rto_data')) {
         $vehicle_no = strtoupper(trim($row[2]));  // Example: TN10AB1234
         $new_vehicle = strtolower(trim($row[2]));
 
+        if(!validate_indian_vehicle_number($vehicle_no)['status']){
+            return [
+                'status' => false,
+                'error'  => 'Invalid Vehicle Number. Format should be like TN82AX2024 (no spaces or special characters).'
+            ];
+        };
+
+        // BH Series: 22BH1234AA
+        $bhPattern = '/^[0-9]{2}BH[0-9]{4}[A-Z]{2}$/';
+
+        if (preg_match($bhPattern, $vehicle_no)) {
+            return [
+                'status' => true, 
+                'error' => null,
+                'rto_data'  => []
+            ];
+        }
+
         if($new_vehicle == "new"){
             return [
                 'status' => true,
diff --git a/app/Helpers/sanitizeInputArrayAdvanced_helper.php b/app/Helpers/sanitizeInputArrayAdvanced_helper.php
new file mode 100644
index 00000000..79d7df9b
--- /dev/null
+++ b/app/Helpers/sanitizeInputArrayAdvanced_helper.php
@@ -0,0 +1,84 @@
+<?php
+
+// use Normalizer;
+
+/**
+ * High security sanitizer
+ * - Normalizes unicode
+ * - Removes control chars
+ * - Removes null bytes
+ * - Removes invisible unicode tricks
+ * - Strips dangerous HTML
+ * - Prevents polyglot payloads
+ */
+function sanitizeInputArrayAdvanced(array $data, array $htmlAllowedFields = []): array
+{
+    foreach ($data as $k => $v) {
+
+        if (is_array($v)) {
+            $data[$k] = sanitizeInputArrayAdvanced($v, $htmlAllowedFields);
+            continue;
+        }
+
+        if (!is_string($v)) {
+            continue;
+        }
+
+        // 1. Unicode normalization (prevents homoglyph attacks)
+        if (class_exists('Normalizer')) {
+            $v = \Normalizer::normalize($v, \Normalizer::FORM_C);
+        }
+
+        // 2. Remove NULL bytes & control chars
+        $v = preg_replace('/[\x00-\x1F\x7F]/u', '', $v);
+
+        // 3. Remove invisible unicode chars (zero width, etc)
+        $v = preg_replace('/[\x{200B}-\x{200F}\x{202A}-\x{202E}\x{2060}-\x{206F}]/u', '', $v);
+
+        // 4. Decode HTML entities (so hidden payloads are exposed)
+        $v = html_entity_decode($v, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+
+        // 5. Trim
+        $v = trim($v);
+
+        // 6. If this field is NOT allowed to contain HTML → strip aggressively
+        if (!in_array($k, $htmlAllowedFields, true)) {
+
+            // Remove all tags
+            $v = strip_tags($v);
+
+            // Kill any leftover JS protocol
+            $v = preg_replace('/(javascript:|data:|vbscript:)/i', '', $v);
+
+        } else {
+            // This is HTML-allowed field → run HTML sanitizer
+            $v = sanitizeTrustedHtml($v);
+        }
+
+        $data[$k] = $v;
+    }
+
+    return $data;
+}
+
+function sanitizeTrustedHtml(string $html): string
+{
+    // Allowed tags for email templates
+    $allowedTags = '<p><br><b><strong><i><u><em><ul><ol><li><table><thead><tbody><tr><td><th><a><img><div><span><h1><h2><h3><h4><h5><h6>';
+
+    // Strip all other tags
+    $html = strip_tags($html, $allowedTags);
+
+    // Remove event handlers like onclick, onerror, etc
+    $html = preg_replace('/\son\w+="[^"]*"/i', '', $html);
+    $html = preg_replace("/\son\w+='[^']*'/i", '', $html);
+
+    // Remove javascript: and data:
+    $html = preg_replace('/(javascript:|vbscript:|data:)/i', '', $html);
+
+    // Remove iframe, object, embed even if sneaked in
+    $html = preg_replace('/<(iframe|object|embed|script|style)[^>]*>.*?<\/\1>/is', '', $html);
+
+    return $html;
+}
+
diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php
index cc46a3cd..5327f8d5 100755
--- a/app/Helpers/sendMailNotification.php
+++ b/app/Helpers/sendMailNotification.php
@@ -116,6 +116,21 @@ class sendMailNotification
             $tpa_id = $params['tpa_id'];
             $common = $params['common'];
 
+            $mailAttachmentModel = new MailAttachmentModel();
+            $attachment_data = $mailAttachmentModel
+                                ->select('file_path, file_name')
+                                ->where('notification_id', $notification['id'])
+                                ->where('is_active', 1)
+                                ->findAll();
+            
+            $attachments = [];
+            foreach ($attachment_data as $data) {
+                $attachments[] = [
+                    "filePath" => WRITEPATH . $data['file_path'],
+                    "fileName" => $data['file_name']
+                ];
+            }
+
 
             $mail_content = $notification['mail_content'];
             $mail = $get_emp_email_and_other_details['email_corporate'];
@@ -160,7 +175,7 @@ class sendMailNotification
                 $mail_content = view('mail_template', $data);
 
 
-            $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common];
+            $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'],'attachments' => $attachments, 'reply_to' => $client_data['reply_to'], 'common' => $common];
 
             return $wholeData;
 
diff --git a/app/Helpers/session_helper.php b/app/Helpers/session_helper.php
index 31162658..bd54744c 100755
--- a/app/Helpers/session_helper.php
+++ b/app/Helpers/session_helper.php
@@ -21,7 +21,7 @@ if(!function_exists('check_cookie')){
                         'userProfile' => $value['userProfile'],
                         'user_team'   => $user_team,
                     ];
-                    set_session_data($session_data);
+                    // set_session_data($session_data);
                     // $this->getUserDeviceInfo($user->id, 'NhanceUser');
                     // return redirect()->to(base_url('/dashboard/view'));
                     return true;
@@ -33,6 +33,7 @@ if(!function_exists('check_cookie')){
     }else{
         return false;
     }
+    }
 }
 
 if (!function_exists('check_session')) {
@@ -40,7 +41,7 @@ if (!function_exists('check_session')) {
     {
         // $ci =& get_instance();
         $session = \Config\Services::session();
-        return $session->get('isLoggedIn');
+        return $session->get('isLoggedIn') === true;
     }
 }
 
@@ -117,7 +118,8 @@ if (!function_exists('check_role')) {
     {
         // $ci =& get_instance();
         $session = \Config\Services::session();
-        return $session->get('role');
+        return $role_id = isset(get_session_userdata()->role) ? get_session_userdata()->role : null;
+        
     }
 }
 
@@ -201,7 +203,6 @@ if (!function_exists('get_chatbot_session_info')) {
 }
 
 
-}
 
 
 
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index 0a6d9e51..178ec18a 100755
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -6,6 +6,7 @@ use App\Models\BatchFileModelFileModel;
 use App\Controllers\GoogleDriveController;
 use App\Models\BatchFileModel;
 use App\Controllers\ApiServiceController;
+use App\Models\TicketMasterModel;
 
 // File: app/Helpers/Uuid_helper.php
 
@@ -639,6 +640,8 @@ if (!function_exists('change_date_format')) {
 
             'd/m/Y',     // 01/01/2025
             'd-m-Y',     // 01-01-2025
+            'm/d/Y h:i:s A',     // 01-01-2025
+            'm/d/Y',     // 25-05-2025
 
         ];
 
@@ -648,7 +651,7 @@ if (!function_exists('change_date_format')) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
                 if (!$date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
-                    log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+                    // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
                 }
                 return $date->format($output_format);
@@ -659,7 +662,7 @@ if (!function_exists('change_date_format')) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
                 if (!$date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
-                    log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+                    // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
                 }
                 return $date->format('Y-m-d'); // MySQL default format
@@ -676,15 +679,15 @@ if (!function_exists('change_date_format')) {
                 // If no format matches, throw an exception
                 $allowed_placeholders = implode(', ', $allowed_formats);
                 // throw new Exception("Invalid date string format. Allowed formats: $allowed_placeholders");
-                log_message(
-                    'error',
-                    "❌ Date format error: Invalid date string. Allowed formats: {$allowed_placeholders} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}"
-                );
+                // log_message(
+                //     'error',
+                //     "❌ Date format error: Invalid date string. Allowed formats: {$allowed_placeholders} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}"
+                // );
                 return null;
             }
         } catch (Exception $e) {
             // return "Error: " . $e->getMessage();
-            log_message('error', "❌ Date format error: {$e->getMessage()} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+            // log_message('error', "❌ Date format error: {$e->getMessage()} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
             return null;
         }
 
@@ -940,6 +943,44 @@ if (!function_exists('getMimeTypeByFileName')) {
     }
 }
 
+if (!function_exists('validateExcelFile')) {
+
+    function validateExcelFile($file)
+    {
+        // 1. Check if the file was uploaded without errors
+        if (! $file->isValid() || $file->hasMoved()) {
+            return false;
+        }
+
+        // 2. Size check (16MB)
+        if ($file->getSizeByUnit('mb') > 16) {
+            return false;
+        }
+
+        // 3. Define allowed types
+        $allowedMimes = [
+            'application/vnd.ms-excel',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'application/vnd.oasis.opendocument.spreadsheet',
+            'application/zip',
+            'application/octet-stream'
+        ];
+
+        $allowedExtensions = ['xls', 'xlsx', 'ods', 'xlsm'];
+
+        // Get the actual values using CI4 methods
+        $mime = $file->getClientMimeType();
+        $extension = $file->getExtension(); // This is the CI4 method
+
+        // 4. Validate
+        if (in_array($mime, $allowedMimes) || in_array($extension, $allowedExtensions)) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
 if (!function_exists('generate_ecard_download_link_based_on_tpa')) {
 
     function generate_ecard_download_link_based_on_tpa($params) {
@@ -956,3 +997,154 @@ if (!function_exists('generate_ecard_download_link_based_on_tpa')) {
     }
 }
 
+if (!function_exists('canSendOtp')) {
+    function canSendOtp(array $row, int $limitSeconds = 60): array
+    {
+        // If OTP does not exist → allow
+        if (empty($row['otp']) || empty($row['updated_at'])) {
+            return ['allowed' => true];
+        }
+
+        $lastUpdated = strtotime($row['updated_at']);
+        $currentTime = time();
+
+        // Calculate expiry time
+        $allowedAfter = $lastUpdated + $limitSeconds;
+
+        // If still within limit → block
+        if ($currentTime < $allowedAfter) {
+            return [
+                'allowed' => false,
+                'retry_after' => $allowedAfter - $currentTime
+            ];
+        }
+
+        return ['allowed' => true];
+    }
+}
+
+if (!function_exists('checkDuplicateClaim')) {
+
+   function checkDuplicateClaim(array $params): bool
+    {   
+        $ticketMaster = new TicketMasterModel();
+        $query = $ticketMaster->where('is_active', 1);
+
+        if(empty($params['doa']) && empty($params['claim_amount'])){
+            return false;
+        }
+
+        $hasValidCondition = false;
+
+        foreach ($params as $key => $value) {
+            if ($value !== null && $value !== '') {
+                $query->where($key, $value);
+                $hasValidCondition = true;
+            }
+        }
+
+        if (!$hasValidCondition) {
+            return false;
+        }
+
+        $result = $query->countAllResults();
+        // print_r($ticketMaster->getLastQuery()->getQuery());  die;
+        if($result > 0){ return true; }else{ return false; }
+    }
+}
+
+
+function getRealClientIP()
+{
+    $request = service('request');
+
+    if (!empty($_SERVER['HTTP_CF_CONNECTING_IP'])) {
+        return $_SERVER['HTTP_CF_CONNECTING_IP'];
+    }
+
+    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        return explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])[0];
+    }
+
+    return $request->getIPAddress();
+}
+
+function generateFingerprint()
+{
+    $request = service('request');
+
+    $ua = $request->getUserAgent()->getAgentString();
+    $ip = getRealClientIP();
+
+    // Use only subnet (first 3 blocks) to tolerate IP change
+    $ipParts = explode('.', $ip);
+    $ipSubnet = $ipParts[0] . '.' . $ipParts[1] . '.' . $ipParts[2];
+
+    // $secret = env('app.sessionFingerprintSalt');
+
+    // return hash('sha256', $ua . '|' . $ipSubnet . '|' . $secret);
+    return hash('sha256', $ua . '|' . $ipSubnet );
+}
+
+if (!function_exists('convertGoogleDriveToDownloadLink')) {
+    function convertGoogleDriveToDownloadLink(?string $url): ?string
+    {
+        if (empty($url)) {
+            return null;
+        }
+
+        // Trim spaces
+        $url = trim($url);
+
+        // Pattern to extract Google Drive file ID
+        $patterns = [
+            '#https?://drive\.google\.com/file/d/([^/]+)/?#',
+            '#https?://drive\.google\.com/open\?id=([^&]+)#',
+            '#https?://drive\.google\.com/uc\?id=([^&]+)#'
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $url, $matches)) {
+                $fileId = $matches[1];
+
+                // Return direct download link
+                return 'https://drive.google.com/uc?export=download&id=' . $fileId;
+            }
+        }
+
+        // Not a Google Drive link → return original
+        return $url;
+    }
+}
+
+if (!function_exists('get_cd_balance')) {
+    function get_cd_balance(): array
+    {
+        $session = session();
+
+        return [
+            'has_cd_balance'  => $session->has('cd_balance'),
+            'cd_balance'  => $session->get('cd_balance') ?? null,
+            'hr_data'         => $session->get('hr_data') ?? [],
+            'cd_balance_info' => $session->get('cd_balance_info') ?? [],
+        ];
+    }
+}
+
+if (!function_exists('clear_cd_balance_session')) {
+    function clear_cd_balance_session(): void
+    {
+        $session = session();
+
+        $session->remove('cd_balance');
+        $session->remove('hr_data');
+        $session->remove('cd_balance_info');
+
+        log_message('error', 'clear_cd_balance_session clered');
+    }
+}
+
+
+
+
+
diff --git a/app/Libraries/AuthLogout.php b/app/Libraries/AuthLogout.php
new file mode 100644
index 00000000..ac7786cb
--- /dev/null
+++ b/app/Libraries/AuthLogout.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Libraries;
+
+use CodeIgniter\HTTP\RedirectResponse;
+
+class AuthLogout
+{
+    public static function logout(): RedirectResponse
+    {
+        $session = session();
+
+        // Regenerate session ID (kills fixation)
+        $session->regenerate(true);
+
+        // Destroy CI session
+        $session->destroy();
+
+        // Kill PHP session cookie safely
+        if (ini_get('session.use_cookies')) {
+            $params = session_get_cookie_params();
+
+            setcookie(
+                session_name(),   // DO NOT hardcode cookie name
+                null,
+                time() - 42000,
+                $params['path'],
+                $params['domain'],
+                $params['secure'],
+                $params['httponly']
+            );
+        }
+
+        session_write_close();
+
+        // Redirect with anti-cache headers
+        return redirect()->to(base_url('login'))
+            ->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->setHeader('Pragma', 'no-cache')
+            ->setHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
+    }
+}
diff --git a/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
new file mode 100644
index 00000000..ffb4b970
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
@@ -0,0 +1,448 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+
+class AbhiClaimImportService extends BaseTpaClaimImportService
+{
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping = [
+        ["excel_column" => ["col_name" => "ABHI Claim No", "col_index" => 0], "db_column" => "abhi_claim_no"],
+        ["excel_column" => ["col_name" => "New ABHI Claim No With Extension", "col_index" => 1], "db_column" => "new_abhi_claim_no_with_extension"],
+        ["excel_column" => ["col_name" => "Unique Count", "col_index" => 2], "db_column" => "unique_count"],
+        ["excel_column" => ["col_name" => "Proposer Name", "col_index" => 3], "db_column" => "proposer_name"],
+        ["excel_column" => ["col_name" => "Patient Name", "col_index" => 4], "db_column" => "patient_name"],
+        ["excel_column" => ["col_name" => "Family ID", "col_index" => 5], "db_column" => "family_id"],
+        ["excel_column" => ["col_name" => "Member Code", "col_index" => 6], "db_column" => "member_code"],
+        ["excel_column" => ["col_name" => "Patient Age", "col_index" => 7], "db_column" => "patient_age"],
+        ["excel_column" => ["col_name" => "Relation", "col_index" => 8], "db_column" => "relation"],
+        ["excel_column" => ["col_name" => "Gender", "col_index" => 9], "db_column" => "gender"],
+        ["excel_column" => ["col_name" => "Certificate No", "col_index" => 10], "db_column" => "certificate_no"],
+        ["excel_column" => ["col_name" => "Master Policy No", "col_index" => 11], "db_column" => "master_policy_no"],
+        ["excel_column" => ["col_name" => "Policy Number", "col_index" => 12], "db_column" => "policy_number"],
+        ["excel_column" => ["col_name" => "Policy From", "col_index" => 13], "db_column" => "policy_from"],
+        ["excel_column" => ["col_name" => "Policy Upto", "col_index" => 14], "db_column" => "policy_upto"],
+        ["excel_column" => ["col_name" => "Product Name", "col_index" => 15], "db_column" => "product_name"],
+        ["excel_column" => ["col_name" => "Product Name 1", "col_index" => 16], "db_column" => "product_name_1"],
+        ["excel_column" => ["col_name" => "Sub - Product", "col_index" => 17], "db_column" => "sub_product"],
+        ["excel_column" => ["col_name" => "Policy Category", "col_index" => 18], "db_column" => "policy_category"],
+        ["excel_column" => ["col_name" => "Policy Category (Carry Forward till Q3 18-19)+(New Q4 18-19 Onward)", "col_index" => 19], "db_column" => "policy_category_cf_q3_q4"],
+        ["excel_column" => ["col_name" => "Sum Insured", "col_index" => 20], "db_column" => "sum_insured"],
+        ["excel_column" => ["col_name" => "Bonus", "col_index" => 21], "db_column" => "bonus"],
+        ["excel_column" => ["col_name" => "Intimation Date", "col_index" => 22], "db_column" => "intimation_date"],
+        ["excel_column" => ["col_name" => "Date Of Doc Rec", "col_index" => 23], "db_column" => "date_of_doc_rec"],
+        ["excel_column" => ["col_name" => "Intimation Final Month", "col_index" => 24], "db_column" => "intimation_final_month"],
+        ["excel_column" => ["col_name" => "Reported Year", "col_index" => 25], "db_column" => "reported_year"],
+        ["excel_column" => ["col_name" => "Reported Qurter", "col_index" => 26], "db_column" => "reported_quarter"],
+        ["excel_column" => ["col_name" => "Hospital Name", "col_index" => 27], "db_column" => "hospital_name"],
+        ["excel_column" => ["col_name" => "Hospital City", "col_index" => 28], "db_column" => "hospital_city"],
+        ["excel_column" => ["col_name" => "Hospital State", "col_index" => 29], "db_column" => "hospital_state"],
+        ["excel_column" => ["col_name" => "Diagnosis", "col_index" => 30], "db_column" => "diagnosis"],
+        ["excel_column" => ["col_name" => "ICD Chapter", "col_index" => 31], "db_column" => "icd_chapter"],
+        ["excel_column" => ["col_name" => "ICD Block", "col_index" => 32], "db_column" => "icd_block"],
+        ["excel_column" => ["col_name" => "ICD Level1", "col_index" => 33], "db_column" => "icd_level1"],
+        ["excel_column" => ["col_name" => "ICD Level2", "col_index" => 34], "db_column" => "icd_level2"],
+        ["excel_column" => ["col_name" => "Procedure Description", "col_index" => 35], "db_column" => "procedure_description"],
+        ["excel_column" => ["col_name" => "PCS Description", "col_index" => 36], "db_column" => "pcs_description"],
+        ["excel_column" => ["col_name" => "DOA", "col_index" => 37], "db_column" => "doa"],
+        ["excel_column" => ["col_name" => "DOD", "col_index" => 38], "db_column" => "dod"],
+        ["excel_column" => ["col_name" => "Claim Type", "col_index" => 39], "db_column" => "claim_type"],
+        ["excel_column" => ["col_name" => "Claim Category", "col_index" => 40], "db_column" => "claim_category"],
+        ["excel_column" => ["col_name" => "Disc Datails", "col_index" => 41], "db_column" => "disc_details"],
+        ["excel_column" => ["col_name" => "Disc Date", "col_index" => 42], "db_column" => "disc_date"],
+        ["excel_column" => ["col_name" => "Hospital Code", "col_index" => 43], "db_column" => "hospital_code"],
+        ["excel_column" => ["col_name" => "Claim Status", "col_index" => 44], "db_column" => "claim_status"],
+        ["excel_column" => ["col_name" => "Final ABHI Status-Current Month", "col_index" => 45], "db_column" => "final_abhi_status_current_month"],
+        ["excel_column" => ["col_name" => "Claimed Amount", "col_index" => 46], "db_column" => "claimed_amount"],
+        ["excel_column" => ["col_name" => "ABHI Amount Less Coins - Current Month", "col_index" => 47], "db_column" => "abhi_amount_less_coins_current_month"],
+        ["excel_column" => ["col_name" => "Repudiation Date", "col_index" => 48], "db_column" => "repudiation_date"],
+        ["excel_column" => ["col_name" => "Settled Date", "col_index" => 49], "db_column" => "settled_date"],
+        ["excel_column" => ["col_name" => "Settled Month", "col_index" => 50], "db_column" => "settled_month"],
+        ["excel_column" => ["col_name" => "Settled Year", "col_index" => 51], "db_column" => "settled_year"],
+        ["excel_column" => ["col_name" => "Settled Quarter", "col_index" => 52], "db_column" => "settled_quarter"],
+        ["excel_column" => ["col_name" => "Rejection Category", "col_index" => 53], "db_column" => "rejection_category"],
+        ["excel_column" => ["col_name" => "Rejection Category - Level 1", "col_index" => 54], "db_column" => "rejection_category_level_1"],
+        ["excel_column" => ["col_name" => "Rejection Category - Level 2", "col_index" => 55], "db_column" => "rejection_category_level_2"],
+        ["excel_column" => ["col_name" => "COVID tagging - Current Month", "col_index" => 56], "db_column" => "covid_tagging_current_month"],
+        ["excel_column" => ["col_name" => "EXPECTED DOA", "col_index" => 57], "db_column" => "expected_doa"],
+        ["excel_column" => ["col_name" => "EXPECTED DOD", "col_index" => 58], "db_column" => "expected_dod"],
+        ["excel_column" => ["col_name" => "AGENT/BROKER CODE", "col_index" => 59], "db_column" => "agent_broker_code"],
+        ["excel_column" => ["col_name" => "AGENT/BROKER NAME", "col_index" => 60], "db_column" => "agent_broker_name"],
+        ["excel_column" => ["col_name" => "HEALTHCARD_ID", "col_index" => 61], "db_column" => "healthcard_id"],
+        ["excel_column" => ["col_name" => "ABHI_NETWORK_NON_NETWORK", "col_index" => 62], "db_column" => "abhi_network_non_network"],
+        ["excel_column" => ["col_name" => "CORPORATE_EMPLOYEE_CODE", "col_index" => 63], "db_column" => "corporate_employee_code"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Employee / Member details
+        'member_code'        => 'emp_code',
+        'abhi_claim_no'     => 'claim_number',
+
+        // Dates
+        'doa'                => 'doa',
+        'dod'                => 'dod',
+        'intimation_date'    => 'date_of_intimat',
+
+        // Claim info
+        'claim_status'       => 'tpa_claim_status',
+        'claimed_amount'     => 'claim_amount',
+
+        // Hospital details
+        'hospital_name'      => 'hospital_name',
+        'hospital_city'      => 'hospital_city',
+        'hospital_state'     => 'hospital_state',
+
+        // Settlement / decision
+        'repudiation_date'   => 'denial_date',
+        'settled_date'       => 'settled_date',
+        'rejection_category' => 'denial_reason',
+
+        // Misc
+        'diagnosis'          => 'claim_description',
+        'healthcard_id'      => 'tpa_no',
+        'claim_type'         => 'tpa_claim_type',
+        'diagnosis'         => 'tpa_ailments',
+
+    ];
+
+    protected $statusMapping = [
+        'Settled' => 11,
+        'Rejected' => 8,
+        'Cancelled' => 13,
+    ];
+
+    protected $dateColumns = [
+        'policy_from',
+        'policy_upto',
+
+        'intimation_date',
+        'date_of_doc_rec',
+
+        'doa',
+        'dod',
+
+        'repudiation_date',
+        'settled_date',
+
+        'expected_doa',
+        'expected_dod',
+    ];
+
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_abhi');
+        return $builder->insertBatch($data);   
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_abhi');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_abhi');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+                $item[$dbColumn] = trim($value);
+            }
+
+            foreach ($this->dateColumns as $key => $value) {
+                $item[$value] = change_date_format($item[$value] ?? null, 'm/d/Y h:i:s A', 'Y-m-d');
+            }
+
+            $params = [
+                'doa' => $item['doa'] ?? null,
+                'member_code' => $item['member_code'] ?? null,
+                'claimed_amount' => $item['claimed_amount'] ?? null,
+                'healthcard_id' => $item['healthcard_id'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_abhi', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_abhi', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['doa'] ?? '') ?? null,
+                    'emp_code' => $row['member_code'] ?? null,
+                    'claim_amount' => $row['claimed_amount'] ?? null,
+                    'tpa_no' => $row['healthcard_id'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relation'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['member_code'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['file_id']    = $file_id;
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_type'] = isset($row['mainclaim_prepost_type']) && !empty($row['mainclaim_prepost_type']) && strtolower($row['mainclaim_prepost_type']) == 'normal' ? 1 : 3;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+    public function isDateValue($value): bool
+    {
+        if (empty($value)) {
+            return false;
+        }
+
+        // Excel numeric date
+        if (is_numeric($value) && $value > 30000) {
+            return true;
+        }
+
+        return strtotime(str_replace('/', '-', $value)) !== false;
+    }
+
+    public function normalizeDate($value): ?string
+    {
+        try {
+            if (empty($value)) {
+                return null;
+            }
+
+            // Excel numeric date
+            if (is_numeric($value)) {
+                return date(
+                    'Y-m-d',
+                    \PhpOffice\PhpSpreadsheet\Shared\Date::excelToTimestamp($value)
+                );
+            }
+
+            $value = trim((string) $value);
+
+            // Replace / with - for strtotime compatibility
+            $value = str_replace('/', '-', $value);
+
+            $timestamp = strtotime($value);
+
+            if ($timestamp === false) {
+                return null;
+            }
+
+            return date('Y-m-d', $timestamp);
+
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    public function convertRelation(?string $relation): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        // trim removes whitespace, strtolower handles case sensitivity
+        $relation = strtolower(trim($relation));
+
+        // Mapping specific keywords to standardized outputs
+        // ORDER MATTERS: Specific phrases (in-law) must come before general ones (father)
+        $map = [
+            'father-in-law' => ['father in law', 'father-in-law', 'fil'],
+            'mother-in-law' => ['mother in law', 'mother-in-law', 'mil'],
+            'father'        => ['father', 'papa', 'dad'],
+            'mother'        => ['mother', 'mom', 'mummy'],
+            'spouse'        => ['spouse', 'wife', 'husband', 'hubby'],
+            'daughter'      => ['daughter', 'daug'],
+            'son'           => ['son'],
+            'self'          => ['self', 'employee', 'main'],
+        ];
+
+        foreach ($map as $standard => $keywords) {
+            foreach ($keywords as $keyword) {
+                if (str_contains($relation, $keyword)) {
+                    return $standard;
+                }
+            }
+        }
+
+        return null; 
+    }
+
+}
diff --git a/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
new file mode 100644
index 00000000..3a6a5777
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
@@ -0,0 +1,360 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use CodeIgniter\Database\BaseConnection;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use App\Models\TicketMasterModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+use App\Models\ClaimsDumpFhplModel;
+use RuntimeException;
+
+abstract class BaseTpaClaimImportService
+{
+    protected BaseConnection $db;
+    protected $claimDumpFileModel;
+
+    public function __construct()
+    {
+        $this->db = db_connect();
+        $this->claimDumpFileModel = new ClaimDumpFileModel();
+    }
+
+    /**
+     * First JOB for insert TPA wise Bulk Upload
+     */
+    public function runTpaClaimDumpInsert(string $filePath, int $fileId): array
+    {
+        // 1. Start Transaction
+        $this->db->transBegin(); 
+
+        try {
+            $fileData = $this->claimDumpFileModel->where('id', $fileId)->first();
+
+            // Determine sheet name logic...
+            if (env('FHPL_PRIMARY_KEY_CONSTANT') == $fileData['tpa_id']) {
+                $rows = $this->readExcelBySheetName($filePath, 'Claims&Preauth');
+            } else if (env('R_CARE_PRIMARY_KEY_CONSTANT') == $fileData['tpa_id']) {
+                $rows = $this->readExcelBySheetName($filePath, 'CL');
+            } else {
+                $rows = $this->readExcel($filePath);
+            }
+
+            if (empty($rows)) {
+                $this->db->transRollback(); // ROLLBACK BEFORE RETURN
+                return ['status' => false, 'message' => 'Excel file contains no data or wrong file upload'];
+            }
+
+            $tpaInsertData = $this->mapTPAData($rows, $fileId);
+
+            if (empty($tpaInsertData)) {
+                $this->db->transRollback(); // ROLLBACK BEFORE RETURN
+                return ['status' => false, 'message' => 'These records already exist in the system.'];
+            }
+
+            $return_res = $this->bulkInsertTPATable($tpaInsertData);
+
+            if ($return_res !== true) {
+                $this->db->transRollback(); // ROLLBACK BEFORE RETURN
+                return ['status' => false, 'message' => 'TPA Import bulk insert failed'];
+            }
+
+            // 2. Commit if everything is fine
+            $this->db->transCommit();
+            return ['status' => true, 'message' => 'File uploaded successfully', 'record_count' => count($tpaInsertData)];
+
+        } catch (\Throwable $e) {
+            // 3. Rollback on any crash/exception
+            $this->db->transRollback();
+            return ['status' => false, 'message' => 'System error : ' . $e->getMessage()];
+        }
+    }
+
+    /**
+     * Second JOB for insert Ticket Master table after insert the TPA bulk upload success
+     */
+    public function runTicketMasterInsert(array $params): array
+    {
+        // 1. Start manual transaction
+        $this->db->transBegin();
+
+        try {
+            $file_id = $params['file_id']; 
+            $ticketMasterData = $this->mapClaimMasterData($file_id);
+
+            // Check if mapping failed
+            if (!$ticketMasterData['status']) {
+                $this->db->transRollback(); // ALWAYS rollback before early return
+                return $ticketMasterData;
+            }
+
+            $message = '';
+            $hasExecutedTask = false;
+            $status = true;
+
+            // Process Mapped Data
+            if (!empty($ticketMasterData['mapped_array'])) {
+                $insert_res = $this->importClaimMaster($ticketMasterData['mapped_array']);
+                if (!$insert_res) {
+                    $this->db->transRollback();
+                    return ['status' => false, 'message' => 'Ticket Master Claim bulk insert failed'];
+                }
+                $message .= 'Ticket Master Claim bulk insert success. ';
+                $hasExecutedTask = true;
+            }else{
+                $status = false;
+            }
+
+            // Process Rejected Reasons
+            if (!empty($ticketMasterData['rejected_reason_array'])) {
+                $update_res = $this->updateTicketMasterRejectedReasonInTPATable($ticketMasterData['rejected_reason_array']);
+                if (!$update_res) {
+                    $this->db->transRollback();
+                    return ['status' => false, 'message' => 'Updating rejected reasons failed'];
+                }
+                
+                $message .= empty($ticketMasterData['mapped_array']) 
+                    ? 'Those employee or dependent not in our system. ' 
+                    : 'Ticket Master Claim rejected reason updated successfully. ';
+                $hasExecutedTask = true;
+            }
+
+            // If nothing was processed but no error occurred
+            if (!$hasExecutedTask) {
+                $this->db->transRollback();
+                return ['status' => false, 'message' => 'No data found to process.'];
+            }
+
+            // 2. Commit the transaction
+            $this->db->transCommit();
+            return ['status' => $status, 'message' => trim($message)];
+
+        } catch (\Throwable $th) {
+            // 3. Rollback on crash
+            $this->db->transRollback();
+            return [
+                'status' => false, 
+                'message' => 'System error during Ticket Master Insert: ' . $th->getMessage()
+            ];
+        }
+    }
+
+    /**
+     * Read Excel and return associative rows (header based)
+     */
+    protected function readExcel(string $filePath): array
+    {   
+        helper('excel_util_helper');
+
+        if (!file_exists($filePath)) {
+            throw new RuntimeException("File not found: {$filePath}");
+        }
+
+        $spreadsheet = IOFactory::load($filePath);
+        $sheet = $spreadsheet->getActiveSheet();
+
+        $rows = $sheet->toArray(null, true, true, true);
+
+        // dd($rows);
+
+        if (count($rows) < 2) {
+            return [];
+        }
+
+        // First row is header
+        $headers = array_shift($rows);
+        $headers = array_map('trim', $headers);
+
+        $data = [];
+
+        foreach ($rows as $row) {
+
+            if(check_row_is_empty_or_null($row)){
+                break;
+            }
+
+            $item = [];
+            foreach ($headers as $key => $headerName) {
+                if ($headerName !== '') {
+                    $item[$headerName] = $row[$key] ?? null;
+                }
+            }
+            $data[] = $item;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Read Excel By Sheet name and return associative rows (header based)
+     */
+
+    protected function readExcelBySheetName(string $filePath, string $sheetName): array
+    {
+        if (!file_exists($filePath)) {
+            throw new RuntimeException("File not found: {$filePath}");
+        }
+
+        $spreadsheet = IOFactory::load($filePath);
+
+        // Get sheet by name
+        $sheet = $spreadsheet->getSheetByName($sheetName);
+
+        if ($sheet === null) {
+            throw new RuntimeException("Sheet '{$sheetName}' not found in Excel file");
+        }
+
+        $rows = $sheet->toArray(null, true, true, true);
+
+        // Need at least header + one row
+        if (count($rows) < 2) {
+            return [];
+        }
+
+        // First row = headers
+        $headers = array_shift($rows);
+        $headers = array_map('trim', $headers);
+
+        $data = [];
+
+        foreach ($rows as $row) {
+            // Skip completely empty rows
+            if (!array_filter($row)) {
+                continue;
+            }
+
+            $item = [];
+
+            foreach ($headers as $key => $headerName) {
+                if ($headerName !== '') {
+                    $item[$headerName] = $row[$key] ?? null;
+                }
+            }
+
+            $data[] = $item;
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Dublicate check in the ticket_master table records
+     */
+    protected function checkDublicateTicketMasterClaim(array $param): bool
+    {   
+        $ticketMaster = new TicketMasterModel();
+        $ticket_master_data = $ticketMaster
+                ->where('doa', $param['doa'])
+                ->where('tpa_no', $param['tpa_no'])
+                ->where('claim_amount', $param['claim_amount'])
+                ->where('emp_code', $param['emp_code'])
+                ->where('is_active', 1)
+                ->findAll();
+
+        if(count($ticket_master_data) > 0){
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Dublicate check in the TPA specific table records
+     */
+    protected function checkDuplicateTpaClaim(string $table, array $params): bool
+    {   
+        return $this->db->table($table)
+            ->where($params)
+            ->where('is_active', 1)
+            ->countAllResults() > 0;
+    }
+
+    /**
+     * Dublicate check in the TPA specific table records
+     */
+    protected function getTpaClaimDumpData(string $table, array $params): array
+    {   
+        return $this->db
+            ->table($table)
+            ->where('is_active', 1)
+            ->where('file_id', $params['file_id'])
+            ->where('ticket_id IS NULL')
+            ->where('master_reject_reason IS NULL')
+            ->get()
+            ->getResultArray();
+    }
+
+    /**
+     * Dublicate check in the TPA specific table records
+     */
+    public function getEmployeeDetails(int $client_id, int $client_policy_id, string $emp_code, string $relation): array
+    {
+        $EmployeeModel = new EmployeeModel();
+        $employeeData = $EmployeeModel
+            ->select([
+                'employees.id AS id',
+                'employees.email_corporate AS emp_mail',
+                'employees.mobile AS emp_mobile',
+                'employees.name AS name',
+                'employees.emp_code AS emp_code',
+
+                // insured employee
+                'insured.id AS insured_emp_id',
+                'insured.name AS insured_name'
+            ])
+            ->join(
+                'employee_polices',
+                'employees.id = employee_polices.employee_id'
+            )
+            ->join(
+                'employees AS insured',
+                "insured.emp_code = employees.emp_code
+                AND insured.client_id = employees.client_id
+                AND LOWER(insured.relationship) = " . $EmployeeModel->db->escape(strtolower($relation)),
+                'left'
+            )
+            ->where('employees.is_active', 1)
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.client_policy_id', $client_policy_id)
+            ->where('employees.client_id', $client_id)
+            ->where('employees.emp_code', $emp_code)
+            ->where('LOWER(employees.relationship)', 'self')
+            ->first();
+
+
+        return $employeeData ?? [];
+    }
+
+    /**
+     * Map Excel rows to TPA table structure
+     */
+    abstract protected function mapTPAData(array $rows, $fileId): array;
+
+    /**
+     * Map DB rows to Ticket Master table structure
+     */
+    abstract protected function mapClaimMasterData($fileId): array;
+
+    /**
+     * Insert into TPA-specific table (bulk)
+     */
+    abstract protected function bulkInsertTPATable(array $data): bool;
+
+    /**
+     * Insert into Ticket-Master-specific table (bulk)
+     */
+    abstract protected function importClaimMaster(array $data): bool;
+
+    /**
+     * Update TPA table with ticket_master primary key
+     */
+    abstract protected function updateTicketIdInTPATable(): bool;
+
+    /**
+     * Update TPA table with ticket_master insert rejected reason
+     */
+    abstract protected function updateTicketMasterRejectedReasonInTPATable(array $data): bool;
+}
diff --git a/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
new file mode 100644
index 00000000..324fd3a7
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
@@ -0,0 +1,484 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClaimDumpFileModel;
+use App\Models\ClaimsDumpFhplModel;
+
+class FhplClaimImportService extends BaseTpaClaimImportService
+{   
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping = [
+        ["excel_column"=>["col_name"=>"Requesttype","col_index"=>0],"db_column"=>"request_type"],
+        ["excel_column"=>["col_name"=>"Intimation ID","col_index"=>1],"db_column"=>"intimation_id"],
+        ["excel_column"=>["col_name"=>"Intimation Date","col_index"=>2],"db_column"=>"intimation_date"],
+        ["excel_column"=>["col_name"=>"claimid","col_index"=>3],"db_column"=>"claim_id"],
+        ["excel_column"=>["col_name"=>"slno","col_index"=>4],"db_column"=>"sl_no"],
+        ["excel_column"=>["col_name"=>"UHIDNO","col_index"=>5],"db_column"=>"uhid_no"],
+        ["excel_column"=>["col_name"=>"Membername","col_index"=>6],"db_column"=>"member_name"],
+        ["excel_column"=>["col_name"=>"Main Memuhidno","col_index"=>7],"db_column"=>"main_member_uhid_no"],
+        ["excel_column"=>["col_name"=>"Main Memname","col_index"=>8],"db_column"=>"main_member_name"],
+        ["excel_column"=>["col_name"=>"Gender","col_index"=>9],"db_column"=>"gender"],
+        ["excel_column"=>["col_name"=>"DOB","col_index"=>10],"db_column"=>"dob"],
+        ["excel_column"=>["col_name"=>"Yrs","col_index"=>11],"db_column"=>"years"],
+        ["excel_column"=>["col_name"=>"relationship","col_index"=>12],"db_column"=>"relationship"],
+        ["excel_column"=>["col_name"=>"employeeid","col_index"=>13],"db_column"=>"employee_id"],
+        ["excel_column"=>["col_name"=>"Mobile","col_index"=>14],"db_column"=>"mobile"],
+        ["excel_column"=>["col_name"=>"Email","col_index"=>15],"db_column"=>"email"],
+        ["excel_column"=>["col_name"=>"Policy No","col_index"=>16],"db_column"=>"policy_no"],
+        ["excel_column"=>["col_name"=>"Policy Start Date","col_index"=>17],"db_column"=>"policy_start_date"],
+        ["excel_column"=>["col_name"=>"Policy Commencing Date","col_index"=>18],"db_column"=>"policy_commencing_date"],
+        ["excel_column"=>["col_name"=>"Policy Expiry Date","col_index"=>19],"db_column"=>"policy_expiry_date"],
+        ["excel_column"=>["col_name"=>"Organisationname","col_index"=>20],"db_column"=>"organisation_name"],
+        ["excel_column"=>["col_name"=>"Claimreceiveddate","col_index"=>21],"db_column"=>"claim_received_date"],
+        ["excel_column"=>["col_name"=>"Admdate","col_index"=>22],"db_column"=>"admission_date"],
+        ["excel_column"=>["col_name"=>"Dis Date","col_index"=>23],"db_column"=>"discharge_date"],
+        ["excel_column"=>["col_name"=>"Diagnosis","col_index"=>24],"db_column"=>"diagnosis"],
+        ["excel_column"=>["col_name"=>"Service Type","col_index"=>25],"db_column"=>"service_type"],
+        ["excel_column"=>["col_name"=>"Service Sub Type","col_index"=>26],"db_column"=>"service_sub_type"],
+        ["excel_column"=>["col_name"=>"icdcode First Level","col_index"=>27],"db_column"=>"icd_code_first_level"],
+        ["excel_column"=>["col_name"=>"icdcode Second Level","col_index"=>28],"db_column"=>"icd_code_second_level"],
+        ["excel_column"=>["col_name"=>"icdcode Third Level","col_index"=>29],"db_column"=>"icd_code_third_level"],
+        ["excel_column"=>["col_name"=>"Claim Type","col_index"=>30],"db_column"=>"claim_type"],
+        ["excel_column"=>["col_name"=>"Providername","col_index"=>31],"db_column"=>"provider_name"],
+        ["excel_column"=>["col_name"=>"provideraddress","col_index"=>32],"db_column"=>"provider_address"],
+        ["excel_column"=>["col_name"=>"providerplace","col_index"=>33],"db_column"=>"provider_place"],
+        ["excel_column"=>["col_name"=>"providerstate","col_index"=>34],"db_column"=>"provider_state"],
+        ["excel_column"=>["col_name"=>"Provider Pincode","col_index"=>35],"db_column"=>"provider_pincode"],
+        ["excel_column"=>["col_name"=>"PROVIDERTYPE","col_index"=>36],"db_column"=>"provider_type"],
+        ["excel_column"=>["col_name"=>"Provider Identification","col_index"=>37],"db_column"=>"provider_identification"],
+        ["excel_column"=>["col_name"=>"coverageamount","col_index"=>38],"db_column"=>"coverage_amount"],
+        ["excel_column"=>["col_name"=>"claimamount","col_index"=>39],"db_column"=>"claim_amount"],
+        ["excel_column"=>["col_name"=>"billedamount","col_index"=>40],"db_column"=>"billed_amount"],
+        ["excel_column"=>["col_name"=>"Disallowed Amount","col_index"=>41],"db_column"=>"disallowed_amount"],
+        ["excel_column"=>["col_name"=>"Dis Allowence Reason1","col_index"=>42],"db_column"=>"dis_allowance_reason_1"],
+        ["excel_column"=>["col_name"=>"Dis Allowence Reason2","col_index"=>43],"db_column"=>"dis_allowance_reason_2"],
+        ["excel_column"=>["col_name"=>"settledamt","col_index"=>44],"db_column"=>"settled_amount"],
+        ["excel_column"=>["col_name"=>"Incurred Amount","col_index"=>45],"db_column"=>"incurred_amount"],
+        ["excel_column"=>["col_name"=>"Discountamount","col_index"=>46],"db_column"=>"discount_amount"],
+        ["excel_column"=>["col_name"=>"TDSAmount","col_index"=>47],"db_column"=>"tds_amount"],
+        ["excel_column"=>["col_name"=>"Net Amount Paid","col_index"=>48],"db_column"=>"net_amount_paid"],
+        ["excel_column"=>["col_name"=>"Co Payment","col_index"=>49],"db_column"=>"co_payment"],
+        ["excel_column"=>["col_name"=>"Current Claim Status","col_index"=>50],"db_column"=>"current_claim_status"],
+        ["excel_column"=>["col_name"=>"Balance Suminsured","col_index"=>51],"db_column"=>"balance_sum_insured"],
+        ["excel_column"=>["col_name"=>"Chequeno","col_index"=>52],"db_column"=>"cheque_no"],
+        ["excel_column"=>["col_name"=>"chequedate","col_index"=>53],"db_column"=>"cheque_date"],
+        ["excel_column"=>["col_name"=>"Claim Passed Date","col_index"=>54],"db_column"=>"claim_passed_date"],
+        ["excel_column"=>["col_name"=>"Settled Date","col_index"=>55],"db_column"=>"settled_date"],
+        ["excel_column"=>["col_name"=>"Pending Remarks","col_index"=>56],"db_column"=>"pending_remarks"],
+        ["excel_column"=>["col_name"=>"Ir Investigation","col_index"=>57],"db_column"=>"ir_investigation"],
+        ["excel_column"=>["col_name"=>"Date of IR","col_index"=>58],"db_column"=>"ir_date"],
+        ["excel_column"=>["col_name"=>"Date of IRretrieval Date","col_index"=>59],"db_column"=>"ir_retrieval_date"],
+        ["excel_column"=>["col_name"=>"first Reminder","col_index"=>60],"db_column"=>"first_reminder"],
+        ["excel_column"=>["col_name"=>"Second Reminder","col_index"=>61],"db_column"=>"second_reminder"],
+        ["excel_column"=>["col_name"=>"Rejection Remarks","col_index"=>62],"db_column"=>"rejection_remarks"],
+        ["excel_column"=>["col_name"=>"Payee name","col_index"=>63],"db_column"=>"payee_name"],
+        ["excel_column"=>["col_name"=>"Treatment Type","col_index"=>64],"db_column"=>"treatment_type"],
+        ["excel_column"=>["col_name"=>"roomdays","col_index"=>65],"db_column"=>"room_days"],
+        ["excel_column"=>["col_name"=>"icudays","col_index"=>66],"db_column"=>"icu_days"],
+        ["excel_column"=>["col_name"=>"totalstay","col_index"=>67],"db_column"=>"total_stay"],
+        ["excel_column"=>["col_name"=>"Room Rent Claimed","col_index"=>68],"db_column"=>"room_rent_claimed"],
+        ["excel_column"=>["col_name"=>"ICU Claimed","col_index"=>69],"db_column"=>"icu_claimed"],
+        ["excel_column"=>["col_name"=>"ICU Related","col_index"=>70],"db_column"=>"icu_related"],
+        ["excel_column"=>["col_name"=>"Nursing Claimed","col_index"=>71],"db_column"=>"nursing_claimed"],
+        ["excel_column"=>["col_name"=>"Nursing Charges","col_index"=>72],"db_column"=>"nursing_charges"],
+        ["excel_column"=>["col_name"=>"Room Rent Related","col_index"=>73],"db_column"=>"room_rent_related"],
+        ["excel_column"=>["col_name"=>"Professional Charges","col_index"=>74],"db_column"=>"professional_charges"],
+        ["excel_column"=>["col_name"=>"Drugs Medication Consumables Investigationsetc","col_index"=>75],"db_column"=>"drugs_medication_consumables"],
+        ["excel_column"=>["col_name"=>"Investigations Procedures IP","col_index"=>76],"db_column"=>"investigations_procedures_ip"],
+        ["excel_column"=>["col_name"=>"Domicillary Hospitalization","col_index"=>77],"db_column"=>"domicillary_hospitalization"],
+        ["excel_column"=>["col_name"=>"Maternity","col_index"=>78],"db_column"=>"maternity"],
+        ["excel_column"=>["col_name"=>"Day Care","col_index"=>79],"db_column"=>"day_care"],
+        ["excel_column"=>["col_name"=>"Operation Theatre","col_index"=>80],"db_column"=>"operation_theatre"],
+        ["excel_column"=>["col_name"=>"Organ Donar","col_index"=>81],"db_column"=>"organ_donor"],
+        ["excel_column"=>["col_name"=>"Ancilliary Services","col_index"=>82],"db_column"=>"ancillary_services"],
+        ["excel_column"=>["col_name"=>"Dental","col_index"=>83],"db_column"=>"dental"],
+        ["excel_column"=>["col_name"=>"Out Patient Coverage","col_index"=>84],"db_column"=>"out_patient_coverage"],
+        ["excel_column"=>["col_name"=>"Personal Accident","col_index"=>85],"db_column"=>"personal_accident"],
+        ["excel_column"=>["col_name"=>"Critical Illness","col_index"=>86],"db_column"=>"critical_illness"],
+        ["excel_column"=>["col_name"=>"Health Check Up","col_index"=>87],"db_column"=>"health_check_up"],
+        ["excel_column"=>["col_name"=>"Spectacles Contact Lenses Hearing Aid","col_index"=>88],"db_column"=>"spectacles_contact_lenses_hearing_aid"],
+        ["excel_column"=>["col_name"=>"Notes","col_index"=>89],"db_column"=>"notes"],
+        ["excel_column"=>["col_name"=>"Buffer Amount","col_index"=>90],"db_column"=>"buffer_amount"],
+        ["excel_column"=>["col_name"=>"tertiaryamount","col_index"=>91],"db_column"=>"tertiary_amount"],
+        ["excel_column"=>["col_name"=>"insurancename","col_index"=>92],"db_column"=>"insurance_name"],
+        ["excel_column"=>["col_name"=>"Roname","col_index"=>93],"db_column"=>"ro_name"],
+        ["excel_column"=>["col_name"=>"Class Of Accommodation","col_index"=>94],"db_column"=>"class_of_accommodation"],
+        ["excel_column"=>["col_name"=>"claimcreateddatetime","col_index"=>95],"db_column"=>"claim_created_datetime"],
+        ["excel_column"=>["col_name"=>"Insurer Claim ID","col_index"=>96],"db_column"=>"insurer_claim_id"],
+        ["excel_column"=>["col_name"=>"Gipsa","col_index"=>97],"db_column"=>"gipsa"],
+        ["excel_column"=>["col_name"=>"Date Of Joining","col_index"=>98],"db_column"=>"date_of_joining"],
+        ["excel_column"=>["col_name"=>"GIPSAHospital","col_index"=>99],"db_column"=>"gipsa_hospital"],
+        ["excel_column"=>["col_name"=>"Package","col_index"=>100],"db_column"=>"package"],
+        ["excel_column"=>["col_name"=>"Is NIDB","col_index"=>101],"db_column"=>"is_nidb"],
+        ["excel_column"=>["col_name"=>"NIDB Removed Date","col_index"=>102],"db_column"=>"nidb_removed_date"],
+        ["excel_column"=>["col_name"=>"Investigationdate","col_index"=>103],"db_column"=>"investigation_date"],
+        ["excel_column"=>["col_name"=>"Investigation Retrieval Date","col_index"=>104],"db_column"=>"investigation_retrieval_date"],
+        ["excel_column"=>["col_name"=>"Reopeneddate","col_index"=>105],"db_column"=>"reopened_date"],
+        ["excel_column"=>["col_name"=>"Referto Insurer Date","col_index"=>106],"db_column"=>"refer_to_insurer_date"],
+        ["excel_column"=>["col_name"=>"Receiveddatefrom Insurer","col_index"=>107],"db_column"=>"received_date_from_insurer"],
+        ["excel_column"=>["col_name"=>"Rejection Category","col_index"=>108],"db_column"=>"rejection_category"],
+        ["excel_column"=>["col_name"=>"Referto Insurer Reasons","col_index"=>109],"db_column"=>"refer_to_insurer_reasons"],
+        ["excel_column"=>["col_name"=>"Is VIP","col_index"=>110],"db_column"=>"is_vip"],
+        ["excel_column"=>["col_name"=>"Main Claim Status","col_index"=>111],"db_column"=>"main_claim_status"],
+        ["excel_column"=>["col_name"=>"Main Claimtype","col_index"=>112],"db_column"=>"main_claim_type"],
+        ["excel_column"=>["col_name"=>"icd Third Level Code","col_index"=>113],"db_column"=>"icd_third_level_code"],
+        ["excel_column"=>["col_name"=>"Benefit Plan Name","col_index"=>114],"db_column"=>"benefit_plan_name"],
+        ["excel_column"=>["col_name"=>"zone","col_index"=>115],"db_column"=>"zone"],
+        ["excel_column"=>["col_name"=>"Grade","col_index"=>116],"db_column"=>"grade"],
+        ["excel_column"=>["col_name"=>"Last Modified Date","col_index"=>117],"db_column"=>"last_modified_date"],
+        ["excel_column"=>["col_name"=>"Temp MOU","col_index"=>118],"db_column"=>"temp_mou"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Claim / Reference
+        'claim_id'                => 'claim_number',
+
+        // Employee / Member
+        'employee_id'             => 'emp_code',
+
+        // Claim Dates
+        'admission_date'          => 'doa',
+        'discharge_date'          => 'dod',
+        'claim_received_date'     => 'date_of_intimat',
+        'claim_passed_date'       => 'approved_date',
+        'settled_date'            => 'settled_date',
+
+        'current_claim_status'    => 'tpa_claim_status',
+
+        // Amounts
+        'claim_amount'            => 'claim_amount',
+        'settled_amount'          => 'settled_amount',
+        'disallowed_amount'       => 'denial_reason',
+        'coverage_amount'         => 'si_amt',
+
+        // Hospital
+        'provider_name'           => 'hospital_name',
+        'provider_address'        => 'hospital_address',
+        'provider_state'          => 'hospital_state',
+        'provider_place'          => 'hospital_city',
+        'provider_pincode'        => 'hospital_pin_code',
+
+        // Remarks / Description
+        'diagnosis'               => 'claim_description',
+        'rejection_remarks'       => 'return_remark',
+
+        // Payment
+        'cheque_no'               => 'utr_details',
+        'uhid_no'                 => 'tpa_no',
+        'claim_type'              => 'tpa_claim_type',
+        'diagnosis'               => 'tpa_ailments',
+
+    ];
+
+    protected $statusMapping = [
+        'Settled' => 11,
+        'Rejected' => 8,
+    ];
+
+    protected $dateColumns = [
+        'intimation_date',
+        'policy_start_date',
+        'policy_commencing_date',
+        'policy_expiry_date',
+        'claim_received_date',
+        'admission_date',
+        'discharge_date',
+        'cheque_date',
+        'claim_passed_date',
+        'settled_date',
+        'ir_date',
+        'ir_retrieval_date',
+        'first_reminder',
+        'second_reminder',
+        'date_of_joining',
+        'nidb_removed_date',
+        'investigation_date',
+        'investigation_retrieval_date',
+        'reopened_date',
+        'refer_to_insurer_date',
+        'received_date_from_insurer',
+        'claim_created_datetime',
+        'last_modified_date'
+    ];
+
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_fhpl');
+        return $builder->insertBatch($data);   
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_fhpl');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {   
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_fhpl');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {   
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+                $item[$dbColumn] = trim($value);
+            }
+
+            foreach ($this->dateColumns as $key => $value) {
+                $item[$value] = change_date_format($item[$value] ?? null, 'd-M-y', 'Y-m-d');
+            }
+
+            $params = [
+                'admission_date' => $item['admission_date'] ?? null,
+                'employee_id' => $item['employee_id'] ?? null,
+                'claim_amount' => $item['claim_amount'] ?? null,
+                'uhid_no' => $item['uhid_no'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_fhpl', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_fhpl', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['admission_date'] ?? '') ?? null,
+                    'emp_code' => $row['employee_id'] ?? null,
+                    'claim_amount' => $row['claim_amount'] ?? null,
+                    'tpa_no' => $row['uhid_no'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relationship'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['employee_id'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_status_id'] = $statusMapping[$row['current_claim_status']] ?? 61;
+                $item['file_id']    = $file_id;
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_type'] = 1;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+            
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+    public function convertRelation(?string $relation): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        $relation = strtolower($relation);
+
+        if (str_contains($relation, 'self')) {
+            return 'self';
+        }
+
+        if (str_contains($relation, 'spouse') || str_contains($relation, 'wife') || str_contains($relation, 'husband')) {
+            return 'spouse';
+        }
+
+        if (str_contains($relation, 'daughter')) {
+            return 'daughter';
+        }
+
+        if (str_contains($relation, 'son')) {
+            return 'son';
+        }
+
+        if (str_contains($relation, 'father in law') || str_contains($relation, 'father-in-law')) {
+            return 'father-in-law';
+        }
+
+        if (str_contains($relation, 'mother in law') || str_contains($relation, 'mother-in-law')) {
+            return 'mother-in-law';
+        }
+
+        if (str_contains($relation, 'father')) {
+            return 'father';
+        }
+
+        if (str_contains($relation, 'mother')) {
+            return 'mother';
+        }
+
+        return null; // unmatched case
+    }
+
+
+
+}
diff --git a/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
new file mode 100644
index 00000000..132986a2
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
@@ -0,0 +1,402 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+use App\Models\ClaimsDumpFhplModel;
+
+class IciciClaimImportService extends BaseTpaClaimImportService
+{   
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping = [
+        ["excel_column" => ["col_name" => "POLICY_NAME", "col_index" => 0], "db_column" => "policy_name"],
+        ["excel_column" => ["col_name" => "POLICY_NO", "col_index" => 1], "db_column" => "policy_no"],
+        ["excel_column" => ["col_name" => "UHID", "col_index" => 2], "db_column" => "uhid"],
+        ["excel_column" => ["col_name" => "INSURED_NAME", "col_index" => 3], "db_column" => "insured_name"],
+        ["excel_column" => ["col_name" => "MAIN_MEMBER_NAME", "col_index" => 4], "db_column" => "main_member_name"],
+        ["excel_column" => ["col_name" => "EMPLOYEE_MEMBER_ID", "col_index" => 5], "db_column" => "employee_member_id"],
+        ["excel_column" => ["col_name" => "GRADE", "col_index" => 6], "db_column" => "grade"],
+        ["excel_column" => ["col_name" => "RELATION", "col_index" => 7], "db_column" => "relation"],
+        ["excel_column" => ["col_name" => "AGE", "col_index" => 8], "db_column" => "age"],
+        ["excel_column" => ["col_name" => "GENDER", "col_index" => 9], "db_column" => "gender"],
+        ["excel_column" => ["col_name" => "DIAGNOSIS", "col_index" => 10], "db_column" => "diagnosis"],
+        ["excel_column" => ["col_name" => "CLAIMED_AMOUNT", "col_index" => 11], "db_column" => "claimed_amount"],
+        ["excel_column" => ["col_name" => "NET_SANCT_AMT", "col_index" => 12], "db_column" => "net_sanct_amt"],
+        ["excel_column" => ["col_name" => "COPAYMENT_AMT", "col_index" => 13], "db_column" => "copayment_amt"],
+        ["excel_column" => ["col_name" => "DISALLOWED_AMOUNT", "col_index" => 14], "db_column" => "disallowed_amount"],
+        ["excel_column" => ["col_name" => "REASON_FOR_DISALLOWANCE", "col_index" => 15], "db_column" => "reason_for_disallowance"],
+        ["excel_column" => ["col_name" => "PAYMENT_AMOUNT", "col_index" => 16], "db_column" => "payment_amount"],
+        ["excel_column" => ["col_name" => "SUM_INSURED", "col_index" => 17], "db_column" => "sum_insured"],
+        ["excel_column" => ["col_name" => "BAL_SUM_INSURED", "col_index" => 18], "db_column" => "bal_sum_insured"],
+        ["excel_column" => ["col_name" => "TYPE_OF_CLAIM", "col_index" => 19], "db_column" => "type_of_claim"],
+        ["excel_column" => ["col_name" => "Claim_r_Os_Amt", "col_index" => 20], "db_column" => "claim_r_os_amt"],
+        ["excel_column" => ["col_name" => "Updated_status", "col_index" => 21], "db_column" => "updated_status"],
+        ["excel_column" => ["col_name" => "Disease_Category", "col_index" => 22], "db_column" => "disease_category"],
+        ["excel_column" => ["col_name" => "POLICY_START_DATE", "col_index" => 23], "db_column" => "policy_start_date"],
+        ["excel_column" => ["col_name" => "POLICY_END_DATE", "col_index" => 24], "db_column" => "policy_end_date"],
+        ["excel_column" => ["col_name" => "CLAIM_NUMBER", "col_index" => 25], "db_column" => "claim_number"],
+        ["excel_column" => ["col_name" => "AL_NO", "col_index" => 26], "db_column" => "al_no"],
+        ["excel_column" => ["col_name" => "HOSPITAL_CODE", "col_index" => 27], "db_column" => "hospital_code"],
+        ["excel_column" => ["col_name" => "HOSPITAL_ID", "col_index" => 28], "db_column" => "hospital_id"],
+        ["excel_column" => ["col_name" => "HOSPITAL_NAME", "col_index" => 29], "db_column" => "hospital_name"],
+        ["excel_column" => ["col_name" => "TREATMENT_TAKEN", "col_index" => 30], "db_column" => "treatment_taken"],
+        ["excel_column" => ["col_name" => "CF_Utilised_Amounnt", "col_index" => 31], "db_column" => "cf_utilised_amount"],
+        ["excel_column" => ["col_name" => "DT_OF_DEFICIENCIES_SENT", "col_index" => 32], "db_column" => "dt_of_deficiencies_sent"],
+        ["excel_column" => ["col_name" => "DT_OF_DEFICIENCIES_RECIEVED", "col_index" => 33], "db_column" => "dt_of_deficiencies_received"],
+        ["excel_column" => ["col_name" => "PAYMENT_DATE", "col_index" => 34], "db_column" => "payment_date"],
+        ["excel_column" => ["col_name" => "PAYEE_NAME", "col_index" => 35], "db_column" => "payee_name"],
+        ["excel_column" => ["col_name" => "PAYMENT_MODE", "col_index" => 36], "db_column" => "payment_mode"],
+        ["excel_column" => ["col_name" => "CHEQUE_NUMBER", "col_index" => 37], "db_column" => "cheque_number"],
+        ["excel_column" => ["col_name" => "DOA", "col_index" => 38], "db_column" => "doa"],
+        ["excel_column" => ["col_name" => "DOD", "col_index" => 39], "db_column" => "dod"],
+        ["excel_column" => ["col_name" => "HOSPITAL_CITY", "col_index" => 40], "db_column" => "hospital_city"],
+        ["excel_column" => ["col_name" => "HOSPITAL_STATE", "col_index" => 41], "db_column" => "hospital_state"],
+        ["excel_column" => ["col_name" => "REJECTED_QUERY_REASON", "col_index" => 42], "db_column" => "rejected_query_reason"],
+        ["excel_column" => ["col_name" => "REJECTED_QUERY_DESC", "col_index" => 43], "db_column" => "rejected_query_desc"],
+        ["excel_column" => ["col_name" => "REJECTED_QUERY_CLOSED_DATE", "col_index" => 44], "db_column" => "rejected_query_closed_date"],
+        ["excel_column" => ["col_name" => "REJREOPEN_CLOSURE_DATE", "col_index" => 45], "db_column" => "rejreopen_closure_date"],
+        ["excel_column" => ["col_name" => "CLAIM_CLASSIFICATION", "col_index" => 46], "db_column" => "claim_classification"],
+        ["excel_column" => ["col_name" => "TAGGED_INWARD_NO", "col_index" => 47], "db_column" => "tagged_inward_no"],
+        ["excel_column" => ["col_name" => "INWARD_DATE", "col_index" => 48], "db_column" => "inward_date"],
+        ["excel_column" => ["col_name" => "ICD_ID_L3", "col_index" => 49], "db_column" => "icd_id_l3"],
+        ["excel_column" => ["col_name" => "Incidence_Count", "col_index" => 50], "db_column" => "incidence_count"],
+        ["excel_column" => ["col_name" => "FLEXI_OPTION", "col_index" => 51], "db_column" => "flexi_option"],
+        ["excel_column" => ["col_name" => "Base_TopUp_Option", "col_index" => 52], "db_column" => "base_topup_option"],
+        ["excel_column" => ["col_name" => "POLICY_GROUP_NAME", "col_index" => 53], "db_column" => "policy_group_name"],
+        ["excel_column" => ["col_name" => "Relation_Group", "col_index" => 54], "db_column" => "relation_group"],
+        ["excel_column" => ["col_name" => "Age_Band", "col_index" => 55], "db_column" => "age_band"],
+        ["excel_column" => ["col_name" => "Work_Location", "col_index" => 56], "db_column" => "work_location"],
+        ["excel_column" => ["col_name" => "ILTC_TAG", "col_index" => 57], "db_column" => "iltc_tag"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Employee / Member
+        'employee_member_id' => 'emp_code',
+
+        // Claim
+        'claim_number'      => 'claim_number',
+        'claimed_amount'    => 'claim_amount',
+        'claim_status'      => 'tpa_claim_status',
+
+        // Dates
+        'doa'  => 'doa',
+        'dod'  => 'dod',
+        'payment_date'       => 'settled_date',
+
+        // Hospital
+        'hospital_name'      => 'hospital_name',
+        'hospital_city'      => 'hospital_city',
+        'hospital_state'     => 'hospital_state',
+
+        'cheque_number'      => 'utr_details',
+        'uhid'               => 'tpa_no',
+        'rejected_query_desc' => 'claim_description',
+        'type_of_claim'       => 'tpa_claim_type',
+        'diagnosis'         => 'tpa_ailments',
+    ];
+
+    protected $statusMapping = [
+        'PAID' => 11,
+        'REJECTED' => 8,
+    ];
+
+    protected $dateColumns = [
+        'policy_start_date',
+        'policy_end_date',
+
+        'dt_of_deficiencies_sent',
+        'dt_of_deficiencies_received',
+
+        'payment_date',
+
+        'doa',
+        'dod',
+
+        'rejected_query_closed_date',
+        'rejreopen_closure_date',
+    ];
+
+
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_icici');
+        return $builder->insertBatch($data);
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_icici');
+        return $builder->upsertBatch($data, 'id');
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {   
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_icici');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {   
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+                $item[$dbColumn] = $value;
+            }
+
+            foreach ($this->dateColumns as $key => $value) {
+                $item[$value] = change_date_format($item[$value] ?? null);
+            }
+
+            $params = [
+                'doa' => change_date_format($item['doa'] ?? '') ?? null,
+                'employee_member_id' => $item['employee_member_id'] ?? null,
+                'claimed_amount' => $item['claimed_amount'] ?? null,
+                'uhid' => $item['uhid'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_icici', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_icici', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['doa'] ?? '') ?? null,
+                    'emp_code' => $row['employee_member_id'] ?? null,
+                    'claim_amount' => $row['claim_amount'] ?? null,
+                    'tpa_no' => $row['uhid'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relation_group'] ?? '');
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['employee_member_id'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_status_id'] = $statusMapping[$row['updated_status']] ?? 61;
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['file_id']    = $file_id;
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_type'] = 1;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+            
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+
+    public function convertRelation(?string $relation): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        $relation = strtolower($relation);
+
+        if (str_contains($relation, 'self')) {
+            return 'self';
+        }
+
+        if (str_contains($relation, 'spouse') || str_contains($relation, 'wife') || str_contains($relation, 'husband')) {
+            return 'spouse';
+        }
+
+        if (str_contains($relation, 'daughter')) {
+            return 'daughter';
+        }
+
+        if (str_contains($relation, 'son')) {
+            return 'son';
+        }
+
+        if (str_contains($relation, 'father in law') || str_contains($relation, 'father-in-law')) {
+            return 'father-in-law';
+        }
+
+        if (str_contains($relation, 'mother in law') || str_contains($relation, 'mother-in-law')) {
+            return 'mother-in-law';
+        }
+
+        if (str_contains($relation, 'father')) {
+            return 'father';
+        }
+
+        if (str_contains($relation, 'mother')) {
+            return 'mother';
+        }
+
+        return null; // unmatched case
+    }
+
+
+
+}
diff --git a/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
new file mode 100644
index 00000000..d052c9f5
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
@@ -0,0 +1,438 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+
+class MediAssistClaimImportService extends BaseTpaClaimImportService
+{   
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping = [
+        ["excel_column" => ["col_name" => "insurance_company", "col_index" => 0], "db_column" => "insurance_company"],
+        ["excel_column" => ["col_name" => "insurer_region_name", "col_index" => 1], "db_column" => "insurer_region_name"],
+        ["excel_column" => ["col_name" => "insurer_ro_code", "col_index" => 2], "db_column" => "insurer_ro_code"],
+        ["excel_column" => ["col_name" => "insurer_do_code", "col_index" => 3], "db_column" => "insurer_do_code"],
+        ["excel_column" => ["col_name" => "insurer_bo_code", "col_index" => 4], "db_column" => "insurer_bo_code"],
+        ["excel_column" => ["col_name" => "event_id", "col_index" => 5], "db_column" => "event_id"],
+        ["excel_column" => ["col_name" => "claim_id", "col_index" => 6], "db_column" => "claim_id"],
+        ["excel_column" => ["col_name" => "insurer_claim_ref_no", "col_index" => 7], "db_column" => "insurer_claim_ref_no"],
+        ["excel_column" => ["col_name" => "claim_pre_auths", "col_index" => 8], "db_column" => "claim_pre_auths"],
+        ["excel_column" => ["col_name" => "ma_policy_id", "col_index" => 9], "db_column" => "ma_policy_id"],
+        ["excel_column" => ["col_name" => "policy_no", "col_index" => 10], "db_column" => "policy_no"],
+        ["excel_column" => ["col_name" => "policy_holder_name", "col_index" => 11], "db_column" => "policy_holder_name"],
+        ["excel_column" => ["col_name" => "policy_type", "col_index" => 12], "db_column" => "policy_type"],
+        ["excel_column" => ["col_name" => "policy_subtype_desc", "col_index" => 13], "db_column" => "policy_subtype_desc"],
+        ["excel_column" => ["col_name" => "policy_start_date", "col_index" => 14], "db_column" => "policy_start_date"],
+        ["excel_column" => ["col_name" => "policy_end_date", "col_index" => 15], "db_column" => "policy_end_date"],
+        ["excel_column" => ["col_name" => "devlopment_officer", "col_index" => 16], "db_column" => "devlopment_officer"],
+        ["excel_column" => ["col_name" => "agent", "col_index" => 17], "db_column" => "agent"],
+        ["excel_column" => ["col_name" => "broker", "col_index" => 18], "db_column" => "broker"],
+        ["excel_column" => ["col_name" => "pribenef_employee_code", "col_index" => 19], "db_column" => "pribenef_employee_code"],
+        ["excel_column" => ["col_name" => "pribenef_name", "col_index" => 20], "db_column" => "pribenef_name"],
+        ["excel_column" => ["col_name" => "pribenef_floater_sum", "col_index" => 21], "db_column" => "pribenef_floater_sum"],
+        ["excel_column" => ["col_name" => "benef_maid", "col_index" => 22], "db_column" => "benef_maid"],
+        ["excel_column" => ["col_name" => "benef_insurer_id", "col_index" => 23], "db_column" => "benef_insurer_id"],
+        ["excel_column" => ["col_name" => "benef_name", "col_index" => 24], "db_column" => "benef_name"],
+        ["excel_column" => ["col_name" => "benef_gender", "col_index" => 25], "db_column" => "benef_gender"],
+        ["excel_column" => ["col_name" => "benef_relation", "col_index" => 26], "db_column" => "benef_relation"],
+        ["excel_column" => ["col_name" => "benef_age", "col_index" => 27], "db_column" => "benef_age"],
+        ["excel_column" => ["col_name" => "benef_sum_insured", "col_index" => 28], "db_column" => "benef_sum_insured"],
+        ["excel_column" => ["col_name" => "balance_sum_insured", "col_index" => 29], "db_column" => "balance_sum_insured"],
+        ["excel_column" => ["col_name" => "intimation_id", "col_index" => 30], "db_column" => "intimation_id"],
+        ["excel_column" => ["col_name" => "intimation_date", "col_index" => 31], "db_column" => "intimation_date"],
+        ["excel_column" => ["col_name" => "settled_date", "col_index" => 32], "db_column" => "settled_date"],
+        ["excel_column" => ["col_name" => "ClaimSource", "col_index" => 33], "db_column" => "ClaimSource"],
+        ["excel_column" => ["col_name" => "claim_mode_of_rcpt", "col_index" => 34], "db_column" => "claim_mode_of_rcpt"],
+        ["excel_column" => ["col_name" => "claim_type", "col_index" => 35], "db_column" => "claim_type"],
+        ["excel_column" => ["col_name" => "claim_sub_type", "col_index" => 36], "db_column" => "claim_sub_type"],
+        ["excel_column" => ["col_name" => "claim_stage", "col_index" => 37], "db_column" => "claim_stage"],
+        ["excel_column" => ["col_name" => "claim_status", "col_index" => 38], "db_column" => "claim_status"],
+        ["excel_column" => ["col_name" => "is_cashlessanywhere", "col_index" => 39], "db_column" => "is_cashlessanywhere"],
+        ["excel_column" => ["col_name" => "date_of_admission", "col_index" => 40], "db_column" => "date_of_admission"],
+        ["excel_column" => ["col_name" => "date_of_discharge", "col_index" => 41], "db_column" => "date_of_discharge"],
+        ["excel_column" => ["col_name" => "claim_amount", "col_index" => 42], "db_column" => "claim_amount"],
+        ["excel_column" => ["col_name" => "claim_approved_amount", "col_index" => 43], "db_column" => "claim_approved_amount"],
+        ["excel_column" => ["col_name" => "incurred_amount", "col_index" => 44], "db_column" => "incurred_amount"],
+        ["excel_column" => ["col_name" => "primary_icd_group", "col_index" => 45], "db_column" => "primary_icd_group"],
+        ["excel_column" => ["col_name" => "primary_ailment_name", "col_index" => 46], "db_column" => "primary_ailment_name"],
+        ["excel_column" => ["col_name" => "primary_ailment_code", "col_index" => 47], "db_column" => "primary_ailment_code"],
+        ["excel_column" => ["col_name" => "treatment_type", "col_index" => 48], "db_column" => "treatment_type"],
+        ["excel_column" => ["col_name" => "treatment_name", "col_index" => 49], "db_column" => "treatment_name"],
+        ["excel_column" => ["col_name" => "hospital_id", "col_index" => 50], "db_column" => "hospital_id"],
+        ["excel_column" => ["col_name" => "hospital_name", "col_index" => 51], "db_column" => "hospital_name"],
+        ["excel_column" => ["col_name" => "hospital_city", "col_index" => 52], "db_column" => "hospital_city"],
+        ["excel_column" => ["col_name" => "hospital_state", "col_index" => 53], "db_column" => "hospital_state"],
+        ["excel_column" => ["col_name" => "hospital_pincode", "col_index" => 54], "db_column" => "hospital_pincode"],
+        ["excel_column" => ["col_name" => "hospital_address", "col_index" => 55], "db_column" => "hospital_address"],
+        ["excel_column" => ["col_name" => "Clinic_DoctorName_Hospital", "col_index" => 56], "db_column" => "Clinic_DoctorName_Hospital"],
+        ["excel_column" => ["col_name" => "OPD_pincode", "col_index" => 57], "db_column" => "OPD_pincode"],
+        ["excel_column" => ["col_name" => "payable_amount_OPD_Consultation", "col_index" => 58], "db_column" => "payable_amount_OPD_Consultation"],
+        ["excel_column" => ["col_name" => "payable_amount_Dental", "col_index" => 59], "db_column" => "payable_amount_Dental"],
+        ["excel_column" => ["col_name" => "payable_amount_Diagnostics", "col_index" => 60], "db_column" => "payable_amount_Diagnostics"],
+        ["excel_column" => ["col_name" => "payable_amount_Other", "col_index" => 61], "db_column" => "payable_amount_Other"],
+        ["excel_column" => ["col_name" => "payable_amount_Pharmacy", "col_index" => 62], "db_column" => "payable_amount_Pharmacy"],
+        ["excel_column" => ["col_name" => "payable_amount_Vaccination", "col_index" => 63], "db_column" => "payable_amount_Vaccination"],
+        ["excel_column" => ["col_name" => "payable_amount_Miscellaneous_Charges", "col_index" => 64], "db_column" => "payable_amount_Miscellaneous_Charges"],
+        ["excel_column" => ["col_name" => "payable_amount_Health_Checkup", "col_index" => 65], "db_column" => "payable_amount_Health_Checkup"],
+        ["excel_column" => ["col_name" => "deduction_amount_copay", "col_index" => 66], "db_column" => "deduction_amount_copay"],
+        ["excel_column" => ["col_name" => "deduction_amount_excess_ailment", "col_index" => 67], "db_column" => "deduction_amount_excess_ailment"],
+        ["excel_column" => ["col_name" => "deduction_amount_excess_policy", "col_index" => 68], "db_column" => "deduction_amount_excess_policy"],
+        ["excel_column" => ["col_name" => "deduction_amount_prorata", "col_index" => 69], "db_column" => "deduction_amount_prorata"],
+        ["excel_column" => ["col_name" => "deduction_amount_hospital_discount", "col_index" => 70], "db_column" => "deduction_amount_hospital_discount"],
+        ["excel_column" => ["col_name" => "deduction_amount_paid_by_patient", "col_index" => 71], "db_column" => "deduction_amount_paid_by_patient"],
+        ["excel_column" => ["col_name" => "deduction_amount_issurer_approved", "col_index" => 72], "db_column" => "deduction_amount_issurer_approved"],
+        ["excel_column" => ["col_name" => "deduction_amount_deductible", "col_index" => 73], "db_column" => "deduction_amount_deductible"],
+        ["excel_column" => ["col_name" => "deduction_amount_intimation_penalty", "col_index" => 74], "db_column" => "deduction_amount_intimation_penalty"],
+        ["excel_column" => ["col_name" => "claim_payable_to_name", "col_index" => 75], "db_column" => "claim_payable_to_name"],
+        ["excel_column" => ["col_name" => "utr_no", "col_index" => 76], "db_column" => "utr_no"],
+        ["excel_column" => ["col_name" => "utr_date", "col_index" => 77], "db_column" => "utr_date"],
+        ["excel_column" => ["col_name" => "denial_short_description", "col_index" => 78], "db_column" => "denial_short_description"],
+        ["excel_column" => ["col_name" => "claim_received_date", "col_index" => 79], "db_column" => "claim_received_date"],
+        ["excel_column" => ["col_name" => "last_necessary_doc_rec_date", "col_index" => 80], "db_column" => "last_necessary_doc_rec_date"],
+        ["excel_column" => ["col_name" => "processed_date", "col_index" => 81], "db_column" => "processed_date"],
+        ["excel_column" => ["col_name" => "first_document_attached_date", "col_index" => 82], "db_column" => "first_document_attached_date"],
+        ["excel_column" => ["col_name" => "claim_processing_tat_days", "col_index" => 83], "db_column" => "claim_processing_tat_days"],
+        ["excel_column" => ["col_name" => "ready_for_payment_date", "col_index" => 84], "db_column" => "ready_for_payment_date"],
+        ["excel_column" => ["col_name" => "payment_date", "col_index" => 85], "db_column" => "payment_date"],
+        ["excel_column" => ["col_name" => "claim_payment_tat_days", "col_index" => 86], "db_column" => "claim_payment_tat_days"],
+        ["excel_column" => ["col_name" => "denial_description", "col_index" => 87], "db_column" => "denial_description"],
+        ["excel_column" => ["col_name" => "error_group", "col_index" => 88], "db_column" => "error_group"],
+        ["excel_column" => ["col_name" => "tpa_name", "col_index" => 89], "db_column" => "tpa_name"],
+        ["excel_column" => ["col_name" => "new_short_error_group", "col_index" => 90], "db_column" => "new_short_error_group"],
+        ["excel_column" => ["col_name" => "death_claim", "col_index" => 91], "db_column" => "death_claim"],
+        ["excel_column" => ["col_name" => "vip_claim", "col_index" => 92], "db_column" => "vip_claim"],
+        ["excel_column" => ["col_name" => "balance_sum_insured_exhausted", "col_index" => 93], "db_column" => "balance_sum_insured_exhausted"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Employee / Beneficiary details
+        'pribenef_employee_code' => 'emp_code',
+
+        // Policy / Claim identifiers
+        'claim_id'               => 'claim_number',
+        'event_id'               => 'tpa_no',
+        'claim_pre_auths'        => 'tpa_claim_push_reference_no',
+
+        // Claim type & status
+        'claim_status'           => 'tpa_claim_status',
+
+        // Dates
+        'date_of_admission'      => 'doa',
+        'date_of_discharge'      => 'dod',
+        'intimation_date'        => 'date_of_intimat',
+        'settled_date'           => 'settled_date',
+        'claim_received_date'    => 'registration_date',
+        'processed_date'         => 'approved_date',
+
+        // Amounts
+        'claim_amount'           => 'claim_amount',
+        'claim_approved_amount'  => 'approved_amount',
+
+        // Hospital details
+        'hospital_name'          => 'hospital_name',
+        'hospital_address'       => 'hospital_address',
+        'hospital_city'          => 'hospital_city',
+        'hospital_state'         => 'hospital_state',
+        'hospital_pincode'       => 'hospital_pin_code',
+        'hospital_phone_no'      => 'hospital_phone_no',
+
+        // Denial / approval
+        'denial_description'     => 'denial_reason',
+        'approved_description'   => 'approved_description',
+
+        // Payment
+        'utr_no'                 => 'utr_details',
+        'claim_type'             => 'tpa_claim_type',
+        'primary_ailment_name'   => 'tpa_ailments',
+    ];
+
+    protected $statusMapping = [
+        'Settled' => 11,
+        'Rejected' => 8,
+        'Denied' => 8,
+        'Cancelled' => 13,
+        'Processed' => 61,
+        'Information Awaited' => 4,
+        'Denied Letter Sent' => 66,
+        'Cashless Document Awaited' => 3,
+    ];
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_medi_assist');
+        return $builder->insertBatch($data);
+
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_medi_assist');
+        $builder->insertBatch($data);
+
+        return true;
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {   
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_medi_assist');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {   
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+                $item[$dbColumn] = $value;
+            }
+
+            $params = [
+                'date_of_admission' => change_date_format($item['date_of_admission'] ?? '') ?? null,
+                'pribenef_employee_code' => $item['pribenef_employee_code'] ?? null,
+                'claim_amount' => $item['claim_amount'] ?? null,
+                'event_id' => $item['event_id'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_medi_assist', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_medi_assist', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['date_of_admission'] ?? '') ?? null,
+                    'emp_code' => $row['pribenef_employee_code'] ?? null,
+                    'claim_amount' => $row['claim_amount'] ?? null,
+                    'tpa_no' => $row['event_id'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['benef_relation'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['pribenef_employee_code'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['file_id']    = $file_id;
+                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_type'] = 1;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+            
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+    public function convertRelation(?string $relation): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        $relation = strtolower($relation);
+
+        if (str_contains($relation, 'self')) {
+            return 'self';
+        }
+
+        if (str_contains($relation, 'spouse') || str_contains($relation, 'wife') || str_contains($relation, 'husband')) {
+            return 'spouse';
+        }
+
+        if (str_contains($relation, 'daughter')) {
+            return 'daughter';
+        }
+
+        if (str_contains($relation, 'son')) {
+            return 'son';
+        }
+
+        if (str_contains($relation, 'father in law') || str_contains($relation, 'father-in-law')) {
+            return 'father-in-law';
+        }
+
+        if (str_contains($relation, 'mother in law') || str_contains($relation, 'mother-in-law')) {
+            return 'mother-in-law';
+        }
+
+        if (str_contains($relation, 'father')) {
+            return 'father';
+        }
+
+        if (str_contains($relation, 'mother')) {
+            return 'mother';
+        }
+
+        return null; // unmatched case
+    }
+
+
+}
diff --git a/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
new file mode 100644
index 00000000..770caadd
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
@@ -0,0 +1,392 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+use App\Models\ClaimsDumpFhplModel;
+
+class RcareClaimImportService extends BaseTpaClaimImportService
+{   
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping = [
+        ["excel_column" => ["col_name" => "CLInwardNo", "col_index" => 0], "db_column" => "cl_inward_no"],
+        ["excel_column" => ["col_name" => "Inward Date", "col_index" => 1], "db_column" => "inward_date"],
+        ["excel_column" => ["col_name" => "Claim Classification", "col_index" => 2], "db_column" => "claim_classification"],
+        ["excel_column" => ["col_name" => "Policy Name", "col_index" => 3], "db_column" => "policy_name"],
+        ["excel_column" => ["col_name" => "Policy Number", "col_index" => 4], "db_column" => "policy_number"],
+        ["excel_column" => ["col_name" => "Policy Start Date", "col_index" => 5], "db_column" => "policy_start_date"],
+        ["excel_column" => ["col_name" => "Policy End Date", "col_index" => 6], "db_column" => "policy_end_date"],
+        ["excel_column" => ["col_name" => "UHID", "col_index" => 7], "db_column" => "uhid"],
+        ["excel_column" => ["col_name" => "Insured Name", "col_index" => 8], "db_column" => "insured_name"],
+        ["excel_column" => ["col_name" => "Patient Name", "col_index" => 9], "db_column" => "patient_name"],
+        ["excel_column" => ["col_name" => "Employee/Member Id", "col_index" => 10], "db_column" => "employee_member_id"],
+        ["excel_column" => ["col_name" => "Grade", "col_index" => 11], "db_column" => "grade"],
+        ["excel_column" => ["col_name" => "Relation", "col_index" => 12], "db_column" => "relation"],
+        ["excel_column" => ["col_name" => "Age", "col_index" => 13], "db_column" => "age"],
+        ["excel_column" => ["col_name" => "Gender", "col_index" => 14], "db_column" => "gender"],
+        ["excel_column" => ["col_name" => "DF/DNF idenitifcation", "col_index" => 15], "db_column" => "df_dnf_identification"],
+        ["excel_column" => ["col_name" => "Sum Insured", "col_index" => 16], "db_column" => "sum_insured"],
+        ["excel_column" => ["col_name" => "DOA/OPD Treatment From", "col_index" => 17], "db_column" => "doa_opd_treatment_from"],
+        ["excel_column" => ["col_name" => "DOD/OPD Treatment To", "col_index" => 18], "db_column" => "dod_opd_treatment_to"],
+        ["excel_column" => ["col_name" => "Hospital Name", "col_index" => 19], "db_column" => "hospital_name"],
+        ["excel_column" => ["col_name" => "Hospital District", "col_index" => 20], "db_column" => "hospital_district"],
+        ["excel_column" => ["col_name" => "Hospital State", "col_index" => 21], "db_column" => "hospital_state"],
+        ["excel_column" => ["col_name" => "ICDCode", "col_index" => 22], "db_column" => "icd_code"],
+        ["excel_column" => ["col_name" => "Disease Category", "col_index" => 23], "db_column" => "disease_category"],
+        ["excel_column" => ["col_name" => "Final Status", "col_index" => 24], "db_column" => "final_status"],
+        ["excel_column" => ["col_name" => "Approved Date", "col_index" => 25], "db_column" => "approved_date"],
+        ["excel_column" => ["col_name" => "Claimed Amount", "col_index" => 26], "db_column" => "claimed_amount"],
+        ["excel_column" => ["col_name" => "Disallowed Amount", "col_index" => 27], "db_column" => "disallowed_amount"],
+        ["excel_column" => ["col_name" => "Net Sanct Amt", "col_index" => 28], "db_column" => "net_sanction_amount"],
+        ["excel_column" => ["col_name" => "Reason For Disallowance", "col_index" => 29], "db_column" => "reason_for_disallowance"],
+        ["excel_column" => ["col_name" => "External Query Remarks", "col_index" => 30], "db_column" => "external_query_remarks"],
+        ["excel_column" => ["col_name" => "Rejection Remarks", "col_index" => 31], "db_column" => "rejection_remarks"],
+        ["excel_column" => ["col_name" => "Cheque/NEFT Number", "col_index" => 32], "db_column" => "cheque_neft_number"],
+        ["excel_column" => ["col_name" => "Cheque/NEFT Date", "col_index" => 33], "db_column" => "cheque_neft_date"],
+        ["excel_column" => ["col_name" => "Diagnosis", "col_index" => 34], "db_column" => "diagnosis"],
+        ["excel_column" => ["col_name" => "Treatment Detail", "col_index" => 35], "db_column" => "treatment_detail"],
+        ["excel_column" => ["col_name" => "Member Reimbursement CL Type", "col_index" => 36], "db_column" => "member_reimbursement_cl_type"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Employee / Member
+        'employee_member_id'   => 'emp_code',
+
+        // Policy
+        'policy_start_date'    => 'date_of_incep',
+
+        // Claim Dates
+        'doa_opd_treatment_from' => 'doa',
+        'dod_opd_treatment_to'   => 'dod',
+        'approved_date'          => 'approved_date',
+
+        // Claim Amounts
+        'claimed_amount'        => 'claim_amount',
+        'net_sanction_amount'   => 'approved_amount',
+
+        // Status / Remarks
+        'final_status'          => 'tpa_claim_status',
+        'reason_for_disallowance' => 'denial_reason',
+        'rejection_remarks'     => 'return_remark',
+
+        // Hospital
+        'hospital_name'         => 'hospital_name',
+        'hospital_state'        => 'hospital_state',
+        'hospital_district'     => 'hospital_city',
+
+        'diagnosis'             => 'claim_description',
+        'diagnosis'             => 'tpa_ailments',
+
+
+        // Payment
+        'cheque_neft_number'    => 'utr_details',
+        'cheque_neft_date'      => 'settled_date',
+
+        // References
+        'cl_inward_no'          => 'claim_number',
+    ];
+
+    protected $statusMapping = [
+        'Settled' => 11,
+        'Rejected' => 8,
+        'Denied' => 8,
+        'Cancelled' => 13,
+        'Processed' => 61,
+        'Information Awaited' => 4,
+        'Denied Letter Sent' => 66,
+        'Cashless Document Awaited' => 3,
+    ];
+
+    protected $dateColumns = [
+        'inward_date',
+        'policy_start_date',
+        'policy_end_date',
+        'doa_opd_treatment_from',
+        'dod_opd_treatment_to',
+        'approved_date',
+        'cheque_neft_date'
+    ];
+
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $builder = $this->db->table('claims_dump_reliance');
+        return $builder->insertBatch($data);
+
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_reliance');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {   
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_reliance');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {   
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+                $item[$dbColumn] = $value;
+            }
+
+            foreach ($this->dateColumns as $key => $value) {
+                $item[$value] = change_date_format($item[$value] ?? null, 'd-M-y', 'Y-m-d');
+            }
+
+            $params = [
+                'doa_opd_treatment_from' => $item['doa_opd_treatment_from'] ?? null,
+                'employee_member_id' => $item['employee_member_id'] ?? null,
+                'claimed_amount' => $item['claimed_amount'] ?? null,
+                'uhid' => $item['uhid'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_reliance', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_reliance', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['doa_opd_treatment_from'] ?? '') ?? null,
+                    'emp_code' => $row['employee_member_id'] ?? null,
+                    'claim_amount' => $row['claimed_amount'] ?? null,
+                    'tpa_no' => $row['uhid'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relation'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['employee_member_id'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_status_id'] = $statusMapping[$row['final_status']] ?? 61;
+                $item['file_id']    = $file_id;
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['claim_type'] = 1;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+            
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+    public function convertRelation(?string $relation): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        $relation = strtolower($relation);
+
+        if (str_contains($relation, 'self')) {
+            return 'self';
+        }
+
+        if (str_contains($relation, 'spouse') || str_contains($relation, 'wife') || str_contains($relation, 'husband')) {
+            return 'spouse';
+        }
+
+        if (str_contains($relation, 'daughter')) {
+            return 'daughter';
+        }
+
+        if (str_contains($relation, 'son')) {
+            return 'son';
+        }
+
+        if (str_contains($relation, 'father in law') || str_contains($relation, 'father-in-law')) {
+            return 'father-in-law';
+        }
+
+        if (str_contains($relation, 'mother in law') || str_contains($relation, 'mother-in-law')) {
+            return 'mother-in-law';
+        }
+
+        if (str_contains($relation, 'father')) {
+            return 'father';
+        }
+
+        if (str_contains($relation, 'mother')) {
+            return 'mother';
+        }
+
+        return null; // unmatched case
+    }
+
+
+
+}
diff --git a/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
new file mode 100644
index 00000000..c90d580b
--- /dev/null
+++ b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
@@ -0,0 +1,801 @@
+<?php
+
+namespace App\Libraries\TPAClaimsImportServices;
+
+use App\Models\TicketMasterModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
+use App\Models\EmployeeModel;
+use App\Models\ClaimDumpFileModel;
+
+class VidalClaimImportService extends BaseTpaClaimImportService
+{   
+
+    /**
+     * MAPPING ARRAYs 
+     */
+
+    protected $mapping_old = [
+
+        ["excel_column" => "TPA Policy Number", "db_column" => "tpa_policy_number"],
+        ["excel_column" => "Insurer Policy Number", "db_column" => "insurer_policy_number"],
+        ["excel_column" => "Corporate Name", "db_column" => "corporate_name"],
+        ["excel_column" => "Proposer Name", "db_column" => "proposer_name"],
+        ["excel_column" => "Corporate Group ID", "db_column" => "corporate_group_id"],
+
+        ["excel_column" => "Policy Start Date", "db_column" => "policy_start_date"],
+        ["excel_column" => "Policy End date", "db_column" => "policy_end_date"],
+
+        ["excel_column" => "Insurance Company Name", "db_column" => "insurance_company_name"],
+
+        ["excel_column" => "Employee Number", "db_column" => "employee_number"],
+        ["excel_column" => "Employee Location", "db_column" => "employee_location"],
+
+        ["excel_column" => "Primary Policy Holder Name", "db_column" => "primary_policy_holder_name"],
+        ["excel_column" => "Primary Policy Holder Card ID", "db_column" => "primary_policy_holder_card_id"],
+
+        ["excel_column" => "Employee Grade", "db_column" => "employee_grade"],
+
+        ["excel_column" => "Patient Health Card ID", "db_column" => "patient_health_card_id"],
+        ["excel_column" => "Patient Name", "db_column" => "patient_name"],
+        ["excel_column" => "Date of Birth", "db_column" => "date_of_birth"],
+        ["excel_column" => "Age", "db_column" => "age"],
+        ["excel_column" => "Gender", "db_column" => "gender"],
+        ["excel_column" => "Relation", "db_column" => "relation"],
+
+        ["excel_column" => "Sum Insured", "db_column" => "sum_insured"],
+        ["excel_column" => "Balance Sum Insured", "db_column" => "balance_sum_insured"],
+        ["excel_column" => "Top Up Sum Insured", "db_column" => "top_up_sum_insured"],
+
+        ["excel_column" => "Enrollment status", "db_column" => "enrollment_status"],
+
+        ["excel_column" => "Policy Inception date", "db_column" => "policy_inception_date"],
+        ["excel_column" => "Policy Exit Date", "db_column" => "policy_exit_date"],
+
+        ["excel_column" => "Insurer Risk ID", "db_column" => "insurer_risk_id"],
+
+        ["excel_column" => "Claim Preauth Identifier", "db_column" => "claim_preauth_identifier"],
+        ["excel_column" => "TPA Claim Number", "db_column" => "tpa_claim_number"],
+        ["excel_column" => "Preauth Number", "db_column" => "preauth_number"],
+        ["excel_column" => "Insurer Claim Number", "db_column" => "insurer_claim_number"],
+
+        ["excel_column" => "Claim Received date", "db_column" => "claim_received_date"],
+        ["excel_column" => "Date of Admission", "db_column" => "date_of_admission"],
+        ["excel_column" => "Date of Discharge", "db_column" => "date_of_discharge"],
+
+        ["excel_column" => "Hospital Name", "db_column" => "hospital_name"],
+        ["excel_column" => "Hospital ID", "db_column" => "hospital_id"],
+        ["excel_column" => "Hospital Address", "db_column" => "hospital_address"],
+        ["excel_column" => "Hospital City", "db_column" => "hospital_city"],
+        ["excel_column" => "Hospital State", "db_column" => "hospital_state"],
+        ["excel_column" => "Hospital Pincode", "db_column" => "hospital_pincode"],
+        ["excel_column" => "Hospital Network status", "db_column" => "hospital_network_status"],
+        ["excel_column" => "PPN Hospital Status", "db_column" => "ppn_hospital_status"],
+
+        ["excel_column" => "Room Category", "db_column" => "room_category"],
+        ["excel_column" => "Room Days", "db_column" => "room_days"],
+        ["excel_column" => "ICU Days", "db_column" => "icu_days"],
+
+        ["excel_column" => "Medical Surgical Identifier", "db_column" => "medical_surgical_identifier"],
+        ["excel_column" => "Treatment Type of AYUSH", "db_column" => "treatment_type_of_ayush"],
+        ["excel_column" => "Package", "db_column" => "package"],
+
+        ["excel_column" => "Diagnosis", "db_column" => "diagnosis"],
+        ["excel_column" => "Illness Details", "db_column" => "illness_details"],
+        ["excel_column" => "Ailment Grouping", "db_column" => "ailment_grouping"],
+
+        ["excel_column" => "Primary ICD Code", "db_column" => "primary_icd_code"],
+        ["excel_column" => "Secondary ICD Code", "db_column" => "secondary_icd_code"],
+
+        ["excel_column" => "Procedure Code", "db_column" => "procedure_code"],
+        ["excel_column" => "Procedure Description", "db_column" => "procedure_description"],
+        ["excel_column" => "Procedure Grouping", "db_column" => "procedure_grouping"],
+
+        ["excel_column" => "Claim Submission mode", "db_column" => "claim_submission_mode"],
+        ["excel_column" => "Admission Category", "db_column" => "admission_category"],
+        ["excel_column" => "Type of Claim", "db_column" => "type_of_claim"],
+        ["excel_column" => "MainClaim_Prepost type", "db_column" => "mainclaim_prepost_type"],
+        ["excel_column" => "Type of Hospitalization", "db_column" => "type_of_hospitalization"],
+        ["excel_column" => "Death Status", "db_column" => "death_status"],
+        ["excel_column" => "Treatement Given", "db_column" => "treatment_given"],
+
+        ["excel_column" => "Claim Amount", "db_column" => "claim_amount"],
+        ["excel_column" => "Total Billed Amount", "db_column" => "total_billed_amount"],
+
+        ["excel_column" => "Claim Consultation Charges", "db_column" => "claim_consultation_charges"],
+        ["excel_column" => "Claim Investigation Charges", "db_column" => "claim_investigation_charges"],
+        ["excel_column" => "Claim Medicines", "db_column" => "claim_medicines"],
+        ["excel_column" => "Claim Nursing", "db_column" => "claim_nursing"],
+        ["excel_column" => "Claim Room Charges", "db_column" => "claim_room_charges"],
+        ["excel_column" => "Claim Icu Charges", "db_column" => "claim_icu_charges"],
+        ["excel_column" => "Claim Stay Charges", "db_column" => "claim_stay_charges"],
+        ["excel_column" => "Claim Surgeon Charges", "db_column" => "claim_surgeon_charges"],
+        ["excel_column" => "Claim Surgery Charges", "db_column" => "claim_surgery_charges"],
+        ["excel_column" => "Claim Miscellaneous Charges", "db_column" => "claim_miscellaneous_charges"],
+        ["excel_column" => "Claim Other Charges", "db_column" => "claim_other_charges"],
+
+        ["excel_column" => "Approved Consultation Charges", "db_column" => "approved_consultation_charges"],
+        ["excel_column" => "Approved Investigation Charges", "db_column" => "approved_investigation_charges"],
+        ["excel_column" => "Approved Medicines", "db_column" => "approved_medicines"],
+        ["excel_column" => "Approved Nursing", "db_column" => "approved_nursing"],
+        ["excel_column" => "Approved Room Charges", "db_column" => "approved_room_charges"],
+        ["excel_column" => "Approved Icu Charges", "db_column" => "approved_icu_charges"],
+        ["excel_column" => "Approved Stay Charges", "db_column" => "approved_stay_charges"],
+        ["excel_column" => "Approved Surgeon Charges", "db_column" => "approved_surgeon_charges"],
+        ["excel_column" => "Approved Surgery Charges", "db_column" => "approved_surgery_charges"],
+        ["excel_column" => "Approved Miscellaneous Charges", "db_column" => "approved_miscellaneous_charges"],
+        ["excel_column" => "Approved Others Charges", "db_column" => "approved_others_charges"],
+
+        ["excel_column" => "Total Disallowed Amount", "db_column" => "total_disallowed_amount"],
+        ["excel_column" => "Copayment Amount", "db_column" => "copayment_amount"],
+        ["excel_column" => "Deposit Amount", "db_column" => "deposit_amount"],
+
+        ["excel_column" => "Exceeds Policy Limit", "db_column" => "exceeds_policy_limit"],
+        ["excel_column" => "Copay Buffer", "db_column" => "copay_buffer"],
+        ["excel_column" => "Hospital Discount Amount", "db_column" => "hospital_discount_amount"],
+        ["excel_column" => "Deductible Amount", "db_column" => "deductible_amount"],
+
+        ["excel_column" => "Approved Amount", "db_column" => "approved_amount"],
+        ["excel_column" => "Total Incurred Amount", "db_column" => "total_incurred_amount"],
+        ["excel_column" => "Total Buffer Approved", "db_column" => "total_buffer_approved"],
+        ["excel_column" => "Total Buffer Utlilized", "db_column" => "total_buffer_utilized"],
+
+        ["excel_column" => "TDS Amount", "db_column" => "tds_amount"],
+        ["excel_column" => "Net Amount", "db_column" => "net_amount"],
+
+        ["excel_column" => "Claim Decision date", "db_column" => "claim_decision_date"],
+        ["excel_column" => "Payment Reference Number", "db_column" => "payment_reference_number"],
+        ["excel_column" => "Payment Reference Date", "db_column" => "payment_reference_date"],
+
+        ["excel_column" => "Claim Status", "db_column" => "claim_status"],
+        ["excel_column" => "Deduction Remarks", "db_column" => "deduction_remarks"],
+        ["excel_column" => "Rejection Reasons", "db_column" => "rejection_reasons"],
+        ["excel_column" => "Claim Query Reasons", "db_column" => "claim_query_reasons"],
+
+        ["excel_column" => "Insurer Request Sent date", "db_column" => "insurer_request_sent_date"],
+        ["excel_column" => "Insurer Conf. Received date", "db_column" => "insurer_conf_received_date"],
+        ["excel_column" => "Claim Reopen Date", "db_column" => "claim_reopen_date"],
+
+        ["excel_column" => "First Query Raised date", "db_column" => "first_query_raised_date"],
+        ["excel_column" => "First Query response date", "db_column" => "first_query_response_date"],
+        ["excel_column" => "Last Query Raised date", "db_column" => "last_query_raised_date"],
+        ["excel_column" => "Last Query response date", "db_column" => "last_query_response_date"],
+        ["excel_column" => "Last Document Received date", "db_column" => "last_document_received_date"],
+    ];
+
+    protected $mapping = [
+
+        ["excel_column" => ["col_name" => "TPA Policy Number", "col_index" => 0], "db_column" => "tpa_policy_number"],
+        ["excel_column" => ["col_name" => "Insurer Policy Number", "col_index" => 1], "db_column" => "insurer_policy_number"],
+        ["excel_column" => ["col_name" => "Corporate Name", "col_index" => 2], "db_column" => "corporate_name"],
+        ["excel_column" => ["col_name" => "Proposer Name", "col_index" => 3], "db_column" => "proposer_name"],
+        ["excel_column" => ["col_name" => "Corporate Group ID", "col_index" => 4], "db_column" => "corporate_group_id"],
+
+        ["excel_column" => ["col_name" => "Policy Start Date", "col_index" => 5], "db_column" => "policy_start_date"],
+        ["excel_column" => ["col_name" => "Policy End date", "col_index" => 6], "db_column" => "policy_end_date"],
+
+        ["excel_column" => ["col_name" => "Insurance Company Name", "col_index" => 7], "db_column" => "insurance_company_name"],
+
+        ["excel_column" => ["col_name" => "Employee Number", "col_index" => 8], "db_column" => "employee_number"],
+        ["excel_column" => ["col_name" => "Employee Location", "col_index" => 9], "db_column" => "employee_location"],
+
+        ["excel_column" => ["col_name" => "Primary Policy Holder Name", "col_index" => 10], "db_column" => "primary_policy_holder_name"],
+        ["excel_column" => ["col_name" => "Primary Policy Holder Card ID", "col_index" => 11], "db_column" => "primary_policy_holder_card_id"],
+
+        ["excel_column" => ["col_name" => "Employee Grade", "col_index" => 12], "db_column" => "employee_grade"],
+
+        ["excel_column" => ["col_name" => "Patient Health Card ID", "col_index" => 13], "db_column" => "patient_health_card_id"],
+        ["excel_column" => ["col_name" => "Patient Name", "col_index" => 14], "db_column" => "patient_name"],
+        ["excel_column" => ["col_name" => "Date of Birth", "col_index" => 15], "db_column" => "date_of_birth"],
+        ["excel_column" => ["col_name" => "Age", "col_index" => 16], "db_column" => "age"],
+        ["excel_column" => ["col_name" => "Gender", "col_index" => 17], "db_column" => "gender"],
+        ["excel_column" => ["col_name" => "Relation", "col_index" => 18], "db_column" => "relation"],
+
+        ["excel_column" => ["col_name" => "Sum Insured", "col_index" => 19], "db_column" => "sum_insured"],
+        ["excel_column" => ["col_name" => "Balance Sum Insured", "col_index" => 20], "db_column" => "balance_sum_insured"],
+        ["excel_column" => ["col_name" => "Top Up Sum Insured", "col_index" => 21], "db_column" => "top_up_sum_insured"],
+
+        ["excel_column" => ["col_name" => "Enrollment status", "col_index" => 22], "db_column" => "enrollment_status"],
+
+        ["excel_column" => ["col_name" => "Policy Inception date", "col_index" => 23], "db_column" => "policy_inception_date"],
+        ["excel_column" => ["col_name" => "Policy Exit Date", "col_index" => 24], "db_column" => "policy_exit_date"],
+
+        ["excel_column" => ["col_name" => "Insurer Risk ID", "col_index" => 25], "db_column" => "insurer_risk_id"],
+
+        ["excel_column" => ["col_name" => "Claim Preauth Identifier", "col_index" => 26], "db_column" => "claim_preauth_identifier"],
+        ["excel_column" => ["col_name" => "TPA Claim Number", "col_index" => 27], "db_column" => "tpa_claim_number"],
+        ["excel_column" => ["col_name" => "Preauth Number", "col_index" => 28], "db_column" => "preauth_number"],
+        ["excel_column" => ["col_name" => "Insurer Claim Number", "col_index" => 29], "db_column" => "insurer_claim_number"],
+
+        ["excel_column" => ["col_name" => "Claim Received date", "col_index" => 30], "db_column" => "claim_received_date"],
+        ["excel_column" => ["col_name" => "Date of Admission", "col_index" => 31], "db_column" => "date_of_admission"],
+        ["excel_column" => ["col_name" => "Date of Discharge", "col_index" => 32], "db_column" => "date_of_discharge"],
+
+        ["excel_column" => ["col_name" => "Hospital Name", "col_index" => 33], "db_column" => "hospital_name"],
+        ["excel_column" => ["col_name" => "Hospital ID", "col_index" => 34], "db_column" => "hospital_id"],
+        ["excel_column" => ["col_name" => "Hospital Address", "col_index" => 35], "db_column" => "hospital_address"],
+        ["excel_column" => ["col_name" => "Hospital City", "col_index" => 36], "db_column" => "hospital_city"],
+        ["excel_column" => ["col_name" => "Hospital State", "col_index" => 37], "db_column" => "hospital_state"],
+        ["excel_column" => ["col_name" => "Hospital Pincode", "col_index" => 38], "db_column" => "hospital_pincode"],
+        ["excel_column" => ["col_name" => "Hospital Network status", "col_index" => 39], "db_column" => "hospital_network_status"],
+        ["excel_column" => ["col_name" => "PPN Hospital Status", "col_index" => 40], "db_column" => "ppn_hospital_status"],
+
+        ["excel_column" => ["col_name" => "Room Category", "col_index" => 41], "db_column" => "room_category"],
+        ["excel_column" => ["col_name" => "Room Days", "col_index" => 42], "db_column" => "room_days"],
+        ["excel_column" => ["col_name" => "ICU Days", "col_index" => 43], "db_column" => "icu_days"],
+
+        ["excel_column" => ["col_name" => "Medical Surgical Identifier", "col_index" => 44], "db_column" => "medical_surgical_identifier"],
+        ["excel_column" => ["col_name" => "Treatment Type of AYUSH", "col_index" => 45], "db_column" => "treatment_type_of_ayush"],
+        ["excel_column" => ["col_name" => "Package", "col_index" => 46], "db_column" => "package"],
+
+        ["excel_column" => ["col_name" => "Diagnosis", "col_index" => 47], "db_column" => "diagnosis"],
+        ["excel_column" => ["col_name" => "Illness Details", "col_index" => 48], "db_column" => "illness_details"],
+        ["excel_column" => ["col_name" => "Ailment Grouping", "col_index" => 49], "db_column" => "ailment_grouping"],
+
+        ["excel_column" => ["col_name" => "Primary ICD Code", "col_index" => 50], "db_column" => "primary_icd_code"],
+        ["excel_column" => ["col_name" => "Secondary ICD Code", "col_index" => 51], "db_column" => "secondary_icd_code"],
+
+        ["excel_column" => ["col_name" => "Procedure Code", "col_index" => 52], "db_column" => "procedure_code"],
+        ["excel_column" => ["col_name" => "Procedure Description", "col_index" => 53], "db_column" => "procedure_description"],
+        ["excel_column" => ["col_name" => "Procedure Grouping", "col_index" => 54], "db_column" => "procedure_grouping"],
+
+        ["excel_column" => ["col_name" => "Claim Submission mode", "col_index" => 55], "db_column" => "claim_submission_mode"],
+        ["excel_column" => ["col_name" => "Admission Category", "col_index" => 56], "db_column" => "admission_category"],
+        ["excel_column" => ["col_name" => "Type of Claim", "col_index" => 57], "db_column" => "type_of_claim"],
+        ["excel_column" => ["col_name" => "MainClaim_Prepost type", "col_index" => 58], "db_column" => "mainclaim_prepost_type"],
+        ["excel_column" => ["col_name" => "Type of Hospitalization", "col_index" => 59], "db_column" => "type_of_hospitalization"],
+        ["excel_column" => ["col_name" => "Death Status", "col_index" => 60], "db_column" => "death_status"],
+        ["excel_column" => ["col_name" => "Treatement Given", "col_index" => 61], "db_column" => "treatment_given"],
+
+        ["excel_column" => ["col_name" => "Claim Amount", "col_index" => 62], "db_column" => "claim_amount"],
+        ["excel_column" => ["col_name" => "Total Billed Amount", "col_index" => 63], "db_column" => "total_billed_amount"],
+
+        ["excel_column" => ["col_name" => "Claim Consultation Charges", "col_index" => 64], "db_column" => "claim_consultation_charges"],
+        ["excel_column" => ["col_name" => "Claim Investigation Charges", "col_index" => 65], "db_column" => "claim_investigation_charges"],
+        ["excel_column" => ["col_name" => "Claim Medicines", "col_index" => 66], "db_column" => "claim_medicines"],
+        ["excel_column" => ["col_name" => "Claim Nursing", "col_index" => 67], "db_column" => "claim_nursing"],
+        ["excel_column" => ["col_name" => "Claim Room Charges", "col_index" => 68], "db_column" => "claim_room_charges"],
+        ["excel_column" => ["col_name" => "Claim Icu Charges", "col_index" => 69], "db_column" => "claim_icu_charges"],
+        ["excel_column" => ["col_name" => "Claim Stay Charges", "col_index" => 70], "db_column" => "claim_stay_charges"],
+        ["excel_column" => ["col_name" => "Claim Surgeon Charges", "col_index" => 71], "db_column" => "claim_surgeon_charges"],
+        ["excel_column" => ["col_name" => "Claim Surgery Charges", "col_index" => 72], "db_column" => "claim_surgery_charges"],
+        ["excel_column" => ["col_name" => "Claim Miscellaneous Charges", "col_index" => 73], "db_column" => "claim_miscellaneous_charges"],
+        ["excel_column" => ["col_name" => "Claim Other Charges", "col_index" => 74], "db_column" => "claim_other_charges"],
+
+        ["excel_column" => ["col_name" => "Approved Consultation Charges", "col_index" => 75], "db_column" => "approved_consultation_charges"],
+        ["excel_column" => ["col_name" => "Approved Investigation Charges", "col_index" => 76], "db_column" => "approved_investigation_charges"],
+        ["excel_column" => ["col_name" => "Approved Medicines", "col_index" => 77], "db_column" => "approved_medicines"],
+        ["excel_column" => ["col_name" => "Approved Nursing", "col_index" => 78], "db_column" => "approved_nursing"],
+        ["excel_column" => ["col_name" => "Approved Room Charges", "col_index" => 79], "db_column" => "approved_room_charges"],
+        ["excel_column" => ["col_name" => "Approved Icu Charges", "col_index" => 80], "db_column" => "approved_icu_charges"],
+        ["excel_column" => ["col_name" => "Approved Stay Charges", "col_index" => 81], "db_column" => "approved_stay_charges"],
+        ["excel_column" => ["col_name" => "Approved Surgeon Charges", "col_index" => 82], "db_column" => "approved_surgeon_charges"],
+        ["excel_column" => ["col_name" => "Approved Surgery Charges", "col_index" => 83], "db_column" => "approved_surgery_charges"],
+        ["excel_column" => ["col_name" => "Approved Miscellaneous Charges", "col_index" => 84], "db_column" => "approved_miscellaneous_charges"],
+        ["excel_column" => ["col_name" => "Approved Others Charges", "col_index" => 85], "db_column" => "approved_others_charges"],
+
+        ["excel_column" => ["col_name" => "Total Disallowed Amount", "col_index" => 86], "db_column" => "total_disallowed_amount"],
+        ["excel_column" => ["col_name" => "Copayment Amount", "col_index" => 87], "db_column" => "copayment_amount"],
+        ["excel_column" => ["col_name" => "Deposit Amount", "col_index" => 88], "db_column" => "deposit_amount"],
+
+        ["excel_column" => ["col_name" => "Exceeds Policy Limit", "col_index" => 89], "db_column" => "exceeds_policy_limit"],
+        ["excel_column" => ["col_name" => "Copay Buffer", "col_index" => 90], "db_column" => "copay_buffer"],
+        ["excel_column" => ["col_name" => "Hospital Discount Amount", "col_index" => 91], "db_column" => "hospital_discount_amount"],
+        ["excel_column" => ["col_name" => "Deductible Amount", "col_index" => 92], "db_column" => "deductible_amount"],
+
+        ["excel_column" => ["col_name" => "Approved Amount", "col_index" => 93], "db_column" => "approved_amount"],
+        ["excel_column" => ["col_name" => "Total Incurred Amount", "col_index" => 94], "db_column" => "total_incurred_amount"],
+        ["excel_column" => ["col_name" => "Total Buffer Approved", "col_index" => 95], "db_column" => "total_buffer_approved"],
+        ["excel_column" => ["col_name" => "Total Buffer Utlilized", "col_index" => 96], "db_column" => "total_buffer_utilized"],
+
+        ["excel_column" => ["col_name" => "TDS Amount", "col_index" => 97], "db_column" => "tds_amount"],
+        ["excel_column" => ["col_name" => "Net Amount", "col_index" => 98], "db_column" => "net_amount"],
+
+        ["excel_column" => ["col_name" => "Claim Decision date", "col_index" => 99], "db_column" => "claim_decision_date"],
+        ["excel_column" => ["col_name" => "Payment Reference Number", "col_index" => 100], "db_column" => "payment_reference_number"],
+        ["excel_column" => ["col_name" => "Payment Reference Date", "col_index" => 101], "db_column" => "payment_reference_date"],
+
+        ["excel_column" => ["col_name" => "Claim Status", "col_index" => 102], "db_column" => "claim_status"],
+        ["excel_column" => ["col_name" => "Deduction Remarks", "col_index" => 103], "db_column" => "deduction_remarks"],
+        ["excel_column" => ["col_name" => "Rejection Reasons", "col_index" => 104], "db_column" => "rejection_reasons"],
+        ["excel_column" => ["col_name" => "Claim Query Reasons", "col_index" => 105], "db_column" => "claim_query_reasons"],
+
+        ["excel_column" => ["col_name" => "Insurer Request Sent date", "col_index" => 106], "db_column" => "insurer_request_sent_date"],
+        ["excel_column" => ["col_name" => "Insurer Conf. Received date", "col_index" => 107], "db_column" => "insurer_conf_received_date"],
+        ["excel_column" => ["col_name" => "Claim Reopen Date", "col_index" => 108], "db_column" => "claim_reopen_date"],
+
+        ["excel_column" => ["col_name" => "First Query Raised date", "col_index" => 109], "db_column" => "first_query_raised_date"],
+        ["excel_column" => ["col_name" => "First Query response date", "col_index" => 110], "db_column" => "first_query_response_date"],
+        ["excel_column" => ["col_name" => "Last Query Raised date", "col_index" => 111], "db_column" => "last_query_raised_date"],
+        ["excel_column" => ["col_name" => "Last Query response date", "col_index" => 112], "db_column" => "last_query_response_date"],
+        ["excel_column" => ["col_name" => "Last Document Received date", "col_index" => 113], "db_column" => "last_document_received_date"],
+    ];
+
+    protected $ticketMasterMapping = [
+
+        // Policy / Claim identifiers
+        'insurer_claim_number'     => 'claim_number',
+        'tpa_claim_number'         => 'tpa_claim_id',
+
+        // Employee / Insured details
+        'employee_number'          => 'emp_code',
+        'primary_policy_holder_name' => 'emp_name',
+        'patient_name'             => 'insured_name',
+
+        // Dates
+        'date_of_admission'        => 'doa',
+        'date_of_discharge'        => 'dod',
+        'date_of_birth'            => 'dob',
+        'claim_received_date'      => 'registration_date',
+
+        // Claim details
+        'claim_amount'             => 'claim_amount',
+        'approved_amount'          => 'approved_amount',
+        'sum_insured'              => 'si_amt',
+        'claim_status'             => 'tpa_claim_status',
+
+        // Hospital details
+        'hospital_name'            => 'hospital_name',
+        'hospital_address'         => 'hospital_address',
+        'hospital_city'            => 'hospital_city',
+        'hospital_state'           => 'hospital_state',
+        'hospital_pincode'         => 'hospital_pin_code',
+
+        // Meta
+        'file_id'                  => 'file_id',
+        'type_of_claim'            => 'tpa_claim_type',
+        'diagnosis'                => 'tpa_ailments',
+
+    ];
+
+    protected $statusMapping = [
+        'CL Paid with Settlement Letter' => 11,
+        'CL Rejected' => 8,
+        'CL Approved' => 9,
+        'AL Closed' => 12,
+    ];
+
+
+    /**
+     * ABSTRACT FUNCTIONs 
+     */
+    public function bulkInsertTPATable(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_vidal');
+        return $builder->insertBatch($data);
+
+    }
+
+
+    public function importClaimMaster(array $data): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $ticketMasterModel = new TicketMasterModel();
+        return $ticketMasterModel->insertBatch($data);
+    }
+
+
+    public function updateTicketIdInTPATable(): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_vidal');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    public function updateTicketMasterRejectedReasonInTPATable($data): bool
+    {   
+        if (empty($data)) {
+            return false;
+        }
+        
+        $builder = $this->db->table('claims_dump_vidal');
+        return $builder->updateBatch($data, 'id');
+    }
+
+
+    /**
+     * MAPPING FUNCTIONs 
+     */
+
+    public function mapTPAData(array $rows, $file_id): array
+    {   
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $mapped = [];
+
+        foreach ($rows as $row) {
+
+            $item = [];
+
+            foreach ($this->mapping as $map) {
+                $excelColumn = $map['excel_column']['col_name'];
+                $dbColumn    = $map['db_column'];
+
+                $value = $row[$excelColumn] ?? null;
+
+                if ($this->isDateValue($value)) {
+                    $value = $this->normalizeDate($value);
+                }
+
+                $item[$dbColumn] = $value;
+            }
+
+            $params = [
+                'date_of_admission' => change_date_format($item['date_of_admission'] ?? '') ?? null,
+                'employee_number' => $item['employee_number'] ?? null,
+                'claim_amount' => $item['claim_amount'] ?? null,
+                'primary_policy_holder_card_id' => $item['primary_policy_holder_card_id'] ?? null
+            ];
+
+            $is_duplicate = $this->checkDuplicateTpaClaim('claims_dump_vidal', $params);
+
+            if ($is_duplicate) {
+                $item = [];
+                continue;
+            }
+
+            $item['file_id'] = $file_id ?? null;
+            $item['client_id'] = $file_data['client_id'] ?? null;
+            $item['client_policy_id'] = $file_data['client_policy_id'] ?? null;
+            $item['created_by'] = $file_data['created_by'] ?? null;
+
+            $mapped[] = $item;
+        }
+
+        return $mapped;
+    }
+
+    public function mapClaimMasterData($file_id): array
+    {
+
+        $ClientPolicyModel = new ClaimDumpFileModel();
+        $file_data = $ClientPolicyModel->where('id', $file_id)->first();
+
+        $tpaClaimDumpData = $this->getTpaClaimDumpData('claims_dump_vidal', ['file_id' => $file_id]);
+
+        if (empty($tpaClaimDumpData)) {
+            return ['status' => false, 'message' => "No data to insert in TICKET MASTER"];
+        }
+
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel
+            ->select("
+                client_policy.*,
+                (
+                    SELECT id
+                    FROM client_rm
+                    WHERE is_active = 1
+                    AND level = 3
+                    AND client_id = client_policy.client_id
+                    ORDER BY id ASC
+                    LIMIT 1
+                ) AS acm_id
+            ")
+            ->where('client_policy.id', $file_data['client_policy_id'])
+            ->where('client_policy.is_active', 1)
+            ->first();
+
+        try {
+
+            $mapped = [];
+            $rejecetd_reason = [];
+
+            foreach ($tpaClaimDumpData as $row) {
+
+                $params = [
+                    'doa' => change_date_format($row['date_of_admission'] ?? '') ?? null,
+                    'emp_code' => $row['employee_number'] ?? null,
+                    'claim_amount' => $row['claim_amount'] ?? null,
+                    'tpa_no' => $row['primary_policy_holder_card_id'] ?? null
+                ];
+
+                $isduplicate = $this->checkDublicateTicketMasterClaim($params);
+
+                if ($isduplicate) {
+                    $reason = "This claim already exists in our system.";
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item = [];
+
+                $item['client_id']    = $client_policy_data['client_id'] ?? null;
+                $item['client_policy_id'] = $client_policy_data['id'] ?? null;
+                $item['insurer_id']  = $client_policy_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
+                $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
+                $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relation'] ?? null, $row['gender'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['employee_number'], $item['relationship']);
+
+                if (!empty($employee_data)) {
+                    $item['emp_id']    = $employee_data['id'] ?? null;
+                    $item['emp_name'] = $employee_data['name'] ?? null;
+                    $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
+                    $item['emp_code'] = $employee_data['emp_code'] ?? null;
+                    $item['emp_mobile']  = $employee_data['mobile'] ?? null;
+                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                } else {
+
+                    $reason = 'This employee not exist in our system.';
+                    $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                    continue;
+                }
+
+                foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                    $item[$ticketMasterKey] = array_key_exists($tpaKey, $row) ? $row[$tpaKey] : null;
+                }
+
+                // Meta fields
+                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['file_id']    = $file_id;
+                $item['claim_dump_ref_id']    = $row['id'];
+                $item['created_by'] = $file_data['created_by'] ?? null;
+                $item['claim_type'] = isset($row['mainclaim_prepost_type']) && !empty($row['mainclaim_prepost_type']) && strtolower($row['mainclaim_prepost_type']) == 'normal' ? 1 : 3;
+                $item['priority']           = 1;
+                $item['mode_of_intimation'] = 5;
+                $item['ticket_type_id']     = 1;
+
+                $mapped[] = $item;
+            }
+
+            return ['status' => true, 'mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+            
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            return ['status' => false, "message" => $errorData['message'], 'error_data' => $errorData];
+        }
+    }
+
+    public function mapClaimMasterDataOld($file_id): array
+    {
+
+        $tpaClaimDumpData = $this->db
+            ->table('claims_dump_vidal')
+            ->where('is_active', 1)
+            ->where('file_id', $file_id)
+            ->where('ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($tpaClaimDumpData)) {
+            return [];
+        }
+
+        $ClientPolicyModel = new ClientPolicyModel();
+        $client_policy_data = $ClientPolicyModel->where('is_active', 1)->findAll();
+
+        $mapped = [];
+        $rejecetd_reason = [];
+
+        foreach ($tpaClaimDumpData as $row) {
+
+            $item = [];
+
+            if(isset($row['insurer_policy_number']) && !empty($row['insurer_policy_number'])){
+
+                $basic_claim_data = $this->getClientPolicyDataBypolicyNo($client_policy_data, $row['insurer_policy_number']);
+                if(empty($basic_claim_data)){
+                    $reason = " This policy no ( " . $row['insurer_policy_number'] ." ) does not exist in our system";
+                    $rejecetd_reason[$row['id']] = ["ticket_master_insert_reject_reason" => $reason];
+                    continue;
+                }
+
+                $item['client_id']    = $basic_claim_data['client_id'] ?? null;
+                $item['client_policy_id'] = $basic_claim_data['id'] ?? null;
+                $item['insurer_id']  = $basic_claim_data['insurer_id'] ?? null;
+                $item['tpa_id']  = $basic_claim_data['tpa_id'] ?? null;
+                $item['acm_id']  = $basic_claim_data['acm_id'] ?? null;
+                $item['policy_no']  = $basic_claim_data['policy_no'] ?? null;
+                $item['relationship']  = $this->convertRelation($row['relation'] ?? null, $row['gender'] ?? null);
+
+                $employee_data = $this->getEmployeeDetails($item['client_id'], $item['client_policy_id'], $row['employee_number'], $item['relationship']);
+                if(!empty($employee_data)){
+                    $item['emp_id']    = $employee_data['client_id'] ?? null;
+                    $item['emp_name'] = $employee_data['id'] ?? null;
+                    $item['emp_mail']  = $employee_data['insurer_id'] ?? null;
+                    $item['emp_mobile']  = $employee_data['tpa_id'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
+                }else{
+                    $reason = " This policy no ( " . $row['insurer_policy_number'] ." ) does not exist in our system";
+                    $rejecetd_reason[$row['id']] = ["ticket_master_insert_reject_reason" => $reason];
+                    continue;
+                }
+
+            }else{
+                $reason = " Policy Number is empty";
+                $rejecetd_reason[$row['id']] = ["ticket_master_insert_reject_reason" => $reason];
+                continue;
+            }
+
+            foreach ($this->ticketMasterMapping as $tpaKey => $ticketMasterKey) {
+                $item[$ticketMasterKey] = array_key_exists($tpaKey, $row)
+                    ? $row[$tpaKey]
+                    : null;
+            }
+
+            $isduplicate = checkDuplicateClaim([
+                'doa' => change_date_format($item['doa'] ?? '') ?? null, 
+                'emp_code' => $item['emp_code'] ?? null, 
+                'claim_amount' => $item['claim_amount'] ?? null, 
+                'policy_no' => $item['policy_no'] ?? null
+            ]);
+
+            if($isduplicate){
+                $reason = " This claim ( " . $row['insurer_policy_number'] ." ) does not exist in our system";
+                $rejecetd_reason[$row['id']] = ["ticket_master_insert_reject_reason" => $reason];
+                continue;
+            }
+
+            // Meta fields
+            $item['file_id']    = $file_id;
+            $item['created_by'] = get_session_userid() ?? null;
+            $item['claim_type'] = isset($row['mainclaim_prepost_type']) && !empty($row['mainclaim_prepost_type']) && strtolower($row['mainclaim_prepost_type']) == 'normal' ? 1 : 3;
+            
+            $mapped[] = $item;
+            
+        }
+
+        return ['mapped_array' => $mapped, 'rejected_reason_array' => $rejecetd_reason];
+    }
+
+
+    /**
+     * HELPER FUNCTIONs 
+     */
+
+    public function isDateValue($value): bool
+    {
+        if (empty($value)) {
+            return false;
+        }
+
+        // Excel numeric date (e.g. 44927)
+        if (is_numeric($value) && $value > 30000) {
+            return true;
+        }
+
+        // Common date formats
+        return preg_match(
+            '/^\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}$|^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/',
+            (string) $value
+        ) === 1;
+    }
+
+
+    public function normalizeDate($value): ?string
+    {
+        try {
+            // Excel numeric date
+            if (is_numeric($value)) {
+                return date('Y-m-d', \PhpOffice\PhpSpreadsheet\Shared\Date::excelToTimestamp($value));
+            }
+
+            // String date
+            return date('Y-m-d', strtotime(str_replace('/', '-', $value)));
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+
+    public function looksLikeDate($value): bool
+    {
+        if (empty($value)) {
+            return false;
+        }
+
+        // Excel numeric date
+        if (is_numeric($value) && $value > 30000) {
+            return true;
+        }
+
+        return preg_match(
+            '/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}|
+         \d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}|
+         \d{1,2}\s?[A-Za-z]{3,}\s?\d{2,4}|
+         \d{8}/x',
+            (string) $value
+        ) === 1;
+    }
+
+
+    public function convertRelation(string $relation, string $gender): ?string
+    {
+        if (empty($relation)) {
+            return null;
+        }
+
+        $relation = strtolower($relation);
+        $gender = strtolower($gender);
+
+        if ($relation == 'self') {
+            return $relation;
+        }
+
+        if ($relation == 'spouse') {
+            return $relation;
+        }
+
+        if ($relation == 'child' && $gender == 'male') {
+            return 'son';
+        }
+
+        if ($relation == 'child' && $gender == 'female') {
+            return 'daughter';
+        }
+
+        if ($relation == 'parents' && $gender == 'male') {
+            return 'father';
+        }
+
+        if ($relation == 'parents' && $gender == 'female') {
+            return 'mother';
+        }
+
+        if ($relation == 'parents-in-law' && $gender == 'male') {
+            return 'father-in-law';
+        }
+
+        if ($relation == 'parents-in-law' && $gender == 'female') {
+            return 'mother-in-law';
+        }
+
+        return null;
+    }
+
+
+    public function getClientPolicyDataBypolicyNo(array $client_policy_data, string $policy_number): array
+    {   
+        $matched_data = [];
+        foreach ($client_policy_data as $key => $value) {
+            if(trim($value) == trim($policy_number)){
+                $matched_data = $value;
+            }
+        }
+
+        if(!empty($matched_data)){
+            $ClientRMModel = new ClientRMModel();
+           $acm_data = $ClientRMModel->where('is_active', 1)->where('level', 3)->where('client_id', $matched_data['client_id'])->orderBy('id', 'asc')->first();
+            if(!empty($acm_data)){
+                $matched_data['acm_id'] = $acm_data['id'] ?? null;
+            }
+        }
+
+        return  $matched_data;
+    }
+
+}
diff --git a/app/Libraries/TpaClaimsImportFactory.php b/app/Libraries/TpaClaimsImportFactory.php
new file mode 100644
index 00000000..baeef074
--- /dev/null
+++ b/app/Libraries/TpaClaimsImportFactory.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Libraries;
+
+use App\Libraries\TPAClaimsImportServices\BaseTpaClaimImportService;
+use App\Libraries\TPAClaimsImportServices\VidalClaimImportService;
+use App\Libraries\TPAClaimsImportServices\AbhiClaimImportService;
+use App\Libraries\TPAClaimsImportServices\FhplClaimImportService;
+use App\Libraries\TPAClaimsImportServices\MediAssistClaimImportService;
+use App\Libraries\TPAClaimsImportServices\RcareClaimImportService;
+use App\Libraries\TPAClaimsImportServices\IciciClaimImportService;
+use InvalidArgumentException;
+
+class TpaClaimsImportFactory
+{
+    /**
+     * Resolve TPA Import Service based on TPA ID
+     *
+     * @param int $tpaId
+     * @return BaseTpaClaimImportService
+     */
+    public static function make(int $tpaId): BaseTpaClaimImportService
+    {
+        return match ($tpaId) {
+            
+            (int) env('VIDAL_PRIMARY_KEY_CONSTANT') => new VidalClaimImportService(),
+            (int) env('ABHI_PRIMARY_KEY_CONSTANT') => new AbhiClaimImportService(),
+            (int) env('MEDI_ASSIST_PRIMARY_KEY_CONSTANT') => new MediAssistClaimImportService(),
+            (int) env('FHPL_PRIMARY_KEY_CONSTANT') => new FhplClaimImportService(),
+            (int) env('R_CARE_PRIMARY_KEY_CONSTANT') => new RcareClaimImportService(),
+            (int) env('ICICI_PRIMARY_KEY_CONSTANT') => new IciciClaimImportService(),
+            default => throw new InvalidArgumentException(
+                "Unsupported TPA ID: {$tpaId}"
+            ),
+        };
+    }
+}
diff --git a/app/Libraries/ZipService.php b/app/Libraries/ZipService.php
new file mode 100644
index 00000000..42030ffc
--- /dev/null
+++ b/app/Libraries/ZipService.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Libraries;
+
+use ZipArchive;
+
+class ZipService
+{
+    protected $s3Service;
+
+    public function __construct()
+    {
+        $this->s3Service = new S3Service();
+    }
+
+    /**
+     * Zips a local folder and uploads it to S3
+     */
+    public function zipAndUploadS3(string $localFolderPath, string $s3Folder = '', string $zipName = ''): array
+    {   
+        // dd($localFolderPath, $s3Folder, $zipName);
+        if (!is_dir($localFolderPath)) {
+            return ['status' => false, 'message' => 'Local directory does not exist'];
+        }
+
+        // 1. Prepare naming
+        $folderName = basename($localFolderPath);
+        $zipName = $zipName ?: $folderName . '_' . time() . '.zip';
+        $tempZipPath = FCPATH . 'tmp/' . $zipName;
+
+        // 2. Create the Local Zip
+        $zipResult = $this->createLocalZip($localFolderPath, $tempZipPath);
+
+        if (!$zipResult['status']) {
+            return $zipResult;
+        }
+
+        try {
+
+            // 3. Upload to S3
+            $uploadResult = $this->s3Service->upload($tempZipPath, $s3Folder, $zipName);
+            // dd($uploadResult);
+
+            // 4. Cleanup
+            if (file_exists($tempZipPath)) {
+                unlink($tempZipPath);
+            }
+
+            $get_presinged_url = $this->s3Service->getPresignedUrl($uploadResult['key'], 2,880);
+
+            // To delete the original temprory folder after zipping and uploading
+            // $this->deleteDirectory($localFolderPath);
+
+            return ['status' => true, 'data' => $uploadResult, 'presigned_url' => $get_presinged_url];
+
+        } catch (\Exception $e) {
+            log_message('error', 'Zip/Upload Error: ' . $e->getMessage());
+            return ['status' => false, 'message' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * Zips a local folder using native ZipArchive
+     */
+
+    public function createLocalZip(string $localFolderPath, string $destinationPath): array
+    {
+        // 1. Validate Source Directory
+        if (!is_dir($localFolderPath)) {
+            return ['status' => false, 'message' => 'Source directory does not exist'];
+        }
+
+        // 2. Check if folder is empty (ignoring hidden files)
+        $filesInFolder = array_diff(scandir($localFolderPath), array('.', '..'));
+        if (empty($filesInFolder)) {
+            return ['status' => false, 'message' => 'No records found to compress'];
+        }
+
+        // 3. Ensure the destination directory exists and is writable
+        $destDir = dirname($destinationPath);
+        if (!is_dir($destDir)) {
+            mkdir($destDir, 0777, true);
+        }
+
+        $zip = new ZipArchive();
+
+        // 4. Open the zip file
+        $openZip = $zip->open($destinationPath, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+        if ($openZip !== true) {
+            return ['status' => false, 'message' => "Could not open Zip. Error code: " . $openZip];
+        }
+
+        try {
+            $files = new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($localFolderPath, \RecursiveDirectoryIterator::SKIP_DOTS),
+                \RecursiveIteratorIterator::LEAVES_ONLY
+            );
+            
+            $fileCount = 0;
+            $sourcePath = realpath($localFolderPath);
+
+            foreach ($files as $file) {
+                if (!$file->isDir()) {
+                    $filePath = $file->getRealPath();
+                    
+                    // Calculate relative path correctly
+                    $relativePath = ltrim(substr($filePath, strlen($sourcePath)), DIRECTORY_SEPARATOR);
+                    
+                    // Add to zip
+                    if ($zip->addFile($filePath, $relativePath)) {
+                        $fileCount++;
+                    }
+                }
+            }
+
+            // 5. Finalize
+            if ($fileCount > 0) {
+                if (!$zip->close()) {
+                    return ['status' => false, 'message' => 'Failed to write ZIP file to disk (Check permissions/space)'];
+                }
+            } else {
+                $zip->close();
+                return ['status' => false, 'message' => 'No files were added to the archive'];
+            }
+
+            return [
+                'status' => true,
+                'path'    => $destinationPath,
+                'count'   => $fileCount,
+                'message' => 'Zip created successfully'
+            ];
+
+        } catch (\Exception $e) {
+            // Only attempt to close if the zip object was successfully opened
+            if (isset($zip->status) && $zip->status !== ZipArchive::ER_OK) {
+                @$zip->close(); 
+            }
+            log_message('error', 'Local Zip Error: ' . $e->getMessage());
+            return ['status' => false, 'message' => 'from catch Exception: ' . $e->getMessage()];
+        }
+    }
+
+    private function deleteDirectory($dir) 
+    {
+        if (!file_exists($dir)) {
+            return true;
+        }
+
+        if (!is_dir($dir)) {
+            // Use @ to suppress warnings if the file is already gone or locked
+            // return @unlink($dir);
+            return unlink($dir);
+        }
+
+        // scandir can return false if the directory isn't readable
+        $items = scandir($dir);
+        if ($items === false) {
+            return false;
+        }
+
+        foreach ($items as $item) {
+            if ($item == '.' || $item == '..') {
+                continue;
+            }
+
+            // Recursively call the function
+            if (!$this->deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) {
+                // If a child cannot be deleted, attempt to change its permissions and try once more
+                @chmod($dir . DIRECTORY_SEPARATOR . $item, 0777);
+                if (!$this->deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) {
+                    return false;
+                }
+            }
+        }
+
+        // Finally, remove the empty directory
+        return @rmdir($dir);
+    }
+}
\ No newline at end of file
diff --git a/app/Models/BdsPlacementModel.php b/app/Models/BdsPlacementModel.php
index 82edfce5..947f8a0f 100644
--- a/app/Models/BdsPlacementModel.php
+++ b/app/Models/BdsPlacementModel.php
@@ -57,6 +57,64 @@ class BdsPlacementModel extends Model
 
 
     public function getClientInstallmentDetails()
+    {
+        // 1. Fetch common data ONCE (Heads, Admins, Business Team)
+        // This saves hundreds of redundant queries
+        $heads = $this->db->table('user_profiles')
+            ->select('email')->where(['role' => 5, 'is_active' => 1])
+            ->get()->getResultArray();
+
+        $admins = $this->db->table('user_profiles')
+            ->select('email')->where(['role' => 1, 'is_active' => 1])
+            ->get()->getResultArray();
+
+        $businessTeam = $this->db->table("user_teams ut")
+            ->select("up.email")
+            ->join('user_profiles up', 'up.id = ut.user_id AND up.is_active = 1')
+            ->where(["ut.team_id" => 7, "ut.is_active" => 1])
+            ->get()->getResultArray();
+
+        // 2. Main Query
+        $builder = $this->db->table("bds_installment_payment_details bipd")
+            ->select("bipd.*, ct.client_name, ct.short_name, cb.branch_name, leads.salse_person_id, cp.policy_no")
+            ->join("policy_transaction pt", "pt.id = bipd.pt_id")
+            ->join("clients ct", "ct.id = pt.client_id")
+            ->join("client_branch cb", "cb.id = pt.client_branch_id")
+            ->join("leads", "leads.id = bipd.lead_id")
+            ->join("client_policy cp", "cp.id = pt.client_policy_id")
+            ->where("bipd.is_active", 1)
+            ->where("bipd.payment_date", date('Y-m-d', strtotime('+15 days')));
+
+        $data = $builder->get()->getResultArray();
+
+        // Loop through to extract sales person details
+        // 3. Simple Loop for Sales Person (Since it relies on a JSON ID)
+        foreach ($data as &$row) {
+            $sales_person_ids = json_decode($row['salse_person_id'], true);
+            $sales_person_id = $sales_person_ids[0] ?? null;
+
+            if ($sales_person_id) {
+                $user = $this->db->table('user_profiles')
+                    ->select('email') // or whatever field
+                    ->where('id', (int)$sales_person_id) // Cast to int for extra safety
+                    ->get()
+                    ->getRowArray();
+
+                $row['sales_person'] = $user['email'] ?? 'N/A';
+            } else {
+                $row['sales_person'] = 'Not Assigned';
+            }
+
+            // Assign the pre-fetched data
+            $row['heads'] = $heads;
+            $row['admins'] = $admins;
+            $row['buisness_team'] = $businessTeam;
+        }
+
+
+        return $data;
+    }
+    public function getClientInstallmentDetails_olds()
     {
 
         $builder = $this->db->table("bds_installment_payment_details bipd")
diff --git a/app/Models/ClaimDumpFileModel.php b/app/Models/ClaimDumpFileModel.php
index 224adafc..e34d6116 100644
--- a/app/Models/ClaimDumpFileModel.php
+++ b/app/Models/ClaimDumpFileModel.php
@@ -10,6 +10,9 @@ class ClaimDumpFileModel extends Model
     protected $primaryKey       = 'id';
     protected $allowedFields    = [
         "id",
+        "client_id",
+        "client_policy_id",
+        "tpa_id",
         "file_name",
         "status",
         "reason",
diff --git a/app/Models/ClaimMisFileModel.php b/app/Models/ClaimMisFileModel.php
new file mode 100644
index 00000000..057f9cd0
--- /dev/null
+++ b/app/Models/ClaimMisFileModel.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class ClaimMisFileModel extends Model
+{
+    protected $table            = 'claims_mis_files';
+    protected $primaryKey       = 'id';
+    protected $allowedFields = [
+        'id',
+        'client_id',
+        'tpa_id',
+        'client_policy_id',
+        'from_date',
+        'to_date',
+        'file_name',
+        'created_by',
+        'updated_by',
+        'is_active'
+    ];
+
+
+    // Callbacks
+    protected $allowCallbacks       = true;
+    protected $beforeInsert         = ["checkAndADDCreatedByValue"];
+    protected $afterInsert          = [];
+    protected $beforeUpdate         = ["checkAndUpdateUpdatedByValue"];
+    protected $afterUpdate          = [];
+    protected $beforeFind           = [];
+    protected $afterFind            = [];
+    protected $beforeDelete         = [];
+    protected $afterDelete          = [];
+
+    protected function checkAndADDCreatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['created_by'])) {
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['created_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+    protected function checkAndUpdateUpdatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['updated_by'])) {
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['updated_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Models/ClaimsDumpFhplModel.php b/app/Models/ClaimsDumpFhplModel.php
new file mode 100644
index 00000000..d8cd6632
--- /dev/null
+++ b/app/Models/ClaimsDumpFhplModel.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class ClaimsDumpFhplModel extends Model
+{
+    protected $table            = 'claims_dump_fhpl';
+    protected $primaryKey       = 'id';
+    protected $allowedFields = [
+        'id',
+        'client_id',
+        'client_policy_id',
+        'ticket_id',
+        'file_id',
+        'created_by',
+        'updated_by',
+        'is_active',
+
+        'request_type',
+        'intimation_id',
+        'intimation_date',
+        'claim_id',
+        'sl_no',
+        'uhid_no',
+        'member_name',
+        'main_member_uhid_no',
+        'main_member_name',
+        'gender',
+        'dob',
+        'years',
+        'relationship',
+        'employee_id',
+        'mobile',
+        'email',
+        'policy_no',
+        'policy_start_date',
+        'policy_commencing_date',
+        'policy_expiry_date',
+        'organisation_name',
+        'claim_received_date',
+        'admission_date',
+        'discharge_date',
+        'diagnosis',
+        'service_type',
+        'service_sub_type',
+        'icd_code_first_level',
+        'icd_code_second_level',
+        'icd_code_third_level',
+        'claim_type',
+        'provider_name',
+        'provider_address',
+        'provider_place',
+        'provider_state',
+        'provider_pincode',
+        'provider_type',
+        'provider_identification',
+        'coverage_amount',
+        'claim_amount',
+        'billed_amount',
+        'disallowed_amount',
+        'dis_allowance_reason_1',
+        'dis_allowance_reason_2',
+        'settled_amount',
+        'incurred_amount',
+        'discount_amount',
+        'tds_amount',
+        'net_amount_paid',
+        'co_payment',
+        'current_claim_status',
+        'balance_sum_insured',
+        'cheque_no',
+        'cheque_date',
+        'claim_passed_date',
+        'settled_date',
+        'pending_remarks',
+        'ir_investigation',
+        'ir_date',
+        'ir_retrieval_date',
+        'first_reminder',
+        'second_reminder',
+        'rejection_remarks',
+        'payee_name',
+        'treatment_type',
+        'room_days',
+        'icu_days',
+        'total_stay',
+        'room_rent_claimed',
+        'icu_claimed',
+        'icu_related',
+        'nursing_claimed',
+        'nursing_charges',
+        'room_rent_related',
+        'professional_charges',
+        'drugs_medication_consumables',
+        'investigations_procedures_ip',
+        'domicillary_hospitalization',
+        'maternity',
+        'day_care',
+        'operation_theatre',
+        'organ_donor',
+        'ancillary_services',
+        'dental',
+        'out_patient_coverage',
+        'personal_accident',
+        'critical_illness',
+        'health_check_up',
+        'spectacles_contact_lenses_hearing_aid',
+        'notes',
+        'buffer_amount',
+        'tertiary_amount',
+        'insurance_name',
+        'ro_name',
+        'class_of_accommodation',
+        'claim_created_datetime',
+        'insurer_claim_id',
+        'gipsa',
+        'date_of_joining',
+        'gipsa_hospital',
+        'package',
+        'is_nidb',
+        'nidb_removed_date',
+        'investigation_date',
+        'investigation_retrieval_date',
+        'reopened_date',
+        'refer_to_insurer_date',
+        'received_date_from_insurer',
+        'rejection_category',
+        'refer_to_insurer_reasons',
+        'is_vip',
+        'main_claim_status',
+        'main_claim_type',
+        'icd_third_level_code',
+        'benefit_plan_name',
+        'zone',
+        'grade',
+        'last_modified_date',
+        'temp_mou'
+    ];
+}
diff --git a/app/Models/ClientDepositModel.php b/app/Models/ClientDepositModel.php
index 8a61b204..7aa4ff7b 100755
--- a/app/Models/ClientDepositModel.php
+++ b/app/Models/ClientDepositModel.php
@@ -30,6 +30,7 @@ class ClientDepositModel extends Model
         "cd_ac_pk",
         "record_date",
         "policy_transaction_id",
+        "file_id",
     ];
 
    
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index 90a9b1f6..c99a50f4 100755
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -42,6 +42,7 @@ class ClientModel extends Model
         "addon_subheading",
         "parent_client_id",
         "otp",
+        "hr_file_processed_by",
     ];
 
 
diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 14685074..762e8c40 100755
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -118,7 +118,16 @@ class ClientPolicyModel extends Model
 
 
         return $this->db->table('client_policy')
-            ->select('client_policy.*')
+            ->select('
+
+                    client_policy.*,
+                    CASE
+                        WHEN client_policy.policy_entry_from = 3
+                            AND client_policy.cd_ac_pk IS NULL
+                        THEN leads.cd_amount
+                        ELSE NULL
+                    END AS lead_cd_amount
+            ', false)
             ->select('insurers.name as insurer_name, insurers.short_name as insurer_short')
             ->select('tpa.name as tpa_name, tpa.short_name as tpa_short')
             ->select('policy_type.policy_type as policy_type_name')
@@ -132,6 +141,7 @@ class ClientPolicyModel extends Model
             ->join('tpa_branch', 'client_policy.tpa_branch_id = tpa_branch.id', 'left')
             ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
             ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
+            ->join('leads', 'client_policy.is_from_lead = leads.id', 'left')
             ->where('client_policy.client_id', $client_id)
             // ->where('client_policy.policy_status', 1)
             ->where('client_policy.is_active', 1)
@@ -183,9 +193,14 @@ class ClientPolicyModel extends Model
                             ->join('clients', 'clients.id = client_policy.client_id')
                             ->join('insurers', 'insurers.id = client_policy.insurer_id')
                             ->join('insurer_branch', 'client_policy.insurer_branch_id = insurer_branch.id', 'left')
-                            ->join('cd_master', 'cd_master.insurer_id = insurers.id AND cd_master.client_id = client_policy.client_id')
-                            ->where('client_policy.client_id', $id)
-                            ->where('cd_master.id = client_policy.cd_ac_pk')
+                            ->join('cd_master', 'cd_master.insurer_id = insurers.id AND cd_master.client_id = client_policy.client_id');
+                            // ->where('client_policy.client_id', $id)
+                            if (is_string($id) && preg_match('/^[a-f0-9]{32}$/i', $id)) {
+                                $builder->where('MD5(client_policy.client_id)', $id);
+                            } else {
+                                $builder->where('client_policy.client_id', $id);
+                            }
+                            $builder->where('cd_master.id = client_policy.cd_ac_pk')
                             ->where('cd_master.is_active', 1)
                             ->groupBy('client_policy.client_id')
                             ->groupBy('client_policy.insurer_id')
@@ -248,14 +263,33 @@ class ClientPolicyModel extends Model
     }
 
 
-    public function getClientById($id)
+    // public function getClientById($id)
+    // {
+    //     $query = $this->db->table('clients')->getWhere(['id' => $id]);
+    //     // Debug statement
+    //     return $query->getRow();
+    // }
+
+    public function getClientById($client_id)
     {
-        $query = $this->db->table('clients')->getWhere(['id' => $id]);
-        // Debug statement
-        return $query->getRow();
+        if (empty($client_id)) {
+            return null;
+        }
+
+        $builder = $this->db->table('clients');
+
+        // MD5 vs normal ID check
+        if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
+            $builder->where('MD5(id)', $client_id);
+        } else {
+            $builder->where('id', $client_id);
+        }
+
+        return $builder->get()->getRow();
     }
 
 
+
     public function getDepositData($clientId, $insurerId, $cd_ac_pk = null, $subTypeOptions = null)
     {   
 
@@ -269,6 +303,8 @@ class ClientPolicyModel extends Model
             $caseSql = "";
         }
 
+        $url = base_url('downloadCdSplitUpFile?id=');
+
         // Fetch the deposit data based on client and insurer IDs       
        $query = $this->db->table('cash_deposit')
             ->select('cash_deposit.*')
@@ -278,6 +314,12 @@ class ClientPolicyModel extends Model
             // ->select('policies.name as policy_name')
             ->select('policy_type.policy_type')
             ->select('user_profiles.first_name as username')
+            ->select("CASE 
+                        WHEN cash_deposit.file_id IS NOT NULL AND cash_deposit.file_id != '' 
+                        THEN CONCAT(" . $this->db->escape($url) . ", MD5(cash_deposit.file_id)) 
+                        ELSE NULL 
+                    END AS split_up_url", 
+                false)
             ->select($caseSql)
             ->join('user_profiles', 'user_profiles.id = cash_deposit.created_by', 'left')
             ->join('insurers', 'insurers.id = cash_deposit.insurer_id', 'left')
@@ -285,9 +327,16 @@ class ClientPolicyModel extends Model
             ->join('client_policy', 'client_policy.id = cash_deposit.client_policy_id', 'left')
             ->join('cd_master', 'cd_master.id = cash_deposit.cd_ac_pk', 'left')
             // ->join('policies', 'policies.id = client_policy.policy_id', 'left')
-            ->join('policy_type', 'policy_type.id = client_policy.policy_type_id', 'left')
-            ->where('cash_deposit.client_id', $clientId)
-            ->where('cash_deposit.insurer_id', $insurerId)
+            ->join('policy_type', 'policy_type.id = client_policy.policy_type_id', 'left');
+            // ->where('cash_deposit.client_id', $clientId)
+             if (!empty($clientId)) {
+                if (is_string($clientId) && preg_match('/^[a-f0-9]{32}$/i', $clientId)) {
+                    $query->where('MD5(cash_deposit.client_id)', $clientId);
+                } else {
+                    $query->where('cash_deposit.client_id', $clientId);
+                }
+            }
+            $query->where('cash_deposit.insurer_id', $insurerId)
             ->where('cash_deposit.is_active', 1)
             ->where('cd_master.is_active', 1);
             // ->where('cash_deposit.cd_ac_pk = cd_master.id')
@@ -296,16 +345,62 @@ class ClientPolicyModel extends Model
             }
             $query->orderBy('cash_deposit.id', 'DESC');
 
-            return $query->get()->getResult();
+            $data = $query->get()->getResult();
+
+        return $data;
     }
 
 
+    // public function getDepositSummary($clientId, $insurerId, $cd_ac_pk)
+    // {
+
+    //     $subQuery = $this->db->table('cash_deposit')
+    //         ->select('balance')
+    //         ->where('client_id', $clientId)
+    //         ->where('insurer_id', $insurerId)
+    //         ->where('cd_ac_pk', $cd_ac_pk)
+    //         ->where('is_active', 1)
+    //         ->orderBy('id', 'DESC')
+    //         ->limit(1)
+    //         ->getCompiledSelect();
+
+    //     // Fetch the sum of credit and debit transactions and calculate the balance
+    //     $data = $this->db->table('cash_deposit')
+    //         ->select("($subQuery) AS balance", false)
+    //         ->select('SUM(CASE WHEN transaction_type = "Credit" THEN amount ELSE 0 END) AS total_credit')
+    //         ->select('SUM(CASE WHEN transaction_type = "Debit" THEN amount ELSE 0 END) AS total_withdraw')
+    //         // ->select('SUM(CASE WHEN transaction_type = "Credit" THEN amount ELSE -amount END) AS balance')
+    //         ->select('SUM(CASE WHEN sub_type = 3 THEN amount ELSE 0 END) AS total_refund')
+    //         ->where('client_id', $clientId)
+    //         ->where('insurer_id', $insurerId)
+    //         ->where('cd_ac_pk', $cd_ac_pk)
+    //         ->where('cash_deposit.is_active', 1)
+    //         ->get()
+    //         ->getRow();
+
+    //     // dd($this->db->getLastQuery());
+    //     return $data;
+    // }
+
     public function getDepositSummary($clientId, $insurerId, $cd_ac_pk)
     {
+        if (empty($clientId)) {
+            return null;
+        }
 
+        //  Build SAFE client condition (NO BINDS!)
+        if (is_string($clientId) && preg_match('/^[a-f0-9]{32}$/i', $clientId)) {
+            $clientCondition = 'MD5(client_id) = ' . $this->db->escape($clientId);
+        } else {
+            $clientCondition = 'client_id = ' . $this->db->escape($clientId);
+        }
+
+        /* -------------------------------------------------
+        Subquery: latest balance
+        ------------------------------------------------- */
         $subQuery = $this->db->table('cash_deposit')
             ->select('balance')
-            ->where('client_id', $clientId)
+            ->where($clientCondition, null, false) 
             ->where('insurer_id', $insurerId)
             ->where('cd_ac_pk', $cd_ac_pk)
             ->where('is_active', 1)
@@ -313,14 +408,15 @@ class ClientPolicyModel extends Model
             ->limit(1)
             ->getCompiledSelect();
 
-        // Fetch the sum of credit and debit transactions and calculate the balance
+        /* -------------------------------------------------
+        Main query: totals
+        ------------------------------------------------- */
         $data = $this->db->table('cash_deposit')
             ->select("($subQuery) AS balance", false)
             ->select('SUM(CASE WHEN transaction_type = "Credit" THEN amount ELSE 0 END) AS total_credit')
             ->select('SUM(CASE WHEN transaction_type = "Debit" THEN amount ELSE 0 END) AS total_withdraw')
-            // ->select('SUM(CASE WHEN transaction_type = "Credit" THEN amount ELSE -amount END) AS balance')
             ->select('SUM(CASE WHEN sub_type = 3 THEN amount ELSE 0 END) AS total_refund')
-            ->where('client_id', $clientId)
+            ->where($clientCondition, null, false)
             ->where('insurer_id', $insurerId)
             ->where('cd_ac_pk', $cd_ac_pk)
             ->where('cash_deposit.is_active', 1)
@@ -330,6 +426,8 @@ class ClientPolicyModel extends Model
         // dd($this->db->getLastQuery());
         return $data;
     }
+
+
     // Inside your clientPolicyModel
     // Inside your clientPolicyModel
     // public function getDepositDataWithBalance($clientId, $insurerId)
@@ -402,6 +500,35 @@ class ClientPolicyModel extends Model
         //     ORDER BY cd.id DESC
         // ";
 
+        // $sql = "
+        //     SELECT cd.insurer_id, cd.cd_ac_pk, cd.balance
+        //     FROM cash_deposit cd
+        //     JOIN cd_master cdm ON cdm.id = cd.cd_ac_pk
+        //     JOIN (
+        //         SELECT MAX(id) AS max_id
+        //         FROM cash_deposit
+        //         WHERE is_active = 1 AND client_id = :id:
+        //         GROUP BY insurer_id, cd_ac_pk
+        //     ) latest ON latest.max_id = cd.id
+        //     JOIN insurers on cd.insurer_id = insurers.id
+        //     WHERE cd.is_active = 1 AND cd.client_id = :id: AND cdm.is_active = 1
+        //     ORDER BY cd.insurer_id;
+        // ";
+
+        // $binds = ['id'=>(int)$id];
+        // return $this->db->query($sql,$binds)->getResult();
+
+        $whereClient = 'cd.client_id = :id:';
+        $subWhereClient = 'client_id = :id:';
+
+        $binds = ['id' => $id];
+
+        // 🔐 MD5 handling
+        if (is_string($id) && preg_match('/^[a-f0-9]{32}$/i', $id)) {
+            $whereClient = 'MD5(cd.client_id) = :id:';
+            $subWhereClient = 'MD5(client_id) = :id:';
+        }
+
         $sql = "
             SELECT cd.insurer_id, cd.cd_ac_pk, cd.balance
             FROM cash_deposit cd
@@ -409,15 +536,17 @@ class ClientPolicyModel extends Model
             JOIN (
                 SELECT MAX(id) AS max_id
                 FROM cash_deposit
-                WHERE is_active = 1 AND client_id = $id
+                WHERE is_active = 1 AND {$subWhereClient}
                 GROUP BY insurer_id, cd_ac_pk
             ) latest ON latest.max_id = cd.id
-            JOIN insurers on cd.insurer_id = insurers.id
-            WHERE cd.is_active = 1 AND cd.client_id = $id AND cdm.is_active = 1
-            ORDER BY cd.insurer_id;
+            JOIN insurers ON cd.insurer_id = insurers.id
+            WHERE cd.is_active = 1
+            AND {$whereClient}
+            AND cdm.is_active = 1
+            ORDER BY cd.insurer_id
         ";
 
-        return $this->db->query($sql)->getResult();
+        return $this->db->query($sql, $binds)->getResult();
 
     }
 
@@ -464,10 +593,12 @@ class ClientPolicyModel extends Model
             FROM client_policy
             JOIN policies ON policies.id = client_policy.policy_id
             JOIN policy_type ON policy_type.id = policies.policy_type_id
-            WHERE policy_type.policy_type = '{$type}'        
-            AND client_policy.client_id = {$client_id}";
+            WHERE policy_type.policy_type = :type:
+            AND client_policy.client_id = :client_id:";
 
-        $result = $this->db->query($query)->getResult();
+        $binds = ['type' =>$type,'client_id'=>(int)$client_id];
+            
+        $result = $this->db->query($query,$binds)->getResult();
 
         return $result;
     }
diff --git a/app/Models/EmpEndorsementModel.php b/app/Models/EmpEndorsementModel.php
index d846801b..5cb66173 100755
--- a/app/Models/EmpEndorsementModel.php
+++ b/app/Models/EmpEndorsementModel.php
@@ -94,10 +94,11 @@ class EmpEndorsementModel extends Model
             FROM emp_endorsement
         JOIN employee_polices ON employee_polices.id = emp_endorsement.pk
         JOIN client_policy ON client_policy.id = employee_polices.client_policy_id
-        WHERE group_key = '{$group_key}'
+        WHERE group_key = :group_key:
         ";
 
-        $results = $this->db->query($query)->getResult();
+        $binds['group_key'] = $group_key;
+        $results = $this->db->query($query,$binds)->getResult();
         return $results;
 
     }
@@ -191,10 +192,10 @@ class EmpEndorsementModel extends Model
                             e1.field_name = 'status'
                     ) ee ON aa.emp_code = ee.emp_code
             ) AS deletiondata ON a.emp_code = deletiondata.emp_code 
-            WHERE group_key = '{$group_key}';
+            WHERE group_key = :group_key: ;
             ";
-
-        $results = $this->db->query($query)->getResult();
+        $binds['group_key'] = $group_key;
+        $results = $this->db->query($query,$binds)->getResult();
         return $results;
 
     }
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index b9adb13f..9f2663d7 100755
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -223,12 +223,13 @@ class EmployeeModel extends Model
                             emp_code,
                             COUNT(*) AS family_member_count,
                             MAX(TIMESTAMPDIFF(YEAR, dob, CURDATE())) AS max_age
-                        FROM employees where emp_code = '{$emp_code}'
+                        FROM employees where emp_code = :emp_code:
                         GROUP BY emp_code
                     ) AS family_stats
                     ORDER BY family_member_count DESC, max_age DESC
                     LIMIT 1;";
-        $results = $this->db->query($query)->getResultArray();
+        $binds['emp_code'] = $emp_code;
+        $results = $this->db->query($query,$binds)->getResultArray();
         return $results;
     }
 
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 81f8c580..908d1698 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -222,7 +222,7 @@ class EmployeePolicyModel extends Model
     //     return $res;
     // } // remarks do not remove
 
-    public function getEmployeePolicy($client_id = 0, $policy_id = 0, $status = [], $branch_id = 0, $emp_code = "", $emp_name = "")
+    public function getEmployeePolicy($client_id = 0, $policy_id = 0, $status = [], $branch_id = 0, $emp_code = "", $emp_name = "", $status_type = '')
     {
         // dd($status);
         $ecard_download_link = "
@@ -280,6 +280,14 @@ class EmployeePolicyModel extends Model
             'cp.policy_no',
             'cp.policy_type_id',
             'cp.is_addon',
+            '( 
+                select id from employees 
+                where emp_code = emp.emp_code 
+                and client_id = emp.client_id 
+                and lower(relationship) = "self" 
+                and is_active = 1 
+                limit 1 
+            ) as self_employee_id',
             $ecard_download_link
         ])
             ->join('employees emp', 'employee_polices.employee_id = emp.id')
@@ -295,7 +303,10 @@ class EmployeePolicyModel extends Model
             ->orderBy('emp.emp_code', 'ASC')
             ->orderBy('employee_polices.employee_id', 'ASC');
         // Conditionally add where clauses
-        if ($client_id != 0 && !empty($client_id)) {
+        if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
+            // MD5 hash → compare using md5()
+            $result->where('md5(emp.client_id)', $client_id);
+        }else if ($client_id != 0 && !empty($client_id)) {
             $result->where('emp.client_id', $client_id);
         }
         if ($branch_id != 0 && !empty($branch_id)) {
@@ -345,8 +356,13 @@ class EmployeePolicyModel extends Model
         // Always check these conditions
         $result
         ->where('employee_polices.is_active', 1)
-        ->where('emp.is_active', 1)
-        ->where('employee_polices.status !=', 'inactive');
+        ->where('emp.is_active', 1);
+
+        if($status_type == 'inactive'){
+            $result->whereIn('employee_polices.status', ['active', 'inactive']);
+        }else{
+            $result->where('employee_polices.status !=', 'inactive');
+        }
     
         $res = $result->findAll();
 
@@ -388,8 +404,8 @@ class EmployeePolicyModel extends Model
                        ->where('is_active',1)
                        ->find();
    }
-//-------------------------------------------------------------------------------------------------------
 
+   //-------------------------------------------------------------------------------------------------------
 
     public function getInceptionEmployeeDataForExportExcel($ref_data, $return_type = 0)
     {   
@@ -430,7 +446,7 @@ class EmployeePolicyModel extends Model
                 employees.gender AS emp_gender,
                 employees.relationship AS emp_relationship,
                 employees.relationship_code AS emp_relationship_code,
-                '$datas' as event_type_data,
+                :datas: as event_type_data,
                 employees.change_event AS change_event,
 
 
@@ -483,24 +499,37 @@ class EmployeePolicyModel extends Model
                     batch_files.batch_code as bf
                 FROM batch_files 
                 LEFT JOIN batch_list ON batch_files.batch_code = batch_list.batch_code 
-                WHERE batch_files.event_type = '{$event}' 
+                WHERE batch_files.event_type = :event:
                     AND batch_files.actions = 'export' 
-                    AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
-                    AND batch_files.client_policy_id = '{$client_policy_id}'
-                    AND batch_files.client_policy_id = '{$client_id}'
+                    AND batch_files.insurer_or_tpa = :insurer_or_tpa:
+                    AND batch_files.client_policy_id = :client_policy_id:
+                    AND batch_files.client_policy_id = :client_id:
                     
             ) as batch_data ON employee_polices.id = batch_data.emp_policy_id
-            WHERE employee_polices.client_policy_id = '{$client_policy_id}'
-                AND (employee_polices.{$id} IS NULL OR employee_polices.{$id} = '')
-                AND employees.client_branch_id = '{$client_branch_id}'
+            WHERE employee_polices.client_policy_id = :client_policy_id:
+                AND employees.client_branch_id = :client_branch_id:
                 AND employee_polices.is_active = 1
                 AND employee_polices.status = 'active'
                 AND employees.is_active = 1
                 AND employees.emp_status = 'active'
         ";
 
+       if($insurer_or_tpa == 'insurer'){
+            $sql .= "AND (employee_polices.uhid IS NULL OR employee_polices.uhid <> '')";
+       } 
+
+       if($insurer_or_tpa == 'tpa'){
+             $sql .= "AND (employee_polices.tpa_id IS NULL OR employee_polices.tpa_id <> '')";
+       } 
+
+        $binds = ["datas" => $datas,"event" => $event
+            ,"insurer_or_tpa" => $insurer_or_tpa
+            ,"client_policy_id" => $client_policy_id
+            ,"client_branch_id" => $client_branch_id
+            ,"client_id" => $client_id,"id" => $id];
+
             // Get the result set
-            $query = $this->db->query($sql);
+            $query = $this->db->query($sql,$binds);
             
             if($return_type == 1){
                 $results = $query->getResultArray();
@@ -573,9 +602,9 @@ class EmployeePolicyModel extends Model
                         employees ON employees.id = emp_endorsement.pk
                     LEFT JOIN 
                         employee_polices ON employees.id = employee_polices.employee_id
-                    WHERE employees.client_id = '{$client_id}'
-                    AND employee_polices.client_policy_id = '{$client_policy_id}'
-                    AND employees.client_branch_id = '{$client_branch_id}'
+                    WHERE employees.client_id = :client_id:
+                    AND employee_polices.client_policy_id = :client_policy_id:
+                    AND employees.client_branch_id = :client_branch_id:
                     AND emp_endorsement.actions = 'c'
                     AND emp_endorsement.status != 'truncated'
                     AND emp_endorsement.is_active = 1
@@ -585,8 +614,10 @@ class EmployeePolicyModel extends Model
                     AND employees.emp_status = 'active'
                     $endorsement_condition";
 
+                    $binds = ["client_policy_id" => $client_policy_id,"client_branch_id" => $client_branch_id,"client_id" => $client_id];
+
                 // Execute the raw query
-                $query = $this->db->query($sql);
+                $query = $this->db->query($sql,$binds);
 
                 // Get the result set
                 if($return_type == 1){
@@ -1083,9 +1114,9 @@ class EmployeePolicyModel extends Model
     public function getDeletionEmployeeDataForExportExcel($ref_data, $return_type = 0)
     {
 
-            $client_id = $ref_data['client_id'];
-            $client_policy_id = $ref_data['client_policy_id'];
-            $client_branch_id = $ref_data['client_branch_id'];
+            $client_id = (string) "'".$ref_data['client_id']."'";
+            $client_policy_id = (string) "'".$ref_data['client_policy_id']."'";
+            $client_branch_id = (string) "'".$ref_data['client_branch_id']."'";
             $insurer_or_tpa = $ref_data['insurer_or_tpa'];
 
             $get_insurer_id_from_client_policy = $this->db->table('client_policy')
@@ -1284,12 +1315,12 @@ class EmployeePolicyModel extends Model
                     (
                         SELECT employees.id
                         FROM employees
-                        WHERE client_id = '$client_id'
-                            AND client_branch_id = '$client_branch_id'
+                        WHERE client_id = :client_id:
+                            AND client_branch_id = :client_branch_id:
                             AND is_active = 1
                             AND emp_status = 'active'
-                            AND emp_code = '$emp_code'
-                            AND name = '$emp_name'
+                            AND emp_code = :emp_code:
+                            AND name = :emp_name:
                         LIMIT 1
                     ) AS employees_id,
 
@@ -1318,10 +1349,10 @@ class EmployeePolicyModel extends Model
                     JOIN employee_polices AS ep ON ep.id = ee.pk
                     JOIN employees AS e ON e.emp_code = ee.emp_code
                 WHERE
-                    ee.emp_code = '$emp_code'
-                    AND ep.client_policy_id = '$client_policy_id'
-                    AND e.client_branch_id = '$client_branch_id'
-                    AND ee.name = '$emp_name'
+                    ee.emp_code = :emp_code:
+                    AND ep.client_policy_id = :client_policy_id:
+                    AND e.client_branch_id = :client_branch_id:
+                    AND ee.name = :emp_name:
                     AND ee.field_name IN ('date_of_exit', 'reason_for_exit', 'status', 'claim_status')
                     AND ep.is_active = 1
                     AND ep.status = 'active'
@@ -1331,10 +1362,15 @@ class EmployeePolicyModel extends Model
                     ee.group_key
         ";
 
+        $binds = ['client_policy_id' => $client_policy_id,
+        'client_branch_id' => $client_branch_id,
+        'client_id' => $client_id,
+        'emp_name' => $emp_name,
+        'emp_code' => $emp_code];
         // dd($sql);
 
         // Execute the raw SQL query
-        $query = $this->db->query($sql);
+        $query = $this->db->query($sql,$binds);
 
         // Fetch and return results
          $row = $query->getRowArray();
@@ -1358,12 +1394,12 @@ class EmployeePolicyModel extends Model
 
       
         $query = "UPDATE employee_polices
-                    SET employee_polices.basic_cover_si = '{$basic_cover_si}'
-                    , employee_polices.premium = '{$premium}'
-                    WHERE employee_polices.employee_id = '{$employee_id}'
-                    AND employee_polices.client_policy_id = '{$client_policy_id}'";
-
-        $this->query($query);
+                    SET employee_polices.basic_cover_si = :basic_cover_si:
+                    , employee_polices.premium = :premium:
+                    WHERE employee_polices.employee_id = :employee_id:
+                    AND employee_polices.client_policy_id = :client_policy_id:";
+        $binds = ["client_policy_id"=>$client_policy_id, "employee_id"=>$employee_id,"basic_cover_si"=>$basic_cover_si,"premium"=>$premium];
+        $this->query($query,$binds);
     }
 
 
@@ -1545,9 +1581,9 @@ class EmployeePolicyModel extends Model
         ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id')
         ->join('tpa', 'tpa.id = cp.tpa_id')
         ->where("ep.tpa_id IS NOT NULL AND ep.tpa_id <> ''")
-        ->where('e.emp_status', 'active')
         ->where('e.is_active', '1')
-        ->where('ep.status', 'active')
+        ->whereIn('ep.status', ['active', 'expired'])
+        ->whereIn('e.emp_status', ['active', 'expired'])
         ->where('ep.is_active', '1')
         ->where('e.emp_code', $emp_code)
         ->where('ep.client_policy_id', $client_policy_id)
@@ -1618,9 +1654,9 @@ class EmployeePolicyModel extends Model
         ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id')
         ->join('tpa', 'tpa.id = cp.tpa_id')
         ->where("ep.tpa_id IS NOT NULL AND ep.tpa_id <> ''")
-        ->where('e.emp_status', 'active')
         ->where('e.is_active', '1')
-        ->where('ep.status', 'active')
+        ->whereIn('ep.status', ['active', 'expired'])
+        ->whereIn('e.emp_status', ['active', 'expired'])
         ->where('ep.is_active', '1')
         ->where('ep.rand_string', $rand_string)
         ->get()
@@ -1893,6 +1929,8 @@ class EmployeePolicyModel extends Model
     public function getDeletionDataForTruncated($file_id)
     {   
 
+        $file_id = (int)$file_id;
+
         // Fetch the necessary details in a single query using JOINs
         $result = $this->db->table('files f')
             ->select('i.deletion_add_day')
@@ -2028,6 +2066,8 @@ class EmployeePolicyModel extends Model
             $action = "da";
         }
 
+        $file_id = (int)$file_id;
+
         $query = $this->db->query("
 
            SELECT 
@@ -2050,6 +2090,7 @@ class EmployeePolicyModel extends Model
         // dd($this->db->getLastQuery(), $result);
         // dd($result);
 
+
         return $result[0];        
 
     }
@@ -2060,6 +2101,8 @@ class EmployeePolicyModel extends Model
         log_message('error', 'updateEmployeePolicyTruncateReverse model function called');
         log_message('error', 'FILE ID : {data}', ['data' => $file_id]);
 
+        $file_id = (int)$file_id;
+
         $this->db->query("
             UPDATE employee_polices
             SET 
@@ -2101,6 +2144,9 @@ class EmployeePolicyModel extends Model
     //calculate the CD Transaction sum of the amount for the inception, addition, dependent addition, missed inception
     public function calculateCdTranctionAmount($file_id)
     {
+
+        $file_id = (int)$file_id;
+        
         $query = $this->db->query("
 
             SELECT 
@@ -2195,5 +2241,70 @@ class EmployeePolicyModel extends Model
        // return $result;
     }
 
+    // for this function using bulk e-card download as a zip
+    public function getEmployeeDataWithPolicyUsingClientPolicyIdOrEmployeePolicyIds($params, $limit = 100, $last_id = 0)
+    {
+        $client_policy_id = $params['client_policy_id'] ?? null;
+        $emp_policy_ids   = $params['emp_policy_ids'] ?? null;
+
+        if (empty($client_policy_id) && empty($emp_policy_ids)) {
+            return [];
+        }
+
+        $builder = $this->db->table('employee_polices');
+        $builder->select('
+            employee_polices.id as emp_policy_id, 
+            employee_polices.client_policy_id,
+            employees.name,
+            employees.emp_code,
+            employees.id as emp_id,
+            tpa.short_name,
+            employee_polices.tpa_id,
+            client_policy.policy_no
+        ')
+            ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
+            ->join('employees', 'employees.id = employee_polices.employee_id')
+            ->join('tpa', 'tpa.id = client_policy.tpa_id')
+            ->where([
+                'employees.emp_status' => 'active',
+                'employees.is_active' => '1',
+                'employee_polices.status' => 'active',
+                'employee_polices.is_active' => '1',
+            ])
+            ->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''");
+
+        // BATCHING LOGIC: Only get records greater than the last processed ID
+        if ($last_id > 0) {
+            $builder->where('employee_polices.id >', $last_id);
+        }
+
+        if ($client_policy_id) $builder->where('employee_polices.client_policy_id', $client_policy_id);
+        if ($emp_policy_ids) $builder->whereIn('employee_polices.id', $emp_policy_ids);
+
+        $builder->orderBy('employee_polices.id', 'ASC'); // Critical for keyset pagination
+        $builder->limit($limit);
+
+        return $builder->get()->getResultArray();
+    }
+
+    public function getClientPolicyDetailsByClientPolicyIdOrEmployeePolicyId($params)
+    {
+        $client_policy_id = $params['client_policy_id'] ?? null;
+        $emp_policy_id = $params['emp_policy_id'] ?? null;
+
+        if (empty($client_policy_id) && empty($emp_policy_id)) {
+            return [];
+        }
+
+        $builder = $this->db->table('client_policy');
+        $builder->select('client_policy.*')
+            ->join('employee_polices ep', 'ep.client_policy_id = client_policy.id', 'left');
+
+        if ($client_policy_id) $builder->where('employee_polices.client_policy_id', $client_policy_id);
+        if ($emp_policy_id) $builder->where('employee_polices.id', $emp_policy_id);
+
+        return $builder->get()->getResultArray();
+    }
+
     
 }
\ No newline at end of file
diff --git a/app/Models/FileModel.php b/app/Models/FileModel.php
index 0f72c18f..8017242a 100755
--- a/app/Models/FileModel.php
+++ b/app/Models/FileModel.php
@@ -23,6 +23,7 @@ class FileModel extends Model
         "updated_by",
         "hr_file_id",
         "is_comparison_skipped",
+        "hr_id",
     ];
 
 
diff --git a/app/Models/InsurerModel.php b/app/Models/InsurerModel.php
index dcb7fe8b..a08b3c9e 100755
--- a/app/Models/InsurerModel.php
+++ b/app/Models/InsurerModel.php
@@ -37,27 +37,68 @@ class InsurerModel extends Model
             ->getResult();
     }
 
+    // public function getInsurerName($insurerId, $client_id)
+    // {
+    //     // Fetch the insurer name based on the insurer ID
+    //     $query = $this->db->table('client_policy')
+    //     ->select('insurers.id, insurers.name, cd_master.cd_ac_no as cd_master_account_no')
+    //     ->join('insurers', 'insurers.id = client_policy.insurer_id')
+    //     ->join('cd_master', 'cd_master.insurer_id = insurers.id AND cd_master.client_id = client_policy.client_id')
+    //     ->where('client_policy.insurer_id', $insurerId)
+    //     ->where('client_policy.client_id', $client_id) 
+    //     ->where('cd_master.id = client_policy.cd_ac_pk')
+    //     ->where('cd_master.is_active', 1)
+    //     ->get();
+
+    //     if ($query->resultID->num_rows > 0) {
+    //         $result = $query->getRow();
+    //         return $result;
+    //     }
+
+    //     return null; // or handle accordingly if the insurer is not found
+    // }
+
     public function getInsurerName($insurerId, $client_id)
     {
-        // Fetch the insurer name based on the insurer ID
-        $query = $this->db->table('client_policy')
-        ->select('insurers.id, insurers.name, cd_master.cd_ac_no as cd_master_account_no')
-        ->join('insurers', 'insurers.id = client_policy.insurer_id')
-        ->join('cd_master', 'cd_master.insurer_id = insurers.id AND cd_master.client_id = client_policy.client_id')
-        ->where('client_policy.insurer_id', $insurerId)
-        ->where('client_policy.client_id', $client_id) 
-        ->where('cd_master.id = client_policy.cd_ac_pk')
-        ->where('cd_master.is_active', 1)
-        ->get();
+        $builder = $this->db->table('client_policy')
+            ->select('
+                insurers.id,
+                insurers.name,
+                insurers.short_name,
+                cd_master.cd_ac_no AS cd_master_account_no
+            ')
+            ->join('insurers', 'insurers.id = client_policy.insurer_id')
+            ->join(
+                'cd_master',
+                'cd_master.insurer_id = insurers.id
+                AND cd_master.client_id = client_policy.client_id
+                AND cd_master.id = client_policy.cd_ac_pk
+                AND cd_master.is_active = 1'
+            )
+            ->where('client_policy.insurer_id', $insurerId);
 
-        if ($query->resultID->num_rows > 0) {
-            $result = $query->getRow();
-            return $result;
+        // Handle raw client_id vs MD5
+        if (!empty($client_id)) {
+            if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
+                $builder->where('MD5(client_policy.client_id)', $client_id);
+            } else {
+                $builder->where('client_policy.client_id', $client_id);
+            }
         }
 
-        return null; // or handle accordingly if the insurer is not found
+        $result = $builder
+            ->groupBy([
+                'insurers.id',
+                'cd_master.cd_ac_no'
+            ])
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        return $result ?? null;
     }
 
+
     public function getInsurerTemplateByInsurerID($insurer_id)
     {
         $insurer_data = $this->db->table('insurer_excel_export_template')
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index a2e241dc..a2284d5b 100644
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -206,9 +206,8 @@ class InvoiceModel extends Model
                     WHEN payout_status = 2 THEN 'Completed'
                 END AS status_text,
 
-                partner_agent.name as agent_name
             ")
-        ->join('partner_agent', 'partner_invoice.agent_id = partner_agent.id')
+        // ->join('partner_agent', 'partner_invoice.agent_id = partner_agent.id')
         ->where('partner_invoice.is_active', 1)
         ->where('partner_invoice.id', $invoice_id)
         ->first();
diff --git a/app/Models/MessageModel.php b/app/Models/MessageModel.php
index 6f2256a3..7b05dd40 100755
--- a/app/Models/MessageModel.php
+++ b/app/Models/MessageModel.php
@@ -73,6 +73,6 @@ class MessageModel extends Model
 
         $query = $builder->get();
         return $query->getResult();
-        dd($this->db->getLastQuery());
+        // dd($this->db->getLastQuery());
     }
 }
diff --git a/app/Models/PolicesModel.php b/app/Models/PolicesModel.php
index bd8fe9d4..50ce1e4f 100755
--- a/app/Models/PolicesModel.php
+++ b/app/Models/PolicesModel.php
@@ -67,7 +67,7 @@ class PolicesModel extends Model
                     {
                         $grid_id = $value['policy_grid_id'];
                         $policyGridModel = new PolicyGridModel();
-                        $grid_type = $policyGridModel->find($grid_id);
+                        $grid_type = $policyGridModel->find((int)$grid_id);
                         $premium_slab_data[$key]['grid_master'] = $grid_type;
                     }
                      $premium_slab_data[$key]['grid_master'] = $grid_type;
@@ -78,7 +78,7 @@ class PolicesModel extends Model
             {
                 $additional_grid_id = $additional_premium_slab_data[0]['policy_grid_id'];
                 $policyGridModel = new PolicyGridModel();
-                $additional_grid_type = $policyGridModel->find($additional_grid_id);    
+                $additional_grid_type = $policyGridModel->find((int)$additional_grid_id);    
             }
 
 
diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php
index 92ab47d8..fe7872f7 100644
--- a/app/Models/PolicyTransactionModel.php
+++ b/app/Models/PolicyTransactionModel.php
@@ -2421,16 +2421,20 @@
             $sql1 = $builder2->getCompiledSelect();
             $sql2 = $builder->getCompiledSelect();
 
-            $finalSql = "($sql1) UNION ALL ($sql2) 
+            $finalSql = "(:sql1:) UNION ALL (:sql2:) 
                                 ORDER BY policy_no DESC, insurer_branch_name ASC, statement_uploaded ASC,
                                         STR_TO_DATE(policy_issue_month, '%b %Y') ASC";
 
 
-            $result = $this->db->query($finalSql)->getResultArray();
+            $binds = ['sql1'=>$sql1,'sql2'=>$sql1];
+            $result = $this->db->query($finalSql,$binds)->getResultArray();
             // dd($this->db->getLastQuery());
             return $result;
         }
 
+
+
+        //not in use function due to complexity of query and union, so writing raw query with bindings to avoid sql injection
         public function getBDSReportListSingleUnion($start_date = 0, $end_date = 0, $client_id = 0, $insurer_id = 0, $policy_type_id = 0, $date_type = 0, $issuer = 0, $client_branch_id = 0, $insurer_branch_id = 0, $client_policy_id = 0, $user_id = 0, $where = [])
         {   
 
@@ -2539,6 +2543,9 @@
                         pt.ref,
 
                         pt.data_received_date,
+                        pt.endorse_eff_date,
+                        pt.policy_start_date,
+                        pt.policy_end_date,
                         pt.renewal_date,
                         pt.installment,
                         nhance_branch.branch_name as nhance_branch,
@@ -2568,8 +2575,10 @@
                         pt.action_type as action_type_string,
 
                         c.client_name,
+                        c.id as client_id,
                         c.short_name AS client_short_name,
                         cb.branch_name AS client_branch_name,
+                        cb.id AS client_branch_id,
                         cb.address1 AS client_address,
                         ptype.policy_type,
                         ptype.bap,
@@ -2577,6 +2586,7 @@
                         ins.name AS insurer_name,
                         ins.short_name AS insurer_short_name,
                         ib.branch_name AS insurer_branch_name,
+                        ib.id AS insurer_branch_id,
                         ib.branch_code AS insurer_branch_code,
 
                         created_user.first_name AS user_name,
@@ -2695,6 +2705,9 @@
                         pt.ref,
 
                         pt.data_received_date,
+                        pt.endorse_eff_date,
+                        pt.policy_start_date,
+                        pt.policy_end_date,
                         pt.renewal_date,
                         pt.installment,
                         nhance_branch.branch_name as nhance_branch,
@@ -2734,8 +2747,10 @@
                         pt.action_type as action_type_string,
 
                         c.client_name,
+                        c.id as client_id,
                         c.short_name AS client_short_name,
                         cb.branch_name AS client_branch_name,
+                        cb.id AS client_branch_id,
                         cb.address1 AS client_address,
                         ptype.policy_type,
                         ptype.bap,
@@ -2743,6 +2758,7 @@
                         ins.name AS insurer_name,
                         ins.short_name AS insurer_short_name,
                         ib.branch_name AS insurer_branch_name,
+                        ib.id AS insurer_branch_id,
                         ib.branch_code AS insurer_branch_code,
 
                         created_user.first_name as user_name,
@@ -3002,13 +3018,23 @@
 
         public function getBDSReportList($start_date = 0, $end_date = 0, $client_id = 0, $insurer_id = 0, $policy_type_id = 0, $date_type = 0, $issuer = 0, $client_branch_id = 0, $insurer_branch_id = 0, $client_policy_id = 0, $user_id = 0, $where = [])
         {   
+            $client_id = (int)$client_id;
+            $insurer_id = (int)$insurer_id;
+            $policy_type_id = (int)$policy_type_id;
+            $client_branch_id = (int)$client_branch_id;
+            $insurer_branch_id = (int)$insurer_branch_id;
+            $client_policy_id = (int)$client_policy_id;
+            $user_id = (int)$user_id;
+            $issuer = (int)$issuer;
 
+            $whereAdded = false;
             $statement_month_condition = '';
             if ($date_type == 'statement_month' && $start_date != 0 && $end_date != 0) {
                 $statement_month_condition = "
                     WHERE statement_month >= '" . $start_date . "'
                     AND statement_month <= '" . $end_date . "'
                 ";
+                $whereAdded = true;
             }
 
             $default_date_filter = '';
@@ -3071,7 +3097,7 @@
             }
 
             if ($insurer_id != 0) {
-                $conditions .= " AND pt.insurer_id = $insurer_id ";
+                $conditions .= " AND pcsd.insurer_id = $insurer_id ";
             }
 
             if ($client_branch_id != 0) {
@@ -3079,7 +3105,7 @@
             }
 
             if ($insurer_branch_id != 0) {
-                $conditions .= " AND pt.insurer_branch_id = $insurer_branch_id ";
+                $conditions .= " AND pcsd.insurer_branch_id = $insurer_branch_id ";
             }
 
             if ($client_policy_id != 0) {
@@ -3098,6 +3124,33 @@
                 $conditions .= " AND pt.issuer = $issuer ";
             }
 
+            $main_conditions = '';
+            function addCondition(&$main_conditions, &$whereAdded, $condition)
+            {
+                if (!$whereAdded) {
+                    $main_conditions .= " WHERE $condition ";
+                    $whereAdded = true;
+                } else {
+                    $main_conditions .= " AND $condition ";
+                }
+            }
+
+            // 4. Common filters
+            if ($client_id != 0) {
+                addCondition($main_conditions, $whereAdded, "client_id = $client_id");
+            }
+
+            if ($insurer_id != 0) {
+                addCondition($main_conditions, $whereAdded, "insurer_id = $insurer_id");
+            }
+
+            if ($client_branch_id != 0) {
+                addCondition($main_conditions, $whereAdded, "client_branch_id = $client_branch_id");
+            }
+
+            if ($insurer_branch_id != 0) {
+                addCondition($main_conditions, $whereAdded, "insurer_branch_id = $insurer_branch_id");
+            }
 
             $sql = "
                 SELECT * FROM (
@@ -3108,6 +3161,9 @@
                         pt.ref,
 
                         pt.data_received_date,
+                        pt.endorse_eff_date,
+                        pt.policy_start_date,
+                        pt.policy_end_date,
                         pt.renewal_date,
                         pt.installment,
                         nhance_branch.branch_name as nhance_branch,
@@ -3137,8 +3193,10 @@
                         pt.action_type as action_type_string,
 
                         c.client_name,
+                        c.id as client_id,
                         c.short_name AS client_short_name,
                         cb.branch_name AS client_branch_name,
+                        cb.id AS client_branch_id,
                         cb.address1 AS client_address,
                         ptype.policy_type,
                         ptype.bap,
@@ -3146,6 +3204,7 @@
                         ins.name AS insurer_name,
                         ins.short_name AS insurer_short_name,
                         ib.branch_name AS insurer_branch_name,
+                        ib.id AS insurer_branch_id,
                         ib.branch_code AS insurer_branch_code,
 
                         created_user.first_name AS user_name,
@@ -3265,6 +3324,9 @@
                         pt.ref,
 
                         pt.data_received_date,
+                        pt.endorse_eff_date,
+                        pt.policy_start_date,
+                        pt.policy_end_date,
                         pt.renewal_date,
                         pt.installment,
                         nhance_branch.branch_name as nhance_branch,
@@ -3294,8 +3356,10 @@
                         pt.action_type as action_type_string,
 
                         c.client_name,
+                        c.id as client_id,
                         c.short_name AS client_short_name,
                         cb.branch_name AS client_branch_name,
+                        cb.id AS client_branch_id,
                         cb.address1 AS client_address,
                         ptype.policy_type,
                         ptype.bap,
@@ -3303,6 +3367,7 @@
                         ins.name AS insurer_name,
                         ins.short_name AS insurer_short_name,
                         ib.branch_name AS insurer_branch_name,
+                        ib.id AS insurer_branch_id,
                         ib.branch_code AS insurer_branch_code,
 
                         created_user.first_name as user_name,
@@ -3449,6 +3514,9 @@
                         pt.ref,
 
                         pt.data_received_date,
+                        pt.endorse_eff_date,
+                        pt.policy_start_date,
+                        pt.policy_end_date,
                         pt.renewal_date,
                         pt.installment,
                         nhance_branch.branch_name as nhance_branch,
@@ -3479,8 +3547,10 @@
                         pt.action_type as action_type_string,
 
                         c.client_name,
+                        c.id as client_id,
                         c.short_name AS client_short_name,
                         cb.branch_name AS client_branch_name,
+                        cb.id AS client_branch_id,
                         cb.address1 AS client_address,
                         ptype.policy_type,
                         ptype.bap,
@@ -3488,6 +3558,7 @@
                         ins.name AS insurer_name,
                         ins.short_name AS insurer_short_name,
                         ib.branch_name AS insurer_branch_name,
+                        ib.id AS insurer_branch_id,
                         ib.branch_code AS insurer_branch_code,
 
                         created_user.first_name as user_name,
@@ -3616,6 +3687,7 @@
                 ) AS final_result
                    
                    $statement_month_condition
+                   $main_conditions
                 -- GROUP BY statement_month, insurer_name, policy_no
                 -- WHERE id = 6143
 
@@ -3629,9 +3701,11 @@
                 ";
             $query = $this->db->query($sql);
             $result = $query->getResultArray();
+
+
             // $countofalldata = count($result);
             // dd($result);
-            // dd($this->db->getLastQuery());
+            // dd($this->db->getLastQuery()->getQuery());
 
             $keys     = [];
             $filtered = [];
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index ac970b67..69a0d163 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -85,7 +85,6 @@ class ThzMasterNotesModel extends Model
             $ticketTypeFilter = "AND thz_master_notes.notes_type = 'External' ";
         } 
 
-        $integer_ticket_id = (int)$thz_id;
 
         $notes_sql = "SELECT 
                             thz_master_notes.*,
@@ -103,11 +102,12 @@ class ThzMasterNotesModel extends Model
                     LEFT JOIN thz_master 
                             ON thz_master.thz_id = thz_master_notes.thz_id 
                         AND LOWER(thz_master_notes.notes_by) = 'user'
-                    WHERE thz_master_notes.thz_id = ". $integer_ticket_id ."
+                    WHERE thz_master_notes.thz_id = :integerTicketId:
                     $ticketTypeFilter
                     ORDER BY thz_master_notes.created_at DESC";
 
-        $result = $this->db->query($notes_sql)->getResultArray();
+        $binds = ["integerTicketId" => (int)$thz_id];
+        $result = $this->db->query($notes_sql,$binds)->getResultArray();
 
         return $result;
     }
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index a44286a9..324a18db 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -92,6 +92,10 @@ class TicketMasterModel extends Model
         'claim_description',
         'required_docs',
         'policy_transaction_id',
+        'tpa_claim_type',
+        'tpa_ailments',
+        'claim_dump_ref_id',
+
     ];
 
 
@@ -589,15 +593,17 @@ class TicketMasterModel extends Model
     {
         $ticket_type_data_1 = "";
         $ticket_type_data_2 = "";
+        $statusBinds = [];
 
         if (!empty($policy_type)) {
-            $ticket_type_data_1 = "AND ticket_type = $policy_type";
-            $ticket_type_data_2 = "AND master.ticket_type_id = $policy_type";
+            $ticket_type_data_1 = "AND ticket_type = :policy_type:";
+            $ticket_type_data_2 = "AND master.ticket_type_id = :policy_type:";
+            $statusBinds['policy_type'] = $policy_type;
         }
 
         // Fetch claim statuses dynamically
         $statusQuery = "SELECT id, claim_status FROM ticket_claim_status WHERE is_active = 1 $ticket_type_data_1";
-        $statusResult = $this->db->query($statusQuery)->getResultArray();
+        $statusResult = $this->db->query($statusQuery, $statusBinds)->getResultArray();
 
         // Initialize dynamic query parts
         $dynamicSelect = '';
@@ -649,7 +655,7 @@ class TicketMasterModel extends Model
             JOIN 
                 tpa ON master.tpa_id = tpa.id AND tpa.is_active = 1
             WHERE 
-                master.created_at BETWEEN '$start_date' AND '$end_date'
+                master.created_at BETWEEN :start_date: AND :end_date:
                 AND master.is_active = 1
                 $ticket_type_data_2
             GROUP BY 
@@ -657,9 +663,14 @@ class TicketMasterModel extends Model
         ";
 
         // Execute the query
-        $result = $this->db->query($sql)->getResultArray();
-
-        // print_rr($result);die();
+        $binds = ["start_date"=>$start_date,"end_date"=>$end_date];
+        // Merge policy_type binds if present
+        if (!empty($statusBinds)) {
+            $binds = array_merge($binds, $statusBinds);
+        }
+        $result = $this->db->query($sql, $binds)->getResultArray();
+        // print_rr(count(($result)));
+        // print_rr($this->db->lastQuery);die();
         return $result;
     }
 
@@ -669,15 +680,17 @@ class TicketMasterModel extends Model
         if ($policy_type == 1) {
             $ticket_type_data_1 = "";
             $ticket_type_data_2 = "";
+            $statusBinds = [];
 
-            if (!empty($policy_type)) {
-                $ticket_type_data_1 = "AND ticket_type = $policy_type";
-                $ticket_type_data_2 = "AND master.ticket_type_id = $policy_type";
+            if (!empty($policy_type)) {    
+                $ticket_type_data_1 = "AND ticket_type = :policy_type:";
+                $ticket_type_data_2 = "AND master.ticket_type_id = :policy_type:";
+                $statusBinds['policy_type'] = $policy_type;
             }
 
             // Fetch claim statuses dynamically
             $statusQuery = "SELECT id, claim_status FROM ticket_claim_status WHERE is_active = 1 $ticket_type_data_1";
-            $statusResult = $this->db->query($statusQuery)->getResultArray();
+            $statusResult = $this->db->query($statusQuery,$statusBinds)->getResultArray();
 
             // Initialize dynamic query parts
             $dynamicSelect = '';
@@ -712,28 +725,36 @@ class TicketMasterModel extends Model
             JOIN 
                 user_profiles ON master.acm_id = user_profiles.id AND user_profiles.is_active = 1
             WHERE 
-                master.created_at BETWEEN '$start_date' AND '$end_date'
+                master.created_at BETWEEN :start_date: AND :end_date:
                 AND master.is_active = 1
                 $ticket_type_data_2
             GROUP BY 
                 user_profiles.id;
         ";
 
-            $result = $this->db->query($sql)->getResultArray();
-
+            $binds = ["start_date"=>$start_date,"end_date"=>$end_date];
+             // Merge policy_type binds if present
+            if (!empty($statusBinds)) {
+                $binds = array_merge($binds, $statusBinds);
+            }
+            $result = $this->db->query($sql,$binds)->getResultArray();
+            // print_rr(count(($result)));
+            // print_rr($this->db->lastQuery);die();
             return $result;
         } else {
             $ticket_type_data_1 = "";
             $ticket_type_data_2 = "";
+            $statusBinds = [];
 
             if (!empty($policy_type)) {
-                $ticket_type_data_1 = "AND ticket_type = $policy_type";
-                $ticket_type_data_2 = "AND master.ticket_type_id = $policy_type";
+                $ticket_type_data_1 = "AND ticket_type = :policy_type:";
+                $ticket_type_data_2 = "AND master.ticket_type_id = :policy_type:";
+                $statusBinds['policy_type'] = $policy_type;
             }
 
             // Fetch claim statuses dynamically
             $statusQuery = "SELECT id, claim_status FROM ticket_claim_status WHERE is_active = 1 $ticket_type_data_1";
-            $statusResult = $this->db->query($statusQuery)->getResultArray();
+            $statusResult = $this->db->query($statusQuery,$statusBinds)->getResultArray();
 
             // Initialize dynamic query parts
             $dynamicSelect = '';
@@ -783,16 +804,22 @@ class TicketMasterModel extends Model
                 JOIN 
                     user_profiles ON master.acm_id = user_profiles.id AND user_profiles.is_active = 1
                 WHERE 
-                    master.created_at BETWEEN '$start_date' AND '$end_date'
+                    master.created_at BETWEEN :start_date: AND :end_date:
                     AND master.is_active = 1
                     $ticket_type_data_2
                 GROUP BY 
                     user_profiles.id;
             ";
 
+            $binds = ["start_date"=>$start_date,"end_date"=>$end_date];
             // Execute the query
-            $result = $this->db->query($sql)->getResultArray();
+             // Merge policy_type binds if present
+            if (!empty($statusBinds)) {
+                $binds = array_merge($binds, $statusBinds);
+            }
 
+            $result = $this->db->query($sql,$binds)->getResultArray();
+            //  print_rr($this->db->lastQuery);die();
             return $result;
 
 
@@ -992,13 +1019,13 @@ class TicketMasterModel extends Model
         $sql = " SELECT cp.policy_terms
                     FROM ticket_master tm
                     JOIN client_policy cp ON cp.id = tm.client_policy_id
-                    WHERE tm.id = ?
+                    WHERE tm.id = :ticket_id:
                     AND   tm.is_active = 1
                     AND   cp.is_active = 1
         ";
 
-        $binds = [$ticket_id];
-        $query = $this->db->query($sql, $binds);
+        $binds = ["ticket_id"=>$ticket_id];
+        $query = $this->db->query($sql,$binds);
 
         if ($query && $query->getNumRows() > 0) {
             $row = $query->getRowArray();
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index e1f0f127..571ddda9 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -581,7 +581,7 @@ table.dataTable tbody td {
                 
                 <div class="form-group text-right m-b-0">
                     <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
-                    <button class="btn app-btn-secondary  waves-effect waves-light" id="btnSubmit">Submit</button>
+                    <button type="submit" class="btn app-btn-secondary  waves-effect waves-light" id="btnSubmit">Submit</button>
                     <!-- <button type="button" class="btn btn-secondry waves-effect waves-light mr-1" data-dismiss="modal" aria-hidden="true">Close</button> -->
                 </div>
             </form>
@@ -684,7 +684,7 @@ table.dataTable tbody td {
                             <div class="form-group col-md-5">
                                 <label for="incentive_file_name">Upload File</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="incentive_file_name" id="incentive_file_name" required>
+                                    <input type="file" class="form-control" name="incentive_file_name" id="incentive_file_name" required accept=".jpg,.jpeg,.png">
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>
@@ -884,7 +884,20 @@ table.dataTable tbody td {
         </table>
     </div>
 </div>
+<?php if (session()->getFlashdata('error')) : ?>
+    <?php foreach (session()->getFlashdata('error') as $error) : ?>
+        <script>
+            toastr.error("<?= esc($error) ?>", "Validation Error");
+        </script>
+    <?php endforeach; ?>
 
+    <script>
+        var errorModal = new bootstrap.Modal(
+            document.getElementById('con-close-modal')
+        );
+        errorModal.show();
+    </script>
+<?php endif; ?>
 <script>
     var table;
     $(document).ready(function () {
@@ -1134,6 +1147,29 @@ table.dataTable tbody td {
                     console.error("Response Headers:", xhr.getAllResponseHeaders());
                     console.error("Error Thrown:", error);
                     console.error("Status:", status);
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
                 }
         
             });
@@ -1154,7 +1190,7 @@ table.dataTable tbody td {
                     var student_id = $(this).attr('data-id');
                     $.get('<?php echo base_url('user/deactive/');?>'+student_id, function (data) {
                         console.log(data);
-                        toastr.success('User removed successfully', 'success');
+                        toastr.success('User removed successfully', 'Success');
                         window.location.reload()
                     })
                 }
@@ -1333,7 +1369,32 @@ table.dataTable tbody td {
                 },
                 error: function(xhr) {
                     console.log("Error: " + xhr.statusText);
-                    toastr.error('Server error occurred.', 'Error');
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        }else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
+                            console.error('Unexpected error:', xhr.responseText);
+                          
                 },
                 complete: function() {
                     btn.disabled = false;
@@ -1394,7 +1455,31 @@ table.dataTable tbody td {
                 },
                 error: function(xhr) {
                     console.log("Error: " + xhr.statusText);
-                    toastr.error('Server error occurred.', 'Error');
+                    console.error(xhr.responseText);
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
                 },
                 complete: function() {
                     btn.disabled = false;
@@ -1870,19 +1955,36 @@ table.dataTable tbody td {
 </script>
 
 <script>
-    $(document).on('click', '#btnAdd', function(){
-        $('#first_name').val('');
-        $('#last_name').val('');
-        $('#email').val('');
-        $('#mobile').val('');
-        $('#emp_code').val('');        
-        $('#nhance_branch_id').val('0');        
-        $('#rm_id').val('0');        
+    $(document).on('click', '#btnAdd', function() {
+        // Reset the form
+        $('#UserForm')[0].reset(); 
+        $('#UserId').val('');
+        
+        // Specifically reset Select2 if you are using it
+        $('#nhance_branch_id').val('').trigger('change');
+        $('#rm_id').val('').trigger('change');
+        
+        // Update Modal Title and Action
+        $('.modal-title').text('Add User');
+        $('#btnSubmit').text('Submit');
         $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
-        let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
-        myModal.show();  // open modal
-
+        
+        var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+        myModal.show();
     });
+
+    // $(document).on('click', '#btnAdd', function(){
+    //     $('#first_name').val('');
+    //     $('#last_name').val('');
+    //     $('#email').val('');
+    //     $('#mobile').val('');
+    //     $('#emp_code').val('');        
+    //     $('#nhance_branch_id').val('0');        
+    //     $('#rm_id').val('0');        
+    //     $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
+    //     let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+    //     myModal.show();  // open modal
+    // });
     $(document).on('click', '#btnNhancePartnerAdd', function(){
         $('#partner_name').val('');
         $('#email_addr').val('');
@@ -1910,7 +2012,7 @@ table.dataTable tbody td {
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('')
                 $('#' + submitButId).prop('disabled', true);
             } else{
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index a69924ea..d79655f6 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -56,7 +56,7 @@ table.dataTable thead th {
                             <td class="client_info" ><?php echo $row['status']; ?></td>
                             <td>
                                     <div class="btn-group dropdown">
-                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
                                             <a class="dropdown-item advertise_image_edit" href="#" data-toggle="modal" data-wholearray='<?php echo json_encode($row, JSON_HEX_APOS); ?>' data-target="#bike_make_login-modal"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                             <?php if($row['client_id'] != 0) { ?>   <a class="dropdown-item" onclick="remove_advertise_image('<?= $row['id'];?>')"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a> <?php } ?>
@@ -126,7 +126,7 @@ table.dataTable thead th {
                             <div class="form-group">
                                 <label for="branchname">Upload Image</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="advertise_image" id="advertise_image" accept="image/*" onchange="PreviewImage();" required>
+                                    <input type="file" class="form-control" name="advertise_image" id="advertise_image" accept=".jpg,.jpeg,.png" onchange="PreviewImage();" required>
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>
@@ -219,31 +219,42 @@ table.dataTable thead th {
                     }
                 },
                 error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error('Status:', status);
-                    console.error('Error:', error);
+                    // Get the current domain
+                    const hostname = window.location.hostname;
+                    if (hostname === 'localhost' || hostname === '127.0.0.1') {
+                        // DEVELOPER MODE: Show everything in a nice group
+                        console.group("%c Debug: Server Error ", "background: #222; color: #bada55; padding: 2px;");
+                        console.error("Status:", xhr.status);
+                        console.error("Type:", error);
+                        console.error("Full Response:", xhr.responseText);
+                        console.groupEnd();
+                    } else {
+                        // LIVE MODE: Only log a simple, non-revealing error
+                        console.error("Server Error: Action could not be completed. Reference Code: " + xhr.responseText);
+                    }
 
-                    let msg = 'Something went wrong. Please try again later.';
-
-                    switch (xhr.status) {
-                        case 400:
-                            msg = xhr.responseJSON?.message || 'Bad Request — Invalid input.';
-                            break;
-                        case 401:
-                            msg = 'Unauthorized — Please log in again.';
-                            break;
-                        case 403:
-                            msg = 'Forbidden — You do not have permission.';
-                            break;
-                        case 404:
-                            msg = 'Not Found — Requested URL or resource not found.';
-                            break;
-                        case 500:
-                            console.log('Internal Server Error — Please contact support.');
-                            msg = xhr.responseJSON?.message || xhr.responseText || msg;
-                            break;
-                        default:
-                            msg = xhr.responseJSON?.message || xhr.responseText || msg;
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
                     }
                     
                 }
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index aa2aa0da..9a461282 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -168,6 +168,7 @@
                                                         data-event_type="<?= $file['event_type'] ?>" 
                                                         data-actions="<?= $file['actions'] ?>" 
                                                         data-client_branch_id="<?= $file['client_branch_id'] ?>" 
+                                                        data-issue_date="<?= $file['policy_issue_date'] ?>" 
 
                                             onclick="getBatchFileData(this)" class="dropdown-item upload_button" ><i class="mdi mdi-upload mr-2 text-muted font-18 vertical-middle"></i>Re-Upload</a>
                                         <?php } ?>
@@ -215,6 +216,7 @@
                     <input type="hidden" id="batch_file_insurer_or_tpa" name="insurer_or_tpa">
                     <input type="hidden" id="batch_file_action_type" name="action_type">
                     <input type="hidden" id="batch_file_event_type" name="event_type">
+                    <input type="hidden" id="batch_file_issue_date" name="policy_issue_date">
                     <input type="file" id="import_file_data" name="import_file_data" required
                         accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
                     
@@ -329,6 +331,7 @@
         let insurer_or_tpa = $(input).data('insurer_or_tpa')
         let event_type = $(input).data('event_type')
         let actions = $(input).data('actions')
+        let issue_date = $(input).data('issue_date')
 
         console.log('client_id', client_id);
         console.log('client_policy_id', client_policy_id);
@@ -336,6 +339,7 @@
         console.log('insurer_or_tpa', insurer_or_tpa);
         console.log('event_type', event_type);
         console.log('actions', actions);
+        console.log('issue_date', issue_date);
 
         $('#batch_file_client_id').val(client_id);
         $('#batch_file_policy_id').val(client_policy_id);
@@ -343,6 +347,7 @@
         $('#batch_file_insurer_or_tpa').val(insurer_or_tpa);
         $('#batch_file_action_type').val(actions);
         $('#batch_file_event_type').val(event_type);
+        $('#batch_file_issue_date').val(issue_date);
 
 
         var myModal = new bootstrap.Modal(document.getElementById('batch_file_upload_modal'));
diff --git a/app/Views/bds_dump_file_list.php b/app/Views/bds_dump_file_list.php
index 2c243dcd..b8a39153 100644
--- a/app/Views/bds_dump_file_list.php
+++ b/app/Views/bds_dump_file_list.php
@@ -182,9 +182,9 @@
                     console.log('Upload successful:', response);
 
                     if (response.status == true) {
-                        toastr.success(response.message, "SUCCESS");
+                        toastr.success(response.message, "Success");
                     } else {
-                        toastr.error(response.message, "ERROR");
+                        toastr.error(response.message, "Error");
                     }
 
                     // Reset form
@@ -196,7 +196,30 @@
                 error: function(xhr, status, error) {
                     // Handle error response
                     console.error('Upload failed:', error);
-                    console.error('Upload failed:', error);
+                    console.error('Unexpected error:', xhr.responseText);
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
                 },
                 complete: function() {
                     // Reset button state
@@ -214,7 +237,7 @@
                 // Check file size (optional - set max size as needed, e.g., 10MB)
                 var maxSize = 10 * 1024 * 1024; // 10MB in bytes
                 if (file.size > maxSize) {
-                    toastr.warning('File size should not exceed 10MB');
+                    toastr.warning('File size should not exceed 10MB', 'Warning');
                     $(this).val(''); // Clear the input
                     return false;
                 }
diff --git a/app/Views/cd_master_add_modal.php b/app/Views/cd_master_add_modal.php
index 9089d35f..4cc06188 100644
--- a/app/Views/cd_master_add_modal.php
+++ b/app/Views/cd_master_add_modal.php
@@ -187,7 +187,7 @@
                     }
 
                 } else {
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
 
                 //this function for reset the form values after submitting the form or closing the form
@@ -204,7 +204,30 @@
                 console.error(status, error);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.error('An error occurred while adding the CD account number.', 'ERROR');
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning'); 
+                        }
+                } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                } else {
+                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                }
+                toastr.error('An error occurred while adding the CD account number.', 'Error');
             }
         });
     });
@@ -279,7 +302,6 @@
 
         $('#opening_date').val('');
         $('#cd_ac_no_for_cd_master').val('');
-        $('#opening_bal').val('');        
         // $('#CDMasterForm').attr('action', '<?php echo base_url('master/cash_deposite/create');?>'); 
         $('#title').html('Add Opening Amount');
         $('#cd_master_btn_Submit').html('Submit');
@@ -329,13 +351,13 @@
                     $('#cd_client_id').val('').select2();
                     $('#insurer_id_for_cd').val('').select2();
                     $('#insurer_branch_id').val('').select2();
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
 
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
         }
     } 
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 139a0c75..57c23757 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -98,7 +98,7 @@ table.dataTable thead th {
                             <td><?php echo date('d-M-Y h:i A', strtotime($row['created_at'])) ?> <br>by <?php echo $row['user_name']; ?></td>
                             <td>
                                 <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);"class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                    <a href="javascript: void(0);"class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     <div class="dropdown-menu dropdown-menu-right">
                                         <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" data-toggle="modal" data-target="#con-close-modal"> <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                         <?php if($row['cd_ac_no_count'] == 0) { ?>
@@ -312,7 +312,7 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('success')) : ?>
-            toastr.success('<?= session()->getFlashdata('success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('success') ?>', 'Success');
         <?php endif; ?>
     })
  
@@ -381,10 +381,10 @@ table.dataTable thead th {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('CD removed successfully.', 'success');
+                            toastr.success('CD removed successfully.', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove CD.', 'warning');
+                            toastr.warning('Failed to remove CD.', 'Warning');
                         }
                         }
                     },
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 696d97ce..1330cded 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -22,6 +22,8 @@
     }
 
     .dataTables_length label {height: 21px !important;}
+
+    .readonly-select { background-color: #f3f3f3 !important; cursor: not-allowed;  pointer-events: none; }
 </style>
 
 <!-- <div class="row">
@@ -155,10 +157,35 @@
             <div class="modal-body">
                 <form class="parsley-examples" id="claim-upload-form" enctype="multipart/form-data">
                     <div class="form-group">
+                        <div class="form-row">
+                            <div class="form-group col-md-12">
+                                <label>Client<span id="tpa_danger" class="text-danger"></span></label>
+                                <select name="client_id" class="form-control" id="client_id">
+                                    <option value="">Select</option>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-12">
+                                <label>Policy <span id="tpa_danger" class="text-danger"></span></label>
+                                <select name="client_policy_id" class="form-control" id="client_policy_id">
+                                    <option value="">Select</option>
+                                </select>
+                            </div>
+                            <div class="form-group col-md-12">
+                                <label for="tpa">TPA<span id="tpa_danger" class="text-danger"></span></label>
+                                <select class="form-control readonly-select" id="tpa_id" name="tpa_id">
+                                    <option value="">Select TPA</option>
+                                    <?php foreach ($tpa_list as $value) { ?>
+                                        <option value="<?= $value['id'] ?>"><?= $value['short_name'] ?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
                         <div class="form-row" id="file_upload">
+
                             <div class="form-group col-md-9">
                                 <label>Upload file</label>
-                                <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
+                                &nbsp;[ <a href="<?= base_url("util/download-excel/claim_dump_upload"); ?>" id="download_sample_file" style="font-size: small; color:red !important;">Download sample file</a> ]
                                 <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
                             </div>
                             <div class="form-group col-md-3" style="margin-top: 40px;">
@@ -172,14 +199,47 @@
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+<div id="full-width-modal-emp-list" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel"
+    aria-hidden="true">
+    <div class="modal-dialog modal-full-width">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="fullWidthModalLabel">View Uploaded File<span
+                        id="title_header_name"></span></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body" id="emp_data_success">
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 <script>
 
+    let policyListByClient = null;
+    let client_list = null;
+
     $(document).ready(function() {
 
+        getClientAndBranchAndPolicy();
+
+        $('#client_id').select2();
+        $('#client_policy_id').select2();
+
         // AJAX Form Submit Function
         $('#claim-upload-form').on('submit', function(e) {
             e.preventDefault(); // Prevent default form submission
 
+            let client_id = $('#client_id').val() ?? null;
+            let client_policy_id = $('#client_policy_id').val() ?? null;
+
+            if(client_id){
+                if(!client_policy_id){
+                    toastr.warning('Please select the client policy', 'Warning');
+                    return;
+                }
+            }
+
             // Get form data
             var formData = new FormData(this);
             var fileInput = $('#claim_dump_list')[0];
@@ -220,9 +280,9 @@
                     console.log('Upload successful:', response);
 
                     if (response.status == true) {
-                        toastr.success(response.message, "SUCCESS");
+                        toastr.success(response.message, "Success");
                     } else {
-                        toastr.error(response.message, "ERROR");
+                        toastr.error(response.message, "Error");
                     }
 
                     // Reset form
@@ -275,6 +335,28 @@
             }
         })
 
+        $('#client_id').on('change', function(){
+
+            let client_id = $(this).val();
+
+            if(policyListByClient != '') {
+                console.log(policyListByClient[client_id]);
+                let data = policyListByClient[client_id];
+                appendPolicies(data);
+            }
+        })
+
+        $('#client_policy_id').on('change', function(){
+            let tpa_id = $(this).find(':selected').data('tpaid');
+            console.log('tpa_id', tpa_id);
+
+            if(tpa_id){
+                $('#tpa_id').val(tpa_id);
+            }else{
+                $('#tpa_id').val('');
+            }
+        })
+
     });
 
     // Datatable document ready
@@ -390,6 +472,7 @@
                     }
 
                 }
+                
                 if (err_id != 5 && err_id != 6 && err_id != 0) {
                     file_error_html += (file_error_html != "" ?
                         "<a href ='<?php echo base_url('util/claim_dump_excel_error/') ?>" + file_id +
@@ -428,5 +511,139 @@
         var myModal = new bootstrap.Modal(document.getElementById('claim-file-upload-modal'));
         myModal.show();
     }
+
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+
+                if (res.status == true) {
+                    policyListByClient = res.policyListByClient;
+                    client_list = res.client_data;
+                    appendClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    function appendClients(data) {
+
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+
+            if (item.client_policy_count > 0) {
+
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.client_name
+                });
+                $('#client_id').append(option);
+            }
+
+        });
+    }
+
+    function appendPolicies(data) {
+
+
+        $('#client_policy_id').empty();
+        $('#client_policy_id').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.policy_type + '-' + item.policy_no,
+                'data-tpaid': item.tpa_id,
+            });
+
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    $('body').on('click', '.view_emp_list', function() {
+
+        $('#emp_data_success').empty();
+        var file_id = $(this).attr('data-id');
+        console.log(file_id);
+
+        var queryParams = {
+            file_id: file_id,
+        };
+
+        console.log('queryParams', queryParams)
+        const queryString = objectToQueryString(queryParams);
+        console.log('queryString', queryString)
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        var uri = '<?= base_url('util/view-success-emp-list') ?>?' + queryString
+        console.log(uri)
+
+        $.ajax({
+            url: uri,
+            data: {
+                file_id: file_id,
+            },
+            type: "GET",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
+
+                console.log(res);
+
+                if (res) {
+                    setTimeout(function() {
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                    }, 1000);
+                }
+
+                var title = " - ";
+
+                if (res.file_data) {
+                    title += (res.file_data.file_name || "") + " - ";
+                    title += (res.file_data.short_name || "") + " - ";
+                    title += (res.file_data.policy_name || "") + " - ";
+                    title += (res.file_data.action || "") + " - ";
+                    title += (res.file_data.status || "");
+                }
+
+                $('#title_header_name').html(title);
+                $('#emp_data_success').html(res.data);
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                setTimeout(function() {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    toastr.warning('Something went wrong', 'Warning');
+
+                }, 1000);
+            }
+        });
+
+    })
     
 </script>
\ No newline at end of file
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 1c4f0079..7b9cd814 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -217,6 +217,29 @@
                 console.log("error in submission of url data");
                 console.error(xhr.responseText);
                 console.error(status, error);
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
                 
             },
             complete : function(){
@@ -566,7 +589,7 @@
     function addDocument() {
 
         if (documentConfig.is_action_freeze) {
-            toastr.warning('Cannot add documents when action is frozen', 'WARNING');
+            toastr.warning('Cannot add documents when action is frozen', 'Warning');
             return;
         }
         
@@ -591,7 +614,7 @@
 
     function removeDocument(index) {
         if (documentConfig.is_action_freeze) {
-            toastr.warning('Cannot remove documents when action is frozen', 'WARNING');
+            toastr.warning('Cannot remove documents when action is frozen', 'Warning');
             return;
         }
 
@@ -599,7 +622,7 @@
 
         // ❗ If document is already received, do not remove
         if (doc.document_received === true) {
-            toastr.warning('Cannot remove a received document', 'WARNING');
+            toastr.warning('Cannot remove a received document', 'Warning');
             return;
         }
 
@@ -640,7 +663,7 @@
 
         const hasEmptyNames = documentConfig.docs.some(doc => !doc.document_name.trim());
         if (hasEmptyNames) {
-            toastr.warning('Please fill in all document names', 'WARNING');
+            toastr.warning('Please fill in all document names', 'Warning');
             return false;
         }
 
@@ -665,15 +688,38 @@
 
             if (response.status) {
                 loadConfiguration(response.data);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while saving docs.', 'ERROR');
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
+
         });
         
     }
diff --git a/app/Views/claim_mis_file_list.php b/app/Views/claim_mis_file_list.php
new file mode 100644
index 00000000..56a7c04e
--- /dev/null
+++ b/app/Views/claim_mis_file_list.php
@@ -0,0 +1,411 @@
+<style>
+
+    .reload:hover {
+        cursor: pointer;
+    }
+
+    .table th,
+    .table td {
+        padding: 8px;
+    }
+
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
+
+    .addbtnStyle{
+        margin-left: 20px !important;
+    }
+
+    .dataTables_filter {
+        position: absolute;
+    }
+
+    .dataTables_length label {height: 21px !important;}
+
+    .readonly-select { background-color: #f3f3f3 !important; cursor: not-allowed;  pointer-events: none; }
+</style>
+
+<div class="col-12">
+    <div class="card">
+        <div class="card-body">
+            <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
+                        <th class="font-weight-medium">File name</th>
+                        <th class="font-weight-medium">User/Time</th>
+                        <th class="font-weight-medium">Action</th>
+                    </tr>
+                </thead>
+
+                <tbody class="font-12">
+                    <?php
+                    if (isset($claim_mis_file_list)) {
+                        foreach ($claim_mis_file_list as $key => $file) {
+                    ?>
+
+                            <tr>
+                                <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
+                                <td class="text-center"><?php echo $file['file_name'] ?></td>
+                                <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['user_name'] . '</strong>' ?>
+                                <td>
+                                    <div class="btn-group dropdown">
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a target="_blank" class="dropdown-item" href="<?= base_url("claim_mis/download?id=") . $file['id']; ?>"><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                    <?php }
+                    } ?>
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div><!-- end col -->
+
+<!-- Center modal content for upload file-->
+<div class="modal fade" id="claim-mis-file-upload-modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">Cliam MIS File upload</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <form class="parsley-examples" id="claim-mis-upload-form" enctype="multipart/form-data">
+                    <div class="form-group">
+
+                        <div class="form-row">
+
+                            <div class="form-group col-md-4">
+                                <label>Client<span id="tpa_danger" class="text-danger">*</span></label>
+                                <select name="client_id" class="form-control" id="client_id" required>
+                                    <option value="">Select</option>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label>Policy <span id="tpa_danger" class="text-danger">*</span></label>
+                                <select name="client_policy_id" class="form-control" id="client_policy_id" required>
+                                    <option value="">Select</option>
+                                </select>
+                            </div>
+
+                             <div class="form-group col-md-4">
+                                <label for="tpa">TPA<span id="tpa_danger" class="text-danger">*</span></label>
+                                <select class="form-control readonly-select" id="tpa_id" name="tpa_id" required>
+                                    <option value="">Select TPA</option>
+                                    <?php foreach ($tpa_list as $value) { ?>
+                                        <option value="<?= $value['id'] ?>"><?= $value['short_name'] ?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+
+                        </div>
+
+                        <div class="form-row">
+                            <div class="form-group col-md-4">
+                                <label>From Date<span id="tpa_danger" class="text-danger">*</span></label>
+                                <input class="form-control" type="text" name="from_date" id="from_date" required>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label>To Date<span id="tpa_danger" class="text-danger">*</span></label>
+                                <input class="form-control" type="text" name="to_date" id="to_date" required>
+                            </div>
+                        </div>
+
+                        <div class="form-row" id="file_upload">
+
+                            <div class="form-group col-md-4">
+                                <label>Upload file</label>
+                                <input type="file" name="file" id="file" accept=".pdf,.xls,.xlsx,application/pdf,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" required>
+                            </div>
+
+                            <div class="form-group col-md-3" style="margin-top: 40px;margin-left: 170px;">
+                                <button id="claim_mis_form_submit_button" type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
+                            </div>
+                        </div>
+
+                    </div>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<script>
+
+    let policyListByClient = null;
+    let client_list = null;
+
+    $(document).ready(function() {
+
+        getClientAndBranchAndPolicy();
+
+        $('#client_id').select2();
+        $('#client_policy_id').select2();
+
+        var from_date = flatpickr("#from_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false
+        });
+
+        var to_date = flatpickr("#to_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false
+        });
+
+        // AJAX Form Submit Function
+        $('#claim-mis-upload-form').on('submit', function(e) {
+            e.preventDefault(); // Prevent default form submission
+
+            // Get form data
+            var formData = new FormData(this);
+            var fileInput = $('#file')[0];
+
+            // Validate file type
+            var allowedTypes = [
+                'application/pdf',
+                'application/vnd.ms-excel',
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                'application/vnd.oasis.opendocument.spreadsheet'
+            ];
+
+            if (!fileInput.files || !fileInput.files.length) {
+                toastr.warning('Please select a file', 'Warning');
+                return false;
+            }
+
+            var selectedFile = fileInput.files[0];
+
+            // Some browsers return empty type → fallback to extension
+            var allowedExtensions = ['pdf', 'xls', 'xlsx', 'ods'];
+            var fileExtension = selectedFile.name.split('.').pop().toLowerCase();
+
+            if (
+                (!allowedTypes.includes(selectedFile.type)) &&
+                (!allowedExtensions.includes(fileExtension))
+            ) {
+                toastr.warning(
+                    'Please upload a valid file (PDF / Excel: .pdf, .xls, .xlsx, .ods)',
+                    'Warning'
+                );
+                return false;
+            }
+
+
+            //form submit url;
+            let url = `<?php echo base_url('claim_mis/upload');  ?>`;
+
+            // Show loading state
+            var submitButton = $('#claim_mis_form_submit_button');
+            var originalText = submitButton.text();
+            submitButton.prop('disabled', true).text('Uploading...');
+
+            // AJAX request
+            $.ajax({
+                url: url, // Your route URL
+                type: 'POST',
+                data: formData,
+                processData: false, // CRITICAL: Don't process the data
+                contentType: false, // CRITICAL: Don't set content-type header
+                cache: false,
+                success: function(response) {
+
+                    // Handle successful response
+                    console.log('Upload successful:', response);
+
+                    if (response.status == true) {
+                        toastr.success(response.message, "Success");
+                    } else {
+                        toastr.error(response.message, "Error");
+                    }
+
+                    // Reset form
+                    $('#claim-mis-upload-form')[0].reset();
+                    $('.close').click();
+                    window.location.reload();
+
+                },
+                error: function(xhr, status, error) {
+                    // Handle error response
+                    console.error('Upload failed:', error);
+                    console.error('Unexpected error:', xhr.responseText);
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
+                },
+                complete: function() {
+                    // Reset button state
+                    submitButton.prop('disabled', false).text(originalText);
+                }
+            });
+        });
+
+        $('#client_id').on('change', function(){
+
+            let client_id = $(this).val();
+
+            if(policyListByClient != '') {
+                console.log(policyListByClient[client_id]);
+                let data = policyListByClient[client_id];
+                appendPolicies(data);
+            }
+        })
+
+        $('#client_policy_id').on('change', function(){
+            let tpa_id = $(this).find(':selected').data('tpaid');
+            console.log('tpa_id', tpa_id);
+
+            if(tpa_id){
+                $('#tpa_id').val(tpa_id);
+            }else{
+                $('#tpa_id').val('');
+            }
+        })
+
+    });
+
+    // Datatable document ready
+    $(document).ready(function() {
+
+        var ticketsTable = $('#tickets-table');
+
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                // dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                //     "<'row'<'col-sm-12'tr>>" +
+                //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+                lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
+                buttons: [
+                    {
+                        text: 'Add',
+                        className: 'buttons-html5 addbtnStyle',
+                        action: function (e, dt, node, config) {
+                            openDumpUploadModal();
+                        }
+                    }
+                ],
+                language: {
+                    search: `
+                    <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
+                        <i class="mdi mdi-close-circle datatable-clear-icon" 
+                        style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i>
+                    </div>`,
+                    searchPlaceholder: "Search",
+                    emptyTable: '<div class="text-center text-muted">No Data found</div>'
+                },
+                paging: true, // Enable pagination
+                pageLength: 15, // Set default number of rows per page (optional)
+            });
+        } else {
+            console.error("Table not found.");
+        }
+    });
+
+    function openDumpUploadModal() {
+        var myModal = new bootstrap.Modal(document.getElementById('claim-mis-file-upload-modal'));
+        myModal.show();
+    }
+
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+
+                if (res.status == true) {
+                    policyListByClient = res.policyListByClient;
+                    client_list = res.client_data;
+                    appendClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    function appendClients(data) {
+
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+
+            if (item.client_policy_count > 0) {
+
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.client_name
+                });
+                $('#client_id').append(option);
+            }
+
+        });
+    }
+
+    function appendPolicies(data) {
+
+
+        $('#client_policy_id').empty();
+        $('#client_policy_id').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.policy_type + '-' + item.policy_no,
+                'data-tpaid': item.id,
+            });
+
+            $('#client_policy_id').append(option);
+        });
+    }
+    
+</script>
\ No newline at end of file
diff --git a/app/Views/client_api.php b/app/Views/client_api.php
index e57051f4..7cfd1ae7 100644
--- a/app/Views/client_api.php
+++ b/app/Views/client_api.php
@@ -57,7 +57,7 @@
                         <td>Get Branch Wise Employee Data</td>
                         <td><?= base_url("getClientBranchEmpData") ?></td>
                     </tr>
-                </table>
+                </table>-->
             
                     
                     <!-- Enter Token Section -->
diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php
index 0af82f51..17722d1c 100755
--- a/app/Views/client_basic_info.php
+++ b/app/Views/client_basic_info.php
@@ -81,7 +81,7 @@ input:checked + .slider:before {
                                 style="border-radius:25px; border:1px solid #00999E;padding:10px;color:#00999E;" 
                                 alt="avatar"/>
                             <span style="margin-bottom:5px;">
-                                <input type="file" name="client_logo" id="client_logo" accept="image/*" onchange="PreviewImage();"><br>
+                                <input type="file" name="client_logo" id="client_logo" accept=".jpg,.jpeg,.png" onchange="PreviewImage();"><br>
                                 <i class="text">( Image dimensions 100 x 100 pixels and size of 200KB. )</i> 
                             </span>
                             <br>
@@ -142,6 +142,32 @@ input:checked + .slider:before {
                                 </select>
                             </div>
 
+                            <div class="form-group col-md-4">
+
+                                <label>HR File Processed By <span class="text-danger">*</span></label>
+                                <div class="d-flex align-items-center">
+                                    <div class="form-check form-check-inline mb-0" style="margin-right: -356px;">
+                                        <input class="form-check-input"
+                                            type="radio"
+                                            name="hr_file_processed_by"
+                                            id="hr_processed"
+                                            value="1" <?php echo(isset($client['hr_file_processed_by']) && $client['hr_file_processed_by'] == 1) ? 'checked' : '' ?>>
+                                        <label class="form-check-label" for="hr_processed">HR</label>
+                                    </div>
+
+                                    <div class="form-check form-check-inline mb-0">
+                                        <input class="form-check-input"
+                                            type="radio"
+                                            name="hr_file_processed_by"
+                                            id="account_manager_processed"
+                                            value="2"
+                                             <?php echo(isset($client['hr_file_processed_by']) && $client['hr_file_processed_by'] == 2) ? 'checked' : '' ?>>
+                                        <label class="form-check-label" for="account_manager_processed">Account Manager</label>
+                                    </div>
+                                </div>
+
+                            </div>
+
                         </div>
                         <hr>
                     </div>
@@ -298,7 +324,7 @@ input:checked + .slider:before {
                                 $.each(res.data, function (index, item) {
                                     var row = `<tr>
                                                 <td> ${item.file_name}</td>
-                                                <td id="form_${item.id}" style=""><form class="ajax" ><input class="file-input__input" type="file" name="file_name">
+                                                <td id="form_${item.id}" style=""><form class="ajax" ><input class="file-input__input" type="file" name="file_name" accept=".jpg,.jpeg,.png">
                                                     <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
                                                     <input type="hidden" class="form-control" value="${item.id}" name="kyc_doc_type_id" />
                                                     <input type="hidden" name="client_id" id="id_for_kyc_file" value="${client_id_for_file}"/>
@@ -323,12 +349,30 @@ input:checked + .slider:before {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
                             $submitButton.prop('disabled', false);
-                            if (xhr.status === 404) {
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 404) {
                                 toastr.warning('Resource not found', 'Warning');
                             } else if (xhr.status === 500) {
-                                toastr.warning('Internal server error', 'Warning');
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
                             } else {
-                                toastr.warning('Unknown error occurred', 'Warning');
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
                             }
                     }, 1000);
                 }
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index 01ff9597..97d8161a 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -44,6 +44,69 @@
         cursor: pointer;
     }
 </style>
+<style>
+    
+.switch-branch-contact {
+  position: relative;
+  display: inline-block;
+  width: 54px;
+  height: 34px;
+}
+
+.switch-branch-contact input { 
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.slider-branch-contact {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.slider-branch-contact:before {
+  position: absolute;
+  content: "";
+  height: 19px;
+  width: 19px;
+  left: 4px;
+  bottom: 4px;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+input:checked + .slider-branch-contact {
+  background-color: #00999E;
+}
+
+input:focus + .slider-branch-contact {
+  box-shadow: 0 0 1px #00999E;
+}
+
+input:checked + .slider-branch-contact:before {
+  -webkit-transform: translateX(26px);
+  -ms-transform: translateX(26px);
+  transform: translateX(26px);
+}
+
+/* Rounded sliders */
+.slider-branch-contact.round-branch-contact {
+  border-radius: 34px;
+}
+
+.slider-branch-contact.round-branch-contact:before {
+  border-radius: 50%;
+}
+</style>
+
 
 <div class="tab-pane fade" id="branch-tab">
     <input type="hidden" id="client_id_for_client_branch" value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
@@ -162,12 +225,12 @@
                                 </select>
                             </div>
                             <div class="form-group col-md-4">
-                                <label class="switch" style="position: relative;top: 43px;left: 20px;">
+                                <label class="switch-branch-contact" style="position: relative;top: 43px;left: 20px;">
                                     <input id="sez" type="checkbox" name="sez">
-                                    <span class="slider round" style="height: 27px;"></span>
+                                    <span class="slider-branch-contact round-branch-contact" style="height: 27px;"></span>
                                 </label>
 
-                                <label for="inception_type" style="position: relative;bottom: 5px;left: 85px;">Enable SEZ</label>
+                                <label for="sez" style="position: relative;bottom: 5px;left: 85px;">Enable SEZ</label>
                             </div>
                         </div>
 
@@ -281,7 +344,7 @@ $(document).ready(function() {
                     </tr>
                     `;
                 }
-
+ 
         });
         $('#branch_list').append(branchTable);
     }
@@ -495,6 +558,31 @@ $("#branch_form").submit(function(event) {
                     if(xhr.status === 409){
                         alert('The Current Branch is Already Existing..!!');
                     }
+                    else if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                // Only add the message if it hasn't been seen before
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
                 }, 300);
             },
             complete: function() {
@@ -967,7 +1055,7 @@ function validateInput(input, table, field, submitButId){
 
     checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
         if (isDuplicate) {
-            toastr.warning(message, 'WARNING');
+            toastr.warning(message, 'Warning');
             // $(input).val('')
             $('#' + submitButId).prop('disabled', true);
         } else{
@@ -1003,7 +1091,7 @@ function validateDuplicateByClientBranch(input, field, submitButId) {
     if (isLocalDuplicate) {
         console.log(`r u n Local`);
         console.log(`duplicate found for ${field}`);
-        toastr.warning(message, 'WARNING');
+        toastr.warning(message, 'Warning');
         $('#' + submitButId).prop('disabled', true);
         return;
     }
@@ -1030,7 +1118,7 @@ function validateDuplicateByClientBranch(input, field, submitButId) {
             if (response.isDuplicate) {
                 console.log(`r u n Server`);
                 console.log(`duplicate found for ${field}`);
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $('#' + submitButId).prop('disabled', true);
             } else {
                 console.log(`No duplicate for ${field}`);
@@ -1075,13 +1163,13 @@ function checkAllFieldsValid(submitButId) {
         $('#' + submitButId).prop('disabled', true);
         // show correct message based on what’s duplicated
         if (emailDuplicates && mobileDuplicates) {
-            toastr.warning("Email and Mobile values are duplicate!", "WARNING");
+            toastr.warning("Email and Mobile values are duplicate!", "Warning");
             console.log('Both Email and Mobile duplicates');
         } else if (emailDuplicates) {
-            toastr.warning("Email duplicate!", "WARNING");
+            toastr.warning("Email duplicate!", "Warning");
             console.log('Cross Check Email duplicates');
         } else if (mobileDuplicates) {
-            toastr.warning("Mobile duplicate!", "WARNING");
+            toastr.warning("Mobile duplicate!", "Warning");
             console.log('Cross Check Mobile duplicates');
         }
         console.log(`btn Dis - true`);
@@ -1127,9 +1215,9 @@ function removeLevelContacts(id){
 
         console.log('Data fetched successfully:', response);
         if (response.status == true) {
-            toastr.success(response.message, 'SUCCESS');
+            toastr.success(response.message, 'Success');
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
 
     }, function(xhr, status, error) {
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index e68543e2..6a8a0259 100755
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -157,7 +157,7 @@
                         $('#tbody').append(res.data);
                         toastr.success('File uploaded successfully', 'Success');
                     }else{
-                        toastr.warning('File uploaded failed', 'WARNING');
+                        toastr.warning('File uploaded failed', 'Warning');
                     }
                 },
                 error: function (xhr, status, error) {
@@ -165,7 +165,32 @@
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 404) {
+                                toastr.warning('Resource not found', 'Warning');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+                    
                 }
             });
         });
@@ -211,7 +236,7 @@
                         $('#other_docs').append(res.data);
                         toastr.success('File uploaded successfully', 'Success');
                     }else{
-                        toastr.warning('File uploaded failed', 'WARNING');
+                        toastr.warning('File uploaded failed', 'Warning');
                     }
 
                     $('#kyc_form').trigger('reset');
@@ -221,7 +246,31 @@
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 404) {
+                                toastr.warning('Resource not found', 'Warning');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
                 }
             });
 
@@ -304,7 +353,8 @@
                                 <td>${item.file_name}</td>
                                 <td id="form_${item.id}">
                                     <form class="ajax">
-                                        <input class="file-input__input" type="file" name="file_name">
+                                        <input class="file-input__input" type="file" name="file_name" 
+                                        accept=".pdf,.jpg,.jpeg,.png">
                                         <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>">
                                         <input type="hidden" class="form-control" value="${item.id}" name="kyc_doc_type_id">
                                         <input type="hidden" name="client_id" value="${client_id}">
diff --git a/app/Views/client_kyc_2.php b/app/Views/client_kyc_2.php
index 5032e615..7a34acc8 100755
--- a/app/Views/client_kyc_2.php
+++ b/app/Views/client_kyc_2.php
@@ -36,6 +36,7 @@
                                 <div class="form-group col-md-3 file-input-group">
                                             <label for="file_input">Browser File<span class="text-danger">*</span></label>
                                             <input type="file" class="form-control file-input" id="kyc_docs_file" name="file_name" required 
+                                            accept=".pdf,.jpg,.jpeg,.png"
                                             style="box-shadow: none !important; outline: none !important;   border: none; height: unset !important;padding: 0px !important;background: transparent !important;">
                                 </div>
 
@@ -345,7 +346,7 @@
         }
 
         // Invalid format
-        toastr.warning('Invalid file format. Only PDF or Image files are allowed.', 'WARNING!');
+        toastr.warning('Invalid file format. Only PDF or Image files are allowed.', 'Warning');
         $(fileInput).val(''); // clear file
         return false; // Invalid
     }
diff --git a/app/Views/client_kyc_other_table.php b/app/Views/client_kyc_other_table.php
index 04bcce83..119c7831 100644
--- a/app/Views/client_kyc_other_table.php
+++ b/app/Views/client_kyc_other_table.php
@@ -4,7 +4,7 @@
             <!-- <td><?= $index + 1; ?></td> -->
             <td><?= esc($item['file_name']); ?></td>
             <td><?= esc($item['other_docs_name']); ?></td>
-            <td><a id="download_<?= esc($item['id']); ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download" style="font-size:18px;" download></a></td>
+            <td><a id="download_<?= esc($item['id']); ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download" style="font-size:18px;" download title="Download file"></a></td>
         </tr>
     <?php endforeach; ?>
 <?php else: ?>
diff --git a/app/Views/client_kyc_primary_table.php b/app/Views/client_kyc_primary_table.php
index 4373a373..20317d97 100644
--- a/app/Views/client_kyc_primary_table.php
+++ b/app/Views/client_kyc_primary_table.php
@@ -7,7 +7,7 @@
             <?php if(empty($item['upload_doc_name'])) { ?>
                 <td id="form_<?= esc($item['id']); ?>">
                     <form class="ajax" enctype="multipart/form-data" method="post">
-                        <input class="file-input__input" type="file" name="file_name">
+                        <input class="file-input__input" type="file" name="file_name" accept=".pdf,.jpg,.jpeg,.png">
                         <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>">
                         <input type="hidden" class="form-control" value="<?= esc($item['id']); ?>" name="kyc_doc_type_id">
                         <input type="hidden" name="client_id" value="<?= esc($client_id); ?>">
diff --git a/app/Views/client_kyc_single_table.php b/app/Views/client_kyc_single_table.php
index 58d1b68c..0b67be02 100644
--- a/app/Views/client_kyc_single_table.php
+++ b/app/Views/client_kyc_single_table.php
@@ -48,6 +48,7 @@
                                    name="file_name"
                                    id="kyc_docs_file_<?= $value['id'] ?>"
                                    class="form-control edit-file-input"
+                                   accept=".pdf,.jpg,.jpeg,.png"
                                    style="box-shadow:none!important; outline:none!important;   border:none; height:unset!important;padding: 0px !important;background: transparent !important;">
                         </div>
 
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 798bfaa8..6594af87 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -102,7 +102,7 @@ table.dataTable thead th {
                         <tr >
                             <td class="text-center"><?=$index+1?></td>
                             <td class="client_info" data-id="<?php echo $row->id; ?>"><?php echo $row->client_name; ?> ( <?php echo $row->short_name; ?> ) </td>
-                            <td>
+                            <!-- <td>
                                 <?php $account_managers = ''; ?>
                                 <?php foreach ($client_rm as $client): ?>
                                     <?php if ($client->client_id == $row->id): ?>
@@ -112,10 +112,13 @@ table.dataTable thead th {
                                 <?php 
                                  $account_managers = rtrim($account_managers, ', ');
                                  echo $account_managers !== '' ? $account_managers : 'N/A'; ?> 
+                            </td> -->
+                            <td>
+                                <?= $row->account_managers ?>
                             </td>
                             <td>
                                 <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     <div class="dropdown-menu dropdown-menu-right">
                                         <a class="dropdown-item" href="<?= base_url("client/list/"); ?><?= $row->id;?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                         <a class="dropdown-item" href="<?= base_url("client/deposit/{$row->id}"); ?>"><i class="mdi mdi-cash mr-2 text-muted font-18 vertical-middle"></i>CD Transactions</a>
@@ -375,53 +378,55 @@ $(document).ready(function()
             </span>
         </span>
     `);
-                $('#toggleButtons').on('change', function() {
-                    let type = $(this).is(':checked') ? 1 : 2;
-                    // $('div.col-6 h4').text(
-                    //     $(this).is(':checked') 
-                    //         ? "GC Client List" 
-                    //         : "RC Client List"
-                    // );
-                    let url = '<?= base_url('client/typeList/') ?>' + type;
 
-                    $.ajax({
-                        url: url,        
-                        method: 'GET',
-                        success: function(response) {
-                            if (response.status === "success" && Array.isArray(response.data)) {
-                                renderRows(response.data);
-                            } else {
-                                renderRows([]);
-                            }
-                        },
-                        error: function(xhr, status, error) {
-                            console.error("Error loading:", error);
-                            renderRows([]);
-                        }
-                    });
-            });
+$('#toggleButtons').on('change', function() {
+    let type = $(this).is(':checked') ? 1 : 2;
+    let url = '<?= base_url('client/typeList/') ?>' + type;
+
+    $('.loader').fadeIn(); // Show loader during AJAX
+
+    $.ajax({
+        url: url,        
+        method: 'GET',
+        success: function(response) {
+            $('.loader').fadeOut();
+            // Pass response.data directly to the function
+            if (response.status === "success") {
+                renderRows(response.data);
+            } else {
+                // If the structure is slightly different, pass the whole object
+                renderRows(response); 
+            }
+        },
+        error: function(xhr, status, error) {
+            $('.loader').fadeOut();
+            console.error("Error loading:", error);
+            renderRows([]);
+        }
+    });
+});
     
 }) 
 
-    function renderRows(data) {
+    function renderRows(incomingData) {
+        
+        let actualList = [];
+        if (incomingData && incomingData.clientList) {
+            actualList = incomingData.clientList;
+        } else if (Array.isArray(incomingData)) {
+            actualList = incomingData;
+        }
+
+        
         table.clear();
-        if (Array.isArray(data) && data.length) {
-            data.forEach((row, index) => {
-                let clientrm = <?= json_encode($client_rm) ?>;
-                let account_managers = "";
-
-                clientrm.forEach(client => {
-                    if (client.client_id == row.id) {
-                        account_managers += client.account_manager + ", ";
-                    }
-                });
-                account_managers = account_managers.replace(/,\s*$/, "");
-                if (account_managers === "") account_managers = "N/A";
 
+        if (actualList.length > 0) {
+            actualList.forEach((row, index) => {
+                
                 let rowData = [
                     index + 1,
                     `<span class="client_info" data-id="${row.id}">${row.client_name} (${row.short_name})</span>`,
-                    account_managers,                
+                    row.account_managers || "N/A",                
                     `<div class="btn-group dropdown">
                         <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown">
                             <i class="mdi mdi-dots-horizontal"></i>
@@ -484,7 +489,7 @@ $(document).ready(function()
 
 //                     if(res){
 //                     if (res.status == true) {
-//                         toastr.success('Client removed successfully.', 'success');
+//                         toastr.success('Client removed successfully.', 'Success');
 //                         location.reload();
 //                     } else {
 //                         Swal.fire({
@@ -492,7 +497,7 @@ $(document).ready(function()
 //                             text: res.message,
 //                             icon: "warning"
 //                         });
-//                         // toastr.warning(res.message, 'warning');
+//                         // toastr.warning(res.message, 'Warning');
 //                     }
 //                     }
 //                 },
@@ -549,15 +554,15 @@ function removeClient(element)
                     $('.loader-mask').delay(350).fadeOut('slow');
 
                     if (res.status == true) {
-                        toastr.success(res.message, 'success');
+                        toastr.success(res.message, 'Success');
                         location.reload();
                     } else {
                         Swal.fire({
-                            title: "warning!",
+                            title: "Warning!",
                             text: res.message,
                             icon: "warning"
                         });
-                        // toastr.warning(res.message, 'warning');
+                        // toastr.warning(res.message, 'Warning');
                     }
                 },
                 error: function (xhr, status, error) {
@@ -645,11 +650,15 @@ function featchClient(){
             $('.loader-mask').delay(350).fadeOut('slow');
 
             if(res.status == true){
-                let client_url = '<?= base_url('client/list/') ?>' + res.client_id + '?client_policy_id=' + res.client_policy_id+'#police-tab';
-                toastr.success(res.message, 'SUCCESS')
+                let client_url = '<?= base_url('client/list/') ?>'
+                    + res.client_id
+                    + '?cd_amt=' + (res.cd_amount ?? 0)
+                    + '&client_policy_id=' + res.client_policy_id
+                    + '#police-tab';
+                toastr.success(res.message, 'Success')
                 window.location.href = client_url
             }else{
-                toastr.success(res.message, 'WARNING')
+                toastr.warning(res.message, 'Warning')
             }
 
             $('.close').click()
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 3a195fe7..d8d5eb68 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -464,7 +464,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -481,7 +481,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#relation_form').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -495,7 +495,7 @@
 
         if (check_client_id == '' || check_client_id == null || check_client_id == 0) {
             $('#BtnAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -512,7 +512,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -529,7 +529,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#notification-tab').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -719,9 +719,9 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status === true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
-                console.error(response.message, 'WARNING');
+                console.error(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('--- AJAX Error Details ---');
@@ -813,7 +813,7 @@
             if (response.status === true) {
                 $('#hr_access_append_area').empty();
                 $('#hr_access_append_area').append(response.data)
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
                 console.error(response.message, 'WARNING');
             }
diff --git a/app/Views/client_others_tab.php b/app/Views/client_others_tab.php
index e7f0979c..193eb8b1 100644
--- a/app/Views/client_others_tab.php
+++ b/app/Views/client_others_tab.php
@@ -59,9 +59,9 @@ $(document).ready(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     if (res.status == true) {
-                        toastr.success(res.message, 'SUCCESS');
+                        toastr.success(res.message, 'Success');
                     } else {
-                        toastr.warning(res.message, 'WARNING');
+                        toastr.warning(res.message, 'Warning');
                     }
 
                 },
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 88e2300e..5811354c 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -525,9 +525,9 @@ input:checked + .slider_blue::before {
                                     <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                                     <td>
                                         <div class="btn-group dropdown">
-                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right">
-                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                                 <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                                 <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -792,9 +792,9 @@ input:checked + .slider_blue::before {
                                                 <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                                                 <td>
                                                     <div class="btn-group dropdown">
-                                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                                         <div class="dropdown-menu dropdown-menu-right">
-                                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -825,6 +825,13 @@ input:checked + .slider_blue::before {
                 $('#open_date').val('');
                 $('#close_date').val('');
                 $('#policy').html('<option value="" selected>Select Policy</option>');
+
+                const urlParams = new URLSearchParams(window.location.search);
+                const clientPolicyId = urlParams.get('client_policy_id');
+                if (clientPolicyId) {
+                    let client_url = '<?= base_url('client/list/') ?>' + res.client_id ;
+                    window.location.href = client_url
+                }
             },
             error: function(xhr, status, error) {
                 console.error(xhr.responseText);
@@ -832,16 +839,40 @@ input:checked + .slider_blue::before {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    if (xhr.status === 404) {
-                        //console.log('Resource not found', 'Warning');
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
                     } else if (xhr.status === 500) {
-                        //console.log('Internal server error', 'Warning');
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
                     } else {
-                        //console.log('Unknown error occurred', 'Warning');
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
                     }
+                    // else if (xhr.status === 404) {
+                    //     //console.log('Resource not found', 'Warning');
+                    // } else if (xhr.status === 500) {
+                    //     //console.log('Internal server error', 'Warning');
+                    // } else {
+                    //     //console.log('Unknown error occurred', 'Warning');
+                    // }
                 }, 1000);
             },
             complete :function(){
+                $('#opening_bal').val("")
                 console.log('AJAX request completed');
             }
         });
@@ -926,6 +957,14 @@ input:checked + .slider_blue::before {
 
         var policy_form_action = '';
         var policy_id = $(this).attr('data-id');
+        var opening_bal = $(this).attr('data-cdamt') ?? "";
+        console.log('opening_bal', opening_bal)
+        console.log('opening_bal',  $('#opening_bal'))
+
+        if(opening_bal != "null"){
+            $('#opening_bal').val(opening_bal);
+        }
+
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
@@ -1812,7 +1851,7 @@ input:checked + .slider_blue::before {
                 // //console.log(res.data.length);
 
                 if (res.data.length == 0) {
-                    toastr.warning('The client does not have any branches.', 'warning');
+                    toastr.warning('The client does not have any branches.', 'Warning');
                     return;
                 }
 
@@ -1953,7 +1992,7 @@ input:checked + .slider_blue::before {
 
                             if(res){
                             if (res.status == true) {
-                                toastr.success('Policy removed successfully.', 'success');
+                                toastr.success('Policy removed successfully.', 'Success');
                                 location.reload();
                             } else {
                                 Swal.fire({
@@ -1961,7 +2000,7 @@ input:checked + .slider_blue::before {
                                     text: res.message,
                                     icon: "warning"
                                 });
-                                // toastr.warning('Failed to remove policy', 'warning');
+                                // toastr.warning('Failed to remove policy', 'Warning');
                             }
                             }
                         },
@@ -1997,7 +2036,7 @@ input:checked + .slider_blue::before {
                 console.log(res);
                 if (res.status == true) {
 
-                    toastr.warning(res.message, 'warning');
+                    toastr.warning(res.message, 'Warning');
                     $('#policy_no').val('');
 
                 }else{
@@ -2022,6 +2061,7 @@ input:checked + .slider_blue::before {
             // Get the `client_policy_id` from the URL
             const urlParams = new URLSearchParams(window.location.search);
             const clientPolicyId = urlParams.get('client_policy_id');
+            const cd_amt = urlParams.get('cd_amt');
 
             if (clientPolicyId) {
                 // Call your function with the `client_policy_id`
@@ -2029,6 +2069,10 @@ input:checked + .slider_blue::before {
                     getClientPolicyDataForEdit(clientPolicyId);
                 }, 3000);
             }
+
+            if(cd_amt){
+                $('#opening_bal').val(cd_amt);
+            }
         }
     });
 
@@ -2270,10 +2314,10 @@ input:checked + .slider_blue::before {
 
                 if(res.status == true){
                     let client_url = '<?= base_url('client/list/') ?>' + res.client_id + '?client_policy_id=' + res.client_policy_id+'#police-tab';
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     window.location.href = client_url;
                 }else{
-                    toastr.success(res.message, 'WARNING');
+                    toastr.success(res.message, 'INFO');
                 }
 
                 $('.close').click()
@@ -2487,9 +2531,9 @@ $(document).ready(function () {
                                 <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                                 <td>
                                     <div class="btn-group dropdown">
-                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
-                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -2523,9 +2567,9 @@ $(document).ready(function () {
                                 <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                                 <td>
                                     <div class="btn-group dropdown">
-                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
-                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
diff --git a/app/Views/client_rm.php b/app/Views/client_rm.php
index 4d3dd823..a996bd93 100755
--- a/app/Views/client_rm.php
+++ b/app/Views/client_rm.php
@@ -158,7 +158,33 @@ $(document).ready(function(){
                         setTimeout(function() {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                     console.log('Something Wrong!', 'warning');                        }, 1000);
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 404) {
+                                toastr.warning('Resource not found', 'Warning');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+                            
+                        }, 1000);
                     }
                 });
 
diff --git a/app/Views/commission_file_upload.php b/app/Views/commission_file_upload.php
index 7d1ca6fd..472e452f 100644
--- a/app/Views/commission_file_upload.php
+++ b/app/Views/commission_file_upload.php
@@ -510,11 +510,11 @@
                     $('#commission_upload_form')[0].reset();
 
                     if (response.code === 200 && response.status === true) {
-                        toastr.success('File upload success', 'SUCCESS');
+                        toastr.success('File upload success', 'Success');
                     } else if (response.code === 404 && response.status === false) {
-                        toastr.error(response.message, 'FAILED');
+                        toastr.error(response.message, 'Failed');
                     } else {
-                        toastr.error('Something went wrong! Try later', 'ERROR');
+                        toastr.error('Something went wrong! Try later', 'Error');
                     }
 
                     $('.close').click();
@@ -527,7 +527,7 @@
                 },
                 error: function(xhr, status, error) {
                     console.error("Request failed:", status, error);
-                    toastr.error('Something went wrong! Try later', 'ERROR');
+                    toastr.error('Something went wrong! Try later', 'Error');
 
                     $('.close').click();
                     $('.loader').fadeOut();
diff --git a/app/Views/commission_rules_list.php b/app/Views/commission_rules_list.php
index 93399920..0b6e0318 100644
--- a/app/Views/commission_rules_list.php
+++ b/app/Views/commission_rules_list.php
@@ -721,11 +721,11 @@
             console.log('rules type', typeof rules);
 
             if (response.status == true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 // rules = response.data;
                 displayRules(response.data);
             }else{
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -739,7 +739,7 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
         
     });
@@ -867,11 +867,11 @@
                     console.log('rules type', typeof rules);
 
                     if (response.status == true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         // rules = response.data;
                         displayRules(response.data);
                     }else{
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
@@ -885,7 +885,7 @@
                     $('.loader-mask').delay(350).fadeOut('slow');
                     console.error('Error fetching data:', error);
                     console.error(xhr.responseText);
-                    toastr.error('An error occurred while fetching the data.', 'ERROR');
+                    toastr.error('An error occurred while fetching the data.', 'Error');
                 });
             }
 
@@ -1033,7 +1033,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
 
     }
diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index f557fdd9..c7759622 100644
--- a/app/Views/drive_file_upload.php
+++ b/app/Views/drive_file_upload.php
@@ -99,10 +99,10 @@ $("#drive_file_upload_form").submit(function(event) {
             $('.loader-mask').delay(350).fadeOut('slow');
 
             if(res.status == true){
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 appendFileTableBody(res.data.pt_files);
             }else{
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
             }
 
             $('#drive_file_upload_form')[0].reset();
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index d4704749..adab4187 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -183,7 +183,7 @@
                                     <td><?php $gst_total += $employee['gst']; echo format_indian_number($employee['gst']); ?></td>
                                     <td>
                                         <div class="btn-group dropdown">
-                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right">
 
                                                 <?php 
@@ -197,20 +197,20 @@
 
                                                 <?php } ?>
 
-                                                <?php if(in_array($employee['policy_type_id'], [2,3,4,5]) && $employee['emp_status'] == 'active' && $employee['status'] == 'active' && !empty($employee['tpa_id'])) { ?>
+                                                <?php if(in_array($employee['policy_type_id'], [2,3,4,5]) && in_array($employee['emp_status'], ['active', 'expired'])  && in_array($employee['status'], ['active', 'expired']) && !empty($employee['tpa_id'])) { ?>
                                                     <!-- <a href="<?= base_url('download-e-card/'). $employee['rand_string'] . "/0/1" ?>" class="dropdown-item" target="_blank"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View E-Card</a> -->
                                                     <a class="dropdown-item" onclick="viewEcard(<?= $employee['employee_id'] ?>, '<?= $employee['emp_code'] ?>', <?= $employee['client_policy_id'] ?>, '<?= $employee['policy_no'] ?>')"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View E-Card</a>
                                                  <?php } ?>
 
-                                                <?php if($employee['relationship'] == 'Self' && in_array($employee['policy_type_id'], [2,3,4,5]) && $employee['email_corporate'] != '' && $employee['emp_status'] == 'active' && $employee['status'] == 'active' && !empty($employee['tpa_id'])) { ?>
+                                                <?php if($employee['relationship'] == 'Self' && in_array($employee['policy_type_id'], [2,3,4,5]) && $employee['email_corporate'] != '' && in_array($employee['emp_status'], ['active', 'expired'])  && in_array($employee['status'], ['active', 'expired']) && !empty($employee['tpa_id'])) { ?>
                                                     <a class="dropdown-item" onclick="send_mail_for_individual_employee_ecard('<?= $employee['id'];?>', '<?= $employee['client_policy_id'];?>')" ><i class="mdi mdi-email-alert mr-2 text-muted font-18 vertical-middle"></i>Send E-Card Mail</a>
                                                 <?php } ?>
 
-                                                <?php if($employee['relationship'] == 'Self' && in_array($employee['policy_type_id'], [2,3,4,5]) && $employee['emp_status'] == 'active' && $employee['status'] == 'active' && !empty($employee['tpa_id'])) { ?>
+                                                <?php if($employee['relationship'] == 'Self' && in_array($employee['policy_type_id'], [2,3,4,5]) && in_array($employee['emp_status'], ['active', 'expired'])  && in_array($employee['status'], ['active', 'expired']) && !empty($employee['tpa_id'])) { ?>
                                                     <a class="dropdown-item" onclick="showReGenerateConfirmation('<?= $employee['client_policy_id'];?>', '<?= $employee['emp_code'];?>')" ><i class="mdi mdi-refresh mr-2 text-muted font-18 vertical-middle"></i>Re-Generate E-Card</a>
                                                 <?php } ?>
 
-                                                <?php if($employee['is_addon'] == 3 && $employee['policy_type_id'] == 3 && $employee['emp_status'] == 'active' && $employee['status'] == 'active' && !empty($employee['tpa_id'])) { ?>
+                                                <?php if($employee['is_addon'] == 3 && $employee['policy_type_id'] == 3 && in_array($employee['emp_status'], ['active', 'expired'])  && in_array($employee['status'], ['active', 'expired']) && !empty($employee['tpa_id'])) { ?>
                                                     <a class="dropdown-item" onclick="showReGenerateConfirmation('<?= $employee['client_policy_id'];?>', '<?= $employee['emp_code'];?>')" ><i class="mdi mdi-refresh mr-2 text-muted font-18 vertical-middle"></i>Re-Generate E-Card</a>
                                                 <?php } ?>
 
@@ -468,7 +468,7 @@
                     $('#gender').prop('disabled', false);
                     $('#dob').prop('disabled', false);
 
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
             },
             error: function (xhr, status, error) {
@@ -515,7 +515,7 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     
                     $('.close').click();
 
@@ -531,7 +531,7 @@
                     fetchEmpolyeeList();
 
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -548,8 +548,28 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
-                console.error('Upload error:', error);
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                }
+                else{ toastr.warning('Error uploading file', 'Warning'); }
             },
             complete: function() {
                 $('.loader').fadeOut();
@@ -589,9 +609,9 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if(res.status == true){
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                         }else{
-                            toastr.error(res.message, 'ERROR');
+                            toastr.error(res.message, 'Error');
                         }
                     },
                     error: function (xhr, status, error) {
@@ -630,7 +650,7 @@
 
         checkDuplicateTableFieldValue(table, field, data, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $("#btnSubmit").prop('disabled', true);
             }else{
                 $("#btnSubmit").prop('disabled', false);
@@ -729,12 +749,12 @@
                 showModal();
             } else {
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -769,11 +789,11 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status == true && response.data.eCardDownload) {
-                console.log(response.data.message || 'Initiating successafully', 'SUCCESS');
+                console.log(response.data.message || 'Initiating successfully', 'Success');
                 const newTab = window.open(response.data.eCardDownload, '_blank');
                 if (newTab) newTab.focus();
             } else {
-                toastr.error(response.data.message || 'Unable to fetch e-card', 'ERROR');
+                toastr.error(response.data.message || 'Unable to fetch e-card', 'Error');
             }
 
             $('.loader').fadeOut();
@@ -782,7 +802,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
 
@@ -809,10 +829,10 @@
     function reGenerateEcardForSingleFamily(client_policy_id, emp_code)
     {   
         if(!client_policy_id){
-            toastr.warning('Failed to re-Generate E-card', 'WARNING');
+            toastr.warning('Failed to re-Generate E-card', 'Warning');
         }
         if(!emp_code){
-            toastr.warning('Failed to re-Generate E-card', 'WARNING');
+            toastr.warning('Failed to re-Generate E-card', 'Warning');
         }
 
         console.log({client_policy_id, emp_code});
@@ -834,9 +854,9 @@
             console.log('Data fetched successfully:', response);
 
             if (response.dataStatus == true) {
-                toastr.success(response.message || 'Initiating successafully.', 'SUCCESS');
+                toastr.success(response.message || 'Initiating successfully.', 'Success');
             } else {
-                toastr.warning(response.status || 'Unable to regenerate e-card.', 'WARNING');
+                toastr.warning(response.status || 'Unable to regenerate e-card.', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -845,10 +865,17 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('Unable to regenerate e-card.', 'ERROR');
+            toastr.error('Unable to regenerate e-card.', 'Error');
         });
 
 
     }
 
+    $('#tickets-table tbody').on('click', 'td', function () {
+        const colIndex = this.cellIndex;
+        const rowIndex = this.parentElement.rowIndex - 1; // minus header
+        console.log('Row:', rowIndex, 'Column:', colIndex);
+        init();
+    });
+
 </script>
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php
index 6f6d74dc..a03e40e4 100755
--- a/app/Views/employee_list.php
+++ b/app/Views/employee_list.php
@@ -306,17 +306,53 @@
         }
 
         function handleItemClick(e, item) {
-            e.preventDefault();
-
-            // Execute the stored onclick handler
+            e.preventDefault(); 
+            
             const onclickAttr = item.getAttribute('data-onclick');
             if (onclickAttr) {
-                eval(onclickAttr);
-            }
+                // Regex to separate function name from the inside of the parentheses
+                // Example: myFunc(this, '123') -> match[1]="myFunc", match[2]="this, '123'"
+                const match = onclickAttr.match(/^(\w+)\((.*)\)$/);
+                
+                if (match) {
+                    const funcName = match[1];
+                    const argsRaw = match[2];
 
-            // Handle href navigation
+                    if (typeof window[funcName] === 'function') {
+                        // Parse the arguments string into a real array
+                        const args = argsRaw.split(',').map(arg => {
+                            let cleaned = arg.trim();
+                            
+                            // 1. Handle the 'this' keyword
+                            if (cleaned === 'this') return item;
+                            
+                            // 2. Handle 'event' keyword
+                            if (cleaned === 'event') return e;
+                            
+                            // 3. Handle strings (remove single or double quotes)
+                            if ((cleaned.startsWith("'") && cleaned.endsWith("'")) || 
+                                (cleaned.startsWith('"') && cleaned.endsWith('"'))) {
+                                return cleaned.substring(1, cleaned.length - 1);
+                            }
+                            
+                            // 4. Handle numbers
+                            if (!isNaN(cleaned) && cleaned !== "") {
+                                return Number(cleaned);
+                            }
+                            
+                            return cleaned;
+                        });
+
+                        // Execute function: 
+                        // .apply(item, args) sets the 'this' inside the function to the clicked element
+                        window[funcName].apply(item, args);
+                    }
+                }
+            }
+            
+            // Handle standard navigation if it's a link
             const href = item.getAttribute('href');
-            if (href && href !== '#') {
+            if (href && href !== '#' && !href.includes('javascript:void(0)')) {
                 window.location.href = href;
             }
 
@@ -324,7 +360,7 @@
                 activeDropdown.style.display = 'none';
                 activeDropdown = null;
             }
-
+            
             e.stopPropagation();
         }
 
@@ -739,9 +775,9 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if (res.status == false) {
-                            toastr.info(res.message, 'INFO');
+                            toastr.info(res.message, 'Info');
                         } else {
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                         }
 
                     },
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index a04682a3..9c98bf7f 100755
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -182,7 +182,7 @@ $('#file_upload').hide();
 $(document).ready(function() {
 
     <?php if (session()->has('success1')): ?>
-    toastr.success('<?= session()->getFlashdata('success1') ?>', 'success');
+    toastr.success('<?= session()->getFlashdata('success1') ?>', 'Success');
     <?php endif; ?>
     // Initialize select2
     $("#client_id").select2();
@@ -217,22 +217,22 @@ $(document).ready(function() {
 
         if(checkValues() == 'client'){
 
-            toastr.warning('Client is Required', 'warning')
+            toastr.warning('Client is Required', 'Warning')
             return false;
 
         }else if(checkValues() == 'policy'){
 
-            toastr.warning('Policy is Required', 'warning')
+            toastr.warning('Policy is Required', 'Warning')
             return false;
             
         }else if(checkValues() == 'branch'){
 
-            toastr.warning('Branch is Required', 'warning')
+            toastr.warning('Branch is Required', 'Warning')
             return false;
 
         }else if(checkValues() == 'event'){
 
-            toastr.warning('Event is Required', 'warning')
+            toastr.warning('Event is Required', 'Warning')
             return false;
         }else{
 
@@ -261,7 +261,7 @@ $(document).ready(function() {
             // $('#policy_id').mouseover();
             console.log('required');
             // alert('please choose policy for this uploaing event ');
-            toastr.warning('please choose policy for this uploaing event', 'warning')
+            toastr.warning('please choose policy for this uploaing event', 'Warning')
             return false;
 
         } else {
@@ -622,7 +622,7 @@ function fetchFileError(file_id) {
                         file_error_html += (file_error_html != "" ?
                             "<a href ='<?php echo base_url()?>" +
                             "employee/excel_error/" + file_id +
-                            "' target=_blank class='text-center'>click here to more details...</a>" : "");
+                            "' target=_blank class='text-center'>Click here to more details...</a>" : "");
                     }
                     
                     // console.log(file_error_html);
@@ -833,7 +833,7 @@ $('#fetch_enrolled_data').click(function()
     var action = $('#upload-action-type').val();
     // console.log(client_id + '-' + policy_id);
     if (client_id == '0' || policy_id == '0') {
-        toastr.warning('please select the client and policy for this uploaing event', 'warning')
+        toastr.warning('please select the client and policy for this uploaing event', 'Warning')
         $('#full-width-modal').modal('hide');
         return;
     }
@@ -1106,7 +1106,7 @@ function checkWellnessOnboardStatus(event)
                     console.log('check wellness response', response);
                     if(response.data && response.data != 0)
                     {
-                        var btn_txt = 'click here to onboard ('+ response.data +') employees to Visit wellness';
+                        var btn_txt = 'Click here to onboard ('+ response.data +') employees to Visit wellness';
                         $("#on_board_btn_txt").attr("data-id", response.data);
                         $('#on_board_btn_txt').text(btn_txt);
                         $('#onboard_div').show();
@@ -1175,7 +1175,7 @@ function initiateWellnessOnboard(e)
                     }, 300);
 
                         console.log('initiate wellness response', response);
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         $('#onboard_div').hide();
 
                 },
@@ -1261,9 +1261,9 @@ $(document).on('click', '#confirmYes', function() {
                     console.log('API response:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
@@ -1309,9 +1309,9 @@ $(document).on('click', '#confirmNo', function() {
                     console.log('API response:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index a5535107..76642e9a 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -603,13 +603,14 @@
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
-            buttons: [{
-                    text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
-                    className: 'btn app-btn-primary  mr-2',
-                    action: function(e, dt, node, config) {
-                        openTicket();
-                    }
-                },
+            buttons: [
+                // {
+                //     text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                //     className: 'btn app-btn-primary  mr-2',
+                //     action: function(e, dt, node, config) {
+                //         openTicket();
+                //     }
+                // },
                 {
                     extend: 'collection',
                     text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index bc968cd6..f69517cb 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -521,28 +521,28 @@
                         extend: 'copy',
                         text: '<i class="mdi mdi-content-copy"></i>',
                         titleAttr: 'Copy',
-                        filename: 'Enrolment List'
+                        filename: 'Enrolment List',
                         className: 'app-btn-primary ',
                     },
                     {
                         extend: 'csv',
                         text: '<i class="mdi mdi-file-document"></i>',
                         titleAttr: 'CSV',
-                        filename: 'Enrolment List'
+                        filename: 'Enrolment List',
                         className: 'app-btn-primary ',
                     },
                     {
                         extend: 'print',
                         text: '<i class="mdi mdi-printer"></i>',
                         titleAttr: 'Print',
-                        filename: 'Enrolment List'
+                        filename: 'Enrolment List',
                         className: 'app-btn-primary ',
                     },
                     {
                         extend: 'pdf',
                         text: '<i class="mdi mdi-file-pdf"></i>',
                         titleAttr: 'PDF',
-                        filename: 'Enrolment List'
+                        filename: 'Enrolment List',
                         className: 'app-btn-primary ',
                     }
                 ]
diff --git a/app/Views/errors/404.php b/app/Views/errors/404.php
index f271c312..69c6d42e 100755
--- a/app/Views/errors/404.php
+++ b/app/Views/errors/404.php
@@ -162,7 +162,7 @@
 <body>
     <section>
         <div class="container">
-            <div class="text">
+            <div class="text" style="text-align: center;">
                 <h1><?= isset($message) && !empty($message) ? $message : '404 PAGE NOT FOUND' ?></h1>
             </div>
             <div><img class="image" src="https://omjsblog.files.wordpress.com/2023/07/errorimg.png" alt=""></div>
diff --git a/app/Views/faq_list.php b/app/Views/faq_list.php
index 9a4d6d8c..bc49cd41 100644
--- a/app/Views/faq_list.php
+++ b/app/Views/faq_list.php
@@ -326,6 +326,29 @@
             },
             error: function () {
                 $('.loader, .loader-mask').fadeOut();
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                }
             }
         });
     }
diff --git a/app/Views/fedeploy.php b/app/Views/fedeploy.php
index 906bf5f7..56228bac 100644
--- a/app/Views/fedeploy.php
+++ b/app/Views/fedeploy.php
@@ -1,43 +1,114 @@
-<form action="<?= base_url('fedeploy'); ?>" method="post" enctype="multipart/form-data">
-    <!-- Single zip upload -->
-    <div>
-        <label for="zip_file">Zip File</label>
-        <input type="file" name="zip_file" id="zip_file" required>
-    </div>
+<div class="container-fluid-min">
+  <div class="card mb-1">
+    <!---- new -----> 
+    <div class="row">
+        <div class="col-12">
+          <div class="card-body">
+            <div class="custom-form">
+            <form role="form" class="parsley-examples" action="<?= base_url('fedeploy'); ?>" method="post" enctype="multipart/form-data">
+                <!-- Single zip upload -->
+                <div class="form-group row">
+                    <label for="zip_file" class="col-md-4 col-form-label">Zip File</label>
+                    <div class="col-md-5">
+                            <div class="input-icon">
+                                <input type="file" class="form-control" id="zip_file" name="zip_file" >
+                                <i class="mdi mdi-upload additional-icon"></i>
+                            </div>
+                    </div>
+                </div>
 
-    <div>
-        <label for="zip_folder">Zip Folder (inside zip to deploy)</label>
-        <select name="zip_folder" id="zip_folder">
-            <option value="web/">web/</option>
-            <option value="dist/">dist/</option>
-        </select>
-    </div>
+                <!-- Zip Folder-->
+                <div class="form-group row">
+                    <label for="zip_folder" class="col-md-4 col-form-label">Zip Folder (inside zip to deploy)</label>
+                    <div class="col-md-5">                    
+                        <select name="zip_folder" id="zip_folder" class="form-control">
+                            <option value="web/">web/</option>
+                            <!-- <option value="dist/">dist/</option> -->
+                        </select>
+                    </div>
+                </div>
 
-    <div>
-        <label for="s3_bucket">S3 Bucket</label>
-        <select name="s3_bucket" id="s3_bucket">
-            <option value="benefits-app-bucket">benefits-app-bucket</option>
-            <option value="other-bucket">other-bucket</option>
-        </select>
-    </div>
+                <div class="form-group row">
+                    <label class="col-md-4 col-form-label" for="s3_bucket">S3 Bucket</label>
+                    <div class="col-md-5">
+                            <select name="s3_bucket" id="s3_bucket" class="form-control">
+                                <option value="uat-benefits-app-bucket">UAT Benefits</option>
+                                <option value="uat-hr-app-bucket">UAT HR</option>
+                                <option value="benefits-app-bucket">Live Benefits</option>
+                                <option value="live-hr-app-bucket">Live HR</option>
+                            </select>    
+                    </div>
+                </div>
 
-    <div>
-        <label for="s3_prefix">S3 Prefix</label>
-        <input type="text" name="s3_prefix" id="s3_prefix" value="hr/">
-    </div>
+                <!-- S3 Prefix -->
+                <div class="form-group row">
+                    <label class="col-md-4 col-form-label" for="s3_prefix">S3 Prefix</label>
+                    <div class="col-md-5">
+                        <input type="text" name="s3_prefix" id="s3_prefix" value="/*" class="form-control">
+                    </div>
+                </div>
 
-    <div>
-        <label for="cf_distribution_id">CloudFront Distribution ID (optional)</label>
-        <input type="text" name="cf_distribution_id" id="cf_distribution_id" value="E1MKRK4U5MZ3BD">
-    </div>
+                <!-- CloudFront Distribution -->
+                <div class="form-group row">
+                    <label for="cf_distribution_id" class="col-md-4 col-form-label">CloudFront Distribution ID (optional)</label>
+                    <div class="col-md-5">
+                        <select name="cf_distribution_id" id="cf_distribution_id" class="form-control">
+                            <option value="EUBZ8CDSV9KZZ">UAT Benefits</option>
+                            <option value="E9TNPRI9ITM1M">UAT HR</option>
+                            <option value="E1MKRK4U5MZ3BD">Live Benefits</option>
+                            <option value="E3TE01DPKHTD8B">Live HR</option>
+                        </select>
+                    </div>
+                </div>
 
-    <div>
-        <label for="cf_paths">
-            CloudFront Invalidation Paths (comma or newline separated, e.g. <code>/hr/*,/hr/special/*</code>)
-        </label>
-        <input type="text" name="cf_paths" id="cf_paths" value="/hr/*">
-        <!-- If you prefer multi-line, use <textarea> instead of <input> -->
-    </div>
+                <!-- CloudFront Invalidation -->
+                <div class="form-group row">
+                    <label class="col-md-4 col-form-label" for="cf_paths"> CloudFront Invalidation Paths (comma or newline separated, e.g. <code>/hr/*,/hr/special/*</code>) </label>
+                    <div class="col-md-5 d-flex align-items-center">
+                        <input type="text" name="cf_paths" id="cf_paths" value="/*" class="form-control">
+                    </div>
+                </div>
 
-    <button type="submit">Deploy</button>
-</form>
+
+                <!-- Buttons -->
+                <div class="form-group row">
+                <div class="col-md-12 text-right">
+                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Deploy</button>
+                </div>
+                </div>
+            </form>
+           </div>
+          </div>
+        </div> <!-- end col-->
+    </div>
+    <!---- ends ------>
+  </div>
+</div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const bucketToDistributionMap = {
+        'uat-benefits-app-bucket': 'EUBZ8CDSV9KZZ',
+        'uat-hr-app-bucket': 'E9TNPRI9ITM1M',
+        'benefits-app-bucket': 'E1MKRK4U5MZ3BD',
+        'live-hr-app-bucket': 'E3TE01DPKHTD8B'
+    };
+
+    const s3BucketEl = document.getElementById('s3_bucket');
+    const cfDistributionEl = document.getElementById('cf_distribution_id');
+
+    s3BucketEl.addEventListener('change', function () {
+        const selectedBucket = this.value;
+
+        if (bucketToDistributionMap[selectedBucket]) {
+            cfDistributionEl.value = bucketToDistributionMap[selectedBucket];
+        } else {
+            // Optional: reset if no mapping found
+            cfDistributionEl.value = '';
+        }
+    });
+
+    // Auto-select on page load (useful for edit forms)
+    s3BucketEl.dispatchEvent(new Event('change'));
+});
+</script>
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index 5e2f79dc..0f384c7e 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -136,9 +136,9 @@
             <div class="modal-body" id="emp_data_success">
 
             </div>
-            <div class="modal-footer">
+            <!-- <div class="modal-footer">
                 <button type="button" class="btn btn-primary">Save changes</button>
-            </div>
+            </div> -->
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
@@ -428,7 +428,7 @@ $('#uploadForm').submit(function() {
                 .data !== "") {
                 toastr.success(
                     'File upload successs, Data validation is in-progress',
-                    'success');
+                    'Success');
                 $('.close').click()
                 window.location.reload(true);
             } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/frontend_content_list.php b/app/Views/frontend_content_list.php
index ce3db484..71f8e0ed 100644
--- a/app/Views/frontend_content_list.php
+++ b/app/Views/frontend_content_list.php
@@ -364,10 +364,10 @@
     //                 $('#modalLabel').text('Edit Front End Content');
     //                 appendEditData(response.data);
     //             }else{
-    //                 toastr.success(response.message, 'SUCCESS');
+    //                 toastr.success(response.message, 'Success');
     //             }
     //         } else {
-    //             toastr.warning(response.message, 'WARNING');
+    //             toastr.warning(response.message, 'Warning');
     //         }
 
     //         $('.loader').fadeOut();
@@ -449,6 +449,31 @@
             },
             error: function () {
                 $('.loader, .loader-mask').fadeOut();
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                }
+                else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                }
+                else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                }
             }
         });
     }
@@ -467,8 +492,13 @@
     function appendEditData(data) {
         $('#frontEndContentForm')[0].reset();
         $('#fe_id').val(data.id);
-        $('#type').val(data.type);
-        $('#content_section').val(data.content_section);
+        if (/video/i.test(data.content_section)) {
+            $('#content_section').val('Video');
+            $('#type').val(8);
+        } else {
+            $('#type').val(data.type);
+            $('#content_section').val(data.content_section);
+        }
         $('#heading').val(data.heading);
         // $('#content').val(data.content);
         // $('#notes').val(data.notes);
@@ -522,6 +552,34 @@
 
         return text.length === 0;
     }
+    // $('#content_section').on('keyup blur change', function () {
+    //     let val = $(this).val();
+    //     if (/video/i.test(val)) {
+    //         $(this).val('Video');
+    //         $('#type').val(8);
+    //     }
+    // });
+
+    
+    $('#content_section').on('input blur', function () {
+        let $this = $(this);
+        let val = $this.val().trim();
+
+        // 1. Handle Empty Input
+        if (val === '') {
+            $('#type').val('');
+            return;
+        }
+
+        // 2. Check for "video" (case insensitive)
+        if (/video/i.test(val)) {
+            $('#type').val(8);
+            if (val !== 'Video') { $this.val('Video'); }
+        } else {
+            $('#type').val('');
+        }
+    });
+
 
 </script>
 <script>
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 5df2f43e..51f008b4 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -37,7 +37,8 @@
                             <!-- <div class="text-center"> -->
                             <form class="parsley-examples" id="hr_file_upload_search" >
                                 <input type="hidden" name="<?= csrf_token() ?>" value="<?= csrf_hash() ?>" id="csrf_token">
-                               
+                                <input type="hidden" name="hr_file_type" value="CRM">
+
                                 <div class="form-group">
                                     <div class="form-row">
                                         <div class="form-group col-md-4">
@@ -450,7 +451,7 @@
                     .data !== "") {
                     toastr.success(
                         'File upload successs, Data validation is in-progress',
-                        'success');
+                        'Success');
                     $('.close').click()
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/insurer_basic_info.php b/app/Views/insurer_basic_info.php
index f7834580..fa13a529 100755
--- a/app/Views/insurer_basic_info.php
+++ b/app/Views/insurer_basic_info.php
@@ -70,7 +70,7 @@ input:checked + .slider:before {
             <div class="card-body">
             <div class="custom-form">
             <form role="form" class="parsley-examples" method="post" id="insurer_general_form" enctype="multipart/form-data">
-                <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+                <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" /> 
                 <input type="hidden" name="PrimaryKey" id="insurer_General_PrimaryKey" value="<?= isset($insurer['id']) ? $insurer['id'] : '' ?>" />
                 <input type="hidden" name="insurer_id" id="insurer_id" />
 
@@ -191,18 +191,29 @@ input:checked + .slider:before {
 <script>
     $(document).ready(function() {
 
+        $('#insurer_logo').on('change', function() {
+            PreviewImage(); 
+        });
+
         $("#insurer_general_form").submit(function(events) {
 
             events.preventDefault();
-
-            var isValid = $('#insurer_General_PrimaryKey').parsley().validate();  
+            
+            // var isValid = $('#insurer_General_PrimaryKey').parsley().validate();  
+            var isValid = $('#insurer_general_form').parsley().validate(); 
+            var PrimaryKey = $('#insurer_General_PrimaryKey').val();
             if (!isValid) { 
                 console.log('Form is Empty', 'Warning');
                 return ; 
             }
 
-            var PrimaryKey = $('#insurer_General_PrimaryKey').val();
-            var form_action = '';
+            var formElement = $('#insurer_general_form')[0];
+            var formData = new FormData(formElement);
+
+            // DEBUG: Log formData to see if it's empty
+            for (var pair of formData.entries()) {
+                console.log(pair[0]+ ', ' + pair[1]); 
+            }
             if (isValid) {
 
                 if (PrimaryKey === '') {
@@ -253,7 +264,30 @@ input:checked + .slider:before {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        console.log('Something Wrong!', 'warning');                        
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
                     }
                 });
             }
@@ -290,16 +324,46 @@ input:checked + .slider:before {
 
     });
 
-    function PreviewImage() 
-    {
+    function PreviewImage() {
+        var fileInput = document.getElementById("insurer_logo");
+        var preview = document.getElementById("uploadPreview");
+        var defaultAvatar = '<?= base_url() . "public/assets/images/avatar_2x.png" ?>';
+
+        // If no file is selected (or cleared by validation), reset preview and stop
+        if (!fileInput.files || !fileInput.files[0]) {
+            preview.src = defaultAvatar;
+            return;
+        }
+
+        var file = fileInput.files[0];
+        var fileName = file.name.toLowerCase();
+        var parts = fileName.split('.');
+        
+        // VALIDATION: Extensions and Double Extensions (e.g. .php.jpeg)
+        var allowedExtensions = /(\.jpg|\.jpeg|\.png)$/i;
+
+        if (!allowedExtensions.exec(fileName) || parts.length > 2) {
+            toastr.error("Security violation: Invalid format or double extension.", "Blocked");
+            fileInput.value = ""; // Clear the field
+            preview.src = defaultAvatar; // RESET PREVIEW
+            return;
+        }
+
+        // VALIDATION: Size (200KB)
+        if ((file.size / 1024) > 200) {
+            toastr.warning("File size exceeds 200 KB limit.", "Warning");
+            fileInput.value = ""; // Clear the field
+            preview.src = defaultAvatar; // RESET PREVIEW
+            return;
+        }
+
+        // SUCCESS: Read and Preview
         var oFReader = new FileReader();
-        oFReader.readAsDataURL(document.getElementById("insurer_logo").files[0]);
-
+        oFReader.readAsDataURL(file);
         oFReader.onload = function(oFREvent) {
-            document.getElementById("uploadPreview").src = oFREvent.target.result;
+            preview.src = oFREvent.target.result;
         };
-    };
-
+    }
     //-----------------------------------------------------------------------------------------------------
 
 
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index da147629..1923286b 100755
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -564,7 +564,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -824,10 +824,10 @@ function toggleAddButton() {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('Insurer branch removed successfully', 'success');
+                            toastr.success('Insurer branch removed successfully', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove insurer branch', 'warning');
+                            toastr.warning('Failed to remove insurer branch', 'Warning');
                         }
                         }
                     },
@@ -836,7 +836,7 @@ function toggleAddButton() {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove insurer branch', 'warning');
+                        toastr.warning('Failed to remove insurer branch', 'Warning');
                     }
                 });
 
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index a92543a4..bac14afc 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -99,7 +99,7 @@
                             <td style="overflow: hidden;" class="truncate" ><?= $value['jsoncolumns']; ?></td>
                             <td>
                                 <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     <div class="dropdown-menu dropdown-menu-right">
                                     <a class="dropdown-item" href="#" onclick="editJSONExportTemplate(this, '<?= $value['id']; ?>')"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                     <a class="dropdown-item" id="template_id_for_duplicate" data-id="<?= $value['id']; ?>" data-toggle="modal" data-target="#centermodal"><i class="mdi mdi-content-duplicate mr-2 text-muted font-18 vertical-middle"></i>Duplicate</a>
@@ -305,7 +305,7 @@
 
                 window.location.reload();
             },
-            error: function(xhr, status, error) {
+            error: function (xhr, status, error) {
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
@@ -323,14 +323,33 @@
                 console.error('Response headers:', xhr.getAllResponseHeaders());
                 console.error('Response URL:', xhr.responseURL);
 
-                // Example of throwing a detailed error for further handling
-                throw new Error(`AJAX Request failed:
-                    Status: ${status},
-                    Error: ${error},
-                    Status Code: ${xhr.status},
-                    Status Text: ${xhr.statusText},
-                    Response: ${xhr.responseText}
-                `);
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
+                
+                // Fallback
+                toastr.error('Unexpected error occurred.', 'Error');
             },
             complete: function() {
                 $('.loader').fadeOut();
@@ -451,9 +470,9 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(res.status == false){
-                    toastr.error(res.message, 'ERROR');
+                    toastr.error(res.message, 'Error');
                 }else{
-                    toastr.success(res.message, 'SUCCESS');
+                    toastr.success(res.message, 'Success');
                 }
 
                 window.location.reload(true);
@@ -707,9 +726,9 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(res.status == false){
-                    toastr.error(res.message, 'ERROR');
+                    toastr.error(res.message, 'Error');
                 }else{
-                    toastr.success(res.message, 'SUCCESS');
+                    toastr.success(res.message, 'Success');
                 }
 
                 window.location.reload(true);
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 5a25fd9e..05e0dc7e 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -319,10 +319,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('Insurer removed successfully', 'success');
+                toastr.success('Insurer removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove insurer', 'warning');
+                toastr.warning('Failed to remove insurer', 'Warning');
               }
             }
           },
@@ -331,7 +331,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove insurer', 'warning');
+            toastr.warning('Failed to remove insurer', 'Warning');
           }
         });
       }
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 2889ba13..e1bd6ee6 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -75,7 +75,7 @@
 
         if (check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Insurer!', 'warning', {
+            toastr.warning('First Add the Insurer!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index 55c49153..2e9148ee 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -5,6 +5,354 @@
     }
 </style>
 
+<style>
+    .demo-button {
+        /* background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); */
+        color: white;
+        border: none;
+        padding: 16px 32px;
+        font-size: 16px;
+        font-weight: 700;
+        border-radius: 12px;
+        cursor: pointer;
+        font-family: 'Manrope', sans-serif;
+        box-shadow: 0 10px 25px rgba(102, 126, 234, 0.4);
+        transition: all 0.3s ease;
+        letter-spacing: 0.5px;
+    }
+
+    .demo-button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 15px 30px rgba(102, 126, 234, 0.5);
+    }
+
+    /* Modal Overlay */
+    .modal-overlay {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: var(--bg-overlay);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 1000;
+        opacity: 0;
+        visibility: hidden;
+        transition: all 0.3s ease;
+        backdrop-filter: blur(4px);
+    }
+
+    .modal-overlay.active {
+        opacity: 1;
+        visibility: visible;
+    }
+
+    /* Modal Container */
+    .modal-container {
+        background: var(--bg-modal);
+        border-radius: 20px;
+        box-shadow: var(--shadow-lg);
+        /* max-width: 600px; */
+        width: 100%;
+        max-height: 85vh;
+        overflow: hidden;
+        transform: scale(0.9) translateY(20px);
+        transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+        display: flex;
+        flex-direction: column;
+    }
+
+    .modal-overlay.active .modal-container {
+        transform: scale(1) translateY(0);
+    }
+
+    /* Modal Header */
+    .modal-header {
+        padding: 10px 26px;
+        border-bottom: 2px solid var(--border-color);
+        background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+        flex-shrink: 0;
+    }
+
+    .modal-title {
+        font-family: 'Manrope', sans-serif;
+        font-size: 24px;
+        font-weight: 700;
+        color: var(--text-primary);
+        margin-bottom: 8px;
+    }
+
+    .modal-subtitle {
+        font-size: 14px;
+        color: var(--text-secondary);
+        font-weight: 400;
+    }
+
+    /* Toggle Section */
+    .toggle-section {
+        padding: 14px 25px;
+        background: #fefefe;
+        border-bottom: 1px solid var(--border-color);
+        flex-shrink: 0;
+    }
+
+    .toggle-container {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .toggle-label {
+        font-family: 'Manrope', sans-serif;
+        font-size: 15px;
+        font-weight: 600;
+        color: var(--text-primary);
+    }
+
+    /* Toggle Switch */
+    .toggle-switch {
+        position: relative;
+        width: 54px;
+        height: 28px;
+        cursor: pointer;
+    }
+
+    .toggle-switch input {
+        opacity: 0;
+        width: 0;
+        height: 0;
+    }
+
+    .toggle-slider {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #cbd5e1;
+        border-radius: 34px;
+        transition: all 0.3s ease;
+    }
+
+    .toggle-slider:before {
+        content: "";
+        position: absolute;
+        height: 22px;
+        width: 22px;
+        left: 3px;
+        bottom: 3px;
+        background-color: white;
+        border-radius: 50%;
+        transition: all 0.3s ease;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    }
+
+    .toggle-switch input:checked + .toggle-slider {
+        background: #02a8b5;
+    }
+
+    .toggle-switch input:checked + .toggle-slider:before {
+        transform: translateX(26px);
+    }
+
+    /* HR List Section */
+    .hr-list-section {
+        max-height: 300px;
+        overflow-y: auto;
+        padding: 0;
+        display: none;
+        flex: 1 1 auto;
+        min-height: 0;
+    }
+
+    .hr-list-section.active {
+        display: block;
+    }
+
+    .hr-item {
+        padding: 5px 32px;
+        border-bottom: 1px solid var(--border-color);
+        display: flex;
+        align-items: center;
+        transition: background 0.2s ease;
+        cursor: pointer;
+    }
+
+    .hr-item:hover {
+        background: #f9fafb;
+    }
+
+    .hr-item:last-child {
+        border-bottom: none;
+    }
+
+    /* Checkbox Styling */
+    .hr-checkbox {
+        position: relative;
+        display: flex;
+        align-items: center;
+        margin-right: 16px;
+    }
+
+    .hr-checkbox input[type="checkbox"] {
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+    }
+
+    .checkbox-custom {
+        width: 22px;
+        height: 22px;
+        border: 2px solid #cbd5e1;
+        border-radius: 6px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.2s ease;
+        background: white;
+    }
+
+    .hr-checkbox input:checked ~ .checkbox-custom {
+        background: #02a8b5;
+        border-color: #667eea;
+    }
+
+    .checkbox-custom:after {
+        content: "";
+        display: none;
+        width: 6px;
+        height: 10px;
+        border: solid white;
+        border-width: 0 2px 2px 0;
+        transform: rotate(45deg);
+    }
+
+    .hr-checkbox input:checked ~ .checkbox-custom:after {
+        display: block;
+    }
+
+    /* HR Info */
+    .hr-info {
+        flex: 1;
+    }
+
+    .hr-name {
+        font-family: 'Manrope', sans-serif;
+        font-size: 16px;
+        font-weight: 700;
+        color: var(--text-primary);
+        margin-bottom: 4px;
+    }
+
+    .hr-email {
+        font-size: 13px;
+        font-weight: 500;
+        color: var(--text-secondary);
+    }
+
+    /* Modal Footer */
+    .modal-footer {
+        padding: 24px 32px;
+        background: #fafafa;
+        display: flex;
+        gap: 12px;
+        justify-content: flex-end;
+        flex-shrink: 0;
+        border-top: 1px solid var(--border-color);
+    }
+
+    .btn {
+        padding: 12px 24px;
+        border: none;
+        border-radius: 10px;
+        font-size: 15px;
+        font-weight: 600;
+        cursor: pointer;
+        font-family: 'Manrope', sans-serif;
+        transition: all 0.2s ease;
+        letter-spacing: 0.3px;
+    }
+
+    .btn-submit {
+        /* background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); */
+        color: white;
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
+    }
+
+    .btn-submit:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 6px 16px rgba(102, 126, 234, 0.4);
+    }
+
+    .btn-submit:disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+        transform: none;
+    }
+
+    /* Scrollbar Styling */
+    .hr-list-section::-webkit-scrollbar {
+        width: 8px;
+    }
+
+    .hr-list-section::-webkit-scrollbar-track {
+        background: #f1f5f9;
+    }
+
+    .hr-list-section::-webkit-scrollbar-thumb {
+        background: #cbd5e1;
+        border-radius: 4px;
+    }
+
+    .hr-list-section::-webkit-scrollbar-thumb:hover {
+        background: #94a3b8;
+    }
+
+    /* Empty State */
+    .empty-state {
+        padding: 60px 32px;
+        text-align: center;
+        color: var(--text-secondary);
+    }
+
+    .empty-state-icon {
+        font-size: 48px;
+        margin-bottom: 16px;
+        opacity: 0.5;
+    }
+
+    .empty-state-text {
+        font-size: 15px;
+        font-weight: 500;
+    }
+
+    /* Animations */
+    @keyframes slideIn {
+        from {
+            opacity: 0;
+            transform: translateY(10px);
+        }
+        to {
+            opacity: 1;
+            transform: translateY(0);
+        }
+    }
+
+    .hr-item {
+        animation: slideIn 0.3s ease;
+        animation-fill-mode: backwards;
+    }
+
+    .hr-item:nth-child(1) { animation-delay: 0.05s; }
+    .hr-item:nth-child(2) { animation-delay: 0.1s; }
+    .hr-item:nth-child(3) { animation-delay: 0.15s; }
+    .hr-item:nth-child(4) { animation-delay: 0.2s; }
+    .hr-item:nth-child(5) { animation-delay: 0.25s; }
+
+</style>
+
 <div class="tab-pane fade" id="KYC-DOC-tab">
     <div class="row">
         <div class="col-xl-12">
@@ -146,6 +494,10 @@
                             </form>
                         </div>
                     </div>
+
+                    <!-- Demo Button -->
+                    <button style="display: none" class="demo-button" onclick="openModal()">Open HR Email Modal</button>
+
                 </div>
 
             </div>
@@ -159,12 +511,57 @@
     <!-- end row -->
 </div>
 
+<div class="modal fade" id="payout_modal" tabindex="-1" role="dialog" aria-hidden="true" aria-modal="true" data-backdrop="static"   data-backdrop="static"
+     data-keyboard="false"
+     tabindex="-1">
+    <div class="modal-dialog modal-lg" style="max-width: 800px;">
+        <div class="modal-content">
+            <div class="modal-header" style="background-color: gainsboro;">
+                <h5 class="modal-title" id="myCenterModalLabel"> Insufficient CD Balance HR Notification</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body" id="modal_body">
+
+                    <!-- Form -->
+                    <form id="hrEmailForm">
+
+                        <input type="hidden", id="client_id_for_hr_mail_send" name="client_id" >
+
+                        <!-- Toggle Section -->
+                        <div class="toggle-section">
+                            <div class="toggle-container">
+                                <label class="toggle-label">Insufficient Balance HR Mail Send</label>
+                                <label class="toggle-switch">
+                                    <input type="checkbox" id="mailToggle" onchange="toggleHRList()">
+                                    <span class="toggle-slider"></span>
+                                </label>
+                            </div>
+                        </div>
+
+                        <!-- HR List Section -->
+                        <div class="hr-list-section" id="hrListSection">
+                            <!-- HR items will be dynamically generated here -->
+                        </div>
+
+                        <!-- Footer Buttons -->
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-cancel" onclick="cancelModal()">Cancel</button>
+                            <button type="submit" class="btn btn-submit" id="submitBtn">Send Notification</button>
+                        </div>
+                    </form>
+
+            </div>
+        </div>
+    </div>
+</div>
+
 
 <script>
 
     var client_id_param2 = 0;
     var client_branch_id_param2 = 0;
     var client_policy_param2 = 0;
+    var hr_data = [];
 
     $(document).ready(function() {
         // Initialize select2
@@ -191,7 +588,7 @@
         <?php endif; ?>
 
         <?php if (session()->has('success')) : ?>
-            toastr.success('<?= session()->getFlashdata('success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('success') ?>', 'Success');
         <?php endif; ?>
 
         $('#import_excel_btn').hide();
@@ -235,7 +632,7 @@
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
                         $$("#import_export_excel_form")[0].reset()
-                        toastr.success('File Download successs', 'success');
+                        toastr.success('File Download successs', 'Success');
 
                     } else if (response.code === 404 && response.status === false) {
 
@@ -719,31 +1116,37 @@
     var messageShown = false; // Flag to prevent duplicate messages
 
     //function for checking the session
-    function checkCDBalance() {
+    function checkCDBalanceOld() {
+
+        const get_cd_balance = <?= json_encode(get_cd_balance()) ?>;
+        console.log({ get_cd_balance });
 
         <?php if (session()->has('cd_balance')): ?>
+
             var cdBalance = <?php echo json_encode(session()->get('cd_balance')); ?>;
             var cdAmount = <?php echo json_encode(session()->get('cd_amount')); ?>;
             var excel_file_amt = <?php echo json_encode(session()->get('excel_file_amt')); ?>;
+            hr_data = <?php echo json_encode(session()->get('hr_data')); ?>;
             
-            console.log("cdBalance : ", cdBalance);
-            console.log("cdAmount : ", cdAmount);
-            console.log("excel_file_amt : ", excel_file_amt);
+            console.log({cdBalance, cdAmount, excel_file_amt, hr_data})
             
             // Only show message once and if status is false
-            if (cdBalance === false && !messageShown) {
-                // toastr.warning('Insufficient CD Balance deducated. Please wait the file will be downloaded', 'WARNING');
+            if (get_cd_balance?.cd_balance === false && !messageShown) {
+                // toastr.warning('Insufficient CD Balance deducated. Please wait the file will be downloaded', 'Warning');
                 var message1 = 'Insufficient CD Balance deducted. Please wait the file will be downloaded<br>' +
                 '<strong>CD Amount:</strong> ₹' + (cdAmount || 0) + '<br>' +
                 '<strong>Total Amount:</strong> ₹' + (excel_file_amt || 0);
 
-                toastr.warning(message1, 'WARNING', {
+                toastr.warning(message1, 'Warning', {
                     allowHtml: true,
                     timeOut: 10000,
                     extendedTimeOut: 3000
                 });
+
                 messageShown = true; // Prevent showing message again
                 stopInterval();
+                openModal();
+
             } else if (cdBalance === true) {
                 console.log("CD Balance is sufficient");
                 stopInterval();
@@ -758,6 +1161,53 @@
         <?php else: ?>
             console.log("No cd_balance session found");
         <?php endif; ?>
+    } 
+
+    async function checkCDBalance() {
+        try {
+            // 1. Fetch the LATEST session data from the server
+            const response = await fetch('checkSessionStatus');
+            const cdData = await response.json();
+
+            console.log('Current Session Data:', cdData);
+
+            // 2. Check if cd_balance_info exists and isn't empty
+            if (cdData.has_cd_balance && cdData.cd_balance_info) {
+
+                if(cdData.cd_balance === 'sufficient'){
+                    stopInterval(); // Stop checking once we find the error
+                    console.log("CD Balance is sufficient");
+                    return;
+                }
+                
+                let cd_balance_info = JSON.parse(cdData.cd_balance_info) ?? null;
+                let hr_info = cdData.hr_data ? JSON.parse(cdData.hr_data) : null;
+
+                // If balance is marked as false (insufficient)
+                if (cd_balance_info.cd_balance === false) {
+                    
+                    stopInterval(); // Stop checking once we find the error
+
+                    toastr.warning(
+                        `Insufficient CD Balance.<br>Balance: ₹${cd_balance_info.cd_amount}`, 
+                        'Warning', 
+                        { allowHtml: true }
+                    );
+
+                    if(hr_info) {
+                        $('#client_id_for_hr_mail_send').val(hr_info.client_id);
+                        window.hr_data = hr_info.hr_data;
+                    }
+
+                    openModal();
+
+                    // 3. Clear the session now that we've handled it
+                    fetch('clearCdSession'); 
+                }
+            }
+        } catch (error) {
+            console.error('Error checking CD balance:', error);
+        }
     }
 
     // Start the interval
@@ -796,6 +1246,7 @@
     //------------------------------------------------------------------------------------------------------
 
 </script>
+
 <script>
 
     function togglePolicyIssueDate() {
@@ -837,7 +1288,7 @@
 
         for (let c of checks) {
             if (!c.val || c.val == 0) {
-                toastr.warning(c.msg, 'WARNING');
+                toastr.warning(c.msg, 'Warning');
                 return;
             }
         }
@@ -859,18 +1310,213 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status == true) {
-                toastr.success(response.message || 'Initiating successafully', 'SUCCESS');
+                toastr.success(response.message || 'Initiating successafully', 'Success');
             } else {
-                toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                toastr.error(response.message || 'Unable to fetch data', 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
 
     }
 
+</script>
+
+<script>
+
+    // Sample HR data (replace this with your actual data source)
+    const hrData = [
+        { id: 1, name: 'Rajesh Kumar', email: 'rajesh.kumar@company.com' },
+        { id: 2, name: 'Priya Sharma', email: 'priya.sharma@company.com' },
+        { id: 3, name: 'Arun Patel', email: 'arun.patel@company.com' },
+        { id: 4, name: 'Arun Patel', email: 'arun.patel@company.com' },
+        { id: 5, name: 'Arun Patel', email: 'arun.patel@company.com' },
+    ];
+
+    // Open Modal
+    function openModal() {
+        // document.getElementById('hrModal').classList.add('active');
+        var myModal = new bootstrap.Modal(document.getElementById('payout_modal'));
+        myModal.show();
+    }
+
+    // Toggle HR List
+    function toggleHRList() {
+        const toggle = document.getElementById('mailToggle');
+        const hrListSection = document.getElementById('hrListSection');
+        
+        if (toggle.checked) {
+            hrListSection.classList.add('active');
+            renderHRList();
+        } else {
+            hrListSection.classList.remove('active');
+        }
+    }
+
+    // Render HR List
+    function renderHRList() {
+        const hrListSection = document.getElementById('hrListSection');
+        
+        if (hr_data.length === 0) {
+            hrListSection.innerHTML = `
+                <div class="empty-state">
+                    <div class="empty-state-icon">📭</div>
+                    <div class="empty-state-text">No HR contacts available</div>
+                </div>
+            `;
+            return;
+        }
+
+        hrListSection.innerHTML = hr_data.map(hr => `
+            <div class="hr-item" onclick="toggleCheckbox(${hr.id}, event)">
+                <label class="hr-checkbox">
+                    <input type="checkbox" name="hr_emails[]" value="${hr.id}" data-email="${hr.email}" data-name="${hr.name}" id="hr_${hr.id}">
+                    <span class="checkbox-custom"></span>
+                </label>
+                <div class="hr-info">
+                    <div class="hr-name">${hr.name}</div>
+                    <div class="hr-email">${hr.email}</div>
+                </div>
+            </div>
+        `).join('');
+    }
+
+    // Toggle checkbox when clicking on the item
+    function toggleCheckbox(hrId, event) {
+        // Prevent double toggle if clicking directly on checkbox
+        if (event && event.target.tagName === 'INPUT') {
+            return;
+        }
+        
+        const checkbox = document.getElementById(`hr_${hrId}`);
+        checkbox.checked = !checkbox.checked;
+    }
+
+    // Cancel Modal with Confirmation
+    function cancelModal() {
+        // document.getElementById('confirmDialog').classList.add('active');
+
+            Swal.fire({
+                title: "Cancel Confirmation",
+                text: "Are you sure you want to cancel? No emails will be sent to HR.",
+                icon: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#3085d6",
+                cancelButtonColor: "#d33",
+                confirmButtonText: "Yes, Procced!"
+            }).then((result) => {
+
+                if(result.isConfirmed){
+                    confirmCancel()
+                }else{
+                    return false
+                }
+
+            });
+    }
+
+    // Confirm Cancel
+    function confirmCancel() {
+        setTimeout(() => {
+            $('.close').click();
+            resetForm();
+        }, 300);
+    }
+
+    // Reset Form
+    function resetForm() {
+        document.getElementById('hrEmailForm').reset();
+        document.getElementById('hrListSection').classList.remove('active');
+    }
+
+    $('#hrEmailForm').on('submit', function (e) {
+        e.preventDefault();
+
+        const client_id   = $('#client_id_for_hr_mail_send').val();
+        const mailToggle  = $('#mailToggle');
+        const selectedHRs = $('input[name="hr_emails[]"]:checked');
+
+        if (!mailToggle.is(':checked')) {
+            toastr.warning('Please Enable the mail option.', 'Warning');
+            return;
+        }
+
+        if (selectedHRs.length === 0) {
+            toastr.warning('Please select at least one HR.', 'Warning');
+            return;
+        }
+
+        // Prepare mails object
+        const sendingMails = {};
+        selectedHRs.each(function () {
+            const hrId    = $(this).val();
+            const hrEmail = $(this).data('email');
+            const hrName  = $(this).data('name');
+
+            sendingMails[hrId] = {
+                mail: hrEmail,
+                name: hrName
+            };
+        });
+
+        const formData = {
+            mails: sendingMails,
+            client_id: client_id,
+            mail_enable_key: mailToggle.is(':checked') ? 1 : 0
+        };
+
+        console.log('Form Data:', formData);
+
+        const $submitBtn = $('#submitBtn');
+        $submitBtn.prop('disabled', true).text('Sending...');
+
+        const url = '<?= base_url('util/insufficientCdBalanceHrMailSend') ?>';
+
+        $.ajax({
+            url: url,
+            type: 'POST',
+            data: JSON.stringify(formData),
+            contentType: 'application/json',
+            dataType: 'json',
+            headers: {
+                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') || ''
+            },
+            success: function (data) {
+                console.log('Response Success:', data);
+
+                if (data.status === true) {
+                    toastr.success(data.message, 'Success');
+                } else {
+                    toastr.warning(data.message, 'Warning');
+                }
+            },
+            error: function (xhr, status, error) {
+                console.error('Response Error:', error);
+                toastr.error('Something went wrong. Please try again.', 'Error');
+            },
+            complete: function () {
+                // Reset button state
+                $submitBtn.prop('disabled', false).text('Send Notification');
+                confirmCancel();
+            }
+        });
+    });
+
+    const modal = document.getElementById('payout_modal');
+    const modalDialog = modal.querySelector('.modal-dialog');
+
+    modal.addEventListener('mousedown', function (e) {
+        if (!modalDialog.contains(e.target)) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            return false;
+        }
+    }, true); // 👈 capture phase
+
+
+
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index 4e4a9192..838c9fc4 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -1304,7 +1304,7 @@
                     .data !== "") {
                     toastr.success(
                         'File upload successs',
-                        'success');
+                        'Success');
                     $('.close').click();
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/invoice_policy_mapping.php b/app/Views/invoice_policy_mapping.php
index c103ec1d..6d3d9fea 100644
--- a/app/Views/invoice_policy_mapping.php
+++ b/app/Views/invoice_policy_mapping.php
@@ -525,7 +525,8 @@ table.dataTable tbody td { padding: 4px 4px !important; }
     function loadPolicies() {
         // const agentId = getEl('agentSelect')?.value || '';
         const posId = getEl('posSelect')?.value || '';
-        console.log('-->',posId);
+        console.log(':) POS --> ',posId);
+        console.log(window.allPolicies);
         const policyTillDate = getEl('policyTillDate')?.value || '';
         const list = getEl('policyListBody');
         if (!list) return;
@@ -623,7 +624,6 @@ table.dataTable tbody td { padding: 4px 4px !important; }
 
         if (selectedPolicies.size === 0) {
             summaryBar.classList.remove('show')
-            const summaryBar = getEl('summaryBar');;
             if (selectedCountBadge) selectedCountBadge.style.display = 'none';
             totalPoliciesEl.textContent = '0';
             totalAmountEl.textContent = '₹0.00';
@@ -1090,7 +1090,7 @@ function downloadInvoicePdf(){
 function fetchPreviewInvoiceDetails(invoice_id, invoice_no){  
 
     if (!invoice_id) {
-        toastr.warning("Invoice Id not found!", "WARNING");
+        toastr.warning("Invoice Id not found!", "Warning");
         return false;
     }
 
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index ee134535..6fd2ad16 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -159,14 +159,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index 8b9a703c..1efa8204 100755
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -254,7 +254,28 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        }else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else {
+                            toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
                     }, 1000);
                 }
             });
@@ -296,7 +317,28 @@ $(document).ready(function () {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        }else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else {
+                            toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
                 }, 1000);
             }        
         });
@@ -407,7 +449,7 @@ $(document).ready(function () {
                             window.location.href = '<?= base_url("master/kyc/list/") ?>' + kyc_docs_id_for_reload;
 
                         } else {
-                            toastr.warning('Failed to remove KYC docs', 'warning');
+                            toastr.warning('Failed to remove KYC docs', 'Warning');
                         }
                         }
                     },
@@ -416,7 +458,7 @@ $(document).ready(function () {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove KYC docs', 'warning');
+                        toastr.warning('Failed to remove KYC docs', 'Warning');
                     }
                 });
             }
diff --git a/app/Views/kyc_entity_type_basic_info.php b/app/Views/kyc_entity_type_basic_info.php
index 9998f144..65441948 100755
--- a/app/Views/kyc_entity_type_basic_info.php
+++ b/app/Views/kyc_entity_type_basic_info.php
@@ -88,7 +88,31 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 404) {
+                                toastr.warning('Resource not found', 'Warning');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
                     }, 1000);
                 }
             });
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index fff20bdc..342e24d3 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -64,7 +64,7 @@
                         <td><?php echo $row['name']; ?> </td>
                         <td>
                           <div class="btn-group dropdown">
-                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                             <div class="dropdown-menu dropdown-menu-right">
                               <a class="dropdown-item" href="<?= base_url("master/kyc/list/"); ?><?= $row['id'];?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                               <a class="dropdown-item"  data-id="<?= $row['id'];?>" onclick="removeKYC(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
@@ -308,12 +308,12 @@ function removeKYC(element) {
                 // console.log(res.status == true);
                   if(res){
                     if (res.status == true) {
-                      toastr.success('KYC entity removed successfully', 'success');
+                      toastr.success('KYC entity removed successfully', 'Success');
 
                       location.reload();
 
                     } else {
-                      toastr.warning('Failed to remove KYC entity', 'warning');
+                      toastr.warning('Failed to remove KYC entity', 'Warning');
                     }
                   }
               },
@@ -323,7 +323,7 @@ function removeKYC(element) {
                   setTimeout(function() {
                   $('.loader').fadeOut();
                   $('.loader-mask').delay(350).fadeOut('slow');
-                  toastr.warning('Something Wrong!', 'warning');
+                  toastr.warning('Something Wrong!', 'Warning');
               }, 1000);
               }
           });
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index eec84a12..6728620d 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -92,7 +92,7 @@
         console.log(check_policy_type_id.val());
         if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the KYC Entity Type!', 'warning', {
+            toastr.warning('First Add the KYC Entity Type!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/layout/footer_new.php b/app/Views/layout/footer_new.php
new file mode 100644
index 00000000..1642a758
--- /dev/null
+++ b/app/Views/layout/footer_new.php
@@ -0,0 +1,1224 @@
+</div> <!-- container -->
+
+</div> <!-- content -->
+
+<?php include(__DIR__ . '/../ticket_type_modal.php'); ?>
+
+</div>
+
+<!-- ============================================================== -->
+<!-- End Page content -->
+<!-- ============================================================== -->
+
+    <!-- Footer Start -->
+    <div style="background-color: white !important;">
+        <footer class="footer" style="background-color: white !important;">
+            <div class="">
+                <div class="row">
+                    <div class="col-md-6">
+                        <script>
+                            document.write(new Date().getFullYear())
+                        </script> &copy; NHANCE
+                    </div>
+                    <!-- <div class="col-md-6">
+                        <div class="text-md-right footer-links d-none d-sm-block">
+                            <a href="javascript:void(0);">About Us</a>
+                            <a href="javascript:void(0);">Help</a>
+                            <a href="javascript:void(0);">Contact Us</a>
+                        </div>
+                    </div> -->
+                </div>
+            </div>
+        </footer>
+    </div>
+    <!-- end Footer -->
+
+
+</div>
+<!-- END wrapper -->
+
+<!-- Right Sidebar -->
+<div class="right-bar">
+    <div class="h-100">
+        <!-- Notifications Header -->
+        <h6 class="font-weight-medium px-3 m-0 py-2 font-13 text-uppercase bg-light fixed-header">
+            <i class="mdi mdi-message-text-outline font-22"></i>
+            <span class="header-title">Notification</span>
+        </h6>
+        <div class="scrollable-content">
+            <ul class="list-unstyled" id="messages-list">
+                <!-- Notifications list items go here -->
+            </ul>
+        </div>
+
+        <!-- Pending Action Header -->
+        <h6 class="font-weight-medium px-3 m-0 py-2 font-13 bg-light fixed-header">
+            <i class="mdi mdi-format-list-checks font-22"></i>
+            <span class="header-title">TO DOs</span>
+        </h6>
+        <div class="scrollable-content">
+            <ul class="list-unstyled" id="messages-list-2">
+                <!-- Pending action list items go here -->
+            </ul>
+        </div>
+    </div> <!-- end simplebar -->
+</div>
+
+<!-- /Right-bar -->
+
+<!-- Right bar overlay -->
+<div class="rightbar-overlay"></div>
+
+<!-- ============================= -->
+<!-- Core Vendor JS (Local) -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/vendor.min.js"); ?>"></script>
+
+<!-- ============================= -->
+<!-- Charts -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/apexcharts/apexcharts.min.js"); ?>"></script>
+
+<!-- ============================= -->
+<!-- DataTables -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/datatables.net/js/jquery.dataTables.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.print.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-select/js/dataTables.select.min.js"); ?>"></script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+
+<!-- ============================= -->
+<!-- Date Handling -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/moment/min/moment.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/bootstrap-daterangepicker/daterangepicker.js"); ?>"></script>
+
+<!-- OR: Flatpickr (prefer this long-term) -->
+<script src="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js"></script>
+
+<!-- ============================= -->
+<!-- Forms -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/parsleyjs/parsley.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/js/pages/form-validation.init.js"); ?>"></script>
+
+<!-- ============================= -->
+<!-- Notifications -->
+<!-- ============================= -->
+<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
+
+<!-- ============================= -->
+<!-- Select2 -->
+<!-- ============================= -->
+<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+
+<!-- ============================= -->
+<!-- Editor -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/jodit.min.js"); ?>"></script>
+
+<!-- ============================= -->
+<!-- App Init -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/app.min.js"); ?>"></script>
+
+
+<script>
+    toastr.options = {
+        "timeOut": 5000,
+        "closeButton": true,
+    };
+</script>
+<script>
+    $(document).ready(function() {
+
+
+        var pageName = "<?= esc($page_name ?? '') ?>";
+
+        var titleHtml = (pageName && pageName !== "Dashboard") ?
+            `<h3 style="margin-right:5px !important;">${pageName}</h3>` :
+            " ";
+
+        if (pageName && pageName == "Dashboard") {
+            titleHtml = `<h6 style="margin-right:5px !important;">Welcome <?= esc(get_session_userdata()->first_name ?? 'NOT SET') ?></h6>
+                     <h3>Dashboard</h3>`;
+        }
+
+
+        $(".top-navbar-title").html(titleHtml);
+
+
+        $('#collapseOne').on('show.bs.collapse', function() {
+            // When open
+            $('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');
+            // $('#filterAccordion').removeAttr("style"); // remove bg/border when open
+        });
+
+        $('#collapseOne').on('hide.bs.collapse', function() {
+            // When closed
+            $('#icon').removeClass('mdi-chevron-up').addClass('mdi-chevron-down');
+            // $('#filterAccordion').css({
+            //     "background-color": "#F5FFFF",
+            //     "border": "2px solid #F5FFFF",
+            //     "border-radius": "10px",
+            //     "box-shadow": "0px 4px 4px 0px #00000040"
+            // });
+        });
+
+        const observer = new MutationObserver(() => {
+            document.querySelectorAll('.select2-search__field').forEach(el => {
+                el.style.setProperty('box-shadow', 'none', 'important');
+            });
+        });
+
+        observer.observe(document.body, { childList: true, subtree: true });
+    });
+</script>
+<script>
+    var pullNotificationCount = 0;
+    var pendingActionCount = 0;
+
+    $(document).ready(function() {
+
+
+        function fetchMessages() {
+
+            $.ajax({
+                url: '<?= base_url('dashboard/get-notification') ?>',
+                method: 'GET',
+                success: function(response) {
+
+                    // console.log('responce', response)
+
+                    if (response.status == false) {
+                        $('#notification_count').html('0')
+                        console.log('The session is not set correctly. ')
+                        return;
+                    }
+
+                    let messagesList = $('#messages-list');
+                    messagesList.empty();
+
+                    var html = "";
+
+                    pullNotificationCount = response.message.length
+
+
+
+                    localStorage.setItem('pullNotificationCount', pullNotificationCount)
+
+                    response.message.forEach(message => {
+
+                        // if (!message.is_read) {
+                        //     unreadCount++;
+                        // }
+
+                        var jasonDecodeData = JSON.parse(message.message_text)
+
+                        var toast_body_css = 'background : #bfd7eb !important;';
+                        var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                        var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                        var toast_status_word = 'Success';
+
+                        if (jasonDecodeData.msg_status == 'failure') {
+
+                            toast_body_css = 'background : #fdcfcf !important;';
+                            toast_head_css = 'background-color : rgb(235 105 105 / 85%) !important; color :#000; border-bottom: 0;';
+                            toast_icon = 'mdi mdi-information mr-auto'
+                            toast_status_word = 'Failure';
+
+                        } else if (jasonDecodeData.msg_status == 'success') {
+
+                            toast_body_css = 'background : #bfd7eb !important;';
+                            toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                            toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto'
+                            toast_status_word = 'Success';
+                        }
+
+                        var html = ` <li data-id="${message.id}" data-url="${jasonDecodeData.action_url != undefined && jasonDecodeData.action_url != "" ? jasonDecodeData.action_url : 'dashboard/view'}">
+                                        <div class="p-3">
+                                            <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                <div class="toast-header " style="${toast_head_css}" >
+                                                    <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                    <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button> 
+                                                </div>
+                                                <div class="toast-body" style="${toast_body_css}">
+                                                <strong>${jasonDecodeData.msg_title ? jasonDecodeData.msg_title : ''}</strong> <br><br>
+                                                    <small style="position: relative;bottom: 8px;">${jasonDecodeData.message_text}</small>
+                                                    <div class="toast-footer">
+                                                         <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 25px;position: relative;top: 2px;">${jasonDecodeData.action_url != undefined && jasonDecodeData.action_url != "" ? 'see more' : ''}</small></a>
+                                                        <small style="position: relative;top: 2px;left: 5px;font-size: 10px;">${formatDate(message.created_at)}</small>
+                                                    </div>                                                
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </li>`
+
+
+                        messagesList.append(html);
+                        $(function() {
+                            $('[data-toggle="tooltip"]').tooltip();
+                        });
+                    });
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText); // Log the error response
+                }
+            });
+
+            let PNCount = parseInt(localStorage.getItem('pullNotificationCount'));
+            let PACount = parseInt(localStorage.getItem('pendingActionCount'));
+
+            totalcount = PNCount + PACount
+            $('#notification_count').html(totalcount);
+
+        }
+
+        function acknowledgeMessage(messageId) {
+            $.ajax({
+                url: '<?= base_url('dashboard/acknowledge-notification/') ?>' + messageId,
+                method: 'GET',
+                success: function(response) {
+                    fetchMessages();
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText); // Log the error response
+                }
+            });
+        }
+
+        $('#messages-list').on('click', 'li', function(event) {
+
+            //console.log('messages-list click li')
+
+            if ($(event.target).closest('.rm_msg').length > 0) {
+
+                //console.log('.rm_msg')
+
+                let messageId = $(this).data('id');
+                let url = $(this).data('url');
+                acknowledgeMessage(messageId);
+
+                $(this).delay(300).fadeOut('slow', function() {
+                    $(this).remove();
+                });
+
+            } else if ($(event.target).closest('.redirect_page').length > 0) {
+
+                //console.log('redirect_page')
+
+                let messageId = $(this).data('id');
+                let url = $(this).data('url');
+                //console.log('url : ', url)
+                acknowledgeMessage(messageId);
+
+                window.location.href = '<?= base_url() ?>' + url;
+            }
+
+
+        });
+
+        // fetchMessages();
+
+        // setInterval(fetchMessages, 60000); // Fetch messages every sixty seconds
+    });
+
+    $(document).ready(function() {
+
+        function fetchPendingAction() {
+
+            $.ajax({
+
+                url: '<?= base_url('dashboard/get-pending-action') ?>',
+                method: 'GET',
+                success: function(response) {
+
+                    console.log(response);
+
+                    if (response.length == 0) {
+
+                        pendingActionCount = 0;
+                        localStorage.setItem('pendingActionCount', pendingActionCount);
+                    }
+
+                    for (let key in response) {
+                        // console.log(response[key].length)
+                        // console.log('type', typeof response[key].length)
+                        // console.log('key', response[key])
+                        if (response[key].length != 'undefined' && response[key].length != undefined) {
+                            pendingActionCount = pendingActionCount + response[key].length;
+                        }
+                    }
+
+                    console.log(pendingActionCount);
+
+                    let messagesList = $('#messages-list-2');
+                    messagesList.empty();
+
+
+                    if (response.inception) {
+                        $.each(response.inception, function(index, item) {
+
+                            var queryParams = {
+                                client_id: item.client_id,
+                                client_policy_id: item.client_policy_id,
+                                client_branch_id: item.branch_id,
+                                actions: 'inception'
+                            };
+
+                            const queryString = objectToQueryString(queryParams);
+
+                            var url = 'employee/upload?' + queryString
+                            ////console.log(url)
+
+
+                            var toast_body_css = 'background : #bfd7eb !important;';
+                            var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                            var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                            var toast_status_word = 'Info';
+
+                            if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                //console.log(item.branch_name)
+                                item.branch_name += ' branch';
+                            }
+
+                            ////console.log(item.branch_name);
+
+                            var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+
+                            ////console.log(toast_body_data);
+
+                            var html = ` <li data-id="" data-url="${url}">
+                                            <div class="p-3">
+                                                <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                    <div class="toast-header " style="${toast_head_css}" >
+                                                        <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                        <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button> 
+                                                    </div>
+                                                    <div class="toast-body" style="${toast_body_css}">
+                                                    <strong>Inception Pending</strong><br><br>
+                                                        <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                        <div class="toast-footer">
+                                                            <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                            <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                        </div>                                                
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </li>`
+
+
+                            messagesList.append(html);
+
+                        });
+                    } else {
+                        console.log('response.inception is undefined or null');
+                    }
+
+                    if (response.correction) {
+                        $.each(response.correction, function(index, item) {
+                            if (item.batch_export_count == 0 || item.batch_import_count == 0) {
+
+
+                                var queryParams = {
+                                    client_id: item.client_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'correction',
+                                    actions: 'export',
+                                    insurer_or_tpa: 'tpa',
+                                };
+
+                                const queryString = objectToQueryString(queryParams);
+
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
+
+
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+
+                                var title = 'Correction Pending';
+
+
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
+
+                                }
+
+                                ////console.log(item.branch_name);
+
+                                // if (item.batch_export_count > 0) {
+
+                                //     title = 'Correction Import Pending';
+                                // }
+
+                                var toast_body_data = item.client_name + ' - ' + item.branch_name;
+                                ////console.log(toast_body_data);
+
+                                var html = ` <li data-id="" data-url="${url}">
+                                    <div class="p-3">
+                                        <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                            <div class="toast-header " style="${toast_head_css}" >
+                                                <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                    <span aria-hidden="true">&times;</span>
+                                                </button> 
+                                            </div>
+                                            <div class="toast-body" style="${toast_body_css}">
+                                            <strong>${title}</strong><br><br>
+                                                <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                <div class="toast-footer">
+                                                    <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                    <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                </div>                                                
+                                            </div>
+                                        </div>
+                                    </div>
+                                </li>`
+
+
+                                messagesList.append(html);
+
+                            }
+                        });
+                    } else {
+                        console.log('response.correction is undefined or null');
+                    }
+
+                    if (response.deletion) {
+                        $.each(response.deletion, function(index, item) {
+
+                            if (item.batch_export_count == 0 || item.batch_import_count == 0) {
+
+
+                                var queryParams = {
+
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'deletion',
+                                    actions: 'export',
+                                    insurer_or_tpa: 'tpa',
+
+                                };
+
+                                const queryString = objectToQueryString(queryParams);
+
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
+
+
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'Deletion Pending';
+
+
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
+
+                                }
+
+                                ////console.log(item.branch_name);
+
+                                // if (item.batch_export_count > 0) {
+
+                                //     title = 'Deletion Import Pending';
+                                // }
+
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
+
+                                var html = ` <li data-id="" data-url="${url}">
+                                                <div class="p-3">
+                                                    <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                        <div class="toast-header " style="${toast_head_css}" >
+                                                            <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                            <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button> 
+                                                        </div>
+                                                        <div class="toast-body" style="${toast_body_css}">
+                                                        <strong>${title}</strong><br><br>
+                                                            <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                            <div class="toast-footer">
+                                                                <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                                <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                            </div>                                                
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </li>`
+
+
+                                messagesList.append(html);
+
+                            }
+
+                        });
+                    } else {
+                        console.log('response.deletion is undefined or null');
+
+                    }
+
+                    if (response.si_enhancement) {
+                        $.each(response.si_enhancement, function(index, item) {
+                            if (item.batch_export_count == 0 || item.batch_import_count == 0) {
+
+
+                                var queryParams = {
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'si_enhancement',
+                                    actions: 'export',
+                                    insurer_or_tpa: 'tpa',
+                                };
+
+                                const queryString = objectToQueryString(queryParams);
+
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
+
+
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'SI Enhancement Pending';
+
+
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
+
+                                }
+
+                                ////console.log(item.branch_name);
+
+                                // if (item.batch_export_count > 0) {
+
+                                //     title = 'SI Enhancement Import Pending';
+                                // }
+
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
+
+                                var html = ` <li data-id="" data-url="${url}">
+                                                <div class="p-3">
+                                                    <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                        <div class="toast-header " style="${toast_head_css}" >
+                                                            <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                            <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button> 
+                                                        </div>
+                                                        <div class="toast-body" style="${toast_body_css}">
+                                                        <strong>${title}</strong><br><br>
+                                                            <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                            <div class="toast-footer">
+                                                                <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                                <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                            </div>                                                
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </li>`
+
+
+                                messagesList.append(html);
+
+                            }
+
+                        });
+                    } else {
+                        console.log('response.si_enhancement is undefined or null');
+
+                    }
+
+                    if (response.tpa) {
+                        $.each(response.tpa, function(index, item) {
+                            if (item.batch_export_count == 0 || item.batch_import_count == 0) {
+
+
+                                var queryParams = {
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'inception',
+                                    insurer_or_tpa: 'tpa',
+                                    actions: 'export',
+                                };
+
+                                const queryString = objectToQueryString(queryParams);
+
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
+
+
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'TPA Pending';
+
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
+
+                                }
+
+                                ////console.log(item.branch_name);
+
+                                // if (item.batch_export_count > 0) {
+
+                                //     title = 'TPA Import Pending';
+                                // }
+
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
+
+                                var html = ` <li data-id="" data-url="${url}">
+                                            <div class="p-3">
+                                                <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                    <div class="toast-header " style="${toast_head_css}" >
+                                                        <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                        <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button> 
+                                                    </div>
+                                                    <div class="toast-body" style="${toast_body_css}">
+                                                    <strong>${title}</strong><br><br>
+                                                        <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                        <div class="toast-footer">
+                                                            <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                            <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                        </div>                                                
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </li>`
+
+
+                                messagesList.append(html);
+
+                            }
+                        });
+                    } else {
+                        console.log('response.tpa is undefined or null');
+
+                    }
+
+                    if (response.uhid) {
+                        $.each(response.uhid, function(index, item) {
+                            if (item.batch_export_count == 0 || item.batch_import_count == 0) {
+
+                                var queryParams = {
+
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'inception',
+                                    insurer_or_tpa: 'insurer',
+                                    actions: 'export',
+                                };
+
+                                const queryString = objectToQueryString(queryParams);
+
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                //console.log(url)
+
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'Insurer Pending';
+
+
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
+
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
+
+                                }
+
+                                ////console.log(item.branch_name);
+
+                                // if (item.batch_export_count > 0) {
+
+                                //     title = 'Insurer Import Pending';
+                                // }
+
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
+
+                                var html = ` <li data-id="" data-url="${url}">
+                                                <div class="p-3">
+                                                    <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
+                                                        <div class="toast-header " style="${toast_head_css}" >
+                                                            <strong class="${toast_icon}">   ${toast_status_word}</strong>
+                                                            <button type="button" class="ml-2 mb-1 close rm_msg" data-dismiss="toast" aria-label="Close">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button> 
+                                                        </div>
+                                                        <div class="toast-body" style="${toast_body_css}">
+                                                        <strong>${title}</strong><br><br>
+                                                            <small style="position: relative;bottom: 8px;">${toast_body_data}</small>
+                                                            <div class="toast-footer">
+                                                                <a href="#" class="redirect_page" data-toggle="tooltip" data-placement="bottom" title="Click Go to the Page"><small style="margin-right: 142px;position: relative;top: 2px;">see more</small></a>
+                                                                <small style="position: relative;top: 2px;left: 5px;font-size: 10px;"></small>
+                                                            </div>                                                
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </li>`
+
+
+                                messagesList.append(html);
+
+                            }
+                        });
+                    } else {
+                        console.log('response.uhid is undefined or null');
+                    }
+                    localStorage.setItem('pendingActionCount', pendingActionCount)
+
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText); // Log the error response
+                }
+
+            });
+        }
+
+        // fetchPendingAction()
+
+        $('#messages-list-2').on('click', 'li', function(event) {
+
+            //console.log('messages-list-2 click li')
+
+            if ($(event.target).closest('.rm_msg').length > 0) {
+
+                //console.log('.rm_msg')
+
+                $(this).delay(300).fadeOut('slow', function() {
+                    $(this).remove();
+                });
+
+            } else if ($(event.target).closest('.redirect_page').length > 0) {
+
+                //console.log('redirect_page')
+
+                let url = $(this).data('url');
+                //console.log('url : ', url);
+
+                window.location.href = '<?= base_url() ?>' + url;
+            }
+
+
+        });
+    })
+
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+</script>
+
+
+<script>
+    function formatDate(dateString) {
+        // Parse the input date string
+        let date = new Date(dateString);
+
+        // Define months array
+        const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+        // Extract day, month, year, hours, and minutes
+        let day = date.getDate();
+        let month = months[date.getMonth()];
+        let year = date.getFullYear();
+        let hours = date.getHours();
+        let minutes = date.getMinutes();
+
+        // Convert hours to 12-hour format
+        let period = hours >= 12 ? 'pm' : 'am';
+        hours = hours % 12;
+        hours = hours ? hours : 12; // Handle midnight (0 hours)
+
+        // Format the time string
+        let timeString = ('0' + hours).slice(-2) + ':' + ('0' + minutes).slice(-2) + ' ' + period;
+
+        // Format the date string
+        let formattedDate = day + '-' + month + '-' + year + ' ' + timeString;
+
+        return formattedDate;
+    }
+
+    function printCurrentTime() {
+        var now = new Date();
+        var hours = now.getHours().toString().padStart(2, '0');
+        var minutes = now.getMinutes().toString().padStart(2, '0');
+        var seconds = now.getSeconds().toString().padStart(2, '0');
+        var currentTime = hours + ':' + minutes + ':' + seconds;
+        // console.log("Current Time:", currentTime);
+
+        return currentTime;
+    }
+</script>
+
+<script>
+    function checkDuplicateTableFieldValue(tableName, fieldName, value, callback) {
+        $.ajax({
+            url: '<?= base_url('util/checkDuplicateTableFieldValue') ?>', // Adjust this to your endpoint in CodeIgniter
+            type: 'POST',
+            data: {
+                table: tableName,
+                field: fieldName,
+                value: value
+            },
+            dataType: 'json',
+            success: function(response) {
+                if (typeof callback === 'function') {
+                    callback(response.isDuplicate); // Pass the result to the callback
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('AJAX Error:', error);
+            }
+        });
+    }
+
+    function sendAjaxRequestForGlobal(url, method, data = {}, successCallback = null, errorCallback = null) {
+        $.ajax({
+            url: url,
+            method: method,
+            data: data,
+            dataType: 'json', // Expected response type
+            success: function(response) {
+                // If a success callback is provided, call it with the response
+                if (successCallback) {
+                    successCallback(response);
+                }
+            },
+            error: function(xhr, status, error) {
+                // Handle errors if provided error callback
+                if (errorCallback) {
+                    errorCallback(xhr, status, error);
+                } else {
+                    console.error('AJAX Error:', error);
+                }
+            }
+        });
+    }
+
+    function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, Proceed!", cancelText = "Cancel", icon = "warning") {
+        return Swal.fire({
+            title: message,
+            icon: icon,
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#d33",
+            confirmButtonText: confirmText,
+            cancelButtonText: cancelText
+        }).then((result) => {
+            return result.isConfirmed; // Returns true if confirmed, false otherwise
+        });
+    }
+</script>
+
+<script>
+    function restoreDashboardHistoryIfNeeded() {
+
+        const dashboardHistoryString = localStorage.getItem('dashboardHistory');
+
+        if (!dashboardHistoryString) {
+            console.log("dashboardHistory not found");
+            return;
+        }
+
+        const dashboardHistory = JSON.parse(dashboardHistoryString);
+
+        if (window.location.href === dashboardHistory.dashboard_url) {
+            const tabSelector = dashboardHistory.tab;
+            if (tabSelector) {
+                const tabElement = document.querySelector(`a[href="${tabSelector}"]`);
+                if (tabElement) {
+                    tabElement.click();
+                }
+            }
+
+            const functionName = dashboardHistory.function_name;
+            const params = dashboardHistory.tile_params;
+
+            if (functionName && typeof window[functionName] === 'function') {
+                if (params.majorType == 0 && params.minorType == 0) {
+                    window[functionName]();
+                } else {
+                    window[functionName](params.majorType, params.minorType);
+                }
+
+            }
+
+            console.log("inside location match");
+        }
+    }
+
+    // Run on popstate (back/forward buttons)
+    window.addEventListener('popstate', restoreDashboardHistoryIfNeeded);
+
+    // Run on page load (refresh)
+    window.addEventListener('DOMContentLoaded', () => {
+        // slight delay ensures DOM/tab loads completely
+        setTimeout(restoreDashboardHistoryIfNeeded, 100);
+    });
+</script>
+
+<script>
+    $(document).ready(function() {
+        const activeItem = localStorage.getItem("activeLi");
+        if (activeItem) {
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+            $('#' + activeItem).children('a').first().removeClass('img-inactive').addClass('img-active');
+        }
+
+        $('.li-seperate').on('click', function() {
+            // reset all anchors
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+
+            // only the immediate <a> inside this <li>
+            $(this).children('a').first().removeClass('img-inactive').addClass('img-active');
+
+            localStorage.setItem("activeLi", $(this).attr("id"));
+        });
+    });
+</script>
+
+
+<script>
+    $(document).ready(function() {
+        $('.nav-link').click(function() {
+
+            // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+
+
+
+        });
+    });
+
+    $(document).ready(function() {
+        // find all nav anchors
+        let $nav = $("ul.nav.nav-pills.navtab-bg");
+
+        // check if no anchor has active classes
+        if ($nav.find("a.active.active-tab").length === 0) {
+            // add classes to the first anchor
+            $nav.find("li:first-child a").addClass("active active-tab");
+
+            // also need to find the tab name and show only active image
+            // let tab_name = $nav.find("li:first-child a").attr('href').split('-')[0];
+
+            let href = $nav.find("li:first-child a").attr('href');
+            let tab_name = href ? href.split('-')[0] : '';
+
+            tab_name = tab_name.replace('#', '');
+
+
+            switch (tab_name) {
+                case "leads":
+                    $('.active_leads').show();
+                    $('.inactive_leads').hide();
+                    break;
+                case "bds":
+                    $('.active_bds').show();
+                    $('.inactive_bds').hide();
+                    break;
+                case "claims":
+                    $('.active_claims').show();
+                    $('.inactive_claims').hide();
+                    break;
+                case "pending":
+                    $('.active_pending').show();
+                    $('.inactive_pending').hide();
+                    break;
+                default:
+                    break;
+            }
+
+        }
+    });
+
+$(function(){
+    let $nav = $("#myTab");
+
+    $(".left-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() - 150 }, 200);
+    });
+
+    $(".right-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() + 150 }, 200);
+    });
+});
+
+
+    // function openModal(modalId) {
+    //     console.log('openModal called with ID:', modalId);
+    //     var modalEl = document.getElementById(modalId);
+
+    //     if (typeof bootstrap !== "undefined" && bootstrap.Modal && typeof bootstrap.Modal.getOrCreateInstance === "function") {
+    //         // ✅ Bootstrap 5
+    //         var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+    //         modal.show();
+    //     } else if (typeof $ !== "undefined" && typeof $.fn.modal === "function") {
+    //         // ✅ Bootstrap 4
+    //         $('#' + modalId).modal('show');
+    //     } else {
+    //         console.error("No compatible Bootstrap modal found.");
+    //     }
+    // }
+</script>
+
+
+<script>
+        $(document).ready(function(){
+        $('.nav-link').click(function(){
+
+        // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+        
+
+
+        });
+    });
+</script>
+
+<script>
+    function closeModalById(modalId) {
+        // Get the modal element
+        var modal = document.getElementById(modalId);
+        if (!modal) return; // Exit if no modal found
+
+        // Hide it by removing "show" or "in" classes and setting display:none
+        modal.style.display = 'none';
+        modal.classList.remove('in', 'show'); // 'in' for BS3, 'show' for BS4/5
+        modal.setAttribute('aria-hidden', 'true');
+        modal.removeAttribute('aria-modal'); // optional
+        modal.removeAttribute('role'); // optional
+
+        // Remove backdrop if present
+        var backdrop = document.querySelector('.modal-backdrop');
+        if (backdrop) backdrop.remove();
+
+        // Allow page scrolling again
+        document.body.classList.remove('modal-open');
+    }
+
+</script>
+
+<script>
+    
+    const insurer_category = {
+        1: "general", 2: "general", 3: "general", 4: "general", 5: "general",
+        6: "life", 7: "life", 8: "general", 9: "general", 10: "general",
+        11: "general", 12: "general", 13: "general", 14: "general", 15: "general",
+        16: "general", 17: "general", 18: "general", 19: "general", 20: "general",
+        21: "general", 22: "general", 23: "general", 24: "general", 25: "general",
+        26: "general", 27: "general", 28: "general", 29: "general", 30: "general",
+        31: "general", 32: "life", 33: "general", 34: "life", 35: "general",
+        36: "general", 37: "general", 38: "general", 39: "life", 40: "general",
+        41: "general", 42: "general", 43: "general", 44: "general", 45: "general",
+        46: "general", 47: "general", 48: "general", 49: "general", 50: "general",
+        51: "general", 52: "general", 53: "general", 54: "general", 55: "general",
+        56: "general", 57: "general", 58: "general", 59: "general", 60: "general",
+        61: "general", 62: "general", 63: "general", 64: "general", 65: "general",
+        66: "general", 67: "general", 68: "general", 69: "general", 70: "general",
+        71: "general"
+    };
+
+    function appendInsurerByCategory(data, object, type) 
+    {   
+        return true;
+
+        $(object).empty();
+
+        $(object).append($('<option>', {
+            value: '',
+            text: 'Select Insurer'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var displayValue = item.insurer_name + ' - ' + item.branch_code;
+            var dbValue = item.id+'-'+item.insurer_id
+            
+            if(item.category == type){
+
+                var option = $('<option>', {
+                    value: dbValue,
+                    text: displayValue,
+                    'data-id': item.insurer_id,
+                    'data-bid': item.id,
+                    'data-ic': item.category,
+                });
+
+                $(object).append(option);
+            }
+        });
+
+        $(object).select2();
+    }
+
+    // SVR asked - Add padding to input so text doesn’t merge with icon
+    $(document).on('init.dt', function () {
+        $('.dataTables_filter input[type="search"]').css('padding-right', '30px');
+    });
+
+    // SVR asked - Toggle icons
+    $(document).on('input', '.dataTables_filter input', function() {
+        const wrapper = $(this).closest('.datatable-search-wrapper');
+        if ($(this).val()) {
+            wrapper.find('.datatable-search-icon').hide();
+            wrapper.find('.datatable-clear-icon').show();
+        } else {
+            wrapper.find('.datatable-search-icon').show();
+            wrapper.find('.datatable-clear-icon').hide();
+        }
+    });
+
+    // SVR asked - Clear search
+    $(document).on('click', '.datatable-clear-icon', function() {
+        const input = $(this).closest('.datatable-search-wrapper').find('input');
+        input.val('').trigger('input');
+        table.search('').draw();   
+    });
+
+</script>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index d4f88fbd..57aff2c2 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -51,7 +51,8 @@
 
 
     <!-- JQuery CDN -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+
 
     <!-- Sweet Alert CDN -->
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.10.4/dist/sweetalert2.all.min.js"></script>
@@ -59,7 +60,8 @@
     <!-- select2 -->
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" type="text/css">
 
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.7.1.slim.min.js"></script>
+
     <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.3/dist/umd/popper.min.js"></script>
 
     <!-- <link rel="manifest" href="../manifest.json"> -->
@@ -1863,6 +1865,9 @@
                                     <li>
                                         <a href="<?= base_url('/ticket/claim-upload') ?>">Claim Dump Upload</a>
                                     </li>
+                                    <!-- <li>
+                                        <a href="<?= base_url('/claim_mis/list') ?>">Claim MIS Upload</a>
+                                    </li> -->
                                     <!-- <li>
                                             <a href="<?= base_url('/ticketList?return_type=web') ?>">Ticket List</a>
                                         </li> -->
diff --git a/app/Views/layout/header_new.php b/app/Views/layout/header_new.php
new file mode 100644
index 00000000..b5bfd6fa
--- /dev/null
+++ b/app/Views/layout/header_new.php
@@ -0,0 +1,2192 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8" />
+    <title><?= isset($tab_name) ? $tab_name : 'NHance'; ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta content="" name="description" />
+    <meta content="NHANCE" name="NHANCE" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+
+
+    <!-- App favicon -->
+    <link rel="shortcut icon" href="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg">
+
+    <!-- plugin css -->
+    <link href="<?= base_url() . "public"; ?>/assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" />
+
+    <!-- third party css -->
+    <link href="<?= base_url() . "public"; ?>/assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?= base_url() . "public"; ?>/assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?= base_url() . "public"; ?>/assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <!-- third party css end -->
+
+    <!-- App css -->
+    <link href="<?= base_url() . "public"; ?>/assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+    <link href="<?= base_url() . "public"; ?>/assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+
+    <link href="<?= base_url() . "public"; ?>/assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+    <link href="<?= base_url() . "public"; ?>/assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+
+    <!-- icons -->
+    <link href="<?= base_url() . "public"; ?>/assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+
+    <link href="<?= base_url() . "public"; ?>/assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?= base_url() . "public"; ?>/assets/libs/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" type="text/css">
+    <link href="<?= base_url() . "public"; ?>/assets/libs/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" type="text/css">
+
+
+    <!-- <link href="<?= base_url() . "public"; ?>/assets/css/bootstrap-material.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> -->
+    <!-- <link href="<?= base_url() . "public"; ?>/assets/css/app-material.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" /> -->
+
+
+    <!-- <link href="<?= base_url() . "public"; ?>/assets/css/bootstrap-editable.css" rel="stylesheet" type="text/css" /> -->
+    <link href="https://cdn.jsdelivr.net/npm/remixicon/fonts/remixicon.css" rel="stylesheet">
+
+    <!-- Jodit Css -->
+    <link href="<?= base_url() . "public"; ?>/assets/css/jodit.css" rel="stylesheet" type="text/css" />
+
+
+   <!-- JQuery CDN -->
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+
+<!-- Sweet Alert CDN -->
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.12.0/dist/sweetalert2.all.min.js"></script>
+
+<!-- select2 -->
+<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" type="text/css">
+
+<script src="https://code.jquery.com/jquery-3.7.1.slim.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
+
+
+    <!-- <link rel="manifest" href="../manifest.json"> -->
+
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;700&display=swap" rel="stylesheet">
+
+    <!-- google icons -->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0&icon_names=image" />
+
+
+    <script>
+        // if ('serviceWorker' in navigator) {
+        //     window.addEventListener('load', function() {
+        //         navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
+        //             // console.log('Service Worker registration successful with scope:', registration.scope);
+        //         }, function(err) {
+        //             // console.log('Service Worker registration failed:', err);
+        //         });
+        //     });
+        // }
+    </script>
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" />
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
+    <!-- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> -->
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.js"></script>
+    <!-- srinivas -->
+
+    <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
+    <script src="https://editor.unlayer.com/embed.js"></script>
+
+    <!-- MD5 Hash Start  -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/blueimp-md5/2.19.0/js/md5.min.js"></script>
+
+
+    <!-- MD5 Hash End  -->
+
+    <!-- <script src="<?= base_url('public/unlayer/js/embed.js') . '' ?>"></script> -->
+    <!-- srinivas -->
+
+
+    <script>
+        $(window).on('load', function() {
+            setTimeout(function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').fadeOut('slow');
+            }, 1000);
+        });
+    </script>
+
+
+    <!-- Global section starts -->
+    <style>
+        * {
+            font-family: 'Poppins' !important;
+        }
+
+        .content {
+            min-height: 70vh;
+        }
+
+        .tooltip-inner {
+            color: #fff !important;
+            /* restore white text */
+            background-color: #000 !important;
+            /* keep background black */
+        }
+
+        .container-fluid {
+            padding: 0px 20px 0px 20px !important;
+        }
+
+        .container-fluid-top {
+            padding: 0px 40px 0px 40px !important;
+        }
+
+        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages) {
+            min-height: 100vh !important;
+        }
+
+        body .content-page {
+            margin-top: 90px !important;
+        }
+    </style>
+
+    <!-- navbar -->
+    <style>
+        .nav-bar {
+            position: fixed !important;
+            z-index: 4;
+            width: 90%;
+            margin-left: 120px !important;
+            background: #fff;
+        }
+
+        .top-navbar-div {
+            display: flex;
+            flex-flow: row;
+            flex-shrink: 1 !important;
+            justify-content: space-between;
+            margin-top: 20px;
+            margin-left: 15px;
+        }
+
+
+        .ul-flex {
+            display: flex;
+            flex-flow: column nowrap;
+            justify-content: center;
+            align-content: space-evenly;
+            flex-shrink: 1;
+        }
+
+
+
+        .nav-flex {
+            display: flex;
+            flex-flow: row nowrap;
+            justify-content: end;
+            justify-content: center;
+            align-items: center;
+            margin-right: 20px;
+        }
+    </style>
+
+    <!-- tab-switch -->
+    <style>
+        .nav-pills,
+        .nav-link {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            border-radius: 10px;
+
+        }
+
+        .nav-pills {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+            padding-top: 5px;
+        }
+
+        .nav-pills.nav-dash {
+            background-color: white !important;
+            box-shadow: none !important;
+        }
+
+        .nav-pills .nav-dash {
+            background-color: #D4F5F6 !important;
+            border-radius: 10px;
+            color: black !important;
+        }
+
+
+        .nav-link.active-tab {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+
+        }
+
+        .nav-link-btn {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+        }
+
+        .navtab-bg .nav-link {
+            margin: 5px !important;
+        }
+    </style>
+
+
+
+    <!-- sidebar -->
+    <style>
+        #side-menu .menu-logo a:hover {
+            background-color: transparent !important;
+            color: inherit !important;
+            text-decoration: none !important;
+            box-shadow: none !important;
+        }
+
+
+        #side-menu .menu-logo img {
+            height: 24px;
+            display: inline-block;
+        }
+
+        .left-side-menu {
+            margin-left: 30px;
+            margin-top: 20px;
+            margin-bottom: 5px;
+            border-radius: 25px;
+            background-color: #D4F5F6;
+            z-index: 700;
+            padding: 0 !important;
+            height: 90% !important;
+            display: flex;
+            flex-flow: column wrap;
+        }
+
+        /* every <li> inside should be allowed to shrink */
+        .left-side-menu li {
+            flex-shrink: 1 !important;
+            min-height: 0 !important;
+            /* prevents flex bugs */
+        }
+
+        .left-side-menu ul li:hover>ul {
+            position: relative;
+            z-index: 99999 !important;
+        }
+
+
+
+        .img-inactive {
+            background-color: white;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 1px solid white;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+
+
+        .li-seperate {
+            margin: 10px 0px;
+        }
+
+        .img-active {
+            background-color: #B7F0F2;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 2px solid #00999E;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+    </style>
+
+    <!-- rightbar -->
+    <style>
+        .right-bar {
+            width: 300px !important;
+            /* Adjust as needed */
+            overflow: hidden;
+        }
+    </style>
+
+    <!-- Dashboard-tab and header section starts -->
+    <style>
+        .notification-dot {
+            position: absolute;
+            top: 5px;
+            /* adjust depending on icon size */
+            right: 8px;
+            /* adjust depending on icon size */
+            width: 8px;
+            height: 8px;
+            background: red;
+            border-radius: 50%;
+        }
+
+        .dash-tab-font {
+            font-weight: 500 !important;
+            font-size: 0.875rem !important;
+        }
+
+
+        #current_tile,
+        #main_tile,
+        #mainMenuTiles {
+            font-size: 25px !important;
+            font-weight: 600 !important;
+        }
+
+
+
+        .navbar-custom {
+            top: -10px !important;
+            height: 61px !important;
+        }
+
+        .logo-box {
+            top: -10px !important;
+            height: 61px !important;
+        }
+
+        .content-page {
+            padding: 80px 15px 65px 15px !important;
+            min-height: 1000px ;
+        }
+
+        /* Media query for small screens */
+        @media screen and (min-width: 768px) {
+
+            /* Styles for screens with a minimum width of 768px (e.g., tablets and larger devices) */
+            .navbar-custom .button-menu-mobile {
+                display: none;
+                /* Hide the button on larger screens */
+            }
+        }
+    </style>
+
+    <!-- loader section starts   -->
+    <style>
+        .loader div {
+            background-color: #6ad9cf;
+            display: inline-block;
+            float: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 50px;
+            height: 50px;
+            opacity: .5;
+            border-radius: 50%;
+            -webkit-animation: ballPulseDouble 2s ease-in-out infinite;
+            animation: ballPulseDouble 2s ease-in-out infinite;
+        }
+
+        .loader div:last-child {
+            -webkit-animation-delay: -1s;
+            animation-delay: -1s;
+        }
+
+        .loader-mask {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background-color: #00000069;
+            z-index: 99999;
+        }
+
+        .loader {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            height: 50px;
+            font-size: 0;
+            color: #00c9d0;
+            display: inline-block;
+            margin: -25px 0 0 -25px;
+            text-indent: -9999em;
+            -webkit-transform: translateZ(0);
+            -ms-transform: translateZ(0);
+            transform: translateZ(0);
+        }
+
+        /* end of loaders */
+    </style>
+
+
+
+    <!-- ticket list specific code -->
+    <style>
+        /*
+        #E26728   (base)
+        #B8521F   (darker 1)
+        #9C461B   (darker 2)
+        #803A16   (darker 3)
+        rgba(226, 103, 40, 0.5)  (transparent)
+
+        #00999E   (base)
+        #007A7E   (darker 1)
+        #006C70   (darker 2)
+        #005D61   (darker 3)
+        rgba(0, 153, 158, 0.5)  (transparent)
+        */
+
+        .app-field-grey {
+            background-color: #ECECEC !important;
+        }
+
+
+        .app-title {
+            font-size: 18px;
+        }
+
+        .app-heading {
+            font-size: 16px;
+        }
+
+        .app-subtitle {
+            font-size: 14px;
+        }
+
+        .app-text {
+            font-size: 12px;
+        }
+
+        .secondary-title {
+            margin-left: 26px;
+            display: flex;
+            align-items: center;
+        }
+
+        .secondary-title i {
+            font-size: 43px;
+        }
+
+        .secondary-title span {
+            position: relative;
+        }
+
+        .font-color-black {
+            color: black;
+        }
+
+
+        .app-text-white {
+            color: #ffffff !important;
+        }
+
+        .app-text-grey {
+            color: #5D5D5D !important;
+        }
+
+        .app-text-primary {
+            color: #00999E !important;
+        }
+
+        .app-text-secondary {
+            color: #E26728 !important;
+        }
+
+        .app-text-success {
+            color: #1abc9c !important;
+        }
+
+
+        a.app-text-primary:hover,
+        a.app-text-primary:focus {
+            color: rgba(0, 153, 158, 0.5) !important;
+        }
+
+        a.app-text-secondary:hover,
+        a.app-text-secondary:focus {
+            color: rgba(226, 103, 40, 0.5) !important;
+        }
+
+        a.app-text-success:hover,
+        a.app-text-success:focus {
+            color: #117964 !important;
+        }
+
+        .app-btn-primary {
+            color: #fff !important;
+            background-color: #00999E;
+            border-color: #00999E;
+        }
+
+        .app-btn-primary:hover {
+            color: #fff !important;
+            background-color: #007A7E;
+            border-color: #006C70;
+        }
+
+        .app-btn-primary:focus,
+        .app-btn-primary.focus {
+            color: #fff !important;
+            background-color: #007A7E;
+            border-color: #006C70;
+            box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5);
+        }
+
+        .app-btn-primary.disabled,
+        .app-btn-primary:disabled {
+            color: #fff !important;
+            background-color: #00999E;
+            border-color: #00999E;
+        }
+
+        .app-btn-primary:not(:disabled):not(.disabled):active,
+        .app-btn-primary:not(:disabled):not(.disabled).active,
+        .show>.app-btn-primary.dropdown-toggle {
+            color: #fff !important;
+            background-color: #006C70;
+            border-color: #005D61;
+        }
+
+        .app-btn-primary:not(:disabled):not(.disabled):active:focus,
+        .app-btn-primary:not(:disabled):not(.disabled).active:focus,
+        .show>.app-btn-primary.dropdown-toggle:focus {
+            box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5);
+        }
+
+        .app-btn-secondary {
+            color: #fff !important;
+            background-color: #E26728;
+            border-color: #E26728;
+        }
+
+        .app-btn-secondary:hover {
+            color: #fff !important;
+            background-color: #B8521F;
+            border-color: #9C461B;
+        }
+
+        .app-btn-secondary:focus,
+        .app-btn-secondary.focus {
+            color: #fff !important;
+            background-color: #E26728;
+            border-color: #9C461B;
+            box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5);
+        }
+
+        .app-btn-secondary.disabled,
+        .app-btn-secondary:disabled {
+            color: #fff !important;
+            background-color: #E26728;
+            border-color: #E26728;
+        }
+
+        .app-btn-secondary:not(:disabled):not(.disabled):active,
+        .app-btn-secondary:not(:disabled):not(.disabled).active,
+        .show>.app-btn-secondary.dropdown-toggle {
+            color: #fff !important;
+            background-color: #9C461B;
+            border-color: #803A16;
+        }
+
+        .app-btn-secondary:not(:disabled):not(.disabled):active:focus,
+        .app-btn-secondary:not(:disabled):not(.disabled).active:focus,
+        .show>.app-btn-secondary.dropdown-toggle:focus {
+            box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5);
+        }
+
+        .app-btn-outline-primary {
+            color: #000000;
+            border-color: #00999E;
+        }
+
+        .app-btn-outline-primary:hover {
+            color: #ffffff;
+            background-color: #00999E;
+            border-color: #00999E;
+        }
+
+        .app-btn-outline-primary:focus,
+        .app-btn-outline-primary.focus {
+            box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5);
+        }
+
+        .app-btn-outline-primary.disabled,
+        .app-btn-outline-primary:disabled {
+            color: #000000;
+            background-color: transparent;
+        }
+
+        .app-btn-outline-primary:not(:disabled):not(.disabled):active,
+        .app-btn-outline-primary:not(:disabled):not(.disabled).active,
+        .show>.app-btn-outline-primary.dropdown-toggle {
+            color: #ffffff;
+            background-color: #00999E;
+            border-color: #00999E;
+        }
+
+        .app-btn-outline-primary:not(:disabled):not(.disabled):active:focus,
+        .app-btn-outline-primary:not(:disabled):not(.disabled).active:focus,
+        .show>.app-btn-outline-primary.dropdown-toggle:focus {
+            box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5);
+        }
+
+        .app-btn-outline-secondary {
+            color: #000000;
+            border-color: #E26728;
+        }
+
+        .app-btn-outline-secondary:hover {
+            color: #ffffff;
+            background-color: #E26728;
+            border-color: #E26728;
+        }
+
+        .app-btn-outline-secondary:focus,
+        .app-btn-outline-secondary.focus {
+            box-shadow: 0 0 0 0.15rem rgba(206, 222, 239, 0.5);
+        }
+
+        .app-btn-outline-secondary.disabled,
+        .app-btn-outline-secondary:disabled {
+            color: #000000;
+            background-color: transparent;
+        }
+
+        .app-btn-outline-secondary:not(:disabled):not(.disabled):active,
+        .app-btn-outline-secondary:not(:disabled):not(.disabled).active,
+        .show>.btn-outline-secondary.dropdown-toggle {
+            color: #ffffff;
+            background-color: #E26728;
+            border-color: #E26728;
+        }
+
+        .app-btn-outline-secondary:not(:disabled):not(.disabled):active:focus,
+        .app-btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
+        .show>.btn-outline-secondary.dropdown-toggle:focus {
+            box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5);
+        }
+
+
+        .app-badge-primary {
+            color: #ffffff;
+            background-color: #00999E;
+        }
+
+        a.app-badge-primary:hover,
+        a.app-badge-primary:focus {
+            color: #ffffff;
+            background-color: #007A7E;
+        }
+
+        a.app-badge-primary:focus,
+        a.app-badge-primary.focus {
+            outline: 0;
+            box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5);
+        }
+
+        .app-badge-secondary {
+            color: #ffffff;
+            background-color: #E26728;
+        }
+
+        a.app-badge-secondary:hover,
+        a.app-badge-secondary:focus {
+            color: #ffffff;
+            background-color: #B8521F;
+        }
+
+        a.app-badge-secondary:focus,
+        a.app-badge-secondary.focus {
+            outline: 0;
+            box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5);
+        }
+    </style>
+
+    <!-- toaster -->
+    <style>
+        .toast-success {
+            background-color: #009688 !important;
+            color: #FFFFFF !important;
+        }
+
+        .toast-body {
+            padding: .75rem;
+            background: aliceblue !important;
+        }
+
+        .toast-footer {
+            text-align: right;
+            color: #000;
+            border-top: 1px solid aliceblue;
+            margin-top: 11px;
+            margin-bottom: -6px;
+        }
+    </style>
+
+    <!-- table section starts -->
+    <style>
+        table[data-custom-table-css="table"] thead th,
+        table[data-custom-table-css="second-table"] thead th {
+            background-color: #00999E;
+            color: #fff !important;
+            border-top: 0px solid #fff !important;
+            border-bottom: 0px solid #fff !important;
+            vertical-align: middle;
+            font-weight: 600 !important;
+        }
+
+
+        table[data-custom-table-css="table"] tbody td {
+            background: #F5FFFF;
+            padding: 12px;
+            border-top: 0px solid #fff !important;
+            border-bottom: 2px solid #C3EDEE !important;
+            font-weight: 400 !important;
+        }
+
+        table[data-custom-table-css="table"] thead th:first-child,
+        table[data-custom-table-css="second-table"] thead th:first-child {
+            border-top-left-radius: 15px !important;
+            border-bottom-left-radius: 15px !important;
+        }
+
+        table[data-custom-table-css="table"] thead th:last-child,
+        table[data-custom-table-css="second-table"] thead th:last-child {
+            border-top-right-radius: 15px !important;
+            border-bottom-right-radius: 15px !important;
+        }
+
+        table[data-custom-table-css="table"] tbody tr td:first-child,
+        table[data-custom-table-css="second-table"] tbody tr td:first-child {
+            border-top-left-radius: 15px !important;
+            border-bottom-left-radius: 15px !important;
+        }
+
+        table[data-custom-table-css="table"] tbody tr td:last-child,
+        table[data-custom-table-css="second-table"] tbody tr td:last-child {
+            border-top-right-radius: 15px !important;
+            border-bottom-right-radius: 15px !important;
+        }
+
+        table[data-custom-table-css="table"] tbody tr:hover td,
+        table[data-custom-table-css="second-table"] tbody tr:hover td {
+            background-color: #e0e0e0;
+        }
+
+        table[data-custom-table-css="table"],
+        table[data-custom-table-css="second-table"] {
+            border-collapse: separate !important;
+            border-spacing: 0 8px !important;
+            width: 100% !important;
+        }
+
+        table[data-custom-table-css="table"].dataTable thead th {
+            padding: 15px !important;
+        }
+
+        table[data-custom-table-css="table"] thead.bg-light {
+            background-color: transparent !important;
+        }
+
+
+        /* ========== SECOND TABLE (white rows) ========== */
+        table[data-custom-table-css="second-table"] tbody td {
+            background: #FFFFFF !important;
+            padding: 12px;
+            border-top: 0px solid #fff !important;
+            border-bottom: 2px solid #F0F0F0 !important;
+            font-weight: 400 !important;
+        }
+    </style>
+
+    <!-- Datatable section starts  -->
+    <style>
+        /* Pagination buttons */
+        .dataTables_wrapper .dataTables_paginate .paginate_button {
+            padding: 2px 6px !important;
+            font-size: 12px !important;
+            background: transparent !important;
+            border-radius: 13px !important;
+            border: none !important;
+        }
+
+        /* Previous / Next buttons */
+        .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link,
+        .dataTables_wrapper .dataTables_paginate .page-item.next .page-link {
+            border-radius: 13px !important;
+            background-color: #F5FFFF;
+            border: none !important;
+            box-shadow: 0 0 0 0.15rem #F5FFFF;
+            font-size: 0;
+            /* hide default text */
+            position: relative;
+        }
+
+        /* Custom arrows */
+        .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link::before {
+            content: "◄";
+            font-size: 14px;
+        }
+
+        .dataTables_wrapper .dataTables_paginate .page-item.next .page-link::before {
+            content: "►";
+            font-size: 14px;
+        }
+
+
+
+
+        /* Active / Inactive pages */
+        .dataTables_wrapper .dataTables_paginate .page-item.active .page-link {
+            color: #fff !important;
+            border-radius: 13px !important;
+        }
+
+        .dataTables_wrapper .dataTables_paginate .page-item:not(.active) .page-link {
+            border: 1px solid #fff !important;
+            border-radius: 13px !important;
+        }
+
+        /* Info text */
+        .dataTables_info {
+            font-size: 12px;
+        }
+
+        .dataTables_wrapper .dt-buttons .buttons-csv,
+        .dataTables_wrapper .dt-buttons .buttons-html5 {
+            background-color: #02a8b5;
+            color: #fff;
+            border-color: #02a8b5;
+        }
+
+        .dataTables_wrapper .dt-buttons .buttons-csv:hover,
+        .dataTables_wrapper .dt-buttons .buttons-html5:hover {
+            background-color: #028291;
+            border-color: #028291;
+        }
+
+        .dataTables_info,
+        .text,
+        #client_logo {
+            font-weight: 500 !important;
+            color: #000 !important;
+        }
+
+        .buttons-html5 {
+            margin-right: 10px !important;
+        }
+
+        .dataTables_scrollBody thead.bg-light tr,
+        .dataTables_scrollBody thead tr {
+            visibility: collapse !important;
+            /* hides + removes row space */
+            height: 0 !important;
+        }
+
+        .dataTables_scrollBody thead.bg-light th {
+            padding: 0 !important;
+            margin: 0 !important;
+            border: none !important;
+            height: 0 !important;
+            line-height: 0 !important;
+            overflow: hidden !important;
+        }
+
+
+
+        /* Wrapper around the search input */
+        .datatable-search-wrapper {
+            position: relative;
+            display: inline-block;
+            width: 100%;
+        }
+
+        /* The search input itself */
+        .dataTables_filter input {
+            background: #F0F0F0 !important;
+            color: #707070 !important;
+            font-weight: 400 !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #F0F0F0 !important;
+            margin-left: 1px !important;
+        }
+
+        /* Placeholder styling */
+        .dataTables_filter input::placeholder {
+            color: #707070 !important;
+            font-weight: 400 !important;
+        }
+
+        /* The magnify icon */
+        .datatable-search-icon {
+            position: absolute !important;
+            right: 12px !important;
+            top: 50% !important;
+            transform: translateY(-50%) !important;
+            color: #707070 !important;
+            font-size: 18px !important;
+            pointer-events: none;
+            /* prevents blocking typing */
+        }
+
+        .datatable-search {
+            margin-right: auto;
+        }
+
+        .datatable-buttons {
+            margin-left: auto;
+        }
+
+        /* Fix DataTables buttons alignment inside card-body */
+        .card-body .card-body .dt-buttons,
+        .card-body .card-body .datatable-buttons {
+            margin-right: 0 !important;
+            padding-right: 2.25rem !important;
+            /* match card-body padding */
+        }
+
+        /* Applies only to tables with data-custom-table-css="table" */
+        table[data-custom-table-css="table"] tbody tr td {
+            padding: 8px 10px !important;
+            /* spacing */
+            line-height: 20px;
+            /* consistent spacing for text */
+            min-height: 40px;
+            /* makes sense here if you use display:block */
+            vertical-align: middle;
+            /* aligns text properly */
+        }
+    </style>
+
+
+    <!-- modal section -->
+    <style>
+        /* Inside modal field color changes */
+        /* modal section starts */
+
+        .modal-full-width {
+            width: 80% !important;
+        }
+
+        .modal-body {
+            padding: 2rem !important;
+        }
+
+        .modal.show .modal-dialog .modal-content,
+        .modal .modal-dialog .modal-content {
+            border-radius: 10px !important;
+            overflow: hidden !important;
+            box-shadow: none;
+        }
+
+        .modal .parsley-examples {
+            background-color: #FFFF !important;
+            padding: 0px !important;
+            border: 0px solid #fff !important;
+            border-radius: 0px !important;
+            box-shadow: none !important;
+        }
+
+
+        /* Common modal Title styles */
+        .modal .modal-title {
+            font-weight: 500;
+            font-size: 23px;
+            line-height: 100%;
+            letter-spacing: 0;
+            text-align: center;
+        }
+
+        /* Common modal Header styles */
+        .modal .modal-header {
+            border-bottom: 0px solid #e5e8eb;
+        }
+
+        /* Common modal Body styles */
+        .modal .modal-body {
+            padding: 15px !important;
+        }
+
+        /* Common modal close button styles */
+        .modal .close {
+            /* width: 17.5px;
+            height: 17.5px;
+            line-height: 17.5px;  */
+            opacity: 1;
+            font-size: 24px;
+            color: #000;
+            position: absolute;
+            top: 18px;
+            right: 15px;
+            cursor: pointer;
+            text-shadow: none;
+        }
+
+        .modal .form-control {
+            background-color: #ECECEC !important;
+            border: 1px solid #ccc;
+            /* optional */
+            box-shadow: none !important;
+        }
+
+        .modal .form-control:focus {
+            background-color: #ECECEC !important;
+            box-shadow: none;
+        }
+
+        .modal .input-icon {
+            position: relative;
+            display: inline-block;
+        }
+
+        .modal .input-icon .form-control {
+            padding-right: 40px;
+        }
+
+        .modal .input-icon .additional-icon {
+            position: absolute;
+            right: 10px;
+            top: 50%;
+            transform: translateY(-50%);
+            font-size: 18px;
+            color: #555;
+            pointer-events: none;
+            /* icon doesn’t block input clicks */
+        }
+
+
+        .modal input[type='file'] {
+            padding: 10px !important;
+            background-color: #ECECEC !important;
+            color: #000 !important;
+        }
+
+        .modal .modal-dialog {
+            margin: 5px auto !important;
+        }
+
+        .modal .parsley-required {
+            font-size: 11px !important;
+        }
+
+        .modal .select2-container--default .select2-selection--multiple {
+            background-color: #ECECEC !important;
+            border: 1px solid #ccc;
+        }
+
+
+        /* Select2 box */
+        .modal .select2-container .select2-selection--single {
+            background-color: #ECECEC !important;
+            border: 1px solid #ccc !important;
+            height: 38px !important;
+            box-shadow: none !important;
+        }
+
+        /* Common modal readonly-select styles */
+        .modal .readonly-select+.select2-container .select2-selection--single {
+            background-color: #CACACA !important;
+            color: #666666 !important;
+            pointer-events: none;
+            cursor: not-allowed;
+        }
+
+        .modal .select2-container--default .select2-selection--multiple {
+            background-color: #ECECEC !important;
+            border: 1px solid #ccc !important;
+            min-height: 38px !important;
+            border-radius: 5px;
+            /* optional */
+        }
+
+
+        /* Text inside */
+        .modal .select2-container .select2-selection__rendered {
+            line-height: 36px !important;
+        }
+
+        .modal .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
+            background-color: #00999E !important;
+        }
+    </style>
+
+
+    <!-- jodit section -->
+    <style>
+        /* ✅ Whole editor box */
+        .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #F5FFFF !important;
+            /* fallback */
+        }
+
+        /* ✅ Toolbar (header) */
+        .jodit .jodit-toolbar__box,
+        .jodit .jodit-toolbar-editor-collection {
+            background-color: #F5FFFF !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .jodit .jodit-status-bar {
+            background-color: #F5FFFF !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .jodit .jodit-wysiwyg {
+            background-color: #F5FFFF !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .jodit iframe {
+            background-color: #F5FFFF !important;
+            border-radius: 0 0 10px 10px;
+        }
+    </style>
+
+    <!-- jodit section inside modal -->
+    <style>
+        /* ✅ Whole editor box */
+        .modal .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        .modal .jodit p {
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        /* ✅ Toolbar (header) */
+        .modal .jodit .jodit-toolbar__box,
+        .modal .jodit .jodit-toolbar-editor-collection {
+            background-color: #ECECEC !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .modal .jodit .jodit-status-bar {
+            background-color: #ECECEC !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .modal .jodit .jodit-wysiwyg {
+            background-color: #ECECEC !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .modal .jodit iframe {
+            background-color: #ECECEC !important;
+            border-radius: 0 0 10px 10px;
+        }
+    </style>
+
+
+    <!-- specific tag section starts -->
+    <style>
+        label {
+            font-weight: 500 !important;
+            font-size: 0.875rem !important;
+            color: #000;
+        }
+
+        .right-bar {
+            right: -300px;
+        }
+
+        .select2-container--default .select2-selection--single {
+            height: 37px !important;
+        }
+
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height: 35px !important;
+        }
+
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            top: 7px !important;
+        }
+
+        /* Apply to normal inputs and selects */
+        input,
+        select,
+        textarea {
+            background-color: #F5FFFF !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #F5FFFF !important;
+        }
+
+        .select2 textarea {
+            box-shadow: none !important;
+        }
+
+
+
+        /* Chrome, Edge, Safari */
+        input[type="file"]::file-selector-button {
+            background-color: #00999E;
+            /* button color */
+            color: #000 !important;
+            /* text color */
+            border: none;
+            /* remove border */
+            border-radius: 10px;
+            /* rounded corners */
+            padding: 6px 20px;
+            /* space inside */
+            cursor: pointer;
+            /* pointer cursor */
+            font-size: 14px;
+        }
+
+        /* Cancel Bootstrap's .form-control for file inputs */
+        /* input[type="file"].form-control { */
+        /* height: auto !important;*/
+        /* remove forced height */
+        /* padding: initial !important;*/
+        /* reset padding */
+        /* font-size: inherit !important;*/
+        /* reset font size */
+        /* line-height: normal !important;*/
+        /* reset line height */
+        /* } */
+
+
+        /* Apply to Select2 (single select) */
+        .select2-container .select2-selection--single {
+            background-color: #F5FFFF !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            height: 38px;
+            /* match bootstrap input height */
+            display: flex;
+            align-items: center;
+            border-color: #F5FFFF !important;
+        }
+
+        /* Apply to Select2 (multiple select) */
+        .select2-container .select2-selection--multiple {
+            background-color: #F5FFFF !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #F5FFFF !important;
+        }
+    </style>
+
+
+    <!-- button section starts -->
+    <style>
+        /* Target only buttons with type="submit" */
+
+        .btn {
+            border-radius: 10px !important;
+        }
+
+        button[type="submit"],
+        .buttons-collection,
+        input[type="submit"],
+        #get-emp-list,
+        .submit-btn {
+            color: #fff !important;
+            background-color: #E26728 !important;
+            border-color: #E26728 !important;
+        }
+
+        /* Optional: hover effect */
+        button[type="submit"]:hover,
+        .buttons-collection,
+        input[type="submit"]:hover,
+        #get-emp-list {
+            cursor: pointer;
+            /* optional */
+        }
+
+        .cancel-btn,
+        .modal-footer .cancel-btn {
+            color: #000000 !important;
+            background-color: #ffffff !important;
+            border-color: #E26728 !important;
+        }
+    </style>
+
+    <!-- accordian -->
+    <style>
+        .card #collapseOne .card-body,
+        #collapseOne .card-body,
+        .card #collapseTwo .card-body,
+        .card #collapseThree .card-body,
+        .card #collapseFour .card-body {
+            background-color: #F5FFFF !important;
+            border: 2px solid #F5FFFF;
+            border-radius: 10px;
+            box-shadow: 0px 4px 4px 0px #00000040;
+        }
+
+        /* Apply to normal inputs and selects */
+        .card #collapseOne .card-body input,
+        .card #collapseOne .card-body select,
+        .card #collapseOne .card-body textarea,
+
+        .card #collapseTwo .card-body input,
+        .card #collapseTwo .card-body select,
+        .card #collapseTwo .card-body textarea,
+
+        .card #collapseThree .card-body input,
+        .card #collapseThree .card-body select,
+        .card #collapseThree .card-body textarea,
+
+        .card #collapseFour .card-body input,
+        .card #collapseFour .card-body select,
+        .card #collapseFour .card-body textarea {
+            background-color: #ffff !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #ffff !important;
+        }
+
+        .card #collapseOne .card-body input[type='file'],
+        .card #collapseTwo .card-body input[type='file'],
+        .card #collapseThree .card-body input[type='file'],
+        .card #collapseFour .card-body input[type='file'] {
+            padding: 10px !important;
+            background-color: white !important;
+            color: black !important;
+        }
+
+        /* Apply to Select2 (single select) */
+        .card #collapseOne .card-body .select2-container .select2-selection--single,
+        .card #collapseTwo .card-body .select2-container .select2-selection--single,
+        .card #collapseThree .card-body .select2-container .select2-selection--single,
+        .card #collapseFour .card-body .select2-container .select2-selection--single {
+            background-color: #ffff !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            height: 38px;
+            /* match bootstrap input height */
+            display: flex;
+            align-items: center;
+            border-color: #ffff !important;
+        }
+
+        /* Apply to Select2 (multiple select) */
+        .card #collapseOne .card-body .select2-container .select2-selection--multiple,
+        .card #collapseTwo .card-body .select2-container .select2-selection--multiple,
+        .card #collapseThree .card-body .select2-container .select2-selection--multiple,
+        .card #collapseFour .card-body .select2-container .select2-selection--multiple {
+            background-color: #ffff !important;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #ffff !important;
+        }
+    </style>
+
+    <!-- legacy styles of random style applied -->
+    <style>
+        .card-body {
+            background-color: white;
+            margin-top: 5px;
+        }
+
+        .content-page {
+            background-color: white !important;
+            padding: 0px !important;
+        }
+
+
+        .dropdown {
+            margin-right: 10px !important;
+        }
+
+        .text-danger-2 {
+            font-style: italic;
+            color: black !important;
+            /* color: #02a8b5 !important; */
+            font-size: 12px;
+        }
+
+        #messages-list li {
+            margin-top: 0;
+            margin-bottom: -25px;
+            /* Adjust this value to reduce the space */
+        }
+
+        .fixed-header {
+            position: relative;
+            top: 0;
+            background-color: #f8f9fa !important;
+        }
+
+        .scrollable-content {
+            max-height: 42vh;
+            overflow-y: auto;
+            padding-top: 0px;
+        }
+
+        /* Additional styles to enhance appearance */
+        .header-title {
+            position: relative;
+            bottom: 5px;
+            left: 60px;
+        }
+
+        #app_content_management:hover {
+            color: red;
+        }
+
+        .lead {
+            font-size: 13px;
+        }
+
+
+
+        @-webkit-keyframes ballPulseDouble {
+
+            0%,
+            100% {
+                -webkit-transform: scale(0);
+                transform: scale(0);
+            }
+
+            50% {
+                -webkit-transform: scale(1);
+                transform: scale(1);
+            }
+        }
+
+        @keyframes ballPulseDouble {
+
+            0%,
+            100% {
+                -webkit-transform: scale(0);
+                transform: scale(0);
+            }
+
+            50% {
+                -webkit-transform: scale(1);
+                transform: scale(1);
+            }
+        }
+    </style>
+
+
+    <!-- footer -->
+    <style>
+        .footer {
+            background-color: white !important;
+            color: black;
+            margin: 30px !important;
+        }
+
+        .footer {
+            margin-left: 150px;
+            position: relative;
+        }
+    </style>
+
+
+    <style>
+        .custom-form .parsley-examples {
+            background-color: transparent !important;
+            padding: 0 !important;
+            border: none !important;
+            box-shadow: none !important;
+        }
+
+        .custom-form .form-control {
+            background-color: #F5FFFF !important;
+            border: none !important;
+            /* color: #000;               keep text readable */
+            box-shadow: 0px 1px 1px 0px #00000040;
+        }
+
+        .custom-form .form-control:focus {
+            background-color: #F5FFFF !important;
+            box-shadow: none;
+        }
+
+        .custom-form .select2-container--default .select2-selection--multiple {
+            background-color: #F5FFFF !important;
+            border: none !important;
+        }
+
+        .custom-form .select2-container .select2-selection--single {
+            background-color: #F5FFFF !important;
+            border: 1px solid #ccc !important;
+            height: 38px !important;
+            box-shadow: none !important;
+        }
+
+        .custom-form .select2-container--default .select2-selection--multiple {
+            background-color: #F5FFFF !important;
+            border: 1px solid #ccc !important;
+            min-height: 38px !important;
+            border-radius: 5px;
+            /* optional */
+        }
+
+        .maincard {
+            margin-top: 0 !important;
+            padding-top: 0 !important;
+        }
+
+        .subcard {
+            padding-top: 0px;
+            padding-left: 5px;
+        }
+
+        .btn-custom {
+            font-weight: 500;
+            font-style: normal;
+            font-size: 12px;
+            line-height: 1;
+            letter-spacing: 0;
+            text-align: center;
+        }
+    </style>
+
+    <style>
+        /* Common wrapper (works for text/file inputs) */
+        .input-icon {
+            position: relative;
+            display: block;
+            width: 100%;
+        }
+
+        /* All form controls inside */
+        .input-icon .form-control {
+            width: 100%;
+            box-sizing: border-box;
+            padding-right: 40px;
+            /* always keep space for icon */
+            cursor: pointer;
+        }
+
+        /* Hide default file button */
+        .input-icon .form-control[type="file"]::file-selector-button {
+            display: none;
+        }
+
+        .input-icon input[type="file"].form-control {
+            padding-right: 40px;
+            /* space for the icon */
+            cursor: pointer;
+        }
+
+        /* Common icon class */
+        .input-icon .additional-icon {
+            position: absolute;
+            right: 12px;
+            top: 50%;
+            transform: translateY(-50%);
+            font-size: 18px;
+            color: #555;
+            pointer-events: none;
+        }
+
+        input[type="radio"] {
+            accent-color: #40B2B6;
+            /* sets the checked color */
+        }
+    </style>
+
+    <!-- tab swich scrollable -->
+    <style>
+        .tab-wrapper {
+            display: flex;
+            align-items: center;
+            position: relative;
+        }
+
+        /* Make the UL a scrollable flex row */
+        #myTab {
+            display: flex;
+            white-space: nowrap;
+            flex-wrap: nowrap;
+            /* prevent wrapping */
+            overflow-x: auto;
+            /* enable horizontal scroll */
+            overflow-y: hidden;
+            white-space: nowrap;
+            /* keep items on one line */
+            margin: 0;
+            padding: 0 40px;
+            /* leave space for arrows */
+            flex-grow: 1;
+        }
+
+        /* Hide scrollbars */
+        #myTab::-webkit-scrollbar {
+            display: none;
+        }
+
+        #myTab {
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+        }
+
+        .scroll-btn {
+            background-color: #F4FFFF;
+            height: 55px;
+            border: none;
+            cursor: pointer;
+            font-size: 18px;
+            padding: 5px 10px;
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            z-index: 1;
+            color: #00999E;
+        }
+
+        .left-btn {
+            left: 0;
+        }
+
+        .right-btn {
+            right: 0;
+        }
+
+        input[type="search"]::-webkit-search-cancel-button {
+            -webkit-appearance: none;
+            appearance: none;
+        }
+        
+    </style>
+
+
+
+
+</head>
+
+<body class="loading" data-layout-mode="" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "sidebar": { "color": "light", "size": "condensed", "showuser": false}, "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": false}'></body>
+
+<!-- Preloader -->
+<div class="loader-mask">
+    <div class="loader">
+        <img src="<?= base_url() . "public" ?>/assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading...">
+    </div>
+</div>
+
+<!-- <img src="<?= base_url() . "public" ?>/assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading..."> -->
+<!-- Begin page -->
+<div id="wrapper" style="background-color:white;">
+
+
+    <!-- ========== Left Sidebar Start ========== -->
+    <div class="left-side-menu">
+
+
+        <div data-simplebar>
+            <!--- Sidemenu -->
+            <div id="sidebar-menu">
+
+                <ul class="ul-flex" id="side-menu">
+
+                    <li class="menu-logo">
+                        <a href="<?= base_url('/dashboard/view') ?>">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo">
+                        </a>
+                    </li>
+
+
+
+                    <li class="li-seperate" id="dashboard-li">
+                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive">
+                            <i class="ri-dashboard-line" style="color:black;"></i>
+                            <span style="color: #02a8b5;"> Dashboard </span>
+                        </a>
+                    </li>
+
+                    <!-- client -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
+                        <li class="li-seperate" id="clients-li">
+                            <a href="<?= base_url('/client/list') ?>" class="img-inactive">
+                                <img style="border-radius: 5px;"
+                                    src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
+                                <span> Clients </span>
+                            </a>
+                        </li>
+                    <?php } ?>
+
+
+                    <!-- Enrollment process -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="action-on-policies-li">
+                            <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive">
+                                <img style="border-radius: 5px;"
+                                    src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
+                                <span> Action on Policies </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboards">
+                                <ul class="nav-second-level">
+
+                                    <li>
+                                        <a href="<?= base_url('/employee/upload') ?>">View Inception</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/list') ?>">View Members</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
+                                    </li>
+                                    <!-- <li>
+                                        <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
+                                    </li> -->
+                                    <li>
+                                        <a href="<?= base_url('/employee/test_members_list') ?>">Test Members List</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
+
+                    <!-- Masters -->
+                    <?php if (get_role_id() == 1 || get_role_id() == 5 || (get_role_id() == 4 && (in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())))) { ?>
+
+                        <li class="li-seperate" id="masters-li">
+                            <a href="#sidebarPolicies" data-toggle="collapse" class=" img-inactive">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
+                                <span> Masters </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboards">
+                                <ul class="nav-second-level">
+
+                                    <?php if (get_role_id() == 1 || get_role_id() == 5 || (get_role_id() == 4 && (in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())))) { ?>
+
+                                        <li>
+                                            <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
+                                        </li>
+
+                                    <?php } ?>
+
+
+                                    <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
+
+                                        <li>
+                                            <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/user/list') ?>"> Users </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/util/nhanceBranchMaster') ?>"> Nhance Branch </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/util/vehicleTypeMaster') ?>"> Vehicle Type </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/util/rtoMaster') ?>"> RTO </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/util/partnerPOS') ?>"> POS </a>
+                                        </li>
+
+                                    <?php } ?>
+
+                                </ul>
+                            </div>
+                        </li>
+
+                    <?php } ?>
+
+                    <!-- <li>
+                            <?php
+                            $sessionData = get_session_userdata();
+                            $currentUrl = base_url();
+                            $parsedUrl = parse_url($currentUrl);
+                            $baseUrl = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . '/';
+                            $hashedEmail = hash('sha256', $sessionData->email);
+                            $redirectUrl =  getenv('helpdeskURL') . '/staff/login?' . http_build_query(['token' => $hashedEmail]);
+                            ?>
+                            <a href="<?php echo $redirectUrl; ?>" target="_blank">
+                                <i class="mdi mdi-lifebuoy"></i>
+                                <span> Tickets </span>
+                            </a>
+                        </li> -->
+
+                    <!-- Claims -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="claims-li">
+                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/claims_sb.png" alt="Logo" height="20">
+                                <span> Claims </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboardsTicket">
+                                <ul class="nav-second-level">
+                                    <li>
+                                        <a href="#" onclick="openTicketTypeAskModal()">New claim</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/list') ?>">Claim List</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/mail_template') ?>">Mail Template</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/ticket_reports') ?>">Claim Reports</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/feedback-list') ?>">Claim Feedback List</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/claim-upload') ?>">Claim Dump Upload</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/claim_mis/list') ?>">Claim MIS Upload</a>
+                                    </li>
+                                    <!-- <li>
+                                            <a href="<?= base_url('/ticketList?return_type=web') ?>">Ticket List</a>
+                                        </li> -->
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
+
+                    <!-- BDS -->
+                    <?php if ((get_role_id() == 1 || get_role_id() == 5 || get_role_id() == 4) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
+                        <li class="li-seperate" id="policy-transactions-li">
+                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/policy_transactions_sb.png" alt="Logo" height="20">
+                                <span> Policy Transactions </span>
+                            </a>
+                            <div class="collapse" id="policyTransactions">
+                                <ul class="nav-second-level">
+                                    <li>
+                                        <a href="#policyTransactionsSub" data-toggle="collapse" class="waves-effect">
+                                            <i class="mdi mdi-format-list-bulleted"></i>
+                                            <span>Policy Transactions</span>
+                                        </a>
+                                        <div class="collapse" id="policyTransactionsSub">
+                                            <ul>
+
+                                                <?php if (in_array(get_role_id(), [1, 5]) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
+                                                    <li>
+                                                        <a href="<?= base_url('/policy_tranction/inception/list') ?>">Policy</a>
+                                                    </li>
+                                                    <!-- <li>
+                                                        <a href="<?= base_url('/policy_tranction/inception/list2') ?>">Policy 2</a>
+                                                    </li> -->
+                                                    <li>
+                                                        <a href="<?= base_url('/policy_tranction/endorsement/list') ?>">Endorsement</a>
+                                                    </li>
+                                                <?php } ?>
+
+                                                <?php if (in_array(get_role_id(), [1, 5]) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+                                                    <li>
+                                                        <a href="<?= base_url('/policy_tranction/statement/list') ?>">Statement Upload</a>
+                                                    </li>
+                                                <?php } ?>
+                                            </ul>
+                                        </div>
+                                    </li>
+
+                                    <?php if ((get_role_id() == 1 || get_role_id() == 5) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
+
+                                        <?php if (in_array(get_role_id(), [1, 5]) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team())) { ?>
+                                            <li>
+                                                <a href="#policyReports" data-toggle="collapse" class="waves-effect">
+                                                    <i class="ri-file-chart-fill"></i>
+                                                    <span> Policy Reports </span>
+                                                </a>
+                                                <div class="collapse" id="policyReports">
+                                                    <ul class="nav-third-level">
+                                                        <li>
+                                                            <a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a>
+                                                        </li>
+                                                        <?php if (in_array(get_role_id(), [1, 5]) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+                                                            <li>
+                                                                <a href="<?= base_url('/policy_tranction/report/report-varience-list') ?>">Variance</a>
+                                                            </li>
+                                                            <li>
+                                                                <a href="<?= base_url('/policy_tranction/report/report-outstanding-list') ?>">Outstanding</a>
+                                                            </li>
+                                                            <li>
+                                                                <a href="<?= base_url('/bdsReport/irba_report') ?>">IRDA Reports</a>
+                                                            </li>
+                                                            <li>
+                                                                <a href="<?= base_url('/bdsReport/renewal_report') ?>">Renewal Reports</a>
+                                                            </li>
+                                                            <li>
+                                                                <a href="<?= base_url('/bdsReport/getTATReport') ?>">TAT Band Reports</a>
+                                                            </li>
+                                                        <?php } ?>
+                                                    </ul>
+                                                </div>
+                                            </li>
+                                        <?php } ?>
+                                        <li>
+                                            <a href="#policy_tat_report_type" data-toggle="collapse" class="waves-effect">
+                                                <i class="ri-file-chart-fill"></i>
+                                                <span> Policy TAT Reports </span>
+                                            </a>
+                                            <div class="collapse" id="policy_tat_report_type">
+                                                <ul class="nav-third-level">
+                                                    <li>
+                                                        <a href="<?= base_url('/bdsReport/getMultiReport/1') ?>">TAT Band Wise</a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="<?= base_url('/bdsReport/getMultiReport/2') ?>">ACM Status Wise</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="<?= base_url('/bdsReport/getMultiReport/3') ?>">ACM TAT Wise</a>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </li>
+
+                                        <!-- This Menu Hide because of Role Merge REF : SVM,SVR,KV.
+                                        <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+                                            <li>
+                                                <a href="#policyPendingActions" data-toggle="collapse" class="waves-effect">
+                                                    <i class="mdi mdi-timer-sand"></i>
+                                                    <span> Policy Pending Actions </span>
+                                                </a>
+                                                <div class="collapse" id="policyPendingActions">
+                                                    <ul class="nav-third-level">
+                                                        <?php if (in_array(get_role_id(), [1, 5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team())) { ?>
+                                                            <li>
+                                                                <a href="<?= base_url('/policy_tranction/report/report-finance-list') ?>">Finance Team</a>
+                                                            </li>
+                                                        <?php } ?>
+
+                                                        <?php if (in_array(get_role_id(), [1, 5])  || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team())) { ?>
+                                                            <li>
+                                                                <a href="<?= base_url('/policy_tranction/report/report-business-list') ?>">Business Team</a>
+                                                            </li>
+                                                        <?php } ?>
+                                                    </ul>
+                                                </div>
+                                            </li>
+                                        <?php } ?>
+                                        -->
+
+                                        <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+                                            <li>
+                                                <a href="#policyMasters" data-toggle="collapse" class="waves-effect">
+                                                    <i class="ri-database-2-line"></i>
+                                                    <span> Masters </span>
+                                                </a>
+                                                <div class="collapse" id="policyMasters">
+                                                    <ul class="nav-third-level">
+                                                        <li>
+                                                            <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
+                                                        </li>
+                                                        <li>
+                                                            <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
+                                                        </li>
+                                                        <?php if ((get_role_id() === 4 && in_array(FINANCE_TEAM_ID, user_team())) || in_array(BUSINESS_TEAM_ID, user_team())) { ?>
+                                                            <li>
+                                                                <a href="<?= base_url('/master/insurer/list') ?>">Insurer Master</a>
+                                                            </li>
+                                                        <?php } ?>
+                                                    </ul>
+                                                </div>
+                                            </li>
+                                        <?php } ?>
+
+                                        <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+                                            <li>
+                                                <a href="<?= base_url('/dmsSearch') ?>">
+                                                    <i class="ri-book-open-line"></i>
+                                                    <span> Documents</span>
+                                                </a>
+                                            </li>
+                                        <?php } ?>
+                                        <li>
+                                            <a href="<?= base_url('/payout/list') ?>">
+                                                <i class="ri-money-rupee-circle-line"></i>
+                                                <span> Payouts</span>
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/commission/list') ?>">
+                                                <i class="ri-percent-line"></i>
+                                                <span> Commission</span>
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="<?= base_url('/bds_upload/list') ?>">
+                                                <i class="ri-car-line"></i>
+                                                <span> Motor Policy Bulk Upload</span>
+                                            </a>
+                                        </li>
+
+                                    <?php } ?>
+                                    <?php if (in_array(get_role_id(), [1, 5]) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
+                                            <li>
+                                                <a href="<?= base_url('/policy_tranction/inception/list2') ?>">
+                                                    <i class="ri-barcode-line"></i>
+                                                    <span> Policy 2</span>
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="<?= base_url('/policy_tranction/endorsement/list2') ?>">
+                                                    <i class="ri-file-edit-line"></i>
+                                                    <span> Endorsement 2</span>
+                                                </a>
+                                            </li>
+                                    <?php } ?>
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
+
+                    <!-- leads -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="leads-li">
+                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
+                                <span> Leads </span>
+                            </a>
+                        </li>
+                    <?php } ?>
+                    <!-- Tickets -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="tickets-li">
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
+                                <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
+                                <span>Tickets</span>
+                            </a>
+                        </li>
+                    <?php } ?>
+
+                    <!-- Ad -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
+                        <li class="li-seperate" id="app-content-mng-li">
+                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/app_content_mng_sb.png" alt="Logo" height="20">
+                                <span style="color: #02a8b5;">App Content Mgmt</span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboardsmenu">
+                                <ul class="nav-second-level">
+                                    <li>
+                                        <a href="<?= base_url('/add_image_index') ?>"> Advertisement Images </a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/frontend_content') ?>">Front-end Content</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/FAQ?return_type=web') ?>"> FAQ </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
+                    <li class="li-seperate" id="user-manual-li">
+                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive" target="_blank" rel="noopener noreferrer">
+                            <img
+                                src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
+                            <span>User Manual</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <!-- End Sidebar -->
+        </div>
+        <!-- Sidebar -left -->
+
+    </div>
+    <!-- Left Sidebar End -->
+
+    <!-- ========== Top Bar Start ========== -->
+    <div class="nav-bar">
+        <div class="top-navbar-div">
+            <div class="top-navbar-title">
+                <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
+            </div>
+            <div class="nav-flex">
+
+                <!-- user pic -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
+
+                        <?php
+                        $profile = get_userProfile();
+                        $default = base_url('public/assets/images/avatar_2x.png');
+                        ?>
+
+                        <img
+                            src="<?= (!empty($profile)) ? $profile : $default; ?>"
+                            onerror="this.onerror=null;this.src='<?= $default ?>';"
+                            alt="user-image"
+                            height="40" width="40"
+                            class="rounded-circle">
+                    </a>
+                </div>
+
+                <!-- Notification -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
+                        style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
+                                    border-radius:25px!important;padding:7px; position: relative;">
+
+                        <i class="fe-bell noti-icon"></i>
+
+                        <span class="notification-dot"></span>
+                    </a>
+
+                </div>
+                &nbsp;&nbsp;
+                <!-- Logout -->
+                <div class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
+                        <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+
+    <!-- End of Top Bar -->
+
+    <!-- <br> -->
+
+
+    <!-- ============================================================== -->
+    <!-- Start Page Content here -->
+    <!-- ============================================================== -->
+
+    <div class="content-page">
+        <div class="content">
+
+            <!-- Start Content-->
+            <div class="container-fluid-top">
\ No newline at end of file
diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php
index 75cebd29..07cf83bb 100644
--- a/app/Views/lead_filter.php
+++ b/app/Views/lead_filter.php
@@ -213,13 +213,13 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index 52902934..ef30ba59 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -629,7 +629,7 @@
         var next_reminder_date = flatpickr("#next_reminder_date", {
             dateFormat: "d/m/Y",
             allowInput: false,
-            maxDate: "today"
+            minDate: "today"
         });
 
 
@@ -1111,7 +1111,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
@@ -1646,7 +1646,7 @@
             console.log('Form is Empty', 'Warning');
             return;
         }
-
+ 
         var salse_person_id = $("#salse_person_id").val();
         console.log('salse_person_id : ', salse_person_id);
 
@@ -1697,10 +1697,45 @@
 
             },
             error: function(xhr, status, error) {
-                console.error(xhr.responseText);
-                console.error(status, error);
+                    const hostname = window.location.hostname;
+                    if (hostname === 'localhost' || hostname === '127.0.0.1') {
+                        // DEVELOPER MODE: Show everything in a nice group
+                        console.group("%c Debug: Server Error ", "background: #222; color: #bada55; padding: 2px;");
+                        console.error("Status:", xhr.status);
+                        console.error("Type:", error);
+                        console.error("Full Response:", xhr.responseText);
+                        console.groupEnd();
+                    } else {
+                        // LIVE MODE: Only log a simple, non-revealing error
+                        console.error("Server Error: Action could not be completed. Reference Code: " + xhr.responseText);
+                    }
+
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+                if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             }
         });
     });
@@ -2146,10 +2181,9 @@
             $('.btnDiv').show();
             $('.claim-row').hide();
 
-
-            $('.emp_title').text('No of Employees')
-            $('.depnd_title').text('No of Dependents')
-            $('.total_title').text('Total Lives')
+            $('.emp_title_text').text('No of Employees')
+            $('.depnd_title_text').text('No of Dependents')
+            $('.total_title_text').text('Total Lives')
 
             $('.renewalFields').find('select, input').removeAttr('required');
             $('.renewalFields').hide();
@@ -2183,9 +2217,9 @@
             $('.btnDiv').hide();
             $('.claim-row').show();
 
-            $('.emp_title').text('No of Employees at Inception')
-            $('.depnd_title').text(' No of Dependents at Inception')
-            $('.total_title').text('Total Lives at Inception')
+            $('.emp_title_text').text('No of Employees at Inception')
+            $('.depnd_title_text').text(' No of Dependents at Inception')
+            $('.total_title_text').text('Total Lives at Inception')
 
             $('.freshFields').find('select, input').removeAttr('required');
             $('.freshFields').hide();
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 563c5933..2773b0e2 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -513,7 +513,7 @@ if (isset($selected_lead_type)) {
         }
 
         if(client_type == ""){
-             toastr.warning('Please select the client type', 'WARNING');
+             toastr.warning('Please select the client type', 'Warning');
              $('#client_short_name').val('')
              return;
         }
@@ -528,7 +528,7 @@ if (isset($selected_lead_type)) {
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('')
                 $('#lead_form_submit_btn').prop('disabled', true);
             } else{
@@ -553,7 +553,7 @@ if (isset($selected_lead_type)) {
         
         let isFirstField = container.childElementCount === 0; // Check if it's the first field
         let placeholder = isFirstField ? 'First file must be Demography.' : '';
-        let accept = isFirstField ? '.xls,.xlsx' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
 
         
         if(selected_lead_form_type != 1){
@@ -662,7 +662,7 @@ if (isset($selected_lead_type)) {
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
-            toastr.warning("You can't remove the first file field", 'WARNING');
+            toastr.warning("You can't remove the first file field", 'Warning');
             return false;
         }
 
@@ -694,7 +694,7 @@ if (isset($selected_lead_type)) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status == true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             //remove the file field
                             const field = document.getElementById(`fileField_${index}`);
@@ -703,7 +703,7 @@ if (isset($selected_lead_type)) {
                             }
                             
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.warning(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -714,7 +714,7 @@ if (isset($selected_lead_type)) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                        toastr.error('An error occurred while checking the CD amount.', 'Error');
                     });
 
                 }else{
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index df5d5a9a..8f5a82f8 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -525,7 +525,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
@@ -628,6 +628,30 @@
                 console.error(status, error);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+                if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             }
         });
     });
@@ -728,9 +752,9 @@
             $('.claim-row').hide();
 
 
-            $('.emp_title').text('No of Employees')
-            $('.depnd_title').text('No of Dependents')
-            $('.total_title').text('Total Lives')
+            $('.emp_title_text').text('No of Employees')
+            $('.depnd_title_text').text('No of Dependents')
+            $('.total_title_text').text('Total Lives')
 
             $('.renewalFields').find('select, input').removeAttr('required');
             $('.renewalFields').hide();
@@ -765,9 +789,9 @@
             $('.btnDiv').hide();
             $('.claim-row').show();
 
-            $('.emp_title').text('No of Employees at Inception')
-            $('.depnd_title').text(' No of Dependents at Inception')
-            $('.total_title').text('Total Lives at Inception')
+            $('.emp_title_text').text('No of Employees at Inception')
+            $('.depnd_title_text').text(' No of Dependents at Inception')
+            $('.total_title_text').text('Total Lives at Inception')
 
             $('.freshFields').find('select, input').removeAttr('required');
             $('.freshFields').hide();
@@ -802,7 +826,6 @@
             }
 
         }
-
     }
     var allContacts = "";
     function getBranchData(input,inputType) {
diff --git a/app/Views/meta_dashboard_demo_one.php b/app/Views/meta_dashboard_demo_one.php
new file mode 100644
index 00000000..4652f9e9
--- /dev/null
+++ b/app/Views/meta_dashboard_demo_one.php
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Metabase Dashboard</title>
+
+    <!-- Metabase embed script -->
+    <script defer src="<?= esc($metabaseUrl) ?>/app/embed.js"></script>
+
+    <script>
+        function defineMetabaseConfig(config) {
+            window.metabaseConfig = config;
+        }
+
+        defineMetabaseConfig({
+            theme: {
+                preset: "light"
+            },
+            isGuest: true,
+            instanceUrl: "<?= esc($metabaseUrl) ?>"
+        });
+    </script>
+</head>
+<body>
+
+    <metabase-dashboard
+        token="<?= esc($metabaseToken) ?>"
+        with-title="true"
+        with-downloads="true">
+    </metabase-dashboard>
+
+</body>
+</html>
diff --git a/app/Views/newClientModal-old.php b/app/Views/newClientModal-old.php
index 387578c9..1e2f3347 100644
--- a/app/Views/newClientModal-old.php
+++ b/app/Views/newClientModal-old.php
@@ -142,7 +142,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_add_modal_submit_btn').prop('disabled', true);
diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php
index 7acdbf5a..6fcf603a 100644
--- a/app/Views/newClientModal.php
+++ b/app/Views/newClientModal.php
@@ -143,7 +143,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_add_modal_submit_btn').prop('disabled', true);
diff --git a/app/Views/nhance_branch_list.php b/app/Views/nhance_branch_list.php
index 29700edd..7dc6f819 100644
--- a/app/Views/nhance_branch_list.php
+++ b/app/Views/nhance_branch_list.php
@@ -197,10 +197,10 @@
     //                 $('#modalLabel').text('Edit Branch');
     //                 appendEditData(response.data);
     //             }else{
-    //                 toastr.success(response.message, 'SUCCESS');
+    //                 toastr.success(response.message, 'Success');
     //             }
     //         } else {
-    //             toastr.warning(response.message, 'WARNING');
+    //             toastr.warning(response.message, 'Warning');
     //         }
 
     //         $('.loader').fadeOut();
@@ -279,10 +279,45 @@
             $('.loader-mask').delay(350).fadeOut('slow');
 
         }, function(xhr, status, error) {
-            console.error('Error fetching data:', error);
-            console.error(xhr.responseText);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    // Get the current domain
+                    const hostname = window.location.hostname;
+                    if (hostname === 'localhost' || hostname === '127.0.0.1') {
+                        // DEVELOPER MODE: Show everything in a nice group
+                        console.group("%c Debug: Server Error ", "background: #222; color: #bada55; padding: 2px;");
+                        console.error("Status:", xhr.status);
+                        console.error("Type:", error);
+                        console.error("Full Response:", xhr.responseText);
+                        console.groupEnd();
+                    } else {
+                        // LIVE MODE: Only log a simple, non-revealing error
+                        console.error("Server Error: Action could not be completed. Reference Text: " + xhr.responseText);
+                    }
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
         });
     }
 
diff --git a/app/Views/notification old.php b/app/Views/notification old.php
index 11cc74ed..c722ce12 100644
--- a/app/Views/notification old.php	
+++ b/app/Views/notification old.php	
@@ -993,7 +993,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1037,7 +1037,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1088,7 +1088,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1131,7 +1131,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1175,7 +1175,7 @@
         //                 {
         //                     $('.loader').fadeOut();
         //                     $('.loader-mask').delay(350).fadeOut('slow');
-        //                     toastr.warning('Something Wrong!', 'warning');
+        //                     toastr.warning('Something Wrong!', 'Warning');
         //                 }, 1000);
         //             }
         //         });
@@ -1219,7 +1219,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1273,7 +1273,7 @@
                     {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });    
@@ -1361,7 +1361,7 @@ template_name = '';
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -1433,13 +1433,13 @@ template_name = '';
                                 console.log('Parsed respond', respond)
 
                                 if(respond.status == 'success'){
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 }else{
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
                                 
                             }else{
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function (xhr, status, error) {
@@ -1454,16 +1454,16 @@ template_name = '';
 
                 }else{
                     let alert_msg = 'Template ID not exist'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             }else{
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
             
         }else{
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1600,10 +1600,10 @@ template_name = '';
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -1620,7 +1620,7 @@ template_name = '';
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1652,10 +1652,10 @@ template_name = '';
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(res.status == true){
-                   toastr.success(res.message, 'SUCCESS')
+                   toastr.success(res.message, 'Success')
                    addHTMLInput(res.data);
                 }else{
-                   toastr.warning(res.message, 'WARNING')
+                   toastr.warning(res.message, 'Warning')
                 }
             },
             error: function (xhr, status, error) {
@@ -1954,7 +1954,7 @@ $('#account_maneger_summary_mail_form').submit(function (event) {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Went Wrong!', 'warning');
+                    toastr.warning('Something Went Wrong!', 'Warning');
                 }, 1000);
             }
         });
diff --git a/app/Views/notification.php b/app/Views/notification.php
index 5248c2bf..5072ab39 100755
--- a/app/Views/notification.php
+++ b/app/Views/notification.php
@@ -131,6 +131,8 @@
                 $member_review_and_summary_mail = 0;
                 $account_maneger_summary_mail = 0;
                 $client_hr_summary_mail = 0;
+                $hr_cd_insufficient_balance_mail = 0;
+
                 if (isset($notification)) {
                     foreach ($notification as $value) {
 
@@ -161,6 +163,10 @@
                         if ($value['template_name'] == 'client_hr_summary_mail') {
                             $client_hr_summary_mail = $value['enabled'];
                         }
+
+                        if ($value['template_name'] == 'hr_cd_insufficient_balance_mail') {
+                            $hr_cd_insufficient_balance_mail = $value['enabled'];
+                        }
                     }
                 }
                 ?></p>
@@ -265,6 +271,7 @@
                         </div>
                     </div>
                 </div>
+
                 <!-- member review and summary mail -->
                 <div class="form-group col-md-6 mail-row">
                     <div class="mail-section">
@@ -283,6 +290,26 @@
                     </div>
 
 
+                </div>
+
+                <!-- Hr cd insifficient mail -->
+                <div class="form-group col-md-6 mail-row">
+                    <div class="mail-section">
+                        <div class="left">
+                            <label class="switch">
+                                <input id="hr_cd_insufficient_balance_mail_btn" type="checkbox" name="hr_cd_insufficient_balance_mail_btn" <?= $hr_cd_insufficient_balance_mail == 1 ? 'checked' : '' ?>>
+                                <span class="slider round"></span>
+                            </label>
+                            <span class="ml-2"> HR CD Insufficient Balance Mail</span>
+                        </div>
+                        <div class="right">
+                            <a href="" data-toggle="modal" id="hr_cd_insufficient_balance_mail" onclick="getMailTemplateData(this)" data-target="#hr_cd_insufficient_balance_mail_modal">
+                                <i class="mdi mdi-pencil"></i>
+                            </a>
+                        </div>
+                    </div>
+
+
                 </div>
             </div>
 
@@ -988,6 +1015,89 @@
     </div> <!-- /.modal-dialog -->
 </div> <!-- /.modal -->
 
+<!-- 7 Modal content for the Large example => CD balance insufficent HR mail sent -->
+<div class="modal fade" id="hr_cd_insufficient_balance_mail_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel"
+    aria-hidden="true" aria-modal="true" data-backdrop="static">
+    <div class="modal-dialog modal-full-width">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myLargeModalLabel"> HR CD Insufficient Balance Mail <span id="nameOfThePolicy"></span></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+
+                <div class="text-center" id="no_data"></div>
+
+                <form role="form" class="parsley-examples" method="post" id="hr_cd_insufficient_balance_mail_form" enctype="multipart/form-data">
+                        <div class="form-group">
+
+                            <div class="form-row" id="rac_rate_dropdown">
+                                <div class="form-group col-md-2">
+                                    <label for="template_name">Template Name</label>
+                                </div>
+                                <div class="form-group col-md-5">
+                                    <input type="text" id="template_name" name="template_name" value="HR CD Insufficient Balance Mail" readonly class="form-control" placeholder="Template Name">
+                                </div>
+                            </div>
+
+                            <div class="form-row" id="rac_rate_dropdown">
+                                <div class="form-group col-md-2">
+                                    <label for="subject">Subject</label>
+                                </div>
+                                <div class="form-group col-md-5">
+                                    <input type="text" id="subject" name="subject" class="form-control" placeholder="Subject">
+                                </div>
+                                <div class="form-group col-md-5 testmail" style="display: none;">
+                                    <a class="btn btn-primary waves-effect waves-light mr-1 setid" onclick="testMailSend(this,'send')">Test Mail</a>
+                                    <a class="btn btn-primary waves-effect waves-light mr-1 setid" onclick="PreviewTheMail(this,'preview','client_hr_summary_mail')">Preview Mail</a>
+                                </div>
+                            </div>
+
+                            <div class="hr_cd_insufficient_balance_mail_section">
+                            <div class="form-row" id="rac_rate_dropdown">
+                                <div class="form-group col-md-12">
+                                    <select id="hr_cd_insufficient_balance_mail_customButton" class="form-control" style="border:none; right:6px; width:auto; position:absolute; z-index:1; top:17px; height:32px; float:right;" onchange="copyToClipboard(this)">
+                                        <option value="">PlaceHolders</option>
+                                        <?php foreach ($placeHolders as $value): ?>
+                                            <?php if (in_array($value, ['hr_name', 'client_name'])): ?>
+                                                <?php $valueChange = ucwords(str_replace('_',' ',$value)); ?>
+                                                <option value="{{<?php echo $value; ?>}}"><?php echo $valueChange; ?></option>
+                                            <?php endif; ?>
+                                        <?php endforeach; ?>
+                                    </select>
+                                    <span id="copy-feedback" style="display: none; position: absolute; top:50px; right:10px; color:green; font-size:12px;">Copied to clipboard!</span>
+                                </div>
+                            </div>
+
+                            <hr>
+                            <!-- Unlayer editor -->
+                            <div class="form-row" id="rac_rate_dropdown">
+                                <div class="form-group col-md-12">
+                                    <div id="hr_cd_insufficient_balance_mail_editor_container" style="height:600px;"></div>
+                                </div>
+                            </div>
+
+                            <div id="editor"></div>
+                            <input type="file" id="Question_title_fileInput" style="display:none;">
+                            </div>
+                
+                        </div> <!-- /.form-group -->
+
+                
+                        <div class="form-group text-right m-b-0 hr_cd_insufficient_balance_mail_action">
+                            <button type="button" class="btn btn-primary waves-effect waves-light mr-1 preview_button">Preview</button>
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnGridSubmit_2">Submit</button>
+                        </div>
+
+                        <div class="hr_cd_insufficient_balance_mail_preview"></div>
+
+                </form>
+            
+            </div> <!-- /.modal-body -->
+        </div> <!-- /.modal-content -->
+    </div> <!-- /.modal-dialog -->
+</div> <!-- /.modal -->
+
 <div class="modal fade" id="preview_modal" tabindex="-1" role="dialog" aria-hidden="false" aria-modal="true" data-backdrop="static">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
@@ -1060,13 +1170,13 @@
                                 console.log('Parsed respond', respond)
 
                                 if (respond.status == 'success') {
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 } else {
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
 
                             } else {
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function(xhr, status, error) {
@@ -1081,16 +1191,16 @@
 
                 } else {
                     let alert_msg = 'Template ID not exist'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             } else {
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
 
         } else {
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1227,10 +1337,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr, status, error) {
@@ -1247,7 +1357,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1279,10 +1389,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (res.status == true) {
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     addHTMLInput(res.data);
                 } else {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 }
             },
             error: function(xhr, status, error) {
@@ -1359,13 +1469,13 @@
                                 console.log('Parsed respond', respond)
 
                                 if (respond.status == 'success') {
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 } else {
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
 
                             } else {
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function(xhr, status, error) {
@@ -1380,16 +1490,16 @@
 
                 } else {
                     let alert_msg = 'Template ID not exist , Kindly Save to Send Test Mails ..!!'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             } else {
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
 
         } else {
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1442,9 +1552,9 @@
                                     $('.loader-mask').delay(350).fadeOut('slow');
 
                                     if (res.status === true) {
-                                        toastr.success(res.message, 'SUCCESS');
+                                        toastr.success(res.message, 'Success');
                                     } else {
-                                        toastr.warning('Failed to send mail', 'WARNING');
+                                        toastr.warning('Failed to send mail', 'Warning');
                                     }
                                 },
                                 error: function(xhr, status, error) {
@@ -1524,7 +1634,7 @@
                 <form class="ajax" onsubmit="submitAttachmentForm(event, this)">
                     <div style="display:flex; align-items:center; gap:10px; white-space:nowrap;">
                         <div>
-                            <input type="file" name="file" required 
+                            <input type="file" name="file"
                                     style="width:100%; min-width:160px;
                                             padding: 0 !important;
                                             background-color: transparent !important;
@@ -1548,7 +1658,7 @@
             newRow.innerHTML = `<td><form class="ajax" onsubmit="submitAttachmentForm(event, this)">
                                     <div style="display:flex; align-items:center; gap:10px; white-space:nowrap;">
                                         <div>
-                                            <input type="file" name="file" required 
+                                            <input type="file" name="file" 
                                                     style="width:100%; min-width:160px;
                                                             padding: 0 !important;
                                                             background-color: transparent !important;
@@ -1614,7 +1724,6 @@
         const formData = new FormData(form);
         formData.append('template_name', template_name);
         formData.append('client_id', client_id);
-        console.log(formData.template_name);
         const fileInput = form.querySelector('input[type="file"]');
 
         // Check if a file is selected
@@ -1645,10 +1754,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr, status, error) {
@@ -1665,7 +1774,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1699,10 +1808,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (res.status == true) {
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     addHTMLInput(res.data);
                 } else {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 }
             },
             error: function(xhr, status, error) {
@@ -1842,7 +1951,14 @@
     function getMailTemplateData(element) {
         template_name = element.id;
         const validTemplates = [
-            "account_maneger_summary_mail", "member_reminder_mail","member_common_mail", "member_ecard_mail", "member_welcome_mail", "member_review_and_summary_mail", "client_hr_summary_mail"
+            "account_maneger_summary_mail", 
+            "member_reminder_mail",
+            "member_common_mail", 
+            "member_ecard_mail", 
+            "member_welcome_mail", 
+            "member_review_and_summary_mail", 
+            "client_hr_summary_mail", 
+            "hr_cd_insufficient_balance_mail"
         ];
         console.log(`:) getMailTemplateData function called for ${template_name}`); // REF : PS
         if (!validTemplates.includes(template_name)) {
@@ -1980,23 +2096,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#account_maneger_summary_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#account_maneger_summary_mail_form')[0]);
 
-            console.log(formData);
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2009,6 +2117,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#account_maneger_summary_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2021,7 +2131,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2040,23 +2150,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#member_welcome_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#member_welcome_mail_form')[0]);
 
-            console.log(formData);
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2069,6 +2171,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#member_welcome_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2081,7 +2185,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2100,23 +2204,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#member_reminder_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#member_reminder_mail_form')[0]);
 
-            console.log(formData);
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2129,6 +2225,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#member_reminder_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2141,7 +2239,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2160,23 +2258,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#member_ecard_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#member_ecard_mail_form')[0]);
 
-            console.log(formData);
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2189,6 +2279,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#member_ecard_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2201,7 +2293,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2221,21 +2313,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#member_common_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#member_common_mail_form')[0]);
+
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2248,6 +2334,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#member_common_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2260,7 +2348,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2279,23 +2367,15 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#member_review_and_summary_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#member_review_and_summary_mail_form')[0]);
 
-            console.log(formData);
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2308,6 +2388,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#member_review_and_summary_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2320,7 +2402,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2339,23 +2421,16 @@
 
         // Use the editor instance instead of unlayer directly
         editor.exportHtml(function(data) {
-            var formData = $('#client_hr_summary_mail_form').serializeArray();
 
-            // Append Unlayer editor data
-            formData.push({
-                name: 'mailContent',
-                value: data.html
-            });
-            formData.push({
-                name: 'client_id',
-                value: $('#general_PrimaryKey').val()
-            });
-            formData.push({
-                name: 'mailJson',
-                value: JSON.stringify(data.design)
-            });
+            var formData = new FormData($('#client_hr_summary_mail_form')[0]);
+
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
 
-            console.log(formData);
 
             // Show loading indicators
             $('.loader').fadeIn();
@@ -2368,6 +2443,8 @@
                 type: "POST",
                 data: formData,
                 dataType: 'json',
+                processData: false, 
+                contentType: false,
                 success: function(res) {
                     $('#client_hr_summary_mail_modal').find('.close').click();
                     toastr.success('Template saved successfully');
@@ -2380,7 +2457,62 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
+                    }, 1000);
+                }
+            });
+        });
+    });
+
+    $('#hr_cd_insufficient_balance_mail_form').submit(function(event) {
+        event.preventDefault();
+
+        // Check if editor instance exists
+        if (!editor) {
+            console.error("Editor not initialized");
+            toastr.error("Editor not ready. Please try again.");
+            return;
+        }
+
+        // Use the editor instance instead of unlayer directly
+        editor.exportHtml(function(data) {
+
+            var formData = new FormData($('#hr_cd_insufficient_balance_mail_form')[0]);
+
+            // Append Unlayer data
+            formData.append('mailContent', data.html);
+            formData.append('client_id', $('#general_PrimaryKey').val());
+            formData.append('mailJson', JSON.stringify(data.design));
+
+            console.log([...formData.entries()]);
+
+
+            // Show loading indicators
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+
+            var form_action = '<?= base_url("client/notification/create") ?>';
+
+            $.ajax({
+                url: form_action,
+                type: "POST",
+                data: formData,
+                dataType: 'json',
+                processData: false, 
+                contentType: false,
+                success: function(res) {
+                    $('#client_hr_summary_mail_modal').find('.close').click();
+                    toastr.success('Template saved successfully');
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                    setTimeout(function() {
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2485,6 +2617,10 @@
             name: 'client_hr_summary_mail_btn',
             value: $('#client_hr_summary_mail_btn').prop('checked')
         });
+        formData.push({
+            name: 'hr_cd_insufficient_balance_mail_btn',
+            value: $('#hr_cd_insufficient_balance_mail_btn').prop('checked')
+        });
 
         var form_action = '<?= base_url("client/notification/update_enable") ?>';
         $('.loader').fadeIn();
@@ -2513,7 +2649,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }
         });
@@ -2545,7 +2681,7 @@
             let template_id = $btn.data('id');
             let test_mail = "xyz@gmail.com";
             if(!template_id){
-                toastr.warning('Template ID not exist', 'WARNING');
+                toastr.warning('Template ID not exist', 'Warning');
                 return;
             }
 
@@ -2572,7 +2708,7 @@
                         $btn.data('previewing', true);
 
                     } else {
-                        toastr.warning('Failed to load content', 'WARNING');
+                        toastr.warning('Failed to load content', 'Warning');
                     }
                 },
                 error: function(xhr){
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index ac91143f..db7d0bb1 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -479,7 +479,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Werning');
                 console.error('Upload error:', error);
             },
             complete: function() {
diff --git a/app/Views/payout_list.php b/app/Views/payout_list.php
index ab2bca29..695e0cd9 100644
--- a/app/Views/payout_list.php
+++ b/app/Views/payout_list.php
@@ -229,7 +229,7 @@
                                     <td> <?= $row['pos_name'] ?? " - " ?> </td>
                                     <td>
                                         <div class="btn-group dropdown">
-                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                                 <div class="dropdown-menu dropdown-menu-right">
                                                 <a class="dropdown-item" onclick="fetchUtrDetails(<?= $row['id'] ?>, '<?= $row['invoice_no'] ?>')"><i class="mdi mdi-bank-transfer mr-2 text-muted font-18 vertical-middle"></i>UTR</a>
                                                 <!-- <a href="<?= base_url('payout/invoices?type=edit&id=' . $row['id']) ?>" class="dropdown-item"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a> -->
@@ -313,13 +313,13 @@
                 "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
-                    {
-                        text: 'Add',
-                        className: 'btn app-btn-primary mr-2',
-                        action: function (e, dt, node, config) {
-                            window.location.href = "<?= base_url('payout/invoices?type=add') ?>";
-                        }
-                    },
+                    // {
+                    //     text: 'Add',
+                    //     className: 'btn app-btn-primary mr-2',
+                    //     action: function (e, dt, node, config) {
+                    //         window.location.href = "<?= base_url('payout/invoices?type=add') ?>";
+                    //     }
+                    // },
                     {
                         extend: 'collection',
                         text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
@@ -381,7 +381,7 @@
 
     function fetchUtrDetails(invoice_id, invoice_no){   
         if (!invoice_id) {
-            toastr.warning("Invoice Id not found!", "WARNING");
+            toastr.warning("Invoice Id not found!", "Warning");
             return false;
         }
 
@@ -413,7 +413,7 @@
             $('#modal_body').append(response.data);
 
             if (response.status == false) {
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -424,14 +424,14 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
     }
 
     function fetchPreviewInvoiceDetails(invoice_id, invoice_no){  
 
         if (!invoice_id) {
-            toastr.warning("Invoice Id not found!", "WARNING");
+            toastr.warning("Invoice Id not found!", "Warning");
             return false;
         }
 
@@ -470,7 +470,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            // toastr.error('An error occurred while fetching the data.', 'ERROR');
+            // toastr.error('An error occurred while fetching the data.', 'Error');
             $('#invoicePreview').empty();
             $('#invoicePreview').append('<div class="text-center p-5 text-muted">No data found</div>');
         });
diff --git a/app/Views/payout_list_handler.php b/app/Views/payout_list_handler.php
index 270ced48..8f32435b 100644
--- a/app/Views/payout_list_handler.php
+++ b/app/Views/payout_list_handler.php
@@ -157,7 +157,7 @@
 
         if(!internalCall){
             if (!pos_id && !status_id && !start_date && !end_date) {
-                toastr.warning("Please select any one filter!", "WARNING");
+                toastr.warning("Please select any one filter!", "Warning");
                 return false;
             }
         }
@@ -184,7 +184,7 @@
             $('#payout_list').append(response.data);
 
             if (response.status == false) {
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -197,7 +197,7 @@
             $('#payout_list').append(response.data);
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
     }
 
diff --git a/app/Views/payout_utr_details.php b/app/Views/payout_utr_details.php
index ee10ded8..0b77eaba 100644
--- a/app/Views/payout_utr_details.php
+++ b/app/Views/payout_utr_details.php
@@ -151,12 +151,12 @@
                 console.log('Data fetched successfully:', response);
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     $('#modal_body').empty();
                     $('#modal_body').append(response.data);
                     window.location.href = '<?= base_url("payout/list") ?>';
                 }else{
-                    toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                    toastr.warning(response.message || 'Unable to fetch data', 'Warning');
                 }
 
                 // Re-enable button
@@ -170,7 +170,7 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the data.', 'ERROR');
+                toastr.error('An error occurred while fetching the data.', 'Error');
             },
             complete: function() {
                 $('#utr_submit_btn').prop('disabled', false).text('Add UTR');
@@ -239,9 +239,9 @@
             $('#modal_body').append(response.data);
 
             if (response.status == true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             }else{
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -252,7 +252,7 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
 
         utrHasBeenChanged = true;
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 2d8fe5eb..c40ae5b0 100755
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -266,7 +266,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
                 }
             });
@@ -315,7 +315,7 @@ $(document).ready(function () {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -385,7 +385,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -420,13 +420,13 @@ function removePolicies(element) {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('Policy removed successfully', 'success');
+                            toastr.success('Policy removed successfully', 'Success');
                             // $('#branch_table').empty();
                             // location.reload();
                             window.location.href = '<?= base_url("master/policy/list/") ?>' + policy_id_for_reload;
 
                         } else {
-                            toastr.warning('Failed to remove policy', 'warning');
+                            toastr.warning('Failed to remove policy', 'Warning');
                         }
                         }
                     },
@@ -435,7 +435,7 @@ function removePolicies(element) {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove policy', 'warning');
+                        toastr.warning('Failed to remove policy', 'Warning');
                     }
                 });
             }
diff --git a/app/Views/policyRegisterModel.php b/app/Views/policyRegisterModel.php
index 719633d4..1310585f 100644
--- a/app/Views/policyRegisterModel.php
+++ b/app/Views/policyRegisterModel.php
@@ -452,7 +452,7 @@
 
                 if (totalSI != allowedSI) {
                     console.log("allowedSI : ", allowedSI, " totalSI : ", totalSI);
-                    toastr.error("Sum Insured Does not Match Allowed Limit", "ERROR");
+                    toastr.error("Sum Insured Does not Match Allowed Limit", "Error");
                     return false;
                 }
                 // console.log("Total SI: ", totalSI);
@@ -475,7 +475,7 @@
         const totalRows = formDataSplitUp.filter(field => field.name === "building[]").length;
 
         if (totalRows != policyDetailsData.location_no) {
-            toastr.error("Please Enter All Risk Address", "ERROR");
+            toastr.error("Please Enter All Risk Address", "Error");
             return;
         }
         // Initialize empty objects for each row
@@ -550,7 +550,7 @@
         const totalRows = formData.filter(field => field.name === "pin_code[]").length;
 
         if (totalRows != policyDetailsData.location_no) {
-            toastr.error("Please Enter All Risk Address", "ERROR");
+            toastr.error("Please Enter All Risk Address", "Error");
             return;
         }
         // Initialize empty objects for each row
@@ -1224,7 +1224,7 @@
         }
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
-        toastr.success("Policy Information Collected ", "SUCCESS");
+        toastr.success("Policy Information Collected ", "Success");
         closeModal();
         changeTerrorism(Number($("#policySI").val()));
         $('.loader').fadeOut();
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index a53b4c54..7fbabc3e 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -1532,7 +1532,7 @@
             });
 
         } else if (gmc_policy_type_id != 'GPA' && gmc_policy_type_id != 'GMC') {
-            // toastr.warning('The terms has no data ', 'warning');
+            // toastr.warning('The terms has no data ', 'Warning');
         }
 
         $(document).ready(function() {
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index e0304ae3..e7a550e8 100755
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -806,7 +806,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');
         }
 
     });
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index af786b4b..4c519a97 100755
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -263,7 +263,7 @@ $(document).on('submit', 'form[id^="GridForm_"]', function(event) {
     console.log('checkFamiliFloatersKeysDuplicate', isEqual)
 
     if(isEqual){
-        toastr.warning('Family floaters alerdey exist', 'warning');
+        toastr.warning('Family floaters alerdey exist', 'Warning');
         return false;
     }
 
@@ -671,7 +671,7 @@ $(document).on('change', 'select[id^="grid_"]', function(event)
             setTimeout(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Wrong!', 'warning');
+                toastr.warning('Something Wrong!', 'Warning');
             }, 1000);
         }
     });
@@ -2003,7 +2003,7 @@ function checkDuplicate(unique_id = null)
 
         if (siDuplicates) {
             // highlightDuplicates(duplicateIndices);
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2045,7 +2045,7 @@ function checkDuplicate(unique_id = null)
 
         if (siDuplicates) {
             // highlightDuplicates(duplicateIndices);
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2086,7 +2086,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2133,7 +2133,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2173,7 +2173,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2219,7 +2219,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2266,7 +2266,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2306,7 +2306,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2356,7 +2356,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2401,7 +2401,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2455,7 +2455,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2491,7 +2491,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -2532,7 +2532,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -3150,7 +3150,7 @@ function checkCheckboxes()
         toastr.warning('You must select at least one checkbox.', 'Warning');
         return false;
     } else if (checkedCount == uncheckedCount) {
-        toastr.warning('You can not select all of the checkboxes', 'Waraning');
+        toastr.warning('You can not select all of the checkboxes', 'Warning');
         return false;
     }
     return true;
@@ -3596,7 +3596,7 @@ function removeTab(input, tabID, tabName)
                                 text: res.message,
                                 icon: "success"
                             });
-                            // toastr.success('Policy removed successfully.', 'success');
+                            // toastr.success('Policy removed successfully.', 'Success');
                         } else {
                             if(res.rr_count > 0){
                                 Swal.fire({
@@ -3612,7 +3612,7 @@ function removeTab(input, tabID, tabName)
                                 });
                             }
 
-                            // toastr.warning('Failed to remove policy', 'warning');
+                            // toastr.warning('Failed to remove policy', 'Warning');
                         }
                         }
                     },
@@ -3711,7 +3711,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
 
                     $('#rack_rate_name').val(newTabName);
 
-                    // toastr.success('Policy removed successfully.', 'success');
+                    // toastr.success('Policy removed successfully.', 'Success');
                 } else {
                     if(res.rr_count > 0){
                         Swal.fire({
@@ -3730,7 +3730,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
 
                     }
 
-                    // toastr.warning('Failed to remove policy', 'warning');
+                    // toastr.warning('Failed to remove policy', 'Warning');
                 }
                 }
             },
@@ -4028,7 +4028,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4056,7 +4056,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4085,7 +4085,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4114,7 +4114,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4144,7 +4144,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4173,7 +4173,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4202,7 +4202,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4231,7 +4231,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4260,7 +4260,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4289,7 +4289,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4318,7 +4318,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4349,7 +4349,7 @@ function checkValideUnits(unique_id = null)
             console.log('checkValideUnits function uncommonValues', uncommonValues);
 
             if (uncommonValues.length > 0) {
-                toastr.warning('Given unit does not exist in the branch!', 'warning');
+                toastr.warning('Given unit does not exist in the branch!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -4377,7 +4377,7 @@ function checkValideUnits(unique_id = null)
             console.log('checkValideUnits function uncommonValues', uncommonValues);
 
             if (uncommonValues.length > 0) {
-                toastr.warning('Given unit does not exist in the branch!', 'warning');
+                toastr.warning('Given unit does not exist in the branch!', 'Warning');
                 return true;
             } else {
                 return false;
diff --git a/app/Views/policy_grid_excel.php b/app/Views/policy_grid_excel.php
index 10ee30b7..373cf154 100755
--- a/app/Views/policy_grid_excel.php
+++ b/app/Views/policy_grid_excel.php
@@ -203,7 +203,7 @@ function copyHeaders(unique_id) {
 
     //console.log('headerString', headerString);
     navigator.clipboard.writeText(headerString).then(function() {
-        toastr.success('Headers copied to clipboard', 'success');
+        toastr.success('Headers copied to clipboard', 'Success');
     }, function(err) {
         toastr.error(err, 'Could not copy headers:');
     });
@@ -493,7 +493,7 @@ function generateTable(unique_id) {
         // console.log(secondKey)
         if ($('.duplicate').length > 0) {
             //console.log('test');
-            toastr.warning("Duplicates found!", "warning");
+            toastr.warning("Duplicates found!", "Warning");
             $('.excel_table_class').empty();
             $('.excel_textarea').val('');
         }
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 2d6a5bd8..4b4ab0ba 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -151,427 +151,450 @@
 
 </style>
 
-<div class="row" id="endorsement_form" style="display: none;">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
-                    <div class="col-6" style="align-self: center;">
-                        <h4 style="position: relative;">Add Endorsement</h4>
-                    </div>
-                    <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url('policy_tranction/endorsement/list') ?>" id="btnAdd" class="btn btn-primary waves-effect waves-light"
-                            >Back</a>
-                    </div>
-                </div>
-                <form role="form" class="parsley-examples" method="post" id="endorsement_form_id" enctype="multipart/form-data">
-                       
-                        <input type="hidden" name="id" id="policy_tranction_primarykey">
-                        <input type="hidden" name="client_id" id="client_id_for_edit">
-                        <input type="hidden" name="insurer_id" id="insurer_id">
-                        <input type="hidden" name="cd_ac_no" id="cd_ac_no">
-                        <input type="hidden" name="cd_ac_pk" id="cd_ac_pk">
-                        <input type="hidden" name="ct_type" id="ct_type">
-                        <input type="hidden" name="bro_payable_by" id="bro_payable_by">
-                        <input type="hidden" name="cop_yes" id="cop_yes">
-                        <input type="hidden" name="base_cd_amount" id="base_cd_amount">
-                        <input type="hidden" name="cd_amt_changed" id="cd_amt_changed" disabled>
-
-
-                        <!-- Client Row -->
-                        <div class="row">
-                            <!-- Section 1 -->
-                            <div class="col-md-12">
-                                <div id="accordion_0" class="mb-0">
-                                    <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
-                                        <span class="font-color-black">Client Details</span>
-                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                                            aria-expanded="true">
-                                            <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
-                                        </a>
-                                    </label>
-                                    <div class="card mb-1">
-                                        <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
-                                            <div class="card-body">
-                                            <div class="row">
-
-                                                <div class="form-group col-md-3">
-                                                    <label for="client_type">Client Type<span class="text-danger"></span></label>
-                                                    <select class="form-control" id="client_type" name="client_type" >
-                                                        <option value="">Select Client type</option>
-                                                        <option value="1">Group</option>
-                                                        <option value="2">Individual</option>
-                                                    </select>
-                                                </div>
-
-                                                <div class="form-group col-md-3">
-                                                    <label for="client_branch">Client<span class="text-danger">*</span></label>
-                                                    <select class="form-control" id="client_id" name="client_id" required>
-                                                        <option value="">Select Client</option>
-                                                        <!-- <option value="add_client"> + Add Client</option> -->
-                                                    </select>
-                                                </div>
-
-                                                <div class="form-group col-md-3 branchdiv">
-                                                    <label for="client_branch">Branch<span class="text-danger"></span></label>
-                                                    <select class="form-control" id="client_branch_id" name="client_branch_id">
-                                                        <option value="">Select Branch</option>
-                                                    </select>
-                                                </div>
-
-                                                <div class="form-group col-md-3">
-                                                    <label for="email"> Policy <span class="text-danger">*</span></label>
-                                                    <select class="form-control" id="client_policy_id" name="client_policy_id" required>
-                                                        <option value="">Select Policy</option>
-                                                    </select>
-                                                </div>
-
-                                            </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+<div class="tab-pane fade active show" id="form">
+    <div class="row" id="endorsement_form">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <div class="row" style="margin-bottom:1rem;">
+                        <div class="col-6" style="align-self: center;">
+                            <h4 style="position: relative;">Add Endorsement</h4>
                         </div>
+                        <div class="col-6" style="text-align: right;">
+                            <a href="<?= base_url('policy_tranction/endorsement/list') ?>" id="btnAdd" class="btn btn-primary waves-effect waves-light"
+                                >Back</a>
+                        </div>
+                    </div>
+                    <form role="form" class="parsley-examples" method="post" id="endorsement_form_id" enctype="multipart/form-data">
+                        
+                            <input type="hidden" name="id" id="policy_tranction_primarykey">
+                            <input type="hidden" name="client_id" id="client_id_for_edit">
+                            <input type="hidden" name="insurer_id" id="insurer_id">
+                            <input type="hidden" name="cd_ac_no" id="cd_ac_no">
+                            <input type="hidden" name="cd_ac_pk" id="cd_ac_pk">
+                            <input type="hidden" name="ct_type" id="ct_type">
+                            <input type="hidden" name="bro_payable_by" id="bro_payable_by">
+                            <input type="hidden" name="cop_yes" id="cop_yes">
+                            <input type="hidden" name="base_cd_amount" id="base_cd_amount">
+                            <input type="hidden" name="cd_amt_changed" id="cd_amt_changed" disabled>
 
-                        <!-- Endorsement details -->
-                        <div class="row">
-                            <div class="col-md-12">
-                                    <div id="accordion_2" class="mb-0">
+
+                            <!-- Client Row -->
+                            <div class="row">
+                                <!-- Section 1 -->
+                                <div class="col-md-12">
+                                    <div id="accordion_0" class="mb-0">
                                         <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
-                                            <span class="font-color-black">Endorsement</span>
-                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                            <span class="font-color-black">Client Details</span>
+                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
                                                 aria-expanded="true">
                                                 <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
                                             </a>
                                         </label>
                                         <div class="card mb-1">
-                                            <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                            <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
                                                 <div class="card-body">
-                                                    <div class="row">
-                                                        
-                                                        <!-- <div class="form-group col-md-3" id="tpa_endorse_div">
-                                                            <label for="tpa"> TPA <span id="tpa_danger"class="text-danger"></span></label>
-                                                            <select class="form-control readonly-select" id="tpa" name="tpa" >
-                                                                <option value="" selected>Select TPA</option>
-                                                                <?php foreach ($tpa as $value) { ?>
-                                                                <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
-                                                                    <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
-                                                                </option>
-                                                                <?php } ?>
-                                                            </select>
-                                                        </div> -->
-                                                        
-                                                        <div class="form-group col-md-3">
-                                                            <label for="addon_policy">Policy No<span id="base_danger"class="text-danger"></span></label>
-                                                            <input type="text" class="form-control" id="policy_no" name="policy_no"placeholder="Enter Policy No" readonly>
-                                                        </div>
+                                                <div class="row">
 
-                                                        <div class="form-group col-md-3">
-                                                            <label for="bp_cgst">D.O.C <span id="base_danger" class="text-danger"></span></label>
-                                                            <input id="policy_start_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="bp_igst">D.O.E <span id="base_danger" class="text-danger"></span></label>
-                                                            <input id="policy_end_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="addon_policy"> Endorsement Type <span id="base_danger" class="text-danger">*</span></label>
-                                                            <select class="form-control" id="action_type" name="action_type" required>
-                                                                <option value="" selected>Select Endorsement Type</option>
-                                                                <?php
-                                                                    if (isset($action_type) && count($action_type)) {
-                                                                        foreach ($action_type as $key => $value) {
-                                                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                                                        }
-                                                                    }
-                                                                ?>
-                                                            </select>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="addon_policy">Endorsement No<span id="base_danger" class="text-danger"></span></label>
-                                                            <input type="text" class="form-control" id="endorsement_no" name="endorsement_no" placeholder="Enter Endorsement No" onchange="validateInput(this, 'policy_transaction', 'endorsement_no')">
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="addon_policy">Data Received Date<span id="base_danger" class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="data_received_date" name="data_received_date" placeholder="DD/MM/YYYY" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="policy_issue_date">Endorsement Issue Date<span id="base_danger" class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date" placeholder="DD/MM/YYYY" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="month">Endorsement Issue Month<span id="base_danger" class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control readonly-select" id="month" name="month" placeholder="MM/YYYY" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="endorse_eff_date">Endorsement Effective Date<span id="base_danger" class="text-danger"></span></label>
-                                                            <input type="text" class="form-control" id="endorse_eff_date" name="endorse_eff_date" placeholder="DD/MM/YYYY" >
-                                                        </div>
-
-                                                        <div class="form-group col-md-3" id="no_of_insured_endorse_div">
-                                                            <label for="addon_policy">No of Insured<span id="base_danger"class="text-danger"></span></label>
-                                                            <input type="text" class="form-control" id="emp_count" name="emp_count" placeholder="Enter Employeee" onkeypress="return onlyNumbers(event)">
-                                                        </div>
-
-                                                        <div class="form-group col-md-3" id="no_of_dependents_endorse_div">
-                                                            <label for="addon_policy">No of Dependents<span id="base_danger" class="text-danger"></span></label>
-                                                            <input type="text" class="form-control" id="dependent_count" name="dependent_count" placeholder="Enter Dependent" onkeypress="return onlyNumbers(event)">
-                                                        </div>
+                                                    <div class="form-group col-md-3">
+                                                        <label for="client_type">Client Type<span class="text-danger"></span></label>
+                                                        <select class="form-control" id="client_type" name="client_type" >
+                                                            <option value="">Select Client type</option>
+                                                            <option value="1">Group</option>
+                                                            <option value="2">Individual</option>
+                                                        </select>
                                                     </div>
 
-                                                    <hr>
+                                                    <div class="form-group col-md-3">
+                                                        <label for="client_branch">Client<span class="text-danger">*</span></label>
+                                                        <select class="form-control" id="client_id" name="client_id" required>
+                                                            <option value="">Select Client</option>
+                                                            <!-- <option value="add_client"> + Add Client</option> -->
+                                                        </select>
+                                                    </div>
 
-                                                    <div class="row">
-
-                                                        <!-- <div class="form-group col-md-3">
-                                                            <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
-                                                            <select class="form-control" id="policy_status" name="status" required>
-                                                                <option value="" selected>Select Status</option>
-                                                                <?php
-                                                                        if (isset($policy_status) && count($policy_status)) {
-                                                                            foreach ($policy_status as $key => $value) {
-                                                                                if($key == 'pending'){
-                                                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                                                                }else{
-                                                                                    echo "<option value=" . $key . ">" . $value . "</option>";
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    ?>
-                                                            </select>
-                                                        </div> -->
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="last_action_date">Latest Action Date</label>
-                                                            <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
-                                                        </div>
-
-                                                        <div class="form-group col-md-3 install_due_date_div" style="display: none;">
-                                                            <label for="install_due_date">Installment due Date</label>
-                                                            <input id="install_due_date" type="text" class="form-control" name="install_due_date" placeholder="DD/MM/YYYY">
-                                                        </div>
-
-                                                        <!-- <div class="form-group col-md-3">
-                                                            <label class="switch" style="position: relative;top: 32px;left: 20px;">
-                                                                <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
-                                                                <span class="slider round" style="height: 27px;"></span>
-                                                            </label>
-
-                                                            <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
-                                                        </div> -->
-
-                                                        <!-- <div class="form-group col-md-3">
-                                                            <label class="switch" style="position: relative;top: 32px;left: 20px;">
-                                                                <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
-                                                                <span class="slider round" style="height: 27px;"></span>
-                                                            </label>
-
-                                                            <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="mdi mdi-information-outline" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
-                                                        </div> -->
+                                                    <div class="form-group col-md-3 branchdiv">
+                                                        <label for="client_branch">Branch<span class="text-danger"></span></label>
+                                                        <select class="form-control" id="client_branch_id" name="client_branch_id">
+                                                            <option value="">Select Branch</option>
+                                                        </select>
+                                                    </div>
 
+                                                    <div class="form-group col-md-3">
+                                                        <label for="email"> Policy <span class="text-danger">*</span></label>
+                                                        <select class="form-control" id="client_policy_id" name="client_policy_id" required>
+                                                            <option value="">Select Policy</option>
+                                                        </select>
                                                     </div>
 
                                                 </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                            </div>
-                        </div>
-
-                        <!-- Premium Details -->
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div id="accordion_3" class="mb-0">
-                                    <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
-                                        <span class="font-color-black">Premium Details</span>
-                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
-                                            aria-expanded="true">
-                                            <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
-                                        </a>
-                                    </label>
-                                    <div class="card mb-0">
-                                        <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
-                                            <div class="card-body">
-                                                <div class="row d-none" id="add_more_row">
-                                                    <div class="col-md-2">
-                                                        <input type="number" id="setInsurerCount" class="form-control" placeholder="Enter count">
-                                                    </div>
-                                                    <!-- <div class="col-md-2">
-                                                        <a id="addInsurer" class="btn btn-primary mb-3">Add Insurer</a>
-                                                    </div> -->
-                                                    <!-- <div class="col-md-1">
-                                                        <a id="submitForm" class="btn btn-success mb-3">Submit</a>
-                                                    </div> -->
-                                                </div>
-
-                                                <div id="insurerTableContainer" style="overflow: auto;">
-                                                    <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
-                                                        <thead>
-                                                            <tr>
-                                                                <th><span class="font-color-black">Premium Details</span></th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr id="table_tr_1">
-                                                                <td>Insurer</td>
-                                                            </tr>
-                                                            <tr id="table_tr_2" style="display: none;">
-                                                                <td>Is Leader?</td>
-                                                            </tr>
-
-                                                            <tr id="table_tr_34">
-                                                                <td>CD Acc No</td>
-                                                            </tr>
-
-                                                            <tr id="table_tr_37">
-                                                                <td>CD Amount</td>
-                                                            </tr>
-                                                            
-                                                            <tr id="table_tr_35" style="display: none;">
-                                                                <td>Follower Policy No</td>
-                                                            </tr>
-                                                            
-                                                            <tr id="table_tr_40" >
-                                                                <td>Endorsement Issue Date</td>
-                                                            </tr>
-
-                                                            <tr id="table_tr_3" style="display: none;">
-                                                                <td>Co-Share %</td>
-                                                            </tr>
-                                                            <tr id="table_tr_36">
-                                                                <td>Non-Commissionable<br> Premium Amount</td>
-                                                            </tr>
-                                                            <tr id="table_tr_4">
-                                                                <td>Base Premium</td>
-                                                            </tr>
-                                                            <tr class="hidetp" id="table_tr_5">
-                                                                <td id="tp_premium_td">TP Premium</td>
-                                                            </tr>
-                                                            <tr class="hideter" id="table_tr_6" style="display: none;">
-                                                                <td>TEP Premium</td>
-                                                            </tr>
-                                                            <tr  class="hidecop" id="table_tr_7" style="display: none;">
-                                                                <td>Co-Premium</td>
-                                                            </tr>
-                                                            <tr class="hidecotp" id="table_tr_38" style="display: none;">
-                                                                <td>Co-TP Premium</td>
-                                                            </tr>
-                                                            <tr class="hidecoter" id="table_tr_39" style="display: none;">
-                                                                <td>Co-TEP Premium</td>
-                                                            </tr>
-                                                            <tr id="table_tr_8">
-                                                                <td>CGST</td>
-                                                            </tr>
-                                                            <tr id="table_tr_9">
-                                                                <td>SGST</td>
-                                                            </tr>
-                                                            <tr id="table_tr_10">
-                                                                <td>IGST</td>
-                                                            </tr>
-                                                            <tr id="table_tr_11">
-                                                                <td>GST Amount</td>
-                                                            </tr>
-                                                            <tr id="table_tr_12">
-                                                                <td>Stamp Duty</td>
-                                                            </tr>
-                                                            <tr id="table_tr_13">
-                                                                <td>Total</td>
-                                                            </tr>
-
-                                                            <tr id="table_tr_14">
-                                                                <td>Agreed BP %</td>
-                                                            </tr>
-                                                            <tr class="hidetp" id="table_tr_15">
-                                                                <td id="agree_tp_td">Agreed TP %</td>
-                                                            </tr>
-                                                            <tr class="hideter" id="table_tr_16"  style="display: none;">
-                                                                <td id="agree_tp_td">Agreed TEP %</td>
-                                                            </tr>
-
-                                                            <?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team())) { ?>
-
-                                                                <tr id="table_tr_17">
-                                                                    <td>Agreed Amount</td>
-                                                                </tr>
-
-                                                            <?php } ?>
-
-                                                            <tr id="table_tr_18">
-                                                                <td>Standard BP %</td>
-                                                            </tr>
-                                                            <tr class="hidetp" id="table_tr_19">
-                                                                <td>Standard TP %</td>
-                                                            </tr>
-                                                            <tr class="hideter" id="table_tr_20"  style="display: none;">
-                                                                <td>Standard TEP %</td>
-                                                            </tr>
-
-                                                            <?php if (in_array(in_array(get_role_id(), [1,5]) || FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
-
-                                                                <tr id="table_tr_21">
-                                                                    <td>Actual BP Amount</td>
-                                                                </tr>
-                                                                <tr class="hidetp" id="table_tr_22">
-                                                                    <td>Actual TP Amount</td>
-                                                                </tr>
-                                                                <tr class="hideter" id="table_tr_23"  style="display: none;">
-                                                                    <td>Actual TEP Amount</td>
-                                                                </tr>
-                                                                <tr id="table_tr_24">
-                                                                    <td>Actual BP %</td>
-                                                                </tr>
-                                                                <tr class="hidetp" id="table_tr_25">
-                                                                    <td>Actual TP %</td>
-                                                                </tr>
-                                                                <tr class="hideter" id="table_tr_26" style="display: none;">
-                                                                    <td>Actual TEP %</td>
-                                                                </tr>
-                                                                <tr id="table_tr_27">
-                                                                    <td>Actual BP <br> Remuneration Amount</td>
-                                                                </tr>
-                                                                <tr class="hidetp" id="table_tr_28">
-                                                                    <td>Actual TP <br> Remuneration Amount</td>
-                                                                </tr>
-                                                                <tr class="hideter" id="table_tr_29" style="display: none;">
-                                                                    <td>Actual TEP <br> Remuneration Amount</td>
-                                                                </tr>
-                                                                <tr id="table_tr_30">
-                                                                    <td>Expected Amount</td>
-                                                                </tr>
-                                                                <!-- <tr id="table_tr_31">
-                                                                    <td>Variance</td>
-                                                                </tr> -->
-                                                                <!-- <tr id="table_tr_32">
-                                                                    <td>Reward</td>
-                                                                </tr> -->
-
-                                                            <?php } ?>
-
-                                                            <tr id="table_tr_33" style="display: none;">
-                                                                <td></td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>  
 
-                        <div class="form-group text-right mt-3 m-b-0" id="submitButton">
-                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
-                        </div>
-                </form>
+                            <!-- Endorsement details -->
+                            <div class="row">
+                                <div class="col-md-12">
+                                        <div id="accordion_2" class="mb-0">
+                                            <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                <span class="font-color-black">Endorsement</span>
+                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                                    aria-expanded="true">
+                                                    <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                </a>
+                                            </label>
+                                            <div class="card mb-1">
+                                                <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                                    <div class="card-body">
+                                                        <div class="row">
+                                                            
+                                                            <!-- <div class="form-group col-md-3" id="tpa_endorse_div">
+                                                                <label for="tpa"> TPA <span id="tpa_danger"class="text-danger"></span></label>
+                                                                <select class="form-control readonly-select" id="tpa" name="tpa" >
+                                                                    <option value="" selected>Select TPA</option>
+                                                                    <?php foreach ($tpa as $value) { ?>
+                                                                    <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
+                                                                        <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                                                    </option>
+                                                                    <?php } ?>
+                                                                </select>
+                                                            </div> -->
+                                                            
+                                                            <div class="form-group col-md-3">
+                                                                <label for="addon_policy">Policy No<span id="base_danger"class="text-danger"></span></label>
+                                                                <input type="text" class="form-control" id="policy_no" name="policy_no"placeholder="Enter Policy No" readonly>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="bp_cgst">D.O.C <span id="base_danger" class="text-danger"></span></label>
+                                                                <input id="policy_start_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="bp_igst">D.O.E <span id="base_danger" class="text-danger"></span></label>
+                                                                <input id="policy_end_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="addon_policy"> Endorsement Type <span id="base_danger" class="text-danger">*</span></label>
+                                                                <select class="form-control" id="action_type" name="action_type" required>
+                                                                    <option value="" selected>Select Endorsement Type</option>
+                                                                    <?php
+                                                                        if (isset($action_type) && count($action_type)) {
+                                                                            foreach ($action_type as $key => $value) {
+                                                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                            }
+                                                                        }
+                                                                    ?>
+                                                                </select>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="addon_policy">Endorsement No<span id="base_danger" class="text-danger"></span></label>
+                                                                <input type="text" class="form-control" id="endorsement_no" name="endorsement_no" placeholder="Enter Endorsement No" onchange="validateInput(this, 'policy_transaction', 'endorsement_no')">
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="addon_policy">Data Received Date<span id="base_danger" class="text-danger">*</span></label>
+                                                                <input type="text" class="form-control" id="data_received_date" name="data_received_date" placeholder="DD/MM/YYYY" required>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="policy_issue_date">Endorsement Issue Date<span id="base_danger" class="text-danger">*</span></label>
+                                                                <input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date" placeholder="DD/MM/YYYY" required>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="month">Endorsement Issue Month<span id="base_danger" class="text-danger">*</span></label>
+                                                                <input type="text" class="form-control readonly-select" id="month" name="month" placeholder="MM/YYYY" required>
+                                                            </div>
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="endorse_eff_date">Endorsement Effective Date<span id="base_danger" class="text-danger"></span></label>
+                                                                <input type="text" class="form-control" id="endorse_eff_date" name="endorse_eff_date" placeholder="DD/MM/YYYY" >
+                                                            </div>
+
+                                                            <div class="form-group col-md-3" id="no_of_insured_endorse_div">
+                                                                <label for="addon_policy">No of Insured<span id="base_danger"class="text-danger"></span></label>
+                                                                <input type="text" class="form-control" id="emp_count" name="emp_count" placeholder="Enter Employeee" onkeypress="return onlyNumbers(event)">
+                                                            </div>
+
+                                                            <div class="form-group col-md-3" id="no_of_dependents_endorse_div">
+                                                                <label for="addon_policy">No of Dependents<span id="base_danger" class="text-danger"></span></label>
+                                                                <input type="text" class="form-control" id="dependent_count" name="dependent_count" placeholder="Enter Dependent" onkeypress="return onlyNumbers(event)">
+                                                            </div>
+                                                        </div>
+
+                                                        <hr>
+
+                                                        <div class="row">
+
+                                                            <!-- <div class="form-group col-md-3">
+                                                                <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+                                                                <select class="form-control" id="policy_status" name="status" required>
+                                                                    <option value="" selected>Select Status</option>
+                                                                    <?php
+                                                                            if (isset($policy_status) && count($policy_status)) {
+                                                                                foreach ($policy_status as $key => $value) {
+                                                                                    if($key == 'pending'){
+                                                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                                    }else{
+                                                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                                    }
+                                                                                }
+                                                                            }
+                                                                        ?>
+                                                                </select>
+                                                            </div> -->
+
+                                                            <div class="form-group col-md-3">
+                                                                <label for="last_action_date">Latest Action Date</label>
+                                                                <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
+                                                            </div>
+
+                                                            <div class="form-group col-md-3 install_due_date_div" style="display: none;">
+                                                                <label for="install_due_date">Installment due Date</label>
+                                                                <input id="install_due_date" type="text" class="form-control" name="install_due_date" placeholder="DD/MM/YYYY">
+                                                            </div>
+
+                                                            <!-- <div class="form-group col-md-3">
+                                                                <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                    <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
+                                                                    <span class="slider round" style="height: 27px;"></span>
+                                                                </label>
+
+                                                                <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
+                                                            </div> -->
+
+                                                            <!-- <div class="form-group col-md-3">
+                                                                <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                    <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
+                                                                    <span class="slider round" style="height: 27px;"></span>
+                                                                </label>
+
+                                                                <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="mdi mdi-information-outline" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
+                                                            </div> -->
+
+                                                        </div>
+
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                </div>
+                            </div>
+
+                            <!-- Policy Docs Row -->
+                            <div class="row" id="policy_docs" style="display: none;">
+                                <div class="col-md-12">
+                                    <div id="accordion_23" class="mb-0">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                            <span class="font-color-black">Policy Docs</span>
+                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwentyTwo"
+                                                aria-expanded="true">
+                                                <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                            </a>
+                                        </label>
+                                        <div class="card mb-1">
+                                            <div id="collapseTwentyTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_23">
+                                                <div class="card-body" id="policy_docs_div" style="background-color: #F5FFFF !important; border-radius: 10px; box-shadow: 4px 4px 4px 4px #00000040;">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div> 
+
+                            <!-- Premium Details -->
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div id="accordion_3" class="mb-0">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                            <span class="font-color-black">Premium Details</span>
+                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                                aria-expanded="true">
+                                                <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                            </a>
+                                        </label>
+                                        <div class="card mb-0">
+                                            <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                <div class="card-body">
+                                                    <div class="row d-none" id="add_more_row">
+                                                        <div class="col-md-2">
+                                                            <input type="number" id="setInsurerCount" class="form-control" placeholder="Enter count">
+                                                        </div>
+                                                        <!-- <div class="col-md-2">
+                                                            <a id="addInsurer" class="btn btn-primary mb-3">Add Insurer</a>
+                                                        </div> -->
+                                                        <!-- <div class="col-md-1">
+                                                            <a id="submitForm" class="btn btn-success mb-3">Submit</a>
+                                                        </div> -->
+                                                    </div>
+
+                                                    <div id="insurerTableContainer" style="overflow: auto;">
+                                                        <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
+                                                            <thead>
+                                                                <tr>
+                                                                    <th><span class="font-color-black">Premium Details</span></th>
+                                                                </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                                <tr id="table_tr_1">
+                                                                    <td>Insurer</td>
+                                                                </tr>
+                                                                <tr id="table_tr_2" style="display: none;">
+                                                                    <td>Is Leader?</td>
+                                                                </tr>
+
+                                                                <tr id="table_tr_34">
+                                                                    <td>CD Acc No</td>
+                                                                </tr>
+
+                                                                <tr id="table_tr_37">
+                                                                    <td>CD Amount</td>
+                                                                </tr>
+                                                                
+                                                                <tr id="table_tr_35" style="display: none;">
+                                                                    <td>Follower Policy No</td>
+                                                                </tr>
+                                                                
+                                                                <tr id="table_tr_40" >
+                                                                    <td>Endorsement Issue Date</td>
+                                                                </tr>
+
+                                                                <tr id="table_tr_3" style="display: none;">
+                                                                    <td>Co-Share %</td>
+                                                                </tr>
+                                                                <tr id="table_tr_36">
+                                                                    <td>Non-Commissionable<br> Premium Amount</td>
+                                                                </tr>
+                                                                <tr id="table_tr_4">
+                                                                    <td>Base Premium</td>
+                                                                </tr>
+                                                                <tr class="hidetp" id="table_tr_5">
+                                                                    <td id="tp_premium_td">TP Premium</td>
+                                                                </tr>
+                                                                <tr class="hideter" id="table_tr_6" style="display: none;">
+                                                                    <td>TEP Premium</td>
+                                                                </tr>
+                                                                <tr  class="hidecop" id="table_tr_7" style="display: none;">
+                                                                    <td>Co-Premium</td>
+                                                                </tr>
+                                                                <tr class="hidecotp" id="table_tr_38" style="display: none;">
+                                                                    <td>Co-TP Premium</td>
+                                                                </tr>
+                                                                <tr class="hidecoter" id="table_tr_39" style="display: none;">
+                                                                    <td>Co-TEP Premium</td>
+                                                                </tr>
+                                                                <tr id="table_tr_8">
+                                                                    <td>CGST</td>
+                                                                </tr>
+                                                                <tr id="table_tr_9">
+                                                                    <td>SGST</td>
+                                                                </tr>
+                                                                <tr id="table_tr_10">
+                                                                    <td>IGST</td>
+                                                                </tr>
+                                                                <tr id="table_tr_11">
+                                                                    <td>GST Amount</td>
+                                                                </tr>
+                                                                <tr id="table_tr_12">
+                                                                    <td>Stamp Duty</td>
+                                                                </tr>
+                                                                <tr id="table_tr_13">
+                                                                    <td>Total</td>
+                                                                </tr>
+
+                                                                <tr id="table_tr_14">
+                                                                    <td>Agreed BP %</td>
+                                                                </tr>
+                                                                <tr class="hidetp" id="table_tr_15">
+                                                                    <td id="agree_tp_td">Agreed TP %</td>
+                                                                </tr>
+                                                                <tr class="hideter" id="table_tr_16"  style="display: none;">
+                                                                    <td id="agree_tp_td">Agreed TEP %</td>
+                                                                </tr>
+
+                                                                <?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team())) { ?>
+
+                                                                    <tr id="table_tr_17">
+                                                                        <td>Agreed Amount</td>
+                                                                    </tr>
+
+                                                                <?php } ?>
+
+                                                                <tr id="table_tr_18">
+                                                                    <td>Standard BP %</td>
+                                                                </tr>
+                                                                <tr class="hidetp" id="table_tr_19">
+                                                                    <td>Standard TP %</td>
+                                                                </tr>
+                                                                <tr class="hideter" id="table_tr_20"  style="display: none;">
+                                                                    <td>Standard TEP %</td>
+                                                                </tr>
+
+                                                                <?php if (in_array(in_array(get_role_id(), [1,5]) || FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+
+                                                                    <tr id="table_tr_21">
+                                                                        <td>Actual BP Amount</td>
+                                                                    </tr>
+                                                                    <tr class="hidetp" id="table_tr_22">
+                                                                        <td>Actual TP Amount</td>
+                                                                    </tr>
+                                                                    <tr class="hideter" id="table_tr_23"  style="display: none;">
+                                                                        <td>Actual TEP Amount</td>
+                                                                    </tr>
+                                                                    <tr id="table_tr_24">
+                                                                        <td>Actual BP %</td>
+                                                                    </tr>
+                                                                    <tr class="hidetp" id="table_tr_25">
+                                                                        <td>Actual TP %</td>
+                                                                    </tr>
+                                                                    <tr class="hideter" id="table_tr_26" style="display: none;">
+                                                                        <td>Actual TEP %</td>
+                                                                    </tr>
+                                                                    <tr id="table_tr_27">
+                                                                        <td>Actual BP <br> Remuneration Amount</td>
+                                                                    </tr>
+                                                                    <tr class="hidetp" id="table_tr_28">
+                                                                        <td>Actual TP <br> Remuneration Amount</td>
+                                                                    </tr>
+                                                                    <tr class="hideter" id="table_tr_29" style="display: none;">
+                                                                        <td>Actual TEP <br> Remuneration Amount</td>
+                                                                    </tr>
+                                                                    <tr id="table_tr_30">
+                                                                        <td>Expected Amount</td>
+                                                                    </tr>
+                                                                    <!-- <tr id="table_tr_31">
+                                                                        <td>Variance</td>
+                                                                    </tr> -->
+                                                                    <!-- <tr id="table_tr_32">
+                                                                        <td>Reward</td>
+                                                                    </tr> -->
+
+                                                                <?php } ?>
+
+                                                                <tr id="table_tr_33" style="display: none;">
+                                                                    <td></td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>  
+
+                            <div class="form-group text-right mt-3 m-b-0" id="submitButton">
+                                <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                            </div>
+                    </form>
+                </div>
             </div>
         </div>
     </div>
@@ -752,13 +775,13 @@
                             }else{
                                 $('#ct_type').val(1)
                                 // addInsurerColumn()
-                                toastr.warning("There is no policy inception data.", 'WARNING!');
+                                toastr.warning("There is no policy inception data.", 'Warning!');
                                 $('#btnSubmit').prop('disabled', true).data('disable', true);
                             }
                         }else{
                             $('#ct_type').val(1)
                             // addInsurerColumn()
-                            toastr.warning(res.message, 'WARNING!');
+                            toastr.warning(res.message, 'Warning!');
                             $('#btnSubmit').prop('disabled', true).data('disable', true);
                         }
                     },
@@ -776,7 +799,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
         }
     });
@@ -796,7 +819,7 @@
 
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
         }else{
             if(client_id && insurer_id){
@@ -890,6 +913,29 @@
                 console.error(status, error);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 500) {
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                    } else {
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                    }
             }
         });
     });
@@ -1017,6 +1063,8 @@
                         $('#cop_yes').val(0);
                     }
                     
+                    $('#policy_tranction_primarykey_for_file_upload').val(res.data.id);
+                    $('#client_policy_id_for_file_upload').val(res.data.client_policy_id);
                     $('#policy_tranction_primarykey').val(res.data.id);
                     $('#client_type').val(res.data.client_type).trigger('change');
                     $('#client_id').val(res.data.client_id).change();
@@ -1048,6 +1096,10 @@
                         $('#policy_start_date').val(res.data.policy_start_date);
                         $('#policy_end_date').val(res.data.policy_end_date);
                         $('#insurer_id').val(res.data.insurer_branch_id + '-' + res.data.insurer_id);
+                        $('#client_type').addClass('readonly-select ');
+                        $('#client_id').addClass('readonly-select ').select2('destroy');
+                        $('#client_branch_id').addClass('readonly-select ').select2('destroy');
+                        $('#client_policy_id').addClass('readonly-select ').select2('destroy');
                     }, 1500)
 
                     $('#policy_no').val(res.data.policy_no);
@@ -1067,12 +1119,16 @@
                     $('#cd_ac_no').val(res.data.cd_ac_no);
                     $('#ct_type').val(res.data.ct_type);
 
+                    $('#hide_file_upload').show()
+
                     if (res.data.policy_with_corr == 1) {
                         $('#policy_with_corr').prop('checked', true);
                     } else {
                         $('#policy_with_corr').prop('checked', false);
                     }
 
+                    appendFileTableBody(res.data.pt_files);
+
                     // if (res.data.is_cd_reduce_from_bds == 1) {
                     //     $('#is_cd_reduce_from_bds').prop('checked', true).prop('checked', false);
                     // } else {
@@ -2034,7 +2090,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
     }
@@ -2941,7 +2997,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
             } 
         });
diff --git a/app/Views/policy_transaction_endorsement_form_2.php b/app/Views/policy_transaction_endorsement_form_2.php
index b032e005..85564e49 100644
--- a/app/Views/policy_transaction_endorsement_form_2.php
+++ b/app/Views/policy_transaction_endorsement_form_2.php
@@ -649,13 +649,13 @@
                             }else{
                                 $('#ct_type').val(1)
                                 // addInsurerColumn()
-                                toastr.warning("There is no policy inception data.", 'WARNING!');
+                                toastr.warning("There is no policy inception data.", 'Warning!');
                                 $('#btnSubmit').prop('disabled', true).data('disable', true);
                             }
                         }else{
                             $('#ct_type').val(1)
                             // addInsurerColumn()
-                            toastr.warning(res.message, 'WARNING!');
+                            toastr.warning(res.message, 'Warning!');
                             $('#btnSubmit').prop('disabled', true).data('disable', true);
                         }
                     },
@@ -673,7 +673,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
         }
     });
@@ -693,7 +693,7 @@
 
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
         }else{
             if(client_id && insurer_id){
@@ -1946,7 +1946,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
     }
@@ -2825,7 +2825,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
             } 
         });
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 1fbc415c..0365496b 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -363,10 +363,9 @@ table.dataTable thead th {
     </div><!-- end col -->
 </div>
 
-
 <!-- end table row -->
+<?php include('pt_endorsement_form_file_upload_tab.php'); ?>
 
-<?php include('policy_transaction_endorsement_form.php'); ?>
 <script>
     document.addEventListener("DOMContentLoaded", function() {
         const table = document.getElementById("tickets-table");
@@ -448,6 +447,7 @@ table.dataTable thead th {
         });
     });
 </script>
+
 <script>
     var client_list = '';
     var branch_list = '';
@@ -461,6 +461,7 @@ table.dataTable thead th {
     $(document).ready(function() {
 
         getClientAndBranchAndPolicy()
+        addHTMLInput();
 
         <?php if (session()->has('create_failed')) : ?>
             toastr.error('<?= session()->getFlashdata('create_failed') ?>', 'Failed');
@@ -471,11 +472,11 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('create_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
         <?php endif; ?>
 
         <?php if (session()->has('update_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
         <?php endif; ?>
 
 
@@ -506,6 +507,8 @@ table.dataTable thead th {
                         className: 'btn app-btn-primary  mr-2',
                         action: function (e, dt, node, config) {
                             hide_list_show_add();
+                            addHTMLInput(null, 'policy_docs_div');
+                            $('#policy_docs').show()
                         },
                         attr: { id: 'btnAdd' }
                     },
@@ -614,15 +617,16 @@ table.dataTable thead th {
         $('#endorsement_form_id')[0].reset();
         $('#client_id').val('').change();
         $('#client_policy_id').val('').change();
-        $('#endorsement_form').show();
-        $('#endorsement_list').hide();
-        $('#endorsement_filter').hide();
         $('#invoice_no_div').hide();
         $('#invoice_no').attr('required', false)
+
+        $('#pt_onboarding').show();
+        $('#endorsement_list').hide();
+        $('#endorsement_filter').hide();
     }
 
     function show_list_hide_add() {
-        $('#endorsement_form').hide()
+        $('#pt_onboarding').hide()
         $('#endorsement_list').show()
         $('#endorsement_filter').show()
 
@@ -836,7 +840,6 @@ table.dataTable thead th {
     })
 </script>
 
-
 <script>
     $(document).ready(function() {
         getURLParams()
@@ -1021,10 +1024,10 @@ table.dataTable thead th {
                     console.log('Data fetched successfully:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         window.location.reload();
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
                 }, function(xhr, status, error) {
                     console.error('Error fetching data:', error);
@@ -1034,4 +1037,87 @@ table.dataTable thead th {
         });
     }
 
+    function addHTMLInput(data = null, container_id = 'dynamic-form-container') 
+    {   
+        console.log('container_id', container_id);
+        const container = document.getElementById(container_id);
+
+        let required = ''
+        let required_star = ''
+        if(container_id == 'dynamic-form-container'){
+            required = 'required';
+            required_star = '*';
+        }
+        console.log('container', container);
+
+        const newRow = document.createElement('div');
+        newRow.className = 'form-row dynamic-form-row';
+        newRow.innerHTML = `
+            <div class="form-group col-md-5">
+                <label for="file_name">Document Name<span class="text-danger">${required_star}</span></label>
+                <input type="text" class="form-control" id="docs_name" name="doc_name[]" placeholder="Enter file name" ${required}>
+            </div>
+            <div class="form-group col-md-5">
+                <label for="file">Upload File<span class="text-danger">${required_star}</span></label>
+                <input type="file" class="form-control" id="file_name" name="file[]" ${required} accept=".pdf,.jpg,.jpeg,.png">
+            </div>
+            <div class="form-group col-md-2" style="position: relative;top: 28px;">
+                <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this, '${container_id}')">x</a>
+                <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInput(null, '${container_id}')">+</a>
+            </div>
+        `;
+        container.appendChild(newRow);
+
+        if (data !== null && data.db_column_name !== undefined) {
+            const selectElement = newRow.querySelector('.db-column-name-select');
+            selectElement.value = data.db_column_name;
+        }
+    }
+
+    function removeHTMLInput(element, container_id) 
+    {
+        const container = document.getElementById(container_id);
+        const rows = container.querySelectorAll('.dynamic-form-row');
+
+        if (rows.length > 1) {
+            const row = element.closest('.dynamic-form-row');
+            row.remove();
+        } 
+    }
+
+    function appendFileTableBody(data) 
+    {   
+        console.log(data);
+
+        $('#table_bd').empty();
+
+        $.each(data, function(index, item) {
+            var row = $('<tr>');
+
+            row.append($('<td>').text(index+1));
+            row.append($('<td>').text(item.doc_name));
+            row.append($('<td>').text(item.file_name));
+
+            // var url = "<?= base_url('/downloadGdriveFile'); ?>" + 
+            //   "?client_id=" + item.client_id + 
+            //   "&file_type=policy" + 
+            //   "&file_name=" + item.file_name + 
+            //   "&client_policy_id=" + item.client_policy_id;
+
+            var url = '<?= base_url('download-kyc-docs/') ?>' + item.file_name;
+
+
+            var link = $('<a>')
+                .attr('href', url)
+                .attr('target', '_blank') // Open in a new tab
+                .attr('style', 'font-size:18px;')
+                .attr('data-id', item.id)
+                .addClass('mdi mdi-download')
+
+
+            // Append the <a> tag inside the <td>
+            row.append($('<td>').append(link));
+            $('#table_bd').append(row);
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_endorsement_list_2.php b/app/Views/policy_transaction_endorsement_list_2.php
index 60e37342..96ff7fa6 100644
--- a/app/Views/policy_transaction_endorsement_list_2.php
+++ b/app/Views/policy_transaction_endorsement_list_2.php
@@ -470,11 +470,11 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('create_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
         <?php endif; ?>
 
         <?php if (session()->has('update_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
         <?php endif; ?>
 
 
@@ -1020,10 +1020,10 @@ table.dataTable thead th {
                     console.log('Data fetched successfully:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         window.location.reload();
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
                 }, function(xhr, status, error) {
                     console.error('Error fetching data:', error);
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 6a0cb78c..7a9c9489 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -1797,7 +1797,7 @@
 
                 }else{
 
-                    toastr.warning('Please select the Owner type', 'WARNING');
+                    toastr.warning('Please select the Owner type', 'Warning');
                 }
 
 
@@ -2065,7 +2065,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }
@@ -2084,7 +2084,7 @@
         // console.log('insurer_id', insurer_id);
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }else{
@@ -2203,7 +2203,7 @@
 
             if (!policy_type_id || !client_id) {
                 $(this).val('').select2();
-                toastr.warning(!policy_type_id ? 'Please select the Policy Type' : 'Please select the Client', 'WARNING');
+                toastr.warning(!policy_type_id ? 'Please select the Policy Type' : 'Please select the Client', 'Warning');
                 return false;
             }
 
@@ -2255,7 +2255,7 @@
                     var page_title = 'Edit Policy' + (res.data.client_short_name || res.data.policy_type || res.data.policy_no ? 
                         ' - ' + [res.data.client_short_name, res.data.policy_type, res.data.policy_no]
                         .filter(Boolean).join('-') : '');
-
+                    
                     $('#page_title').text(page_title);
                     $('#client_id_kyc').val(res.data.client_id);
                     $('#policy_tranction_primarykey_for_file_upload').val(res.data.id);
@@ -2384,6 +2384,9 @@
                             $('#table_tr_37').hide();
                         } 
 
+                        $('#client_id').addClass('readonly-select ').select2('destroy');
+                        $('#client_branch_id').addClass('readonly-select ').select2('destroy');
+
                     }, 4000)
 
                     // Set additional fields
@@ -2485,7 +2488,7 @@
                     // } else {
                     //     $('#bro_payable_by').prop('checked', false);
                     // }
-                    $('#bro_payable_by').val(res.data.bro_payable_by);
+                    $('#bro_payable_by').val(res.data.bro_payable_by ?? 1);
 
                     // Policy transaction status handling
                     if (res.data.status == "completed") {
@@ -3241,7 +3244,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
         // // Find the empty input(s)
@@ -3776,7 +3779,7 @@
 
 
         if(client_id == '' || insurer_id == ''){
-            toastr.warning('Client, Insurer, or both do not exist.', 'WARNING!');
+            toastr.warning('Client, Insurer, or both do not exist.', 'Warning!');
             $(input).val('')
             return false;
         }
@@ -3784,7 +3787,7 @@
         if (isAnyLeaderChecked) {
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('Please select the Leader.', 'WARNING!');
+                toastr.warning('Please select the Leader.', 'Warning!');
                 return false;
             }
         } 
@@ -3792,7 +3795,7 @@
         if(!leader){
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('The CD account number not for the Leader.', 'WARNING!');
+                toastr.warning('The CD account number not for the Leader.', 'Warning!');
                 return false;
             }
         }
@@ -3955,7 +3958,7 @@
         }
 
         if(pt_form_sumbit_handler == 0){
-            toastr.warning('Base premium greater than CD Amount', 'WARNING');
+            toastr.warning('Base premium greater than CD Amount', 'Warning');
             return;
         }
 
@@ -4095,6 +4098,31 @@
                 console.error(status, error);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+                        setTimeout(function() {
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+                            } else if (xhr.status === 403) {
+                                    let response = JSON.parse(xhr.responseText);
+                                    toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+                        }, 1000);
             }
         });
     });
@@ -4687,7 +4715,7 @@
 
         if (!client_id || !client_branch_id || !policy_type_id) {
             if(client_type == 1){
-                toastr.warning('Please select the policy type, client and branch', "WARNING");
+                toastr.warning('Please select the policy type, client and branch', "Warning");
                 $('#policy_no').val('');
                 return;
             }
@@ -4707,7 +4735,7 @@
                     console.log('get_client_policy_data_using_policy_no response', res)
 
                     if(res.status == true && res.code == 409){
-                        toastr.warning(res.message,'WARNING');
+                        toastr.warning(res.message,'Warning');
                         $('#policy_no').val("");
                         return;
                     }else{
@@ -4716,7 +4744,7 @@
                         $('#policy_start_date').val('');
                         $('#policy_end_date').val('');
                         $('#tpa').val('').select2();
-                        console.log(res.message, 'warning');
+                        console.log(res.message, 'Warning');
                     }
 
                     // if(res.status == true){                   
@@ -5600,7 +5628,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
                 if(table == 'vehicle'){
                     resetVehicleField();
@@ -5719,7 +5747,7 @@
 
             // Validate inputs
             if (!base_premium || !cd_ac_no) {
-                toastr.warning('Base premium or CD account number is missing', 'WARNING');
+                toastr.warning('Base premium or CD account number is missing', 'Warning');
                 return;
             }
 
@@ -5740,7 +5768,7 @@
 
                 if (response.status) {
                     if (!response.base_premium_greater_than_balance) {
-                        console.log('Base premium is less than or equal to CD balance:', 'SUCCESS');
+                        console.log('Base premium is less than or equal to CD balance:', 'Success');
                         if(differnce_bp_amt !== 0){
                             $('#cd_amt_changed').prop('disabled', false).val(differnce_bp_amt);
                         }else{
@@ -5748,13 +5776,13 @@
                         }
                         $('#pt_form_sumbit_handler').val(1);
                     } else {
-                        toastr.warning('Base premium greater than CD Amount', 'WARNING');
+                        toastr.warning('Base premium greater than CD Amount', 'Warning');
                         $('#cd_amt_changed').prop('disabled', true).val("");
                         $('#pt_form_sumbit_handler').val(0);
                         // $(input).val("0")
                     }
                 } else {
-                    toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                    toastr.error(response.message || 'Unable to fetch data', 'Error');
                 }
 
                 console.log('#################################### End Check CD Amount For Base Premium  Response ####################################');
@@ -5762,7 +5790,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
 
         }else{
@@ -5806,7 +5834,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
         console.log('#################################### END Get CD Amount ####################################');
@@ -5963,12 +5991,12 @@
 
 
         if (vhno === "" && rc === "") {
-            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "WARNING");
+            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "Warning");
             return;
         }
 
         if(vehicle_no_validation == 1){
-            toastr.warning("Invalid Vehicle Number Format", "WARNING");
+            toastr.warning("Invalid Vehicle Number Format", "Warning");
             return;
         }
 
@@ -6021,7 +6049,7 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendVehicles(response.vehicles, response.vehicle_id);
                 appendBranch(response.branches, response.branch_id);
@@ -6038,7 +6066,7 @@
                 }
                 $('#client_type').val(response.data?.client_type ?? "").trigger('change');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -6054,7 +6082,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
         });
@@ -6100,11 +6128,11 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendBranch(response.branches, response.branch_id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -6120,7 +6148,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -6826,7 +6854,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_form_submit_btn').prop('disabled', true);
diff --git a/app/Views/policy_transaction_inception_form_2.php b/app/Views/policy_transaction_inception_form_2.php
index 13c7b309..77f28d19 100644
--- a/app/Views/policy_transaction_inception_form_2.php
+++ b/app/Views/policy_transaction_inception_form_2.php
@@ -1440,7 +1440,7 @@
 
                 }else{
 
-                    toastr.warning('Please select the Owner type', 'WARNING');
+                    toastr.warning('Please select the Owner type', 'Warning');
                 }
 
 
@@ -1669,7 +1669,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }
@@ -1683,7 +1683,7 @@
         var insurer_branch_id = $('#follow_insurer_id_'+uniqueid).find('option:selected').attr('data-bid');
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }else{
@@ -2799,7 +2799,7 @@
     if (userTouched && sum > 100) {
         toastr.warning(
             'Sum of the co-share is greater than 100',
-            'WARNING'
+            'Warning'
         );
     }
 }
@@ -3357,7 +3357,7 @@
 
 
         if(client_id == '' || insurer_id == ''){
-            toastr.warning('Client, Insurer, or both do not exist.', 'WARNING!');
+            toastr.warning('Client, Insurer, or both do not exist.', 'Warning!');
             $(input).val('')
             return false;
         }
@@ -3365,7 +3365,7 @@
         if (isAnyLeaderChecked) {
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('Please select the Leader.', 'WARNING!');
+                toastr.warning('Please select the Leader.', 'Warning!');
                 return false;
             }
         } 
@@ -3373,7 +3373,7 @@
         if(!leader){
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('The CD account number not for the Leader.', 'WARNING!');
+                toastr.warning('The CD account number not for the Leader.', 'Warning!');
                 return false;
             }
         }
@@ -3408,13 +3408,13 @@
 
         //  Missing base data
         if (!client_id || !insurer_id) {
-            toastr.warning('Client or Insurer does not exist.', 'WARNING!');
+            toastr.warning('Client or Insurer does not exist.', 'Warning!');
             return;
         }
 
         //  COP enabled but no leader selected
         if (cop_yes && !isAnyLeaderSelected) {
-            toastr.warning('Please select a Leader.', 'WARNING!');
+            toastr.warning('Please select a Leader.', 'Warning!');
             $input.val('');
             return;
         }
@@ -3424,7 +3424,7 @@
 
             toastr.warning(
                 'CD account number allowed only for Leader.',
-                'WARNING!'
+                'Warning!'
             );
 
             // Clear current select
@@ -3611,7 +3611,7 @@
         }
 
         if(pt_form_sumbit_handler == 0){
-            toastr.warning('Base premium greater than CD Amount', 'WARNING');
+            toastr.warning('Base premium greater than CD Amount', 'Warning');
             return;
         }
 
@@ -4394,7 +4394,7 @@
 
         if (!client_id || !client_branch_id || !policy_type_id) {
             if(client_type == 1){
-                toastr.warning('Please select the policy type, client and branch', "WARNING");
+                toastr.warning('Please select the policy type, client and branch', "Warning");
                 $('#policy_no').val('');
                 return;
             }
@@ -4414,7 +4414,7 @@
                     console.log('get_client_policy_data_using_policy_no response', res)
                     $('.follower_policy_no').val(policy_no);// auto fetched
                     if(res.status == true && res.code == 409){
-                        toastr.warning(res.message,'WARNING');
+                        toastr.warning(res.message,'Warning');
                         $('#policy_no').val("");
                         $('.follower_policy_no').val("");
                         return;
@@ -4424,7 +4424,7 @@
                         $('#policy_start_date').val('');
                         $('#policy_end_date').val('');
                         $('#tpa').val('').select2();
-                        console.log(res.message, 'warning');
+                        console.log(res.message, 'Warning');
                     }
 
                     // if(res.status == true){                   
@@ -5290,7 +5290,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
                 if(table == 'vehicle'){
                     resetVehicleField();
@@ -5409,11 +5409,11 @@
 
             // Validate inputs
             // if (!base_premium || !cd_ac_no) {
-            //     toastr.warning('Base premium or CD account number is missing', 'WARNING');
+            //     toastr.warning('Base premium or CD account number is missing', 'Warning');
             //     return;
             // }
             if (!base_premium) {
-                toastr.warning('Base premium is missing', 'WARNING');
+                toastr.warning('Base premium is missing', 'Warning');
                 return;
             }
 
@@ -5442,13 +5442,13 @@
                         }
                         $('#pt_form_sumbit_handler').val(1);
                     } else {
-                        toastr.warning('Base premium greater than CD Amount', 'WARNING');
+                        toastr.warning('Base premium greater than CD Amount', 'Warning');
                         $('#cd_amt_changed').prop('disabled', true).val("");
                         $('#pt_form_sumbit_handler').val(0);
                         // $(input).val("0")
                     }
                 } else {
-                    toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                    toastr.error(response.message || 'Unable to fetch data', 'Error');
                 }
 
                 console.log('#################################### End Check CD Amount For Base Premium  Response ####################################');
@@ -5456,7 +5456,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
 
         }else{
@@ -5509,7 +5509,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
         console.log('#################################### END Get CD Amount ####################################');
@@ -5665,12 +5665,12 @@
 
 
         if (vhno === "" && rc === "") {
-            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "WARNING");
+            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "Warning");
             return;
         }
 
         if(vehicle_no_validation == 1){
-            toastr.warning("Invalid Vehicle Number Format", "WARNING");
+            toastr.warning("Invalid Vehicle Number Format", "Warning");
             return;
         }
 
@@ -5723,7 +5723,7 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendVehicles(response.vehicles, response.vehicle_id);
                 appendBranch(response.branches, response.branch_id);
@@ -5740,7 +5740,7 @@
                 }
                 $('#client_type').val(response.data?.client_type ?? "").trigger('change');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -5756,7 +5756,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
         });
@@ -5802,11 +5802,11 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendBranch(response.branches, response.branch_id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -5822,7 +5822,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -6615,7 +6615,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_form_submit_btn').prop('disabled', true);
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index 482429bf..56dec406 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -316,7 +316,7 @@ table.dataTable tbody td {
                             <?php foreach($inception_data_list as $index => $row){ ?>
                             <tr>
                                 <td class="text-center"><?php echo $index+1; ?></td>
-                                <td><?php echo $issuer[$row['issuer']]; ?></td>
+                                <td><?php echo $issuer[$row['issuer']] ?? 'Nhance'; ?></td>
                                 <td><?php echo $issuing_type[$row['issue_type']] ?? 'N/A'; ?></td>
                                 <td><?php echo $client_type[$row['client_type']] ?? 'N/A'; ?></td>
                                 <td><?php echo $row['client_type'] == 2 ? $row['client_name'] . " - " . (!empty($row['pan']) ? $row['pan'] :  'N/A') : $row['client_short_name'] . ' - ' . $row['client_branch_name']; ?></td>
@@ -334,7 +334,7 @@ table.dataTable tbody td {
                                     <div class="btn-group dropdown">
                                         <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
-                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" onclick="getPolicyTransactionDataForEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
+                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" onclick="alertEveryFiveSeconds('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
                                                 <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
                                             </a>
 
@@ -448,7 +448,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 
                 // Handle edit button
                 if (this.classList.contains('btnEdit') && id) {
-                    getPolicyTransactionDataForEdit(id);
+                    alertEveryFiveSeconds(id);
                 }
                 // Handle delete button
                 else if (this.classList.contains('delete') && id) {
@@ -490,6 +490,8 @@ var vehicle_list = ''; // local variable for storing the client policy list
 var branch_policy = '';
 var unit_list = '';
 var count = 0
+var getClientAndBranchAndPolicySuccess = false
+var intervalId = 0;
 
 //for disable all field if client and client branch is empty
 $(document).ready(function() {
@@ -537,11 +539,11 @@ $(document).ready(function(){
     <?php endif; ?>
 
     <?php if (session()->has('create_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
     <?php endif; ?>
 
     <?php if (session()->has('update_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
     <?php endif; ?>
 
 
@@ -767,6 +769,9 @@ function getClientAndBranchAndPolicy(appendStatus = true)
         error: function(xhr, status, error) {
             console.error(xhr.responseText);
             console.error(status, error);
+        },
+        complete : function(){
+            getClientAndBranchAndPolicySuccess = true
         }
     });
 }
@@ -1025,7 +1030,7 @@ function addHTMLInput(data = null, container_id = 'dynamic-form-container')
         </div>
         <div class="form-group col-md-5">
             <label for="file">Upload File<span class="text-danger">${required_star}</span></label>
-            <input type="file" class="form-control" id="file_name" name="file[]" ${required}>
+            <input type="file" class="form-control" id="file_name" name="file[]" ${required} accept=".pdf,.jpg,.jpeg,.png">
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
             <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this, '${container_id}')">x</a>
@@ -1211,7 +1216,7 @@ function addHTMLInputForVehicleFileUpload(data = null, container_id = 'dynamic-f
         </div>
         <div class="form-group col-md-5">
             <label for="file">Upload File<span class="text-danger">${required_star}</span></label>
-            <input type="file" class="form-control" id="file_name" name="file_name[]" ${required}>
+            <input type="file" class="form-control" id="file_name" name="file_name[]" ${required} accept=".pdf,.jpg,.jpeg,.png">
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
             <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInputForVehicleFileUpload(this, '${container_id}')">x</a>
@@ -1312,7 +1317,7 @@ $(document).ready(function(){
             //     myModal.show();
             // }else{
             //     $('#client_id').val('').change();
-            //     toastr.warning('Please select the client type', 'WARNING')
+            //     toastr.warning('Please select the client type', 'Warning')
             // }
             appendClientForm();
 
@@ -1489,7 +1494,7 @@ $('#cd_ac_no_data').change(function(){
 
             console.log('CD Account Number Responcce', res)
             if(res.status == true){
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cd_ac_no_data').val('');
             }
         },
@@ -1595,6 +1600,31 @@ function onlyNumbers(event)
     return false;
 }
 
+function alertEveryFiveSeconds(id) {
+
+    console.log('intervel Started');
+
+    $('.loader').fadeIn();
+    $('.loader-mask').fadeIn();
+
+    intervalId = setInterval(function () {
+
+        if (getClientAndBranchAndPolicySuccess === true) {
+
+            clearInterval(intervalId); // ✅ stop interval
+            console.log('intervel cleared');
+            getPolicyTransactionDataForEdit(id)
+            console.log('getPolicyTransactionDataForEdit function called');
+
+        }else{
+            console.log('intervel not cleared getClientAndBranchAndPolicy is still pending');
+        }
+
+    }, 3000);
+}
+
+
+
 </script>
 
 
@@ -1779,10 +1809,10 @@ function removePolicyTransaction(input, pt_id, policy_type_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/policy_transaction_inception_list_2.php b/app/Views/policy_transaction_inception_list_2.php
index 99ef4eb2..9a47ffa9 100644
--- a/app/Views/policy_transaction_inception_list_2.php
+++ b/app/Views/policy_transaction_inception_list_2.php
@@ -536,11 +536,11 @@ $(document).ready(function(){
     <?php endif; ?>
 
     <?php if (session()->has('create_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
     <?php endif; ?>
 
     <?php if (session()->has('update_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
     <?php endif; ?>
 
 
@@ -1013,7 +1013,7 @@ function addHTMLInput(data = null)
         </div>
         <div class="form-group col-md-5">
             <label for="file">Upload File<span class="text-danger">*</span></label>
-            <input type="file" class="form-control" id="file_name" name="file[]" required>
+            <input type="file" class="form-control" id="file_name" name="file[]" accept=".pdf,.jpg,.jpeg,.png" required>
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
             <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
@@ -1192,7 +1192,7 @@ function addHTMLInputForVehicleFileUpload(data = null)
         </div>
         <div class="form-group col-md-5">
             <label for="file">Upload File<span class="text-danger">*</span></label>
-            <input type="file" class="form-control" id="file_name" name="file_name[]" required>
+            <input type="file" class="form-control" id="file_name" name="file_name[]" accept=".pdf,.jpg,.jpeg,.png" required>
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
             <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInputForVehicleFileUpload(this)">x</a>
@@ -1293,7 +1293,7 @@ $(document).ready(function(){
             //     myModal.show();
             // }else{
             //     $('#client_id').val('').change();
-            //     toastr.warning('Please select the client type', 'WARNING')
+            //     toastr.warning('Please select the client type', 'Warning')
             // }
             appendClientForm();
 
@@ -1470,7 +1470,7 @@ $('#cd_ac_no_data').change(function(){
 
             console.log('CD Account Number Responcce', res)
             if(res.status == true){
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cd_ac_no_data').val('');
             }
         },
@@ -1760,10 +1760,10 @@ function removePolicyTransaction(input, pt_id, policy_type_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/policy_type_basic_info.php b/app/Views/policy_type_basic_info.php
index 1bfb3fe3..2f9d6e6a 100755
--- a/app/Views/policy_type_basic_info.php
+++ b/app/Views/policy_type_basic_info.php
@@ -141,7 +141,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index eeccbb28..c9a89897 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -109,7 +109,7 @@
                         <td><?php echo $row['alloci'] ?: 'N/A'; ?></td>
                         <td>
                           <div class="btn-group dropdown">
-                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                             <div class="dropdown-menu dropdown-menu-right">
                               <a class="dropdown-item" href="<?= base_url("master/policy/list/"); ?><?= $row['id'];?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                               <a class="dropdown-item" data-id="<?= $row['id'];?>" onclick="removePolciyType(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
@@ -357,10 +357,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('Policy type removed successfully', 'success');
+                toastr.success('Policy type removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove policy type', 'warning');
+                toastr.warning('Failed to remove policy type', 'Warning');
               }
             }
           },
@@ -369,7 +369,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove policy type', 'warning');
+            toastr.warning('Failed to remove policy type', 'Warning');
           }
         });
       }
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 392e0cfe..a972675d 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -92,7 +92,7 @@
 
         if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Policy Type!', 'warning', {
+            toastr.warning('First Add the Policy Type!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/pos_list.php b/app/Views/pos_list.php
index 2c1c1af5..500fbdfa 100644
--- a/app/Views/pos_list.php
+++ b/app/Views/pos_list.php
@@ -175,21 +175,21 @@
                             <div class="form-group col-md-4">
                                 <label for="aadhar_file_name">Aadhar</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="aadhar_file_name" id="aadhar_file_name"  accept="image/*,application/pdf">
+                                    <input type="file" class="form-control" name="aadhar_file_name" id="aadhar_file_name"  accept=".pdf,.jpg,.jpeg,.png">
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="pan_file_name">PAN</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="pan_file_name" id="pan_file_name"  accept="image/*,application/pdf">
+                                    <input type="file" class="form-control" name="pan_file_name" id="pan_file_name"  accept=".pdf,.jpg,.jpeg,.png">
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="certificate_file_name">Certificate</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="certificate_file_name" id="certificate_file_name"  accept="image/*,application/pdf">
+                                    <input type="file" class="form-control" name="certificate_file_name" id="certificate_file_name"  accept=".pdf,.jpg,.jpeg,.png">
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>                            
@@ -361,8 +361,34 @@
                 }
                 $('.loader, .loader-mask').fadeOut();
             },
-            error: function () {
+            error: function (xhr) {
                 $('.loader, .loader-mask').fadeOut();
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
+                            console.error('Unexpected error:', xhr.responseText);
+                        
             }
         });
     }
diff --git a/app/Views/pt_endorsement_form_file_upload_tab.php b/app/Views/pt_endorsement_form_file_upload_tab.php
new file mode 100644
index 00000000..d871de22
--- /dev/null
+++ b/app/Views/pt_endorsement_form_file_upload_tab.php
@@ -0,0 +1,34 @@
+<div class="row" id="pt_onboarding" style="position: relative; bottom: 25px; display:none;">
+    <div class="col-xl-12">
+        <div class="card-body">
+            <div class="tab-wrapper position-relative">
+                <ul class="nav nav-pills navtab-bg" id="myTab">
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#form" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active-tab active" id="general_tab">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block">Policy</span>
+                        </a>
+                    </li>
+                    <li class="nav-item" id="hide_file_upload" style="display: none;">
+                        <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">Policy Docs</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <!-- Right Arrow -->
+                        <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="tab-content">
+                <?php include('policy_transaction_endorsement_form.php'); ?>
+                <?php include('drive_file_upload.php'); ?>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index f6b8c348..abc5cdfc 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -161,14 +161,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 40283cfa..934b7fad 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -184,9 +184,9 @@ table.dataTable tbody td {
                             <!-- <td style="display: none;"><?php echo $row['insurer_name'] ?: 'N/A'; ?> </td> -->
                             <td><?php echo $row['insurer_branch_name'] ?: 'N/A'; ?></td>
                             <!-- <td style="display: none;"><?php echo $row['tpa_name']; ?></td> -->
-                            <td style="display: none;"><?php echo empty($row['endorse_eff_date']) ? 'N/A' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
-                            <td style="display: none;"><?php echo empty($row['policy_start_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                            <td style="display: none;"><?php echo empty($row['policy_end_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
+                            <td style="display: none;"><?php echo empty($row['endorse_eff_date']) ? 'N/A' : change_date_format($row['endorse_eff_date'], 'Y-m-d', 'd/m/Y') ?></td>
+                            <td style="display: none;"><?php echo empty($row['policy_start_date']) ? 'N/A' : change_date_format($row['policy_start_date'], 'Y-m-d', 'd/m/Y'); ?></td>
+                            <td style="display: none;"><?php echo empty($row['policy_end_date']) ? 'N/A' : change_date_format($row['policy_end_date'], 'Y-m-d', 'd/m/Y'); ?></td>
                             <td style="display: none;"><?php echo $row['ref'] ?: 'N/A'; ?></td>
                             <td style="display: none;"><?php echo $row['remarks'] ?: 'N/A'; ?></td>
 
@@ -241,8 +241,8 @@ table.dataTable tbody td {
                             <td style="display: none;"><?php echo $row['service_person_name'] ?: 'N/A'; ?></td>
                             <td style="display: none;"><?php echo $row['nhance_branch'] ?: 'N/A'; ?></td>
                             <td style="display: none;"><?php echo $row['installment'] ?: 'N/A'; ?></td>
-                            <td style="display: none;"><?php echo empty($row['data_received_date']) ? 'N/A' : date('d/m/Y', strtotime($row['data_received_date'])) ?></td>
-                            <td style="display: none;"><?php echo empty($row['renewal_date']) ? 'N/A' : date('d/m/Y', strtotime($row['renewal_date'])) ?></td>
+                            <td style="display: none;"><?php echo empty($row['data_received_date']) ? 'N/A' : change_date_format($row['data_received_date'], 'Y-m-d', 'd/m/Y') ?></td>
+                            <td style="display: none;"><?php echo empty($row['renewal_date']) ? 'N/A' : change_date_format($row['renewal_date'], 'Y-m-d', 'd/m/Y') ?></td>
 
                             <td style="display:none;"><?php echo $row['co_share'] ?? 'No'; ?></td>
                             <td style="display:none;"><?php echo $row['bro_payable_by'] ?? 'No'; ?></td>
@@ -734,7 +734,7 @@ function getCoShareStatementDetails(pt_id){
             appendTableData(response.data)
             
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);
diff --git a/app/Views/report_bds_filter.php b/app/Views/report_bds_filter.php
index d55ab379..8dcb4da6 100644
--- a/app/Views/report_bds_filter.php
+++ b/app/Views/report_bds_filter.php
@@ -569,7 +569,7 @@
                     appendPolicies(response.data)
 
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/report_bds_new.php b/app/Views/report_bds_new.php
index 1bb808aa..0dfb45ae 100644
--- a/app/Views/report_bds_new.php
+++ b/app/Views/report_bds_new.php
@@ -615,7 +615,7 @@
                 appendTableData(response.data)
                 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php
index d01de408..67ad9fce 100755
--- a/app/Views/retail_endorsement_list.php
+++ b/app/Views/retail_endorsement_list.php
@@ -273,6 +273,15 @@
 
     });
 
+    $(document).on('click', '.emp_data_model', function() {
+    
+        var id = $(this).attr('data-id');
+        var eno = $(this).attr('data-eno');
+        var status = $(this).attr('data-status');
+ 
+        fetchRetailEndorsementData(id, eno, status);
+    });
+
     function submitRetailEndorsement(e) {
         e.preventDefault(); // stop normal form submit
         var form = document.getElementById("retailEndorsementForm");
@@ -310,8 +319,31 @@
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
+                if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             },
             complete: function() {
                 btn.disabled = false;
diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php
index 0f5bb4d0..4dd3e6d1 100644
--- a/app/Views/rfq/gmc.php
+++ b/app/Views/rfq/gmc.php
@@ -131,22 +131,28 @@
    <div class="form-row">
 
        <div class="form-group col-md-4">
-           <label for="incept_emp_count" class="emp_title"> No of Employees at Inception <span
-                   class="text-danger"></span></label>
+           <label for="incept_emp_count" class="emp_title">
+                <span class="emp_title_text"> No of Employees at Inception </span>
+                <span class="text-danger">*</span>
+            </label>
            <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
        <div class="form-group col-md-4">
-           <label for="incept_dept_count" class="depnd_title"> No of Dependents at Inception <span
-                   class="text-danger"></span></label>
+            <label for="incept_dept_count" class="depnd_title"> 
+                <span class="depnd_title_text"> No of Dependents at Inception </span>
+                <span class="text-danger">*</span>
+            </label>
            <input value="<?= isset($lead_edit_data['incept_dept_count']) ? $lead_edit_data['incept_dept_count'] : '' ?>" type="text" class="form-control" id="incept_dept_count" name="incept_dept_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
        <div class="form-group col-md-4">
-           <label for="incept_no_of_lives" class="total_title"> Total Lives at Inception <span
-                   class="text-danger"></span></label>
+           <label for="incept_no_of_lives" class="total_title"> 
+                <span class="total_title_text">Total Lives at Inception</span> 
+                <span class="text-danger">*</span>
+           </label>
            <input value="<?= isset($lead_edit_data['incept_no_of_lives']) ? $lead_edit_data['incept_no_of_lives'] : '' ?>" type="text" class="form-control" id="incept_no_of_lives" name="incept_no_of_lives[]"
                placeholder="Enter Lives" required>
        </div>
diff --git a/app/Views/rfq/gpa.php b/app/Views/rfq/gpa.php
index a9c74b6f..344d4b04 100644
--- a/app/Views/rfq/gpa.php
+++ b/app/Views/rfq/gpa.php
@@ -3,12 +3,16 @@
 <div class="form-row" >
 
         <div class="form-group col-md-4">
-            <label for="incept_emp_count" class="emp_title"> No of Employees at Inception  <span class="text-danger">*</span></label>
+            <label for="incept_emp_count" class="emp_title"> 
+                <span class="emp_title_text"> No of Employees at Inception </span>
+                <span class="text-danger">*</span>
+            </label>
             <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]" placeholder="Enter Lives" required>
         </div>
 
         <div class="form-group col-md-4">
-            <label for="total_lives_at_incept" class="total_title"> Total Lives at Inception <span class="text-danger"></span></label>
+            <label for="total_lives_at_incept" class="total_title">
+                <span class="total_title_text"> Total Lives at Inception </span> <span class="text-danger"></span></label>
             <input value="<?= isset($lead_edit_data['total_lives_at_incept']) ? $lead_edit_data['total_lives_at_incept'] : '' ?>" type="text" class="form-control" id="total_lives_at_incept" name="total_lives_at_incept[]" placeholder="Enter Lives" disabled>
         </div>
 
diff --git a/app/Views/rfq/multi_files.php b/app/Views/rfq/multi_files.php
index 09ba89ab..bea6da48 100644
--- a/app/Views/rfq/multi_files.php
+++ b/app/Views/rfq/multi_files.php
@@ -7,7 +7,7 @@ $increment = 1;
     foreach ($lead_edit_data["multi_file_data"] as $index => $value) {
         $isFirstField = ($index === 0);
         $placeholder = $isFirstField ? 'First file must be Demography.' : '';
-        $accept = $isFirstField ? '.xls,.xlsx' : '';
+        $accept = $isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
         $displayIndex = $index + 1;
 ?>
 
diff --git a/app/Views/rto_master_list.php b/app/Views/rto_master_list.php
index f95d688b..b872d8be 100644
--- a/app/Views/rto_master_list.php
+++ b/app/Views/rto_master_list.php
@@ -243,6 +243,30 @@
             console.error(xhr.responseText);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
+            if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
         });
     }
 
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 4f880091..5dc58646 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -231,7 +231,7 @@ th:first-child, td:first-child {
                                     <td><?= $employee['policy_count'] ?></td>
                                     <td>
                                         <div class="btn-group dropdown">
-                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right">
 
                                             <a class="dropdown-item" onclick="get_emp_master_data_for_update(this, '<?= $employee['id'];?>')" ><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
@@ -270,6 +270,7 @@ th:first-child, td:first-child {
                             <th><?php echo format_indian_number($gst_total); ?></th> -->
                             <th></th>
                         </tr> */ ?>
+                        </tr>
                     </tfoot>
                 </table>
             </div>
@@ -636,7 +637,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     $('#email_corporate').val('');
                     $('#mobile').val('');
 
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
             },
             error: function (xhr, status, error) {
@@ -683,7 +684,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     
                     $('.close').click();
 
@@ -698,7 +699,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     window.location.reload();
 
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -715,8 +716,25 @@ document.addEventListener("DOMContentLoaded", function () {
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
-                console.error('Upload error:', error);
+                if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                }else{ toastr.warning('Error uploading file', 'Warning'); }
+
+                // toastr.warning('Error uploading file', 'Warning');
+                // console.error('Upload error:', error);
             },
             complete: function() {
                 $('.loader').fadeOut();
@@ -756,9 +774,9 @@ document.addEventListener("DOMContentLoaded", function () {
     //                     $('.loader-mask').delay(350).fadeOut('slow');
 
     //                     if(res.status == true){
-    //                         toastr.success(res.message, 'SUCCESS');
+    //                         toastr.success(res.message, 'Success');
     //                     }else{
-    //                         toastr.error(res.message, 'ERROR');
+    //                         toastr.error(res.message, 'Error');
     //                     }
     //                 },
     //                 error: function (xhr, status, error) {
@@ -781,7 +799,7 @@ document.addEventListener("DOMContentLoaded", function () {
         })
 
         if(selected.length == 0){
-            toastr.warning('Please select atleast one employee', 'WARNING');
+            toastr.warning('Please select atleast one employee', 'Warning');
             return;
         }
         $('#employee_ids').val(selected);
@@ -1060,12 +1078,12 @@ for (let i = 0; i < selected_count.length; i++) {
             if (response.code === 200) {
                 console.log(`Iteration ${i}: Success - ${response.message}`);
             } else {
-                toastr.error(response.message, 'ERROR');
+                toastr.error(response.message, 'Error');
             }
         },
         error: function(xhr, status, error) {
             console.error('AJAX Error:', error);
-            toastr.error('An error occurred. Please try again.', 'ERROR');
+            toastr.error('An error occurred. Please try again.', 'Error');
         },
         complete: function() {
             // Increment the completed requests counter
@@ -1073,7 +1091,7 @@ for (let i = 0; i < selected_count.length; i++) {
 
             // Check if all AJAX requests have completed
             if (completedRequests === selected_count.length) {
-                toastr.success('All employees have been successfully mapped.', 'SUCCESS');
+                toastr.success('All employees have been successfully mapped.', 'Success');
                 $('#map_emp_modal').modal('hide');
                 window.location.reload();
             }
@@ -1090,7 +1108,7 @@ function unmapEmployees(){
     })
 
     if(selected.length == 0){
-        toastr.warning('Please select atleast one employee', 'WARNING');
+        toastr.warning('Please select atleast one employee', 'Warning');
         return;
     }
 
@@ -1135,10 +1153,10 @@ function unmapEmployees(){
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if (res.status === true) {
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                             window.location.reload();
                         } else {
-                            toastr.error(res.message, 'ERROR');
+                            toastr.error(res.message, 'Error');
                         }
                     },
                     error: function (xhr, status, error) {
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index dde7ad77..d055fe91 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -162,9 +162,10 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
 
                 <div class="form-group col-md-5 ">
                   <label for="mobile">Mobile<span class="text-danger">*</span></label>
-                  <input type="text" class="form-control app-field-grey" id="mobile" placeholder="Enter Mobile Number"
+                  <input type="tel" class="form-control app-field-grey" id="mobile" placeholder="Enter Mobile Number"
                         name="mobile" 
-                        pattern="^[0-9]{10}$" required maxlength="10"
+                        required pattern="[0-9]{10}" maxlength="10" inputmode="numeric"
+                        oninput="this.value=this.value.replace(/[^0-9]/g,'');"
                         title="Please enter a valid 10-digit mobile number">
                 </div>
 
@@ -192,7 +193,6 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
               <input type="email" class="form-control" id="email" 
                      name="email" placeholder="Enter Email"
                      required
-                     pattern="[^@\s]+@[^@\s]+\.[^@\s]+"
                      title="Please enter a valid email address">
             </div>
 
@@ -438,25 +438,25 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
 
         // Validation checks
         if (message.length === 0) {
-          toastr.error('Message cannot be empty', 'Warning');
+          toastr.warning('Message cannot be empty', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (message.length > 1500) {
-          toastr.error('Message cannot exceed 1500 characters', 'Warning');
+          toastr.warning('Message cannot exceed 1500 characters', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (subject.length === 0) {
-          toastr.error('Subject cannot be empty', 'Warning');
+          toastr.warning('Subject cannot be empty', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (subject.length > 150) {
-          toastr.error('Subject cannot exceed 150 characters', 'Warning');
+          toastr.warning('Subject cannot exceed 150 characters', 'Warning');
           form.classList.add('was-validated');
           return;
         }
@@ -506,8 +506,31 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        }else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             },
             complete: function() {
                 btn.disabled = false;
@@ -696,7 +719,7 @@ $(document).ready(function() {
       subjectCounter.textContent = `${subjectLength}/150`;
 
       if (subjectLength > 150) {
-        toastr.error('Subject cannot exceed 150 characters', 'Warning');
+        toastr.warning('Subject cannot exceed 150 characters', 'Warning');
         subjectInput.classList.add('is-invalid');
       } else {
         subjectInput.classList.remove('is-invalid');
@@ -712,7 +735,7 @@ $(document).ready(function() {
       messageCounter.textContent = `${messageLength}/1500`;
 
       if (messageLength > 1500) {
-        toastr.error('Message cannot exceed 1500 characters', 'Warning');
+        toastr.warning('Message cannot exceed 1500 characters', 'Warning');
         messageInput.classList.add('is-invalid');
       } else {
         messageInput.classList.remove('is-invalid');
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 959a1633..194ed82d 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -491,7 +491,7 @@ data-backdrop="static"
             messageCounter.textContent = `${messageLength}/1500`;
 
             if (messageLength > 1500) {
-                toastr.error('Message cannot exceed 1500 characters', 'Warning');
+                toastr.warning('Message cannot exceed 1500 characters', 'Warning');
                 messageInput.classList.add('is-invalid');
             } else {
                 messageInput.classList.remove('is-invalid');
@@ -571,8 +571,31 @@ data-backdrop="static"
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             },
             complete: function() {
                 btn.disabled = false;
@@ -619,8 +642,31 @@ data-backdrop="static"
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'Error');
-                console.error(xhr.responseText);
+                    console.error(xhr.responseText);
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        }else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        }  else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             },
             complete: function() { btn.disabled = false;}
         });
diff --git a/app/Views/ticket_auto_query.php b/app/Views/ticket_auto_query.php
index 7c493e8c..a6651e8d 100644
--- a/app/Views/ticket_auto_query.php
+++ b/app/Views/ticket_auto_query.php
@@ -176,7 +176,7 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     let message = response.message;
-                    toastr.error(message, 'ERROR');
+                    toastr.error(message, 'Error');
                 }
 
                 window.location.reload();
@@ -184,7 +184,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the report page.', 'ERROR');
+                toastr.error('An error occurred while fetching the report page.', 'Error');
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index b21b1345..45eabbc3 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -222,7 +222,7 @@
         var isValid = $('#ticket_form_data').parsley().validate();
 
         if (!isValid) {
-            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
+            toastr.warning('Form validation failed. Please check the required fields.', 'Warning');
             return false;
         }
 
@@ -250,9 +250,9 @@
 
                 if (response.status === true) {
                     location.reload();
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
@@ -264,6 +264,30 @@
                 // Hide loader
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                            toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             }
         });
     }
@@ -378,16 +402,16 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status) {
-                toastr.success(response.message || 'Status updated successfully', 'SUCCESS');
+                toastr.success(response.message || 'Status updated successfully', 'Success');
                 window.location.reload(true);
             } else {
-                toastr.warning(response.message || 'Failed to update status', 'WARNING');
+                toastr.warning(response.message || 'Failed to update status', 'Warning');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while saving docs.', 'ERROR');
+            toastr.error('An error occurred while saving docs.', 'Error');
         });
     }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php
index 07637cf6..d744931e 100644
--- a/app/Views/ticket_form_handler.php
+++ b/app/Views/ticket_form_handler.php
@@ -740,7 +740,7 @@
         var isValid = $('#ticket_form_data').parsley().validate();
 
         if (!isValid) {
-            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
+            toastr.warning('Form validation failed. Please check the required fields.', 'Warning');
             return false;
         }
 
@@ -769,12 +769,16 @@
                 console.log('Form submitted response:', response);
 
             if (response.status === true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
+                window.location.href = '<?= base_url('ticket/list') ?>';
             } else {
-                toastr.error(response.message, 'ERROR');
+                if(response.code == 409){
+                    toastr.warning(response.message, 'Warning');
+                }else{
+                    toastr.error(response.message, 'Error');
+                }
             }
 
-            window.location.href = '<?= base_url('ticket/list') ?>';
         },
         error: function(xhr, status, error) {
             console.error(xhr.responseText);
@@ -783,6 +787,31 @@
                 // Hide loader
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+
+                if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                            toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
             }
         });
     }
@@ -810,12 +839,12 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status) {
-                console.log(response.message, 'SUCCESS');
+                console.log(response.message, 'Success');
                 appendEmployee(response.data, 'search_by_client_employee');
                 setClientAndInsurerData(response.dataForClientAndInsurer);
                 setClientPolicyData(input);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             // Hide loader
@@ -825,7 +854,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
@@ -886,7 +915,7 @@
                 appendACMS(response.acms)
 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
                 appendACMS(response.acms);
                 unSetClientPolicy();
                 unSetClientAndInsurerData()
@@ -898,7 +927,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index fc467dfb..da6b20be 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -386,10 +386,10 @@ function removeClaim(input, ticket_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index e55956db..00db4cb5 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -424,7 +424,7 @@
                             toastr.success('Template saved successfully!', 'Success');
                             location.reload();
                         } else if (res.status == false) {
-                            toastr.error('Failed to Save Data', 'error');
+                            toastr.error('Failed to Save Data', 'Error');
                         }
 
                     },
@@ -434,7 +434,31 @@
                         setTimeout(function() {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.error('Something Wrong!', 'warning');
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+
+                            }else if (xhr.status === 403) {
+                                let response = JSON.parse(xhr.responseText);
+                                toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+
                         }, 1000);
                     }
                 });
@@ -543,7 +567,7 @@
                             });
                         }
                     } else {
-                        toastr.error('Data Not Found', 'error');
+                        toastr.error('Data Not Found', 'Error');
                     }
                 }
                 $('.loader').fadeOut();
@@ -555,7 +579,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Went Wrong!', 'warning');
+                    toastr.warning('Something Went Wrong!', 'Warning');
                 }, 1000);
             }
         });
diff --git a/app/Views/ticket_note.php b/app/Views/ticket_note.php
index 42ccd4ee..97c37331 100644
--- a/app/Views/ticket_note.php
+++ b/app/Views/ticket_note.php
@@ -42,7 +42,7 @@ $(document).ready(function() {
             setTimeout(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Went Wrong!', 'warning');
+                toastr.warning('Something Went Wrong!', 'Warning');
             }, 1000);
         }
     })
@@ -79,17 +79,63 @@ $(document).ready(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                              if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+
+                            } else if (xhr.status === 403) {
+                                let response = JSON.parse(xhr.responseText);
+                                toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
-
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
+                          if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+
+                            } else if (xhr.status === 403) {
+                                let response = JSON.parse(xhr.responseText);
+                                toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
         });
     });
 
diff --git a/app/Views/ticket_reply.php b/app/Views/ticket_reply.php
index d83fcbf8..9a732b39 100644
--- a/app/Views/ticket_reply.php
+++ b/app/Views/ticket_reply.php
@@ -195,7 +195,30 @@ $(document).ready(function() {
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.error('Something Wrong!', 'warning');
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+
+                            } else if (xhr.status === 403) {
+                                let response = JSON.parse(xhr.responseText);
+                                toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
                         }, 1000);
                     }
                 });
diff --git a/app/Views/ticket_reports.php b/app/Views/ticket_reports.php
index 08785950..0cb76b64 100644
--- a/app/Views/ticket_reports.php
+++ b/app/Views/ticket_reports.php
@@ -129,14 +129,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_search.php b/app/Views/ticket_search.php
index e248afb1..ea470c39 100644
--- a/app/Views/ticket_search.php
+++ b/app/Views/ticket_search.php
@@ -259,13 +259,13 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -303,13 +303,13 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     let message = response.message;
-                    toastr.error(message, 'ERROR');
+                    toastr.error(message, 'Error');
                 }
 
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the data.', 'ERROR');
+                toastr.error('An error occurred while fetching the data.', 'Error');
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_type_modal.php b/app/Views/ticket_type_modal.php
index 2e7fdf82..dfac9d56 100644
--- a/app/Views/ticket_type_modal.php
+++ b/app/Views/ticket_type_modal.php
@@ -22,7 +22,7 @@
             <div class="modal-body">
                 <div class="form-row">
                     <div class="form-group col-md-12">
-                        <label for="ticket_type"> Policy Type <span class="text-danger"></span></label>
+                        <label> Policy Type <span class="text-danger"></span></label>
                         <select class="form-control" id="openTicketTypeAskModal">
                             <option value="1">Claim-GMC</option>
                             <option value="2">Claim-GPA</option>
diff --git a/app/Views/tpa_basic_info.php b/app/Views/tpa_basic_info.php
index 9830c520..f258ff2d 100755
--- a/app/Views/tpa_basic_info.php
+++ b/app/Views/tpa_basic_info.php
@@ -327,7 +327,33 @@
                         setTimeout(function() {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            console.log('Something Wrong!', 'warning');                        
+                            console.log('Something Wrong!', 'Warning');                        
+                            // Handle validation errors (CI4)
+                            if (xhr.status === 400) {
+                                let response = JSON.parse(xhr.responseText);
+                                let errorMessages = "";
+                                let seenMessages = []; // Array to store unique messages
+                                if (response.errors) {
+                                    $.each(response.errors, function (field, message) {
+                                        if (!seenMessages.includes(message)) {
+                                            errorMessages += `• ${message}<br>`; 
+                                            seenMessages.push(message); // Mark this message as "seen"
+                                        }
+                                    });
+                                    toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                                } else {
+                                    toastr.warning(response.message || 'Validation failed', 'Warning');
+                                }
+
+                            }else if (xhr.status === 403) {
+                                let response = JSON.parse(xhr.responseText);
+                                toastr.error(response.message, 'Security Policy');
+                            } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                            } else {
+                                    toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                            }
+                
                         }, 1000);
                     }
                 });
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index 4237421b..f8e30273 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -478,7 +478,30 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        } 
                     }, 1000);
                 },
                 complete: function() {
@@ -546,7 +569,7 @@ $(document).ready(function () {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -600,7 +623,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -856,10 +879,10 @@ function removeTPABranch(element) {
                 // console.log(res.status == true);
                     if(res){
                     if (res.status == true) {
-                        toastr.success('TPA branch removed successfully', 'success');
+                        toastr.success('TPA branch removed successfully', 'Success');
                         location.reload();
                     } else {
-                        toastr.warning('Failed to remove TPA branch', 'warning');
+                        toastr.warning('Failed to remove TPA branch', 'Warning');
                     }
                     }
                 },
@@ -868,7 +891,7 @@ function removeTPABranch(element) {
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Failed to remove TPA branch', 'warning');
+                    toastr.warning('Failed to remove TPA branch', 'Warning');
                 }
             });
         }
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index bec11d92..4f606a9f 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -314,10 +314,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('TPA removed successfully', 'success');
+                toastr.success('TPA removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove TPA', 'warning');
+                toastr.warning('Failed to remove TPA', 'Warning');
               }
             }
           },
@@ -326,7 +326,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove TPA', 'warning');
+            toastr.warning('Failed to remove TPA', 'Warning');
           }
         });
       }
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index 9c5edb72..902517c3 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -90,7 +90,7 @@
 
         if (check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the TPA!', 'warning', {
+            toastr.warning('First Add the TPA!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 144df61f..207af9b1 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -899,7 +899,7 @@
                 appendPolicies(response.data)
 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
diff --git a/app/Views/vehicle_details.php b/app/Views/vehicle_details.php
index df98d9d2..466795de 100644
--- a/app/Views/vehicle_details.php
+++ b/app/Views/vehicle_details.php
@@ -222,7 +222,7 @@ $(document).ready(function() {
                             $.each(res.data, function(index, item) {
                                 var row = `<tr>
                                                 <td> ${item.file_name}</td>
-                                                <td id="form_${item.id}" style=""><form class="ajax" ><input class="file-input__input" type="file" name="file_name">
+                                                <td id="form_${item.id}" style=""><form class="ajax" ><input class="file-input__input" type="file" name="file_name" accept=".jpg,.jpeg,.png">
                                                     <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
                                                     <input type="hidden" class="form-control" value="${item.id}" name="kyc_doc_type_id" />
                                                     <input type="hidden" name="client_id" id="id_for_kyc_file" value="${client_id_for_file}"/>
@@ -247,13 +247,33 @@ $(document).ready(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     $submitButton.prop('disabled', false);
-                    if (xhr.status === 404) {
+                    if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                    } else if (xhr.status === 403) {
+                        let response = JSON.parse(xhr.responseText);
+                        toastr.error(response.message, 'Security Policy');
+                    } else if (xhr.status === 404) {
                         toastr.warning('Resource not found', 'Warning');
                     } else if (xhr.status === 500) {
-                        toastr.warning('Internal server error', 'Warning');
+                        toastr.error('Something went wrong . Please try again later.', 'Server Error');
                     } else {
-                        toastr.warning('Unknown error occurred', 'Warning');
+                        toastr.error('An unexpected error occurred. Please try again later.', 'Error');
                     }
+                    
                 }, 1000);
             }
         });
@@ -386,7 +406,7 @@ $('#cost_center').change(function() {
 
             console.log(res)
             if (res.status == true) {
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cost_center').val('');
             }
         },
diff --git a/app/Views/vehicle_docs.php b/app/Views/vehicle_docs.php
index 07081588..5409ce0a 100644
--- a/app/Views/vehicle_docs.php
+++ b/app/Views/vehicle_docs.php
@@ -102,10 +102,10 @@ $("#vehicle_file_upload_form").submit(function(event) {
             console.log(res);
 
             if(res.status == true){
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 appendVehicleFileTableBody(res.vehicle_docs);
             }else{
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
             }
 
             $('#vehicle_file_upload_form')[0].reset();
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index f4b29f8e..9ddf3e56 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -636,10 +636,10 @@ function removeVehicleMasterData(element) {
                     // console.log(res.status == true);
                     if (res) {
                         if (res.status == true) {
-                            toastr.success('Vehicle Data removed successfully.', 'success');
+                            toastr.success('Vehicle Data removed successfully.', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove Vehicle Data.', 'warning');
+                            toastr.warning('Failed to remove Vehicle Data.', 'Warning');
                         }
                     }
                 },
@@ -648,7 +648,7 @@ function removeVehicleMasterData(element) {
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    console.log('Something Wrong!', 'warning');
+                    console.log('Something Wrong!', 'Warning');
                 }
             });
         }
@@ -787,6 +787,30 @@ $("#vehicle_form").submit(function(event) {
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
         }
     });
 });
diff --git a/app/Views/vehicle_type_list.php b/app/Views/vehicle_type_list.php
index 4c7bbb09..8927d756 100644
--- a/app/Views/vehicle_type_list.php
+++ b/app/Views/vehicle_type_list.php
@@ -581,7 +581,7 @@
                             <div class="form-group col-md-5">
                                 <label for="incentive_file_name">Upload File</label>
                                 <div class="input-icon">
-                                    <input type="file" class="form-control" name="incentive_file_name" id="incentive_file_name" required>
+                                    <input type="file" class="form-control" name="incentive_file_name" id="incentive_file_name" accept=".jpg,.jpeg,.png" required>
                                     <i class="mdi mdi-upload additional-icon"></i>
                                 </div>
                             </div>
@@ -982,7 +982,7 @@
                     var student_id = $(this).attr('data-id');
                     $.get('<?php echo base_url('user/deactive/');?>'+student_id, function (data) {
                         console.log(data);
-                        toastr.success('User removed successfully', 'success');
+                        toastr.success('User removed successfully', 'Success');
                         window.location.reload()
                     })
                 }
diff --git a/app/Views/vehicle_type_master_list.php b/app/Views/vehicle_type_master_list.php
index a2001b8c..b06382b7 100755
--- a/app/Views/vehicle_type_master_list.php
+++ b/app/Views/vehicle_type_master_list.php
@@ -222,6 +222,30 @@
             console.error(xhr.responseText);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
+                        if (xhr.status === 400) {
+                            let response = JSON.parse(xhr.responseText);
+                            let errorMessages = "";
+                            let seenMessages = []; // Array to store unique messages
+                            if (response.errors) {
+                                $.each(response.errors, function (field, message) {
+                                    if (!seenMessages.includes(message)) {
+                                        errorMessages += `• ${message}<br>`; 
+                                        seenMessages.push(message); // Mark this message as "seen"
+                                    }
+                                });
+                                toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                            } else {
+                                toastr.warning(response.message || 'Validation failed', 'Warning');
+                            }
+
+                        } else if (xhr.status === 403) {
+                            let response = JSON.parse(xhr.responseText);
+                            toastr.error(response.message, 'Security Policy');
+                        } else if (xhr.status === 500) {
+                                toastr.error('Something went wrong . Please try again later.', 'Server Error');
+                        } else {
+                                toastr.error('An unexpected error occurred. Please try again later.', 'Error');
+                        }
         });
     }
 
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 63c66276..79cf9a97 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -1059,7 +1059,7 @@
                 <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
-                 <div style='max-height: 400px; overflow-y: auto; margin-bottom: 30px;'>
+                 <div style='max-height: 400px; overflow-y: auto; margin-bottom: 30px;' id="demography_modal_body">
                     <?php 
                         if(isset($demogrphy_html_data) && !empty($demogrphy_html_data)){
                             echo $demogrphy_html_data;
@@ -2037,7 +2037,7 @@ rfqTable.addEventListener('click', function(e) {
         Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the row?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -2934,7 +2934,7 @@ function removeProposal(event) {
     Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the Proposal?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -2995,7 +2995,7 @@ function removeInsurer(event) {
      Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the insurer?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -3212,7 +3212,7 @@ function changeInsurer(event) {
     console.log('proposel Name', proposal_name);
 
     if(proposal_name == null || proposal_name == ""){
-        toastr.warning("Could not change the insurer", "WARNING")
+        toastr.warning("Could not change the insurer", "Warning")
         return;
     }
 
@@ -3349,7 +3349,7 @@ function changeInsurerData(event, newInsurerName, dataId){
 
 
     }else{
-        toastr.warning("Could not change the insurer", "WARNING")
+        toastr.warning("Could not change the insurer", "Warning")
         return;
     }
 }
@@ -4276,7 +4276,7 @@ function constructURL(url_type) {
         if (validationStatus){
             constructURL_ForInsurerAndClientMailSend();
         }else{
-            toastr.error("All Client Mail ID's Should Contain Same Domain","ERROR");
+            toastr.error("All Client Mail ID's Should Contain Same Domain","Error");
         }
     }else if(url_type == 2){ 
         constructURL_ForInternalMailSend()
@@ -4555,17 +4555,17 @@ function ajaxRequest(formData) {
             $('.loader-mask').delay(350).fadeOut('slow');
 
             console.log(res);
-            if (res.status == 'success' && res.code == 200) {
-                toastr.success('Mail sent Successfully', 'SUCCESS')
+            if (res.status == 'Success' && res.code == 200) {
+                toastr.success('Mail sent Successfully', 'Success')
                 if(res.is_placement == true){
                     clearInterval(intervalId);
                     console.log('******** Intervel Cleared ********')
                 }
             } else {
                 if (res.messgae) {
-                    toastr.error(res.messgae, 'ERROR')
+                    toastr.error(res.messgae, 'Error')
                 } else {
-                    toastr.error('Mail send failed', 'ERROR')
+                    toastr.error('Mail send failed', 'Error')
                 }
             }
 
@@ -4622,7 +4622,7 @@ function getInsurerBranchContacts(input){
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
             if(res.status == false){
-                toastr.warning(res.message, 'WARNING')
+                toastr.warning(res.message, 'Warning')
             }else{
                 appendInsurerContact(res.data)
             }
@@ -4798,7 +4798,7 @@ function getMailContent(id){
            console.log(response);
            $('#'+id).val(response.data)
         } else {
-            toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+            toastr.error(response.message || 'Unable to fetch data', 'Error');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);
@@ -4872,7 +4872,7 @@ function checkTheTableDataChanged(redirect_type, url){
             //PLACEMENT MAIL SEND
             showModal(3);
             // if(demography_file_status == "failed"){
-            //     toastr.warning('Member Demography file validation failed. Please re-upload', 'WARNING');
+            //     toastr.warning('Member Demography file validation failed. Please re-upload', 'Warning');
             // }else{
             //     showModal(3);
             // }
@@ -6416,14 +6416,14 @@ function appendMultiFileData(data) {
 
             if (response.status == true) {
                 if(input == 1){
-                    console.log(response.message, 'SUCCESS');
+                    console.log(response.message, 'Success');
                     showTinyToast();
                 }else{
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 }
                 $('#rfq_primaryKey').val(response.id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             if(input != 1){
@@ -6494,9 +6494,9 @@ function appendMultiFileData(data) {
                 console.log('Data sent successfully:', response);
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
 
                 window.location.href = '<?= base_url('rfq/list/') ?>' + lead_id + '/' + 2;
@@ -7017,7 +7017,7 @@ function appendMultiFileData(data) {
                            console.log('Data fetched successfully:', response);
 
                            if (response.status === true) {
-                               toastr.success(response.message, 'SUCCESS');
+                               toastr.success(response.message, 'Success');
                                $("#no_of_installment").closest('.form-group').hide();
                                $('#no_of_installment').val("");
                                $('#installment_form_row').empty();
@@ -7044,7 +7044,7 @@ function appendMultiFileData(data) {
                                     dateFormat: 'd-m-Y',
                                 });
                            } else {
-                               toastr.error(response.message, 'WARNING');
+                               toastr.error(response.message, 'Warning');
                            }
 
                            $('.loader').fadeOut();
@@ -7055,7 +7055,7 @@ function appendMultiFileData(data) {
                            $('.loader-mask').delay(350).fadeOut('slow');
                            console.error('Error fetching data:', error);
                            console.error(xhr.responseText);
-                           toastr.error('An error occurred while removing the installment.', 'ERROR');
+                           toastr.error('An error occurred while removing the installment.', 'Error');
                        });
                    }else{
                        // alert("Inside else");
@@ -7174,14 +7174,14 @@ function appendMultiFileData(data) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             $this.closest('.form-row').remove();
                             let updated_row_count = $('#installment_form_row .form-row').length;
                             $('#no_of_installment').val(updated_row_count);
                             console.log("after remove row_count", updated_row_count);
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -7192,7 +7192,7 @@ function appendMultiFileData(data) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while removing the installment.', 'ERROR');
+                        toastr.error('An error occurred while removing the installment.', 'Error');
                     });
                 }
             });
@@ -7255,10 +7255,10 @@ function appendMultiFileData(data) {
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $installmentContainer.find('.form-row').slice(-remove_count).remove();
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -7269,7 +7269,7 @@ function appendMultiFileData(data) {
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         $('#no_of_installment').val(row_count);
@@ -7302,11 +7302,11 @@ function appendMultiFileData(data) {
         }, 2000)
     })
 
-    function viewDemography(){
-        // Show the modal
-        const myModal = new bootstrap.Modal(document.getElementById('view_demography_modal'));
-        myModal.show();
-    }
+    // function viewDemography(){
+    //     // Show the modal
+    //     const myModal = new bootstrap.Modal(document.getElementById('view_demography_modal'));
+    //     myModal.show();
+    // }
 
     function viewDocs(){
         // Show the modal
@@ -7345,7 +7345,7 @@ function appendMultiFileData(data) {
         
         let isFirstField = container.childElementCount === 0; // Check if it's the first field
         let placeholder = isFirstField ? 'First file must be Demography.' : '';
-        let accept = isFirstField ? '.xls,.xlsx' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
 
         
         if(isFirstField == 1){
@@ -7381,7 +7381,7 @@ function appendMultiFileData(data) {
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
-            toastr.warning("You can't remove the first file field", 'WARNING');
+            toastr.warning("You can't remove the first file field", 'Warning');
             return false;
         }
 
@@ -7413,7 +7413,7 @@ function appendMultiFileData(data) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status == true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             //remove the file field
                             const field = document.getElementById(`fileField_${index}`);
@@ -7422,7 +7422,7 @@ function appendMultiFileData(data) {
                             }
                             
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -7433,7 +7433,7 @@ function appendMultiFileData(data) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                        toastr.error('An error occurred while checking the CD amount.', 'Error');
                     });
 
                 }else{
@@ -7480,14 +7480,14 @@ function appendMultiFileData(data) {
                 console.log('uploadMultiFileFromRfq reponse', res);
 
                 if(res.status == true){
-                    toastr.success(res.message, 'SUCCESS');
+                    toastr.success(res.message, 'Success');
                     $('#multiFileAppendArea').empty();
                     $('.attachmet_row').empty();
                     $('#multiFileAppendArea').append(res.document_data);
                     $('.attachmet_row').html(res.attachment_html);
                     window.location.reload();
                 }else{
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
 
                 // Hide loader
@@ -7562,10 +7562,10 @@ function appendMultiFileData(data) {
         sendAjaxRequestForGlobal(url, 'POST', requestData, function(res) {
 
             if (res.status == true) {
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 checkMemberDataValidationStatus(res.lead_id)
             } else {
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
                 // Hide loader
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
@@ -7575,7 +7575,7 @@ function appendMultiFileData(data) {
             clearInterval(interval);
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while validation.', 'ERROR');
+            toastr.error('An error occurred while validation.', 'Error');
             console.error("❌ Error checking validation status:", err);
             // Hide loader
             $('.loader').fadeOut();
@@ -7609,10 +7609,10 @@ function appendMultiFileData(data) {
                 if (res.code === 200 && res.data.status != "pending") {
 
                     clearInterval(interval); // stop checking
-                    if(res.data.status == 'success'){
-                        toastr.success("✅ Validation Completed status : " + res.data.status, 'SUCCESS');
+                    if(res.data.status == 'Success'){
+                        toastr.success("✅ Validation Completed status : " + res.data.status, 'Success');
                     }else{
-                        toastr.warning("✅ Validation Completed status : " + res.data.status, 'WARNING');
+                        toastr.warning("✅ Validation Completed status : " + res.data.status, 'Warning');
                     }
 
                     window.location.reload();
@@ -7633,7 +7633,7 @@ function appendMultiFileData(data) {
                 clearInterval(interval);
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while validation.', 'ERROR');
+                toastr.error('An error occurred while validation.', 'Error');
                 console.error("❌ Error checking validation status:", err);
                 // Hide loader
                 $('.loader').fadeOut();
@@ -7643,6 +7643,63 @@ function appendMultiFileData(data) {
         }, 2000); // check every 2 seconds
     }
 
+    function viewDemography() {
+
+        let lead_id = $('#lead_id').val();
+        console.log('lead_id ', lead_id);
+
+        if (!lead_id) {
+            console.error("Lead ID is required");
+            return;
+        }
+
+        let url = '<?= base_url('util/generateDemographyDataTable') ?>';
+
+        // Data to send in the AJAX request
+        let requestData = {
+            lead_id: lead_id,
+        };
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        // Send AJAX request
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(res) {
+
+            $('#demography_modal_body').empty();
+
+            if (res.status) {
+                $('#demography_modal_body').append(res.data);
+            } else {
+                $('#demography_modal_body').append("<p style='text-align: center; color: #6c757d; font-style: italic;'>No Demography Data Found or Wrong File</p>")
+            }
+
+            // Show the modal
+            const myModal = new bootstrap.Modal(document.getElementById('view_demography_modal'));
+            myModal.show();
+
+            // Hide loader
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+
+        }, function(xhr, status, error) {
+            $('#demography_modal_body').append("<p style='text-align: center; color: #6c757d; font-style: italic;'>No Demography Data Found or Wrong File</p>")
+            
+            // Show the modal
+            const myModal = new bootstrap.Modal(document.getElementById('view_demography_modal'));
+            myModal.show();
+
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            // toastr.error('An error occurred while fetching demography.', 'Error');
+            // Hide loader
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        });
+
+    }
+
     function toggleButtons(status) {
         if (status === "failed") {
             $("#send_mail_btn").hide();
@@ -7658,4 +7715,6 @@ function appendMultiFileData(data) {
         this.value = (v < 0) ? 0 : (v > 100 ? 100 : v);
     });
 
+              
+
 </script>
\ No newline at end of file
diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index a1292e11..e55ed4a2 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -2992,7 +2992,7 @@
         // Save all tables' data to localStorage
         localStorage.setItem('allTablesJsonData', JSON.stringify(allTablesData));
         // // console.log('All tables data saved:', allTablesData);
-        // toastr.success("RFQ Saved Successfully", "SUCCESS");
+        // toastr.success("RFQ Saved Successfully", "Success");
         // If needed, reconstruct tables from JSON (implement jsonToTable accordingly)
 
         return allTablesData;
@@ -5048,16 +5048,16 @@
 
                 // // console.log(res);
                 if (res.status == 'success' && res.code == 200) {
-                    toastr.success('Mail send Successfully', 'SUCCESS');
+                    toastr.success('Mail send Successfully', 'Success');
                     if(res.is_placement == true){
                         clearInterval(intervalId);
                         console.log('******** Intervel Cleared ********')
                     }
                 } else {
                     if (res.messgae) {
-                        toastr.error(res.messgae, 'ERROR')
+                        toastr.error(res.messgae, 'Error')
                     } else {
-                        toastr.error('Mail send failed', 'ERROR')
+                        toastr.error('Mail send failed', 'Error')
                     }
                 }
 
@@ -5113,7 +5113,7 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 if (res.status == false) {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 } else {
                     appendInsurerContact(res.data)
                 }
@@ -5490,7 +5490,7 @@
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $("#no_of_installment").hide();
                                 $("#payment_date").show();
                                 $("#utr_no").show();
@@ -5515,7 +5515,7 @@
                                     dateFormat: 'd-m-Y',
                                 });
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -5526,7 +5526,7 @@
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         // alert("Inside else");
@@ -5592,10 +5592,10 @@
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $installmentContainer.find('.form-row').slice(-remove_count).remove();
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -5606,7 +5606,7 @@
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         $('#no_of_installment').val(row_count);
@@ -5704,14 +5704,14 @@
                         console.log('Data fetched successfully:', response);
 
                         if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             $this.closest('.form-row').remove();
                             let updated_row_count = $('#installment_form_row .form-row').length;
                             $('#no_of_installment').val(updated_row_count);
                             console.log("after remove row_count", updated_row_count);
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -5722,7 +5722,7 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while removing the installment.', 'ERROR');
+                        toastr.error('An error occurred while removing the installment.', 'Error');
                     });
                 }
             });
diff --git a/app/Views/view_rfq_non_eb_new.php b/app/Views/view_rfq_non_eb_new.php
index f2293ebb..abc4f3ad 100644
--- a/app/Views/view_rfq_non_eb_new.php
+++ b/app/Views/view_rfq_non_eb_new.php
@@ -3271,7 +3271,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
     }
 
diff --git a/public/assets/.htaccess b/public/assets/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/assets/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>
diff --git a/public/assets/1.pdf b/public/assets/1.pdf
new file mode 100644
index 00000000..dbc6ff1d
Binary files /dev/null and b/public/assets/1.pdf differ
diff --git a/public/assets/1.php b/public/assets/1.php
new file mode 100644
index 00000000..45b4d3b0
--- /dev/null
+++ b/public/assets/1.php
@@ -0,0 +1,4 @@
+<?php
+
+echo 'Hi';
+?>
diff --git a/public/claim_sample_forms/.htaccess b/public/claim_sample_forms/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/claim_sample_forms/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>
diff --git a/public/e_card_imgs/.htaccess b/public/e_card_imgs/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/e_card_imgs/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>
diff --git a/public/sample_excel/.htaccess b/public/sample_excel/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/sample_excel/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>
diff --git a/public/sample_excel/1.pdf b/public/sample_excel/1.pdf
new file mode 100644
index 00000000..dbc6ff1d
Binary files /dev/null and b/public/sample_excel/1.pdf differ
diff --git a/public/sample_excel/1.php b/public/sample_excel/1.php
new file mode 100644
index 00000000..45b4d3b0
--- /dev/null
+++ b/public/sample_excel/1.php
@@ -0,0 +1,4 @@
+<?php
+
+echo 'Hi';
+?>
diff --git a/public/sample_excel/sample_claim_dump_upload_excel.xlsx b/public/sample_excel/sample_claim_dump_upload_excel.xlsx
new file mode 100644
index 00000000..93b0d758
Binary files /dev/null and b/public/sample_excel/sample_claim_dump_upload_excel.xlsx differ
diff --git a/public/sample_import_excel/.htaccess b/public/sample_import_excel/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/sample_import_excel/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>
diff --git a/public/writable/.htaccess b/public/writable/.htaccess
new file mode 100644
index 00000000..13e218d0
--- /dev/null
+++ b/public/writable/.htaccess
@@ -0,0 +1,25 @@
+# ===============================
+# ABSOLUTE SCRIPT EXECUTION BLOCK
+# ===============================
+
+# Disable CGI
+Options -ExecCGI
+
+# Disable PHP for mod_php / LiteSpeed
+<IfModule mod_php.c>
+    php_flag engine off
+</IfModule>
+
+<IfModule lsapi_module>
+    php_flag engine off
+</IfModule>
+
+# Block any script file access
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar|pl|py|cgi|asp|aspx|jsp|sh|rb)$">
+    Require all denied
+</FilesMatch>
+
+# Block double extensions
+<FilesMatch "\.(php|php5|php7|php8|phtml|phar)\.">
+    Require all denied
+</FilesMatch>