MERGE_LIVE_API_RATE_LIMIT_&OT_ISSUES

.env.sample

@@ -183,3 +183,5 @@ CORS_MAX_AGE=7200
 CORS_DEBUG=true
 
 APP_SIGNATURE = 
+TOKENTIMEOUT = 
+JWT_SECRET =

app/Config/Acl.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Config;
+
+class Acl
+{
+    public array $rules = [
+
+        // ===================== PUBLIC / AUTH =====================
+        '#^/login#' => ['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]],
+
+        // ===================== PUBLIC DOWNLOADS / FORMS =====================
+        '#^/download-#' => ['public' => true],
+        '#^/claim-form-download#' => ['public' => true],
+        '#^/claims-feedback-form#' => ['public' => true],
+        '#^/autobookstackLogin#' => ['public' => true],
+
+        // ===================== DASHBOARD =====================
+        '#^/dashboard#' => [
+            'roles' => [ HEAD_ROLE_ID,ADMIN_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' => []
+        ],
+
+        // ===================== 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],
+        // ===================== CLI =====================
+        '#^/cli/#' => ['public' => true],
+
+        // ===================== DEFAULT DENY (ZERO TRUST) =====================
+        '#^/#' => [
+            'roles' => [ADMIN_ROLE_ID],
+            'teams' => []
+        ],
+    ];
+}

app/Config/Filters.php

@@ -16,6 +16,14 @@ use App\Filters\VerifyAppSignature;
 
 use App\Filters\AuthJWT;
 use App\Filters\Cors;
+use App\Filters\GlobalPostFileUploadGuard;
+use App\Filters\SecurityInputFilter;
+use App\Filters\AclFilter;
+use App\Filters\RateLimitFilter;
+use App\Filters\JwtApiRateLimitFilter;
+use App\Filters\AuthApiRateLimitFilter;
+
+
 
 class Filters extends BaseConfig
 {
@@ -39,6 +47,12 @@ class Filters extends BaseConfig
         'CloseDbConnection' => CloseDbConnection::class,
         'Cors'        => Cors::class,
         'appSignature'       => VerifyAppSignature::class,
+        'GlobalPostFileUploadGuard'       => GlobalPostFileUploadGuard::class,
+        'SecurityInputFilter'       => SecurityInputFilter::class,
+        'AclFilter'       => AclFilter::class,
+        'ratelimit' => RateLimitFilter::class,
+        'AuthApiRateLimitFilter' => AuthApiRateLimitFilter::class,
+        'JwtApiRateLimitFilter' => JwtApiRateLimitFilter::class,
         
     ];
 
@@ -52,8 +66,10 @@ class Filters extends BaseConfig
     public array $globals = [
         'before' => [
             'HttpRequestLog' => ['except' => 'cli/*'],
+            'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','/employeeRest/*','processjob', 'getPreEmployeePolicyCount']],
             'Cors',
-            // 'csrf',
+            'SecurityInputFilter' => ['except' => ['/client/notification/create','test_mail'] ],
+            'GlobalPostFileUploadGuard',
             // 'invalidchars',
         ],
         'after' => [

app/Config/RateLimiter.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class RateLimiter extends BaseConfig
+{
+    /*
+    |--------------------------------------------------------------------------
+    | JWT / Authenticated API Routes
+    |--------------------------------------------------------------------------
+    */
+    public array $jwtApi = [
+        'limit'          => 60,      // max requests
+        'window'         => 60,      // window in seconds
+        'violation_soft' => 3,       // violations before soft block
+    ];
+
+    /*
+    |--------------------------------------------------------------------------
+    | Auth API Routes (verifyMobile, verifyOTP, etc.)
+    |--------------------------------------------------------------------------
+    */
+    public array $authApi = [
+        'limit'          => 10,      // max requests per window
+        'window'         => 180,     // window in seconds (3 min)
+        'violation_soft' => 3,       // failed attempts before soft block
+    ];
+
+    /*
+    |--------------------------------------------------------------------------
+    | User-Level Progressive Block Durations (seconds)
+    | 0 = permanent until manual unblock
+    |--------------------------------------------------------------------------
+    */
+    public array $userBlock = [
+        'soft_duration'   => 0,        // permanent, manual unblock only
+        'medium_duration' => 7200,     // 2 hours
+        'hard_duration'   => 86400,    // 24 hours
+        // attempts while at a block level before escalating to next
+        'medium_trigger'  => 1,        // attempts during soft   → medium
+        'hard_trigger'    => 1,        // attempts during medium → hard
+    ];
+
+    /*
+    |--------------------------------------------------------------------------
+    | IP-Level Throttle & Progressive Block (independent of user)
+    |--------------------------------------------------------------------------
+    */
+    public array $ipBlock = [
+        'limit'           => 120,      // max requests per window
+        'window'          => 60,       // window in seconds
+        'violation_soft'  => 5,        // violations before soft block
+        'soft_duration'   => 0,        // permanent, manual unblock only
+        'medium_duration' => 7200,     // 2 hours
+        'hard_duration'   => 86400,    // 24 hours
+        'medium_trigger'  => 1,        // attempts during soft   → medium
+        'hard_trigger'    => 1,        // attempts during medium → hard
+    ];
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Key Prefixes
+    |--------------------------------------------------------------------------
+    */
+    public array $cacheKeys = [
+        'ip_count'        => 'rl_ip_count_',
+        'ip_violations'   => 'rl_ip_viol_',
+        'ip_block'        => 'rl_ip_block_',
+        'ip_block_hits'   => 'rl_ip_blkhit_',
+        'user_count'      => 'rl_usr_count_',
+        'user_violations' => 'rl_usr_viol_',
+        'user_block'      => 'rl_usr_block_',
+        'user_block_hits' => 'rl_usr_blkhit_',
+    ];
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTP Status Codes per block level
+    |--------------------------------------------------------------------------
+    */
+    public array $statusCodes = [
+        'throttle'  => 429,
+        'soft'      => 429,
+        'medium'    => 403,
+        'hard'      => 451,
+    ];
+}

app/Config/Routes.php

@@ -442,7 +442,7 @@ $routes->cli('cli/check_env', 'MasterController::checkEnv');
 
 
 
-$routes->group("/api", ["filter" => "authJWT"], function ($routes) {
+$routes->group("/api", ["filter" => [ 'ratelimit'  , 'authJWT' ] ], function ($routes) {
     $routes->post("logined", "RestAuthenticationController::logined");
     $routes->post("getId", "RestAuthenticationController::getUserIdFromToken");
 });
@@ -453,8 +453,10 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 
 // $routes->post("employeeRest/createOrUpdateEmployeePolicySiAmount", "EmployeeRestController::createOrUpdateEmployeePolicySiAmount");
 // $routes->post("employeeRest/calculatePremium", "EmployeeRestController::calculatePremium");
+ // $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
+$routes->group("employeeRest", ['filter' => [ 'GlobalPostFileUploadGuard', 'appSignature' , 'authJWT','JwtApiRateLimitFilter' ] ], function ($routes) {
 
-$routes->group("employeeRest", ['filter' => ['appSignature' , 'authJWT'] ], function ($routes) {
+    $routes->post('logout', 'RestAuthenticationController::logout');
 
     // $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
 
@@ -501,10 +503,11 @@ $routes->group("employeeRest", ['filter' => ['appSignature' , 'authJWT'] ], func
     $routes->post("hrFileUpload", "EmployeeRestController::hrFileUpload");
 
     $routes->get("copyActiveEmployeeAndDependentDetails", "EmployeeRestController::copyActiveEmployeeAndDependentDetails");
+    $routes->get("getExcelFileErrors/(:any)", "EmployeeController::getExcelFileErrors/$1");
 
 });
 
-$routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($routes) {
+$routes->group("employeeRest", ['filter' => ['appSignature','AuthApiRateLimitFilter'] ], function ($routes) {
 
     //Employee login api's
     $routes->post("verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
@@ -537,7 +540,7 @@ $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($route
 
 });
 
-$routes->post("getPreEmployeePolicyCount","EmployeeRestController::getPreEmployeePolicyCount", ['filter' => ['appSignature']]);
+$routes->post("getPreEmployeePolicyCount","EmployeeRestController::getPreEmployeePolicyCount", ['filter' => ['ratelimit','appSignature']]);
 
 $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
 $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification");
@@ -549,7 +552,7 @@ $routes->get("getBackToEnrolledDetails", "EmployeeRestController::getBackToEnrol
 //crone job
 $routes->cli('cli/enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus');
 $routes->cli("cli/sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail");
-
+$routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
 $routes->get('enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus');
 $routes->get("sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail");
 // $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");

app/Config/Services.php

@@ -8,6 +8,7 @@ use App\Libraries\MyLogger;
 use App\Libraries\GmailAPI;
 use App\Libraries\MyGoogleDrive;
 use App\Libraries\DataServiceSqlite;
+use App\Libraries\RateLimiterService;
 use App\Controllers\Home;
 
 /**
@@ -81,4 +82,13 @@ class Services extends BaseService
           return new MyGoogleDrive();
       }
 
+      public static function limiter($getShared = true)
+      {
+          if ($getShared) {
+              return static::getSharedInstance('limiter');
+          }
+          
+          return new RateLimiterService();
+      }
+     
 }

app/Controllers/EmployeeController.php

@@ -179,8 +179,15 @@ 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 = [])
     {   
+        if(empty($post_data)){
+            $post_data = $this->request->getPost();
+            $post_data = array_merge($post_data, $this->request->getFiles());
+            $is_post_request = true;
+        }else{
+            $is_post_request = false;
+        }
 
         // $empDataServiceController = new EmpDataServiceController();
         // !dd($empDataServiceController->importInceptionUpdateTPAandUHID(['file_id' => 79]));
@@ -233,11 +240,93 @@ class EmployeeController extends AdminController
         // $this->truncateFileData(747, 5) ;
         // print_rr($this->cloneWorksheet());
         // die();
-        if ($this->request->getMethod() == 'post') {
+
+        // old
+        // if ($this->request->getMethod() == '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');
+        //                 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');
+                        
+        //             } 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);
+        //     }
+
+        //     //process post variable entry in file table
+        //     $loggedInUserID = get_session_userid();
+        //     // dd($loggedInUserID);
+        //     // $loggedInUserID = 8;
+
+        //     $client_id = $this->request->getPost('client_id');
+        //     $policy_id = $this->request->getPost('policy_id');
+        //     $branch_id = $this->request->getPost('branch_id');
+        //     $enrollment_open_date = $this->request->getPost('enrollment_open_date');
+        //     $enrollment_close_date = $this->request->getPost('enrollment_close_date');
+        //     $action = $this->request->getPost('upload-action-type');
+        //     $status = 'inprogress';
+
+        //     $enrollment_open_date = change_date_format($enrollment_open_date, 'd/m/Y', 'Y-m-d');
+        //     $enrollment_close_date = change_date_format($enrollment_close_date, 'd/m/Y', 'Y-m-d');
+
+        //     $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, 'enrollment_open_date' => $enrollment_open_date, 'enrollment_close_date' => $enrollment_close_date]); //here field policy_id have client_policy_id and not policy id from policy master
+        //     $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]);
+
+        //     //start validation process
+        //     if($fileSize < 1) // if file size less than 1
+        //     {
+        //         $empServiceController = new EmployeeServiceController();
+        //         $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]);
+        //         $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);
+        //         }
+        //     }
+        //     else //if file size greater than 1 add the file as job
+        //     {
+        //         $job_details  = new Jobs();
+        //         $r = Jobs::addJob(['job_name' => 'excelFileFormatValidation','payload' => ['file_id' => $file_id]]);
+        //         $this->myLogger->logme("error", '{file_id} is greather than 1MB, validating with job queue', ['file_id' => $file_id]);
+        //     }
+
+        //     return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
+        // }
+
+        if (!empty($post_data) || $this->request->is('post') == 'post') {
 
             //validate uploaded file
             $filename = '';
             $fileSize = '';
+
+            if (empty($post_data)) {
                 $validated = $this->validate([
                     'emplist' => [
                         'uploaded[emplist]',
@@ -245,14 +334,21 @@ class EmployeeController extends AdminController
                         'max_size[emplist,16384]',
                     ],
                 ]);
+            } else {
+                $validated = validateExcelFile($post_data['emplist']);
+            }
 
-            if ($validated) 
+            if ($validated) {
-            {
+
-                    $avatar = $this->request->getFile('emplist');
+                $avatar = isset($post_data['emplist']) ? $post_data['emplist'] : $this->request->getFile('emplist');
                 if (!$avatar) {
                     $this->myLogger->logme("error", 'File not found');
+                    if (!$is_post_request) {
+                        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) {
@@ -261,33 +357,48 @@ class EmployeeController extends AdminController
                     $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 (!$is_post_request) {
+                        return ['status' => false, 'message' => 'File move failed'];
+                    } else {
                         return $this->respond(['dataStatus' => false, 'code' => 500, 'message' => 'File move failed'], 500);
                     }
+                }
             } else {
                 $this->myLogger->logme("error", 'Upload failed Invalid file');
+                if (!$is_post_request) {
+                    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();
+            $loggedInUserID = $post_data['created_by'] ?? get_session_userid();
-            // dd($loggedInUserID);
-            // $loggedInUserID = 8;
 
-            $client_id = $this->request->getPost('client_id');
+            // $client_id             = isset($post_data['client_id']) ? $post_data['client_id'] : $this->request->getPost('client_id');
-            $policy_id = $this->request->getPost('policy_id');
+            // $policy_id             = isset($post_data['policy_id']) ? $post_data['policy_id'] : $this->request->getPost('policy_id');
-            $branch_id = $this->request->getPost('branch_id');
+            // $branch_id             = isset($post_data['client_branch_id']) ? $post_data['client_branch_id'] : $this->request->getPost('branch_id');
-            $enrollment_open_date = $this->request->getPost('enrollment_open_date');
+            // $action                = isset($post_data['file_action']) ? $post_data['file_action'] : $this->request->getPost('upload-action-type');
-            $enrollment_close_date = $this->request->getPost('enrollment_close_date');
+            // $enrollment_open_date  = isset($post_data['enrollment_open_date']) ? $post_data['enrollment_open_date'] : $this->request->getPost('enrollment_open_date') ?? null;
-            $action = $this->request->getPost('upload-action-type');
+            // $enrollment_close_date = isset($post_data['enrollment_close_date']) ? $post_data['enrollment_close_date'] : $this->request->getPost('enrollment_close_date') ?? null;
+            // $status                = 'inprogress';
+            // $hr_id                 = $post_data['created_by'] ?? null;            
+            
+            $client_id             = $post_data['client_id'] ?? null;
+            $policy_id             = $post_data['policy_id'] ?? null;
+            $branch_id             = $post_data['client_branch_id'] ?? null;
+            $action                = "enrollment";
+            $enrollment_open_date  = $post_data['enrollment_open_date'] ?? null;
+            $enrollment_close_date = $post_data['enrollment_close_date'] ?? null;
             $status                = 'inprogress';
+            $hr_id                 = $post_data['created_by'] ?? null;
 
             $enrollment_open_date = change_date_format($enrollment_open_date, 'd/m/Y', 'Y-m-d');
             $enrollment_close_date = change_date_format($enrollment_close_date, 'd/m/Y', 'Y-m-d');
 
-            $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, 'enrollment_open_date' => $enrollment_open_date, 'enrollment_close_date' => $enrollment_close_date]); //here field policy_id have client_policy_id and not policy id from policy master
+            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id, 'uploaded_by' => 1, 'enrollment_open_date' => $enrollment_open_date, 'enrollment_close_date' => $enrollment_close_date, '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]);
 
             //start validation process
@@ -298,18 +409,25 @@ 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(!$is_post_request){
+                        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
+            } else //if file size greater than 1 add the file as job
             {
                 $job_details  = new Jobs();
                 $r = Jobs::addJob(['job_name' => 'excelFileFormatValidation', 'payload' => ['file_id' => $file_id]]);
                 $this->myLogger->logme("error", '{file_id} is greather than 1MB, validating with job queue', ['file_id' => $file_id]);
             }
 
+            if (!$is_post_request) {
+                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['page_name'] = 'View Inception';
 
@@ -335,7 +453,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', 'enrollment_open_date', 'enrollment_close_date',
                                 'up.emp_code',
-                                'up.first_name',
+                                // 'up.first_name',
                                 'c.short_name',
                                 'cb.branch_name',
                                 'cp.id as client_policy_id',
@@ -349,8 +467,23 @@ class EmployeeController extends AdminController
                                   WHERE e.file_id = files.id AND ep.client_policy_id = files.policy_id) 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
+                                ",
+                                'files.hr_id'
                             ])
-                            ->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')
@@ -378,19 +511,53 @@ class EmployeeController extends AdminController
 
 
         // dd($data['fileList']);die();
-        if ($this->request->getMethod() == "get") {
+        if ($_SERVER['REQUEST_METHOD'] == "GET") {
             $this->loadLayout('import_export', $data);
         }
     }
 
-    public function getExcelFileErrors()
+    public function getExcelFileErrors($file_id, $retun_type = null)
     {   
-        $file_id = $this->request->uri->getSegment(3);
+
+        $file_data = $this->fileModel->where('id', $file_id)->first();
+        $error = json_decode($file_data['reason'] ?? '{}', true);
+        if(!empty($error) && $retun_type == 'api' && $file_data['status'] == 'failed'){
+            $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;
@@ -2833,7 +3000,7 @@ class EmployeeController extends AdminController
         if (!is_dir($exportDir)) {
             mkdir($exportDir, 0777, true);
         } else {
-            chmod($exportDir, 0777);
+            // chmod($exportDir, 0777);
         }
 
         $filename = 'inception_export_' . date('Ymd_His') . '.xlsx';

app/Controllers/EmployeeRestController.php

@@ -141,7 +141,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);
@@ -162,7 +162,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) {
@@ -190,7 +190,7 @@ class EmployeeRestController extends AdminController
 
             } 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);
@@ -220,7 +220,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) {
@@ -235,8 +235,17 @@ class EmployeeRestController extends AdminController
         try {
             $data = $this->request->getJSON();
 
-            //enrolment check
+            $clientPolicyData = $this->clientPolicyModel->where('id',$data[0]->client_policy_id)
+                                                        ->where('is_active', 1)
+                                                        ->first(); 
+
+            if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){
+                $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $data[0]->emp_code);
+            }else{
                 $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id, $data[0]->emp_code);
+            }
+
+            //enrolment check
             if($openForEnrollment == false){  
                 return $this->respond(['status' => 'failed','code' => 404,'data' => [],'message' => 'Enrollment closed.'], 200); 
             }
@@ -308,7 +317,7 @@ class EmployeeRestController extends AdminController
                 }
             }
         } catch (\Exception $e) {
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage(),'message' => "Action failed."], 500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage() . $e->getLine(),'message' => "Action failed."], 500);
         }
         
     }
@@ -395,6 +404,8 @@ class EmployeeRestController extends AdminController
 
             }else{
 
+                $enrollment_dates = $this->getEnrollmentDates($client_policy_id, $emp_code);
+
                 $data['employee_id']= $employee_id;
                 $data['client_policy_id']= $client_policy_id;
                 $data['basic_cover_si']= $basic_cover_si;
@@ -405,6 +416,9 @@ class EmployeeRestController extends AdminController
                 if(!empty($other_employee_policy_data)){
                     $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null;
                     $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null;
+                }else{
+                    $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null;
+                    $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null;
                 }
 
                 // dd($data);
@@ -550,7 +564,7 @@ class EmployeeRestController extends AdminController
 
                     $this->employeeModel->where('id', $this->request->getGet('id') )
                                         ->where('is_active', 1 )
-                                        ->set(array('is_active'=> 0 ))
+                                        ->set(['emp_status' => 'truncated', 'is_active' => 0])
                                         ->update();
                 }
 
@@ -564,13 +578,13 @@ class EmployeeRestController extends AdminController
                     $query->where('client_policy_id', $clientPolicyId);
                 }
 
-                $query->set(['is_active' => 0])->update();
+                $query->set(['status' => 'truncated', 'is_active' => 0])->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);
             }
                
             
@@ -590,8 +604,18 @@ class EmployeeRestController extends AdminController
             // print_r($requestData);
             // dd($requestData);
 
+
+            $clientPolicyData = $this->clientPolicyModel->where('id',$requestData[0]->client_policy_id)
+                                                        ->where('is_active', 1)
+                                                        ->first(); 
+
+            if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){
+                $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $requestData[0]->emp_code);
+            }else{
                 $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id, $requestData[0]->emp_code);
-            if($openForEnrollment == false){  return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); }
+            }
+
+            if($openForEnrollment == false){  return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 200); }
 
             foreach ($requestData as $key => $value) 
             {
@@ -601,6 +625,7 @@ class EmployeeRestController extends AdminController
                                                         ->where('is_active', 1 )
                                                         ->findAll();
 
+                
                 // dd($checkIfExist);
                 if ($checkIfExist) {
 
@@ -608,10 +633,14 @@ class EmployeeRestController extends AdminController
 
                 }else{
 
+                    $enrollment_dates = $this->getEnrollmentDates($value->client_policy_id, $requestData[0]->emp_code);
+
                     $data['employee_id']= $value->employee_id;
                     $data['client_policy_id']= $value->client_policy_id;
                     $data['basic_cover_si']= $value->basic_cover_si;
                     $data['status'] = 'draft';
+                    $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null;
+                    $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null;
             
                     $this->employeePolicyModel->insert($data);
                 }
@@ -658,12 +687,12 @@ 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: 'hr');
          
             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);
             }
         
             
@@ -776,7 +805,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);
             }
         
             
@@ -786,8 +815,57 @@ class EmployeeRestController extends AdminController
         
     }
 
-    // Upload the Employee Detail in DB by Sheet Data
     public function employeeUpload()
+    {
+        try{
+
+            $post_data = [
+                'client_id'             => $this->request->getPost('client_id') ?? null,
+                'client_branch_id'      => $this->request->getPost('client_branch_id'),
+                'policy_id'             => $this->request->getPost('policy_id'),
+                'enrollment_open_date'  => $this->request->getPost('enrollment_open_date'),
+                'enrollment_close_date' => $this->request->getPost('enrollment_close_date'),
+                'file_action'           => "enrollment",
+                'created_by'            => $this->request->getPost('created_by') ?? null,
+                'emplist'               => $this->request->getFile('file')
+            ];
+
+            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'];
+            } 
+
+           
+            // print_r($post_data); die;
+
+            if(empty($post_data['client_id'])){
+                return $this->respondCreated(['status' => false, 'message' => 'Client is required', 'data' => []]);
+            }
+
+            $employeeController = new EmployeeController();
+            $responce = $employeeController->employeesUplodWithEvents($post_data);
+            // print_r($responce); die;
+
+            return $this->respond($responce, 200);
+
+            // if(!$responce['status']){
+            //     $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);
+            //     $responce['data'] = $file_data;
+            //     return $this->respond($responce, 200);
+            // }else{
+            //     $responce['data'] = [];
+            //     return $this->respond($responce, 200);
+            // }
+
+            
+
+        }catch(\Exception $e){
+            return $this->respondCreated(['status' => false, 'message' => $e->getMessage(), 'data' => []]);
+        }
+    }
+
+    // Upload the Employee Detail in DB by Sheet Data  (DO NOT REMOVE THIS)
+    public function employeeUploadOld()
     {
         try {
             $file = $this->request->getFile('file');
@@ -795,6 +873,11 @@ class EmployeeRestController extends AdminController
             $client_branch_id = $this->request->getPost('client_branch_id');
             $policy_id = $this->request->getPost('policy_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();
+                $client_id = $client_data['id'];
+            } 
+
             $client_data = $this->clientModel->where('id', $client_id)->first();
             $notification = $this->notificationModel->where('client_id',$client_id)->where('template_name','member_welcome_mail')->first();
 
@@ -1128,7 +1211,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 (\Throwable $th) {
             $this->myLogger->logme("error", ($th->getMessage().' --- '.$th->getLine() . '----' . $th->getTraceAsString()));
@@ -1145,8 +1228,77 @@ class EmployeeRestController extends AdminController
             return $this->respond(['status' => 'failed','code' => 500,'data' => $th->getMessage(), 'error_data' =>  $errorData], 500);
         }
 
+    }
+
+    public function getDataFromFilesTable($search_data)
+    {
+        $file_download_base = base_url('util/download-file-list/');
+        $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
+        $data = $builder->get()->getResultArray();
+
+        if (!empty($data)) {
+            return $data;
+        }
+
+        return [];
+    }
+
+    public function getHrFileUploadErrorDetails($file_id)
+    {
 
     }
 
@@ -1463,13 +1615,13 @@ class EmployeeRestController extends AdminController
 
                         $array->mapped_family_floaters = $data;
                         $array->type = "GMC";
-                        $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
+                        $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0.0;
                         if($array->is_premium_summery == 1){
-                            $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
+                            $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0.0;
-                            $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
+                            $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0.0;
                         }else{
-                            $array->family_floaters_of_dependent_and_si_premium_value = 0;
+                            $array->family_floaters_of_dependent_and_si_premium_value = 0.0;
-                            $array->family_floaters_of_dependent_and_gst_value =  0;  
+                            $array->family_floaters_of_dependent_and_gst_value =  0.0;  
                         }
                     
                         $checkGmcParentsPolicyExist = $this->clientPolicyModel->select("
@@ -1532,6 +1684,7 @@ class EmployeeRestController extends AdminController
 
                 if(!empty($result) && $this->request->getGet('policy') == 'GMC'){
                     return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200);                    
+                    // echo json_encode(['status' => 'success','code' => 200,'data' => $result], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION);
                 }else{
                     return $this->respond(['status' => 'success','code' => 200,'data' => []], 200);
                 }
@@ -1775,13 +1928,13 @@ class EmployeeRestController extends AdminController
 
             $array->mapped_family_floaters = $data;
             $array->type = "GMC - Parents";
-            $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
+            $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0.0;
             if($array->is_premium_summery == 1){
-                $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
+                $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0.0;
-                $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
+                $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0.0;
             }else{
-                $array->family_floaters_of_dependent_and_si_premium_value = 0;
+                $array->family_floaters_of_dependent_and_si_premium_value = 0.0;
-                $array->family_floaters_of_dependent_and_gst_value = 0;
+                $array->family_floaters_of_dependent_and_gst_value = 0.0;
             }
 
             return $array;
@@ -2015,10 +2168,10 @@ class EmployeeRestController extends AdminController
 
     //                 return $restAuthController->callThirdPartyGETAPI($queryParams, 'getClientDetails');
     //             } else {
-    //                 return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+    //                 return $this->respond(['status' => 'failed', 'code' => 404, '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);
@@ -2036,15 +2189,19 @@ class EmployeeRestController extends AdminController
 
             if (!empty($pre_client_id)) {
                 
-
+                if (is_string($pre_client_id) && preg_match('/^[a-f0-9]{32}$/i', $pre_client_id)) {
+                    $client = $this->clientModel->where('MD5(id)', $pre_client_id)->first();
+                }else{
                     $client = $this->clientModel->where('id', $pre_client_id)->first();
+                } 
+
                 if ($client) {
                    
 
                     $client['client_logo'] = base_url() . 'public/uploads/logo/' . $client['client_logo'];
 
                     $clientPolicy = $this->clientPolicyModel
-                        ->where('client_id', $pre_client_id)
+                        ->where('client_id', $client['id'] ?? null)
                         ->where('client_branch_id', $pre_branch_id)
                         ->findAll();
 
@@ -2060,7 +2217,7 @@ class EmployeeRestController extends AdminController
                     ], 200);
                 } else {
                    
-                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
                 }
             } elseif (!empty($post_client_id)) {
                 
@@ -2074,7 +2231,7 @@ class EmployeeRestController extends AdminController
 
             } else {
                
-                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
+                return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
             }
             
         } catch (\Exception $e) {
@@ -2139,6 +2296,9 @@ class EmployeeRestController extends AdminController
         try {
 
             $emp_code = $this->request->getGet('emp_code');
+            $client_id = $this->request->getGet('client_id');
+            $client_branch_id = $this->request->getGet('client_branch_id');
+
             $addOnEmployeeData = $this->employeeModel->where('is_active', 1 )
                                                     ->where('emp_code',$this->request->getGet('emp_code'))
                                                     ->where('client_id',$this->request->getGet('client_id'))
@@ -2146,6 +2306,9 @@ class EmployeeRestController extends AdminController
                                                     ->where('is_addon_value',1)->findAll();
 
 
+            $policyIds = $this->getEmployeeAddOnPolicies($emp_code, $client_id, $client_branch_id);
+            // dd($policyIds); 
+       
 
             $clientPolicy = $this->clientPolicyModel->select("
                                                                 client_policy.*, 
@@ -2175,7 +2338,11 @@ class EmployeeRestController extends AdminController
                                                     ->where('policy_status', 1)
                                                     ->where('is_active', 1)
                                                     ->where('enrolment_visibility', 1)
+                                                    ->whereIn('id', $policyIds)
                                                     ->findAll(); 
+            if(empty($policyIds)){
+                return $this->respond(['status' => 'failed','code' => 404,'data' => []], 200);
+            }
             
             if(count($clientPolicy))
             {
@@ -2219,6 +2386,13 @@ class EmployeeRestController extends AdminController
             
             }
 
+            if(isset($array['base_policy']) && !empty($array['base_policy']))
+            {
+                $openForEnrollmentValue = (int) $this->findThePolicyIsOpenForEnrollment($array['base_policy'], $emp_code);
+            }else{
+                $openForEnrollmentValue = $array['open_for_enrollment'];
+            }
+
         
             $policyTypeData = $this->policyTypeModel->where('id',$array['policy_type_id'])->get()->getRow();
             $responce['policy_name'] =  $policyTypeData->long_name;
@@ -2228,7 +2402,7 @@ class EmployeeRestController extends AdminController
             $responce['client_id'] = $array['client_id'];
             $responce['client_policy_id'] = $array['id'];
             $responce['is_addon'] = $array['is_addon'];
-            $responce['OpenForEnrollment'] = $array['open_for_enrollment'];
+            $responce['OpenForEnrollment'] = $openForEnrollmentValue;
             $responce['policy_terms'] = $decodedArray;
             $responce['policy_type_id'] = $array['policy_type_id'];
             //$responce['is_member_modify_allowed'] =  $array['is_member_modify_allowed'];
@@ -2424,13 +2598,13 @@ class EmployeeRestController extends AdminController
                         }
                    
                         $responce['family_floaters_of_dependent_and_si_array'] = $data;
-                        $responce['family_floaters_of_dependent_and_si_value'] = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
+                        $responce['family_floaters_of_dependent_and_si_value'] = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0.0;
                         if($array['is_premium_summery']){
-                            $responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
+                            $responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0.0;
-                            $responce['family_floaters_of_dependent_and_gst_value'] = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
+                            $responce['family_floaters_of_dependent_and_gst_value'] = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0.0;
                         }else{
-                            $responce['family_floaters_of_dependent_and_si_premium_value'] = 0;
+                            $responce['family_floaters_of_dependent_and_si_premium_value'] = 0.0;
-                            $responce['family_floaters_of_dependent_and_gst_value'] = 0;
+                            $responce['family_floaters_of_dependent_and_gst_value'] = 0.0;
                         }
                         
 
@@ -2440,6 +2614,7 @@ class EmployeeRestController extends AdminController
 
                     if($this->request->getGet('policy') == 'GMC-DEPENDENT-ADDON'){
                         return $this->respond(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], 200);                        
+                        // echo json_encode(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION);
                     }
                 
                     //array_push($PolicyData, $responce);
@@ -2606,7 +2781,18 @@ class EmployeeRestController extends AdminController
             $array_list = [];
             foreach ($client_policy_id as $key => $value) 
             {
-                $policy = $this->clientPolicyModel->where('id',$value)->where('open_for_enrollment',1)->find();
+
+                $clientPolicyData = $this->clientPolicyModel->where('client_id',$client_id)
+                                                            ->where('id',$value)
+                                                            ->where('is_active', 1)
+                                                            ->first(); 
+
+                if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){
+                    $policy = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $emp_code);
+                }else{
+                    $policy = $this->findThePolicyIsOpenForEnrollment($value, $emp_code);
+                }
+                
                 if($policy)
                 {
                     $this->myLogger->logme("error", 'client policy id = '.$value.' is open for enrollment');
@@ -2649,7 +2835,6 @@ class EmployeeRestController extends AdminController
                     }
 
                 }else { $this->myLogger->logme("error", 'client policy id = '.$value.' is not open for enrollment');}
-                
             }
 
 
@@ -2914,7 +3099,7 @@ class EmployeeRestController extends AdminController
     return $employee_data_group_by_family;
     }else{
     // dd ($employee_data_group_by_family);
-    return $this->respond(['status' => 'success','code' => (count($employee_data_group_by_family) ? 200 : 404),'data' => [$employee_data_group_by_family] ], 200);
+    return $this->respond(['status' => 'success','code' => (count($employee_data_group_by_family) ? 200 : 200),'data' => [$employee_data_group_by_family] ], 200);
     }
      
     }
@@ -2940,12 +3125,12 @@ class EmployeeRestController extends AdminController
             } 
 
             if(count($policyId) == 0){
-                return $this->respond(['status' => 'failed','code' => (count($policyId) ? 200 : 404),'data' => [] ], 200);
+                return $this->respond(['status' => 'failed','code' => (count($policyId) ? 200 : 200),'data' => [] ], 200);
             }
           
 
             $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') )
+                                                        ->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', 1)
@@ -2988,9 +3173,9 @@ class EmployeeRestController extends AdminController
 
         if($result)
         {
-            return $this->respond(['status' => 'success','code' => (count($result) ? 200 : 404),'data' => $result ], 200);
+            return $this->respond(['status' => 'success','code' => (count($result) ? 200 : 200),'data' => $result ], 200);
         }else{
-            return $this->respond(['status' => 'failed','code' => (count($result) ? 200 : 404),'data' => [] ], 200);
+            return $this->respond(['status' => 'failed','code' => (count($result) ? 200 : 200),'data' => [] ], 200);
         }
         
     }
@@ -3391,7 +3576,7 @@ class EmployeeRestController extends AdminController
 
             } 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);
@@ -3415,7 +3600,7 @@ class EmployeeRestController extends AdminController
 
             } 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);
@@ -3476,7 +3661,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());
@@ -4064,13 +4249,13 @@ class EmployeeRestController extends AdminController
             $file_id = $this->request->getGet('id') ?? $id;
 
             // Find record
-            $record = $this->hrFileUploadModel->find($file_id);
+            $record = $this->fileModel->where('id', $file_id)->first();
 
             if (!$record) {
                 return $this->failNotFound("File record not found");
             }
 
-            $uploadPath = WRITEPATH . 'uploads/hr_files/';
+            $uploadPath = WRITEPATH . 'uploads/excel/';
             $filePath   = $uploadPath . $record['file_name'];
 
             if (!file_exists($filePath)) {
@@ -4078,8 +4263,8 @@ class EmployeeRestController extends AdminController
             }
 
             // Force file download
-            return $this->response->download($filePath, null)
+            return $this->response->download($filePath, null)->setFileName($record['file_name']);
-                                ->setFileName($record['file_name']);
+            
         } catch (\Exception $e) {
             return $this->failServerError($e->getMessage());
         }
@@ -4088,6 +4273,28 @@ class EmployeeRestController extends AdminController
     public function hrFileList()
     {
         try {
+            
+            $request = service('request');
+            $search_data = $request->getGetPost() ?? [];
+
+            // Fetch results
+            $data = $this->getDataFromFilesTable($search_data);
+
+            return $this->respond([
+                'status'  => true,
+                'message' => 'File list fetched successfully',
+                'data'    => $data
+            ]);
+
+        } catch (\Exception $e) {
+            return $this->failServerError($e->getMessage());
+        }
+    }
+
+    public function hrFileListOld()
+    {
+        try {
+            
             $request = service('request');
             $builder = $this->hrFileUploadModel;
 
@@ -4254,4 +4461,100 @@ class EmployeeRestController extends AdminController
         }
     }
 
+    public function getEnrollmentDates($client_policy_id, $emp_code)
+    {
+        $enrollment_open_date = null;                                                    
+        $enrollment_close_date = null;      
+        
+        $clientPolicyData = $this->clientPolicyModel->where('id', $client_policy_id)
+                                    ->where('is_active', 1)
+                                    ->first();
+
+        if(in_array($clientPolicyData['policy_type_id'] ?? null, [3,4,5])){
+
+            $policy = $this->employeePolicyModel
+                    ->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date')
+                    ->join('employees', 'employee_polices.employee_id = employees.id')
+                    ->where('employees.emp_code',$emp_code)
+                    ->where('employee_polices.client_policy_id', $clientPolicyData['base_policy'])
+                    ->where('employee_polices.enrollment_open_date <= CURDATE()', null, false)
+                    ->where('employee_polices.enrollment_close_date >= CURDATE()', null, false)
+                    ->where('employee_polices.enrollment_open_date is not null')
+                    ->where('employee_polices.enrollment_close_date is not null')
+                    ->where('employees.is_active', 1)
+                    ->where('employee_polices.is_active', 1)
+                    ->whereIn('employee_polices.status', ['draft', 'enrolled'])
+                    ->whereIn('employees.emp_status', ['draft', 'enrolled'])
+                    ->first();
+
+            $enrollment_open_date =  $policy['enrollment_open_date'] ?? null;
+            $enrollment_close_date =  $policy['enrollment_close_date'] ?? null;
+        }
+
+        return [
+            'enrollment_open_date' => $enrollment_open_date,
+            'enrollment_close_date' => $enrollment_close_date,
+        ];
+    }
+
+    public function getEmployeeAddOnPolicies($emp_code, $client_id, $client_branch_id): array
+    {
+        $data = $this->employeeModel
+            ->select("
+                client_policy.id AS gmc_client_policy_id,
+
+                (
+                    SELECT id FROM client_policy
+                    WHERE policy_type_id = 3
+                    AND base_policy = gmc_client_policy_id
+                    LIMIT 1
+                ) AS gmc_parent_policy_id,
+
+                (
+                    SELECT id FROM client_policy
+                    WHERE policy_type_id = 4
+                    AND base_policy = gmc_client_policy_id
+                    LIMIT 1
+                ) AS gmc_topup_policy_id
+            ")
+            ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+            ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id')
+            ->whereIn('employees.emp_status', ['draft', 'enrolled'])
+            ->whereIn('employee_polices.status', ['draft', 'enrolled'])
+            ->where([
+                'employees.is_active'              => 1,
+                'employee_polices.is_active'       => 1,
+                'client_policy.policy_type_id'     => 2,
+                'employees.family_floater_key'     => 'self',
+                'employees.emp_code'               => $emp_code ?? null,
+                'employees.client_id'              => $client_id ?? null,
+                'employees.client_branch_id'       => $client_branch_id ?? null,
+            ])
+            ->orderBy('employee_polices.id', 'desc')
+            ->first();
+
+        // dd($data);
+        // dd(db_connect()->getLastQuery()); 
+
+        if (!empty($data) && !empty($data['gmc_parent_policy_id'])) {
+
+            $getParentTopUp = $this->clientPolicyModel
+                ->select('id AS gmc_parent_topup_policy_id')
+                ->where('is_active', 1)
+                ->where('policy_type_id', 5) // parent Top-Up
+                ->where('base_policy', $data['gmc_parent_policy_id'])
+                ->first();
+        }
+
+        if (empty($data)) {
+            return [];
+        }
+
+        $policyIds[] =  $data['gmc_topup_policy_id'];
+        $policyIds[] =  $data['gmc_parent_policy_id'];
+        $policyIds[] =  $getParentTopUp['gmc_parent_topup_policy_id'] ?? null;
+
+        return $policyIds;
+    }
+
 }

app/Controllers/EmployeeServiceController.php

@@ -765,6 +765,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) : [];
@@ -775,6 +783,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;

app/Controllers/LoginController.php

@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface;
 
 use App\Models\UserModel;
 use App\Models\AuthHistoryModel;
+use App\Libraries\AuthLogout;
 
 class LoginController extends BaseController
 {
@@ -36,14 +37,16 @@ class LoginController extends BaseController
             log_message('error', 'Get OAuth Responce Code Sucessfully');
             log_message('error', 'OAuthResponceCode : `'.$code.'`');
             $value = googleOAuthLogin($this->request->getGet('code'));
+              // log_message('error', "OAuthResponceCode :" . json_encode($value));
             if($value){
+                // print_r($value);//die;
                 $user = $UserModel->getUserByEmail($value->email);
                 if($user){
                     if($user->is_active !== '0'){
 
                         $user_team = $UserModel->getUserTeamsByUserID($user->id);
                         // dd($user_team); 
-
+                        session()->regenerate(true);
                         $session_data = [
                             'isLoggedIn'  => True ,
                             'userid'      => $user->id, 
@@ -54,9 +57,11 @@ 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');
 
@@ -66,13 +71,13 @@ class LoginController extends BaseController
                     }else{
                         log_message('error', 'User Not Active');
                         session()->setFlashdata('error', 'User Not Active');
-                        return redirect()->to(base_url('login'));
+                        return AuthLogout::logout();
                     }
                 }else{
 
                     log_message('error', 'User Not Registered');
                     session()->setFlashdata('error', 'User Not Registered');
-                    return redirect()->to(base_url('login'));
+                    return AuthLogout::logout();
                 }
             }
 
@@ -94,14 +99,16 @@ class LoginController extends BaseController
         // setcookie('session_data', '', time() - 3600, $path);
         // return redirect()->to(base_url('login'));
 
-        $path = getenv('cookie.Path');
+        // $path = getenv('cookie.Path');
-        session()->destroy();
+        // session()->destroy();
-        // setcookie('session_data', '', time() - 3600, $path);
+        // // setcookie('session_data', '', time() - 3600, $path);
-        $path = getenv('cookie.Path');
+        // $path = getenv('cookie.Path');
-        $domain = getenv('cookie.Domain');
+        // $domain = getenv('cookie.Domain');
-        $https = getenv('cookie.secure');
+        // $https = getenv('cookie.secure');
-        setcookie('session_data',null, time() -3600, $path, $domain, $https, true);
+        // setcookie('session_data',null, time() -3600, $path, $domain, $https, true);
-        return redirect()->to(base_url('login'));
+        // return redirect()->to(base_url('login'));
+
+        return AuthLogout::logout();
     }
 
 

app/Controllers/MasterController.php

@@ -156,6 +156,7 @@ class MasterController extends AdminController
 
         $this->myLogger->logme('error','Edit Insurer Onboarding function called');
         $headerData['page_name'] = 'Edit Insurer Master';
+        print_r($headerData);die;
 
         $types = array(
             (object) array('id' => 'pvt', 'name' => 'PVT'),
@@ -1742,6 +1743,7 @@ class MasterController extends AdminController
             'cache' => WRITEPATH . 'cache',
             'sample_import_excel' => ROOTPATH . 'public/sample_import_excel',
             'lead_files' => WRITEPATH . 'uploads/lead_files/',
+            'exports' => WRITEPATH . 'exports/',
         ];
 
         foreach ($folders as $folderName => $folderPath) {

app/Controllers/RestAuthenticationController.php

@@ -142,6 +142,7 @@ class RestAuthenticationController extends AdminController
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
                 $result = ['user_verification' => false , 'message' => "User not found"];
+                recordRateLimitFailure();
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
             }
 
@@ -167,6 +168,13 @@ 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', '************************ PRE END ********************************');
@@ -264,10 +272,11 @@ class RestAuthenticationController extends AdminController
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Received Email ID = " . $email);
 
             $empdata = RestAuthHelper::getPreAndPostDataByEmailOrMobile(['email_id' => $email]); 
-            // print_r($empdata); die;
+
 
             $otp = random_int(100000, 999999);
 
+            //only retail policy
             if(empty($empdata)){
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: No employee data found both PRE & POST");
                 log_message('error', '  ');
@@ -312,6 +321,7 @@ class RestAuthenticationController extends AdminController
                 }
 
                 $result = ['user_verification' => false , 'message' => "User not found"];
+                recordRateLimitFailure();
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
             }
 
@@ -323,8 +333,15 @@ class RestAuthenticationController extends AdminController
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Using PRE data");
             } 
 
+           
+
             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 - verifyEmployeeWithEmailId: Valid employee found, generating OTP");
 
@@ -430,10 +447,12 @@ class RestAuthenticationController extends AdminController
             $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
 
             if(empty($otp)){
+                recordRateLimitFailure();
                 return $this->respond(['status' => 'OTP is required','code'   => 400,'message' => 'OTP is required'], 200);
             }
 
             if (empty($mobile_number) && empty($email_id)) {
+                recordRateLimitFailure();
                 return $this->respond(['status' => 'failed','code'   => 400,'message' => 'Mobile number or Email ID is required'], 200);
             }
 
@@ -457,9 +476,11 @@ class RestAuthenticationController extends AdminController
                     // Call the third-party API function
                     $apiResponse = $this->callThirdPartyAPI($retailApiParams, 'getVerifiedRetailUserData');
                     // print_r($apiResponse); die;
+                    recordRateLimitFailure();
                     return $this->respond(['status' => 'failed', 'code' => 200, 'data' => [], 'post_enrollment' => json_decode($apiResponse, true)], 200);
                 }
 
+                recordRateLimitFailure();
                 return $this->respond(['status' => 'Invalid OTP','code' => 404,'data' => "", 'message' => "Invalid OTP"],200);                
             }
 
@@ -579,6 +600,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";
 
                     $db = db_connect();
@@ -638,6 +665,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 = "
@@ -770,6 +803,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;
@@ -951,6 +986,12 @@ class RestAuthenticationController extends AdminController
             $old_mpin = $this->request->getJSON()->old_mpin;
             $mpin = $this->request->getJSON()->new_mpin;
 
+            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);
+            }
+
             $empdata = RestAuthHelper::getPreAndPostDataByEmailOrMobile(['email_id' => $email_id, 'mobile_number' => $mobile_number, 'old_mpin' => $old_mpin ]); 
             // print_r($empdata); die;
 
@@ -959,7 +1000,7 @@ class RestAuthenticationController extends AdminController
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
 
-                $result = ['user_verification' => false , 'message' => "User not found"];
+                $result = ['mpin_verification' => false , 'message' => "Old MPIN is incorrect"];
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
             }
 
@@ -1238,7 +1279,7 @@ class RestAuthenticationController extends AdminController
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - checkMpin: Mpin - Exist");
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
-                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 in PRE so call the thirdpartapi to the POST to check the MPIN");
                 log_message('error', '  ');
@@ -1868,5 +1909,55 @@ 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);
+    }
+
 }
 

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']);
+            }
+
+            // 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');
+    }
+}

app/Filters/AuthApiRateLimitFilter.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Filters;
+
+use App\Libraries\RateLimiterService;
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+/**
+ * AuthApiFilter
+ *
+ * Applied to API routes that do NOT use JWT — e.g. verifyMobileNumber, verifyOTP.
+ * Identity is extracted from request params: 'email' or 'mobile_number'.
+ *
+ * Performs:
+ *  - IP-level throttle + progressive block check (via fingerprint)
+ *  - User-level block check (if identity present in params)
+ *
+ * Usage in Routes.php:
+ *   $routes->post('api/auth/verify-otp', 'AuthController::verifyOtp', ['filter' => 'authApiRateLimit']);
+ *
+ * Register in app/Config/Filters.php:
+ *   'AuthApiRateLimitFilter' => \App\Filters\AuthApiRateLimitFilter::class
+ */
+class AuthApiRateLimitFilter implements FilterInterface
+{
+    protected RateLimiterService $limiter;
+
+    public function __construct()
+    {
+        $this->limiter = new RateLimiterService();
+    }
+
+    // -------------------------------------------------------------------------
+    // BEFORE — runs before the controller
+    // -------------------------------------------------------------------------
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        // $this->limiter->unblockUser('9698262411');die;
+        $fingerprint = generateFingerprint(exclude_ua: true);
+        // echo $fingerprint;die;
+        // 1. IP-level check
+        $ipResult = $this->limiter->checkIp($fingerprint, 'authApi');
+        if ($ipResult) {
+            return $this->jsonResponse($ipResult);
+        }
+
+        // 2. User-level block check (identity may not be present yet on first hit)
+        $identity = resolveIdentity($request);
+        // echo $identity;die;
+        if ($identity) {
+            $userResult = $this->limiter->checkUser($identity);
+            if ($userResult) {
+                return $this->jsonResponse($userResult);
+            }
+        }
+
+        // Store resolved identity in request for use in after()
+        if ($identity) {
+            $request->setGlobal('rateLimitIdentity', $identity);
+        }
+        $request->setGlobal('rateLimitFingerprint', $fingerprint);
+
+        return null; // pass through
+    }
+
+    // -------------------------------------------------------------------------
+    // AFTER — runs after the controller; records failures on bad responses
+    // -------------------------------------------------------------------------
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+
+         // Routes where rate-limit failure should be recorded
+        // $allowedRoutes = [
+        //     'employeeRest/verifyEmployeeNumber',
+        //     'employeeRest/getVerifiedUserData',
+        //     'employeeRest/verifyEmployeeEmailId',
+        //     'employeeRest/verifyHrWithMobileNumber',
+        //     'employeeRest/verifyHrWithEmail',
+        //     'employeeRest/verifyHrWithEmail',
+        //     'employeeRest/getVerifiedHrData',
+        // ];
+
+        // $currentPath = service('request')->getPath();
+        // if (!in_array($currentPath, $allowedRoutes)) {
+        //     return; // Don't record failures for unrelated routes
+        // }
+
+        // Only act on failed responses (4xx from auth failures)
+        $statusCode = $response->getStatusCode();
+        // print_r($response);die();
+        if ($statusCode < 400 || $statusCode === 429 || $statusCode === 403 || $statusCode === 451) {
+            return; // 2xx/3xx = success; 429/403/451 already handled
+        }
+
+        $fingerprint = $request->getVar('rateLimitFingerprint') ?? generateFingerprint(exclude_ua: true);
+        
+        $identity    = $request->getVar('rateLimitIdentity')
+                       ?? resolveIdentity($request);
+
+        // Record failure at IP level
+        $this->limiter->recordIpFailure($fingerprint);
+
+        // Record failure at user level
+        if ($identity) {
+            $this->limiter->recordUserFailure($identity, 'authApi');
+        }
+    }
+
+    /**
+     * Build and return a JSON response for blocked/throttled requests.
+     */
+    protected function jsonResponse(array $result): ResponseInterface
+    {
+        $response = service('response');
+        $response->setStatusCode($result['status']);
+        $response->setContentType('application/json');
+        $response->setBody(json_encode([
+            'success' => false,
+            'error'   => [
+                'code'    => strtoupper('RATE_LIMIT_' . $result['level']),
+                'message' => $result['message'],
+                'type'    => $result['type'] ?? 'request',
+            ],
+        ]));
+        return $response;
+    }
+}

app/Filters/AuthJWT.php

@@ -18,65 +18,116 @@ use App\Models\LevelContactModel;
 
 class AuthJWT implements FilterInterface
 {
+    // public function before(RequestInterface $request, $arguments = null)
+    // {
+    //     $jwt = $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();
+    //     }
+    // }
+
     public function before(RequestInterface $request, $arguments = null)
     {
-        $jwt = $request->getHeaderLine('Authorization');
+        $authHeader = $request->getHeaderLine('Authorization');
 
-        if ($jwt) {
+        if (!$authHeader) {
-            if (JWTToken::validateJWT($jwt)) {
+            return $this->reject(403, 'Access Forbidden');
-                $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;
         }
+
+        $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();
-                    $hr_data = $model->where('id', $id)->first();
+            $id    = $decoded['pre_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')
+        ]);
 
-                    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;
-                    }
     }
 
-            }
+    private function reject(int $code, string $message)
-        } else {
+    {
-            header('Content-Type: application/json');
+        return service('response')
-            http_response_code(403);
+            ->setStatusCode($code)
-            $error = json_encode(["status" => 403, "message" => "Access Forbidden!"]);
+            ->setJSON(['status' => $code, 'message' => $message])
-            echo $error;
+            ->send();
-            exit();
-        }
     }
 
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)

app/Filters/AuthMVC.php

@@ -5,12 +5,27 @@ 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()) {            
+         if (!check_session()) 
-          return redirect()->to(base_url('/login'));
+        {
+          return AuthLogout::logout();
+        }
+
+        // if (!check_cookie()) 
+        // {
+        //   return AuthLogout::logout();
+        // }
+
+        // Fingerprint validation
+        $fp = generateFingerprint();
+
+        if (session()->get('fingerprint') !== $fp) {
+            return AuthLogout::logout();
         }
 
     }

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
@@ -107,11 +107,11 @@ class Cors implements FilterInterface
             );
         }
 
-        $this->log('CORS filter initialized', [
+        // $this->log('CORS filter initialized', [
-            'allowed_origins' => $this->allowedOrigins,
+        //     'allowed_origins' => $this->allowedOrigins,
-            'allow_credentials' => $this->allowCredentials,
+        //     'allow_credentials' => $this->allowCredentials,
-            'allowed_methods' => $this->allowedMethods,
+        //     'allowed_methods' => $this->allowedMethods,
-        ]);
+        // ]);
     }
 
     /**
@@ -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', [
+                // $this->log('Origin allowed: exact match', [
-                    'origin' => $origin,
+                //     'origin' => $origin,
-                    'matched_rule' => $allowed
+                //     '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', [
+                        // $this->log('Origin allowed: wildcard subdomain match', [
-                            'origin' => $origin,
+                        //     'origin' => $origin,
-                            'matched_rule' => $allowed,
+                        //     'matched_rule' => $allowed,
-                            'origin_host' => $originHost
+                        //     '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)', [
+                        // $this->log('Origin allowed: host match (scheme-less)', [
-                            'origin' => $origin,
+                        //     'origin' => $origin,
-                            'matched_rule' => $allowed,
+                        //     'matched_rule' => $allowed,
-                            'origin_host' => $originHost
+                        //     'origin_host' => $originHost
-                        ]);
+                        // ]);
                         return true;
                     }
                 }
@@ -320,11 +320,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', [
+            // $this->log('Preflight request received', [
-                'origin' => $origin,
+            //     'origin' => $origin,
-                'method' => $method,
+            //     'method' => $method,
-                'uri' => (string) $request->getUri()
+            //     'uri' => (string) $request->getUri()
-            ]);
+            // ]);
 
             // Validate origin - reject if not allowed
             if (empty($origin) || !$this->isOriginAllowed($origin)) {
@@ -346,10 +346,10 @@ class Cors implements FilterInterface
             $response->setStatusCode(204);
             $response->setBody('');
 
-            $this->log('Preflight approved', [
+            // $this->log('Preflight approved', [
-                'origin' => $origin,
+            //     'origin' => $origin,
-                'allowed_methods' => $this->allowedMethods
+            //     'allowed_methods' => $this->allowedMethods
-            ]);
+            // ]);
 
             return $response;
         }
@@ -392,10 +392,10 @@ class Cors implements FilterInterface
         // Add CORS headers to the response
         $this->addCorsHeaders($response, $request, $origin, false);
 
-        $this->log('CORS headers added to response', [
+        // $this->log('CORS headers added to response', [
-            'origin' => $origin,
+        //     'origin' => $origin,
-            'status' => $response->getStatusCode()
+        //     'status' => $response->getStatusCode()
-        ]);
+        // ]);
     }
 
     /**

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|phtml|html|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) {}
+}

app/Filters/JwtApiRateLimitFilter.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Filters;
+
+use App\Libraries\RateLimiterService;
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+/**
+ * JwtApiFilter
+ *
+ * Applied to API routes that require a valid JWT token.
+ * Identity (email or mobile) is extracted from the JWT payload using
+ * your existing helper functions: getEmailFromJWT() / getMobileFromJWT().
+ *
+ * Performs:
+ *  - IP-level throttle + progressive block check (via fingerprint)
+ *  - User-level throttle + progressive block check (by JWT identity)
+ *
+ * Usage in Routes.php:
+ *   $routes->get('api/profile', 'ProfileController::index', ['filter' => 'jwtApiRateLimit']);
+ *
+ * Register in app/Config/Filters.php:
+ *   'JwtApiRateLimitFilter' => \App\Filters\JwtApiRateLimitFilter::class
+ */
+class JwtApiRateLimitFilter implements FilterInterface
+{
+    protected RateLimiterService $limiter;
+
+    public function __construct()
+    {
+        $this->limiter = new RateLimiterService();
+    }
+
+    // -------------------------------------------------------------------------
+    // BEFORE — runs before the controller
+    // -------------------------------------------------------------------------
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $fingerprint = generateFingerprint(exclude_ua: true);
+        // echo $fingerprint;die;
+        // 1. IP-level throttle + block check
+        $ipResult = $this->limiter->checkIp($fingerprint, 'jwtApi');
+        if ($ipResult) {
+            return $this->jsonResponse($ipResult);
+        }
+
+        // 2. Resolve user identity from JWT
+        //    Uses your existing JWT helper functions.
+        //    If neither returns a value, fall back to IP-only limiting.
+        // $identity = $this->resolveIdentityFromJwt();
+        $identity = '';
+
+        if ($identity) {
+            // User-level throttle (request count based for JWT routes)
+            $userResult = $this->limiter->checkUserThrottle($identity, 'jwtApi');
+            if ($userResult) {
+                return $this->jsonResponse($userResult);
+            }
+        }
+
+        // Stash for after() use
+        $request->setGlobal('rateLimitFingerprint', $fingerprint);
+        if ($identity) {
+            $request->setGlobal('rateLimitIdentity', $identity);
+        }
+
+        return null; // pass through
+    }
+
+    // -------------------------------------------------------------------------
+    // AFTER — records IP failure on controller-level bad responses
+    // -------------------------------------------------------------------------
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        $statusCode = $response->getStatusCode();
+
+        // Only act on auth-related failures from the controller (401, 422, etc.)
+        // 429/403/451 are already handled by before(); skip 2xx/3xx.
+        if ($statusCode < 400 || in_array($statusCode, [429, 403, 451])) {
+            return;
+        }
+
+        $fingerprint = $request->getGlobal('rateLimitFingerprint') ?? generateFingerprint(exclude_ua: true);
+        
+        // $identity    = $request->getGlobal('rateLimitIdentity') ?? $this->resolveIdentityFromJwt();
+        $identity    = $request->getGlobal('rateLimitIdentity') ?? '';
+
+        $this->limiter->recordIpFailure($fingerprint);
+
+        if ($identity) {
+            $this->limiter->recordUserFailure($identity, 'jwtApi');
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // HELPERS
+    // -------------------------------------------------------------------------
+
+    /**
+     * Resolve user identity from JWT using your existing helper functions.
+     * Tries email first, then mobile. Returns null if JWT is absent/invalid.
+     *
+     * IMPORTANT: Replace getEmailFromJWT() / getMobileFromJWT() with your
+     * actual function names if they differ.
+     */
+    protected function resolveIdentityFromJwt(): ?string
+    {
+        try {
+            // Try email from JWT
+            if (function_exists('getEmailFromJWT')) {
+                $email = getEmailFromJWT();
+                if ($email) {
+                    return strtolower(trim($email));
+                }
+            }
+
+            // Try mobile from JWT
+            if (function_exists('getMobileFromJWT')) {
+                $mobile = getMobileFromJWT();
+                if ($mobile) {
+                    return trim($mobile);
+                }
+            }
+        } catch (\Throwable $e) {
+            // JWT invalid or expired — fall through to IP-only limiting
+            log_message('debug', '[RateLimiter] JWT identity resolution failed: ' . $e->getMessage());
+        }
+
+        return null;
+    }
+
+    /**
+     * Build and return a JSON response for blocked/throttled requests.
+     */
+    protected function jsonResponse(array $result): ResponseInterface
+    {
+        $response = service('response');
+        $response->setStatusCode($result['status']);
+        $response->setContentType('application/json');
+        $response->setBody(json_encode([
+            'success' => false,
+            'error'   => [
+                'code'    => strtoupper('RATE_LIMIT_' . $result['level']),
+                'message' => $result['message'],
+                'type'    => $result['type'] ?? 'request',
+            ],
+        ]));
+        return $response;
+    }
+}

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
+    }
+}

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;
+    }
+}

app/Helpers/EmployeeHelper.php

@@ -43,10 +43,14 @@ class EmployeeHelper
                 if($is_addon_value == 1){ $is_addon_value = 0 ; }else{ $is_addon_value = 1 ; }
 
 
-                $employeeData = $this->employeeModel->where('emp_code',$data[0]->emp_code)
+                $employeeData = $this->employeeModel
-                                                    ->where('client_id',$data[0]->client_id)
+                                    ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                                                    ->where('client_branch_id',$data[0]->client_branch_id)
+                                    ->where('employees.emp_code',$data[0]->emp_code)
-                                                    ->where('is_active', 1 )
+                                    ->where('employees.client_id',$data[0]->client_id)
+                                    ->where('employees.client_branch_id',$data[0]->client_branch_id)
+                                    ->where('employees.is_active', 1 )
+                                    ->where('employee_polices.client_policy_id', $client_policy_id)
+                                    ->where('employee_polices.is_active', 1)
                                     ->where('is_addon_value',$is_addon_value)
                                     ->findAll();
 

app/Helpers/HttpRequestHelper.php

@@ -4,24 +4,176 @@ 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(),
+            'real_ip'         => getRealClientIP(),
-            'browser' => ($request->getUserAgent()->getBrowser().' '.$request->getUserAgent()->getVersion()),
+            'platform'   => $platform,
-            'method' => $request->getMethod(),
+            'browser'    => $browser,
+            'method'     => strtoupper($request->getMethod()),
             'endpoint'   => $request->uri->getPath(),
-            'getparams' => $request->uri->getSegments(),
+            'getparams'  => json_encode($request->uri->getSegments(), JSON_UNESCAPED_UNICODE),
-            'postparams' => $request->getPost()
+            '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'];
+    }
 }

app/Helpers/JWTToken.php

@@ -18,24 +18,29 @@ 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['pre_hr_id'];
+                $models->update($id, $update);
 
             }
             
@@ -47,30 +52,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)) {
-            // print_r($jwtParts);
+            return ['status' => false, 'message' => 'Invalid Authorization header'];
-            if (count($jwtParts) != 2 || $jwtParts[0] == 'Bearer') {
-                return false;
         }
 
-            $token = $jwtParts[1];
+        $token = $matches[1];
 
+        // 2️⃣ Decode JWT header manually
+        $jwtParts = explode('.', $token);
+        if (count($jwtParts) !== 3) {
+            return ['status' => false, 'message' => 'Malformed JWT'];
+        }
+
+        $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("secret", 'HS512'));
+            $decoded = JWT::decode(
-                return json_encode(['status' => true, 'message' => 'Token is valid', 'decoded' => (array) $decoded]);
+                $token,
-            } catch (ExpiredException $e) {
+                new Key(env('JWT_SECRET'), self::ALLOWED_ALG)
-                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']);
-            }           
 
+            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'];
+        }
     }
 
 

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;
@@ -118,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;
+        
     }
 }
 

app/Helpers/utility_helper.php

@@ -557,7 +557,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);
@@ -568,7 +568,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
@@ -585,15 +585,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(
+                // log_message(
-                    'error',
+                //     'error',
-                    "❌ Date format error: Invalid date string. Allowed formats: {$allowed_placeholders} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}"
+                //     "❌ 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;
         }
 
@@ -677,6 +677,32 @@ if (!function_exists('check_pay_by_employee_or_company')) {
     
 }
 
+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('getLatestGMCPolicy')) {
 
     function getLatestGMCPolicy(array $empPolicy)
@@ -709,3 +735,148 @@ if (!function_exists('getLatestGMCPolicy')) {
 
 }
 
+if (!function_exists('validateExcelFile')) {
+
+    function validateExcelFile($file)
+    {
+       $allowed = [
+            'application/vnd.ms-excel','application/vnd',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'application/vnd.oasis.opendocument.spreadsheet',
+              'application/octet-stream'
+        ];
+
+
+        // if ($file->getError() !== UPLOAD_ERR_OK) return 'Upload error';
+        // if ($file->getSize() > (16 * 1024 * 1024)) return 'File too large';
+        // if (!in_array($file->getClientMimeType(), $allowed, true)) return 'Invalid file type';
+        
+        if ($file->getError() !== UPLOAD_ERR_OK) return false;
+        if ($file->getSize() > (16 * 1024 * 1024)) return false;
+        if (!in_array($file->getClientMimeType(), $allowed, true)) return false;
+
+        return true;
+    }
+}
+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(bool $exclude_ua = false): string
+{
+    $request = service('request');
+
+    $ua = $request->getUserAgent()->getAgentString();
+    // echo $ua;
+    // die;
+    $ip = getRealClientIP();
+
+    // Normalize localhost
+    if ($ip === '127.0.0.1' || $ip === '::1') {
+        $ipGroup = 'localhost';
+    }
+    // IPv4 handling
+    elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+        $parts = explode('.', $ip);
+        // Use /24 subnet (first 3 octets)
+        $ipGroup = $parts[0] . '.' . $parts[1] . '.' . $parts[2];
+    }
+    // IPv6 handling
+    elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+        // Use first 4 blocks of IPv6 (rough /64 grouping)
+        $blocks = explode(':', $ip);
+        $ipGroup = implode(':', array_slice($blocks, 0, 4));
+    }
+    // Fallback
+    else {
+        $ipGroup = 'unknown';
+    }
+
+    // return $ua . '_' . $ipGroup;
+    if($exclude_ua){
+        return hash('sha256', $ipGroup);
+    }
+    return hash('sha256', $ua . '|' . $ipGroup);
+    
+}
+
+
+/**
+     * Extract identity from POST body or GET params.
+     * Looks for 'email' or 'mobile_number'.
+     */
+     function resolveIdentity($request): ?string
+    {
+        // Try POST body first
+        $email  = $request->getPost('email');
+        // print_r($email);die;
+        $mobile = $request->getPost('mobile_number');
+
+        // Fallback to GET params
+        if (! $email && ! $mobile) {
+            $email  = $request->getGet('email');
+            $mobile = $request->getGet('mobile_number');
+        }
+        // Fallback to JSON params
+        if (! $email && ! $mobile) {
+         $req_data = $request->getJSON();
+         // print_r( $req_data);
+         
+         $mobile = $req_data->mobile_number ?? null;
+         // return trim($mobile_number);
+
+         $email = $req_data->email ?? null;
+          
+          if (!$email)
+          {
+            $email = $req_data->email_id ?? null;
+          }
+         // return trim($email);
+        }
+
+        if ($email) {
+            return strtolower(trim($email));
+        }
+
+        if ($mobile) {
+            return trim($mobile);
+        }
+
+        return null;
+    }
+
+
+     function recordRateLimitFailure(string $context = 'authApi'): void
+    {
+        /** @var IncomingRequest $request */
+        $request = \Config\Services::request();
+
+        $limiter = \Config\Services::limiter(); // or your custom limiter service
+
+        $fingerprint = $request->getVar('rateLimitFingerprint')
+            ?? generateFingerprint(exclude_ua: true);
+
+        
+
+        $identity = $request->getVar('rateLimitIdentity')
+            ?? resolveIdentity($request);
+
+        // Record IP-level failure
+        $limiter->recordIpFailure($fingerprint);
+
+        // Record user-level failure
+        if (!empty($identity)) {
+            $limiter->recordUserFailure($identity, $context);
+        }
+    }

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');
+    }
+}

app/Libraries/RateLimiterService.php

@@ -0,0 +1,386 @@
+<?php
+
+namespace App\Libraries;
+
+use Config\RateLimiter as RateLimiterConfig;
+use CodeIgniter\Cache\CacheInterface;
+
+/**
+ * RateLimiterService
+ *
+ * Handles all rate limiting logic:
+ *  - IP-level throttle + progressive blocking (soft/medium/hard)
+ *  - User-level progressive blocking (soft/medium/hard) by email or mobile_number
+ *  - Manual block / unblock helpers callable from anywhere
+ *
+ * Block levels: 'soft' | 'medium' | 'hard'
+ * All blocks are MANUAL UNBLOCK ONLY (no auto-expiry on block state).
+ * Counters and violation counts use cache TTLs; block records do not expire.
+ */
+class RateLimiterService
+{
+    protected RateLimiterConfig $config;
+    protected CacheInterface $cache;
+
+    public function __construct()
+    {
+        $this->config = config('RateLimiter');
+        $this->cache  = \Config\Services::cache();
+    }
+
+    // =========================================================================
+    // PUBLIC — IP LEVEL
+    // =========================================================================
+
+    /**
+     * Check & throttle by fingerprint (IP+UA based).
+     * Returns null on pass, or an array ['level'=>..., 'message'=>...] on block.
+     */
+    public function checkIp(string $fingerprint, string $routeType = 'jwtApi'): ?array
+    {
+        // echo $fingerprint;die;
+        // 1. Is the IP already blocked?
+        $blockInfo = $this->getIpBlock($fingerprint);
+        // print_rr($blockInfo);die();
+        if ($blockInfo) {
+            // Count hit while blocked → maybe escalate
+            $this->recordIpBlockHit($fingerprint, $blockInfo['level']);
+            return $this->blockedResponse('ip', $blockInfo['level']);
+        }
+
+        // 2. Throttle check
+        $cfg      = $this->config->ipBlock;
+        $countKey = $this->config->cacheKeys['ip_count'] . $fingerprint;
+        $count    = (int) ($this->cache->get($countKey) ?? 0);
+
+        if ($count === 0) {
+            $this->cache->save($countKey, 1, $cfg['window']);
+        } else {
+            $this->cache->save($countKey, $count + 1, $cfg['window']);
+        }
+
+        if (($count + 1) > $cfg['limit']) {
+            // Over limit → record violation
+            $violated = $this->incrementIpViolation($fingerprint);
+            if ($violated >= $cfg['violation_soft']) {
+                $this->blockIp($fingerprint, 'soft');
+                return $this->blockedResponse('ip', 'soft');
+            }
+            return [
+                'level'   => 'throttle',
+                'message' => 'Too many requests. Please slow down.',
+                'status'  => $this->config->statusCodes['throttle'],
+            ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Record a "bad outcome" for IP (e.g. controller calls this after failed auth).
+     * Same escalation path as throttle violations.
+     */
+    public function recordIpFailure(string $fingerprint): ?array
+    {
+        $blockInfo = $this->getIpBlock($fingerprint);
+        if ($blockInfo) {
+            $this->recordIpBlockHit($fingerprint, $blockInfo['level']);
+            return $this->blockedResponse('ip', $blockInfo['level']);
+        }
+
+        $violated = $this->incrementIpViolation($fingerprint);
+        $cfg      = $this->config->ipBlock;
+
+        if ($violated >= $cfg['violation_soft']) {
+            $this->blockIp($fingerprint, 'soft');
+            return $this->blockedResponse('ip', 'soft');
+        }
+
+        return null;
+    }
+
+    /**
+     * Manually block an IP at a given level.
+     */
+    public function blockIp(string $fingerprint, string $level = 'soft'): void
+    {
+        $cfg      = $this->config->ipBlock;
+        $blockKey = $this->config->cacheKeys['ip_block'] . $fingerprint;
+
+        $duration = $this->blockDuration($cfg, $level);
+
+        $data = [
+            'level'      => $level,
+            'blocked_at' => time(),
+            'fingerprint'=> $fingerprint,
+             'ip'   => getRealClientIP(),
+        ];
+
+        // Duration 0 = store for 10 years (permanent until manual unblock)
+        $ttl = $duration > 0 ? $duration : (10 * 365 * 24 * 3600);
+        $this->cache->save($blockKey, $data, $ttl);
+    }
+
+    /**
+     * Manually unblock an IP. Clears block, violations, and counters.
+     */
+    public function unblockIp(string $fingerprint): void
+    {
+        $keys = $this->config->cacheKeys;
+        $this->cache->delete($keys['ip_block']      . $fingerprint);
+        $this->cache->delete($keys['ip_violations'] . $fingerprint);
+        $this->cache->delete($keys['ip_count']      . $fingerprint);
+        $this->cache->delete($keys['ip_block_hits'] . $fingerprint);
+    }
+
+    /**
+     * Get current IP block info or null if not blocked.
+     */
+    public function getIpBlock(string $fingerprint): ?array
+    {
+        $blockKey = $this->config->cacheKeys['ip_block'] . $fingerprint;
+        $data     = $this->cache->get($blockKey);
+        return $data ?: null;
+    }
+
+    // =========================================================================
+    // PUBLIC — USER LEVEL
+    // =========================================================================
+
+    /**
+     * Check if a user (by email or mobile) is blocked.
+     * Returns null on pass, or block response array on block.
+     */
+    public function checkUser(string $identity): ?array
+    {
+        $blockInfo = $this->getUserBlock($identity);
+        if ($blockInfo) {
+            $this->recordUserBlockHit($identity, $blockInfo['level']);
+            return $this->blockedResponse('user', $blockInfo['level']);
+        }
+        return null;
+    }
+
+    /**
+     * Record a failed attempt for a user identity.
+     * Called from controller after() or manually after a failed verification.
+     * Handles escalation: free → soft → medium → hard
+     */
+    public function recordUserFailure(string $identity, string $routeType = 'authApi'): ?array
+    {
+        $blockInfo = $this->getUserBlock($identity);
+
+        if ($blockInfo) {
+            // Already blocked — count hit and maybe escalate
+            $this->recordUserBlockHit($identity, $blockInfo['level']);
+            return $this->blockedResponse('user', $blockInfo['level']);
+        }
+
+        // Not blocked yet — increment violation count
+        $violated = $this->incrementUserViolation($identity, $routeType);
+        $cfg      = $this->config->userBlock;
+        $routeCfg = $this->config->{$routeType};
+
+        if ($violated >= $routeCfg['violation_soft']) {
+            $this->blockUser($identity, 'soft');
+            return $this->blockedResponse('user', 'soft');
+        }
+
+        return null;
+    }
+
+    /**
+     * Manually block a user identity at a given level.
+     */
+    public function blockUser(string $identity, string $level = 'soft'): void
+    {
+        $cfg      = $this->config->userBlock;
+        $blockKey = $this->config->cacheKeys['user_block'] . $this->hashIdentity($identity);
+
+        $duration = $this->blockDuration($cfg, $level);
+        $ttl      = $duration > 0 ? $duration : (10 * 365 * 24 * 3600);
+
+        $data = [
+            'level'      => $level,
+            'blocked_at' => time(),
+            'identity'   => $identity,
+        ];
+
+        $this->cache->save($blockKey, $data, $ttl);
+    }
+
+    /**
+     * Manually unblock a user identity. Independent — does NOT touch IP block.
+     */
+    public function unblockUser(string $identity): void
+    {
+        $keys   = $this->config->cacheKeys;
+        $hashed = $this->hashIdentity($identity);
+
+        $this->cache->delete($keys['user_block']      . $hashed);
+        $this->cache->delete($keys['user_violations'] . $hashed);
+        $this->cache->delete($keys['user_count']      . $hashed);
+        $this->cache->delete($keys['user_block_hits'] . $hashed);
+    }
+
+    /**
+     * Get current user block info or null if not blocked.
+     */
+    public function getUserBlock(string $identity): ?array
+    {
+        $blockKey = $this->config->cacheKeys['user_block'] . $this->hashIdentity($identity);
+        $data     = $this->cache->get($blockKey);
+        return $data ?: null;
+    }
+
+    // =========================================================================
+    // USER THROTTLE (for JWT API routes — request count based)
+    // =========================================================================
+
+    /**
+     * Throttle check for a known user on JWT routes.
+     * Increments request counter; if over limit records violation.
+     */
+    public function checkUserThrottle(string $identity, string $routeType = 'jwtApi'): ?array
+    {
+        $blockCheck = $this->checkUser($identity);
+        if ($blockCheck) {
+            return $blockCheck;
+        }
+
+        $cfg      = $this->config->{$routeType};
+        $hashed   = $this->hashIdentity($identity);
+        $countKey = $this->config->cacheKeys['user_count'] . $hashed;
+        $count    = (int) ($this->cache->get($countKey) ?? 0);
+
+        if ($count === 0) {
+            $this->cache->save($countKey, 1, $cfg['window']);
+        } else {
+            $this->cache->save($countKey, $count + 1, $cfg['window']);
+        }
+
+        if (($count + 1) > $cfg['limit']) {
+            $violated = $this->incrementUserViolation($identity, $routeType);
+            if ($violated >= $cfg['violation_soft']) {
+                $this->blockUser($identity, 'soft');
+                return $this->blockedResponse('user', 'soft');
+            }
+            return [
+                'level'   => 'throttle',
+                'message' => 'Too many requests. Please slow down.',
+                'status'  => $this->config->statusCodes['throttle'],
+            ];
+        }
+
+        return null;
+    }
+
+    // =========================================================================
+    // PRIVATE HELPERS
+    // =========================================================================
+
+    /**
+     * Increment IP violation counter and return new count.
+     */
+    protected function incrementIpViolation(string $fingerprint): int
+    {
+        $key   = $this->config->cacheKeys['ip_violations'] . $fingerprint;
+        $count = (int) ($this->cache->get($key) ?? 0) + 1;
+        // Keep violation record for the block window duration
+        $this->cache->save($key, $count, $this->config->ipBlock['window'] * 10);
+        return $count;
+    }
+
+    /**
+     * Record a hit while IP is already blocked; escalate if thresholds met.
+     */
+    protected function recordIpBlockHit(string $fingerprint, string $currentLevel): void
+    {
+        $cfg    = $this->config->ipBlock;
+        $hitKey = $this->config->cacheKeys['ip_block_hits'] . $fingerprint;
+        $hits   = (int) ($this->cache->get($hitKey) ?? 0) + 1;
+        $this->cache->save($hitKey, $hits, 10 * 365 * 24 * 3600);
+
+        if ($currentLevel === 'soft' && $hits >= $cfg['medium_trigger']) {
+            $this->cache->delete($hitKey);
+            $this->blockIp($fingerprint, 'medium');
+        } elseif ($currentLevel === 'medium' && $hits >= $cfg['hard_trigger']) {
+            $this->cache->delete($hitKey);
+            $this->blockIp($fingerprint, 'hard');
+        }
+    }
+
+    /**
+     * Increment user violation counter and return new count.
+     */
+    protected function incrementUserViolation(string $identity, string $routeType): int
+    {
+        $hashed = $this->hashIdentity($identity);
+        $key    = $this->config->cacheKeys['user_violations'] . $hashed;
+        $count  = (int) ($this->cache->get($key) ?? 0) + 1;
+        $window = $this->config->{$routeType}['window'] ?? 180;
+        $this->cache->save($key, $count, $window * 10);
+        return $count;
+    }
+
+    /**
+     * Record a hit while user is already blocked; escalate if thresholds met.
+     */
+    protected function recordUserBlockHit(string $identity, string $currentLevel): void
+    {
+        $cfg    = $this->config->userBlock;
+        $hashed = $this->hashIdentity($identity);
+        $hitKey = $this->config->cacheKeys['user_block_hits'] . $hashed;
+        $hits   = (int) ($this->cache->get($hitKey) ?? 0) + 1;
+        $this->cache->save($hitKey, $hits, 10 * 365 * 24 * 3600);
+
+        if ($currentLevel === 'soft' && $hits >= $cfg['medium_trigger']) {
+            $this->cache->delete($hitKey);
+            $this->blockUser($identity, 'medium');
+        } elseif ($currentLevel === 'medium' && $hits >= $cfg['hard_trigger']) {
+            $this->cache->delete($hitKey);
+            $this->blockUser($identity, 'hard');
+        }
+    }
+
+    /**
+     * Resolve block duration from config based on level.
+     */
+    protected function blockDuration(array $cfg, string $level): int
+    {
+        return match ($level) {
+            'soft'   => $cfg['soft_duration'],
+            'medium' => $cfg['medium_duration'],
+            'hard'   => $cfg['hard_duration'],
+            default  => 0,
+        };
+    }
+
+    /**
+     * Build a standardised blocked response array.
+     */
+    protected function blockedResponse(string $type, string $level): array
+    {
+        $messages = [
+            'soft'   => 'Your access has been temporarily suspended. Please contact support.',
+            'medium' => 'Your access has been restricted due to repeated violations.',
+            'hard'   => 'Your access has been permanently blocked. Please contact support.',
+        ];
+
+        return [
+            'level'   => $level,
+            'type'    => $type,
+            'message' => $messages[$level] ?? 'Access denied.',
+            'status'  => $this->config->statusCodes[$level],
+        ];
+    }
+
+    /**
+     * Hash user identity (email or mobile) for cache key safety.
+     */
+    protected function hashIdentity(string $identity): string
+    {
+        // return strtolower(trim($identity));
+        return hash('sha256', strtolower(trim($identity)));
+    }
+}

app/Models/EmployeePolicyModel.php

@@ -82,10 +82,19 @@ class EmployeePolicyModel extends Model
     }
 
     // ----------------------------------------------------------------------------------------------------------
-    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);
 
+        $status_query = "employee_polices.status"; // Default fallback
+
+        if ($status_type == "hr") {
+            $status_query = "CASE 
+                                WHEN employee_polices.status = 'enrolled' THEN 'under process' 
+                                ELSE employee_polices.status 
+                            END as status";
+        }
+
         $result = $this->select([
             'employee_polices.*',
             'policy_type.policy_type as policy_name',
@@ -147,8 +156,8 @@ class EmployeePolicyModel extends Model
                 THEN "Newly Added" 
                 ELSE NULL 
             END) AS newly_added',
-             
+            $status_query
-        ])
+        ], false)
             ->join('employees emp', 'employee_polices.employee_id = emp.id')
             ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy
             ->join('policies pm', 'cp.policy_id = pm.id', 'left') //pm - policy master
@@ -164,7 +173,9 @@ class EmployeePolicyModel extends Model
 
        
         // 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)) {
+            $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)) {

app/Models/FileModel.php

@@ -23,6 +23,7 @@ class FileModel extends Model
         "updated_by",
         "enrollment_open_date",
         "enrollment_close_date",
+        "hr_id",
     ];
 
 

app/Views/UserList.php

@@ -290,7 +290,7 @@ $(document).ready(function () {
                 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()
                 })
             }

app/Views/cd_master_list.php

@@ -312,7 +312,7 @@ document.addEventListener("DOMContentLoaded", function () {
         <?php endif; ?>
 
         <?php if (session()->has('success')) : ?>
-            toastr.success('<?= session()->getFlashdata('success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('success') ?>', 'Success');
         <?php endif; ?>
 
         var endDatePicker = flatpickr("#opening_date", {
@@ -410,7 +410,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
                 console.log(res)
                 if(res.status == true){
-                    toastr.warning(res.message, 'warning');
+                    toastr.warning(res.message, 'Warning');
                     $('#cd_ac_no').val('');
                 }
             },
@@ -446,10 +446,10 @@ document.addEventListener("DOMContentLoaded", function () {
                     // 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');
                         }
                         }
                     },

app/Views/client_branch.php

@@ -609,7 +609,7 @@ $('body').on('click', '.btnBranchEdit', function() {
             setTimeout(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Wrong!', 'warning');
+                toastr.warning('Something Wrong!', 'Warning');
             }, 1000);
         }
     });
@@ -811,10 +811,10 @@ function removeClientBranch(element) {
                     // console.log(res.status == true);
                     if (res) {
                         if (res.status == true) {
-                            toastr.success(res.message, 'success');
+                            toastr.success(res.message, 'Success');
                             location.reload();
                         } else {
-                            toastr.warning(res.message, 'warning');
+                            toastr.warning(res.message, 'Warning');
                         }
                     }
                 },
@@ -824,7 +824,7 @@ function removeClientBranch(element) {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        console.log('Something Wrong!', 'warning');
+                        console.log('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -938,7 +938,7 @@ function validateInput(input, table, field, submitBtnId){
 
     checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
         if (isDuplicate) {
-            toastr.warning(message, 'WARNING');
+            toastr.warning(message, 'Warning');
             // $(input).val('')
             $('#'+submitBtnId).prop('disabled', true);
         } else{
@@ -972,7 +972,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;
     }
@@ -999,7 +999,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}`);
@@ -1044,13 +1044,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`);
@@ -1096,9 +1096,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) {

app/Views/client_kyc.php

@@ -212,7 +212,7 @@
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
 
                 }
@@ -333,7 +333,7 @@
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
 
                 }
@@ -438,7 +438,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }
         });

app/Views/client_list.php

@@ -402,7 +402,7 @@
 
     //                     if(res){
     //                     if (res.status == true) {
-    //                         toastr.success('Client removed successfully.', 'success');
+    //                         toastr.success('Client removed successfully.', 'Success');
     //                         location.reload();
     //                     } else {
     //                         Swal.fire({
@@ -410,7 +410,7 @@
     //                             text: res.message,
     //                             icon: "warning"
     //                         });
-    //                         // toastr.warning(res.message, 'warning');
+    //                         // toastr.warning(res.message, 'Warning');
     //                     }
     //                     }
     //                 },
@@ -419,7 +419,7 @@
     //                     console.error(status, error);
     //                     $('.loader').fadeOut();
     //                     $('.loader-mask').delay(350).fadeOut('slow');
-    //                     console.log('Something Wrong!', 'warning');
+    //                     console.log('Something Wrong!', 'Warning');
     //                 }
     //             });
     //         }
@@ -466,15 +466,15 @@
                         $('.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) {
@@ -563,10 +563,10 @@
 
                 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.warning(res.message, 'Warning')
                 }
 
                 $('.close').click()

app/Views/client_onboarding.php

@@ -200,7 +200,7 @@ body {
 
         if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
+            toastr.warning('Please Add the Client!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
@@ -215,7 +215,7 @@ body {
 
         if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
             $('#relation_form').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
+            toastr.warning('Please Add the Client!', 'Warning',{timeOut: 2000});
         }else{
             $('#relation_form').show();
         }
@@ -228,7 +228,7 @@ body {
 
         if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
             $('#BtnAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
+            toastr.warning('Please Add the Client!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnPolicyBack')[0].style.display == 'none') {
                 $('#BtnAdd').show();
@@ -243,7 +243,7 @@ body {
 
         if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
+            toastr.warning('Please Add the Client!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
@@ -259,7 +259,7 @@ body {
 
         if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
             $('#notification-tab').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
+            toastr.warning('Please Add the Client!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#notification-tab')[0].style.display == 'none') {
                 $('#notification-tab').show();

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');
                     }
 
                 },

app/Views/client_policy.php

@@ -332,7 +332,7 @@ input:checked + .slider:before {
                             </div> -->
 
                             <div class="form-group col-md-12">
-                                <label for="disclaimer">Disclaimer<span class="text-danger">*</span></label>
+                                <label for="disclaimer">Disclaimer<span class="text-danger"></span></label>
                                 <textarea class="form-control" placeholder="Enter Disclaimer" name="disclaimer"
                                     id="disclaimer"></textarea>
                             </div>
@@ -1686,7 +1686,7 @@ $('#policy_type').change(function() {
     }
 
     if ($(this).val() == 5) {
-        toastr.warning('Please Change the Policy Terms after Submit the Policy!', 'INFO');
+        toastr.warning('Please Change the Policy Terms after Submit the Policy!', 'Info');
     }
 
     if ($(this).val() == '4' || $(this).val() == '5') {
@@ -1891,7 +1891,7 @@ function fetchClientBranch() {
             // //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;
             }
 
@@ -2018,15 +2018,15 @@ function removepolicy(element) {
 
                     if (res) {
                         if (res.status == true) {
-                            toastr.success('Policy removed successfully.', 'success');
+                            toastr.success('Policy removed successfully.', 'Success');
                             location.reload();
                         } else {
                             Swal.fire({
-                                title: "warning!",
+                                title: "Warning!",
                                 text: res.message,
                                 icon: "warning"
                             });
-                            // toastr.warning('Failed to remove policy', 'warning');
+                            // toastr.warning('Failed to remove policy', 'Warning');
                         }
                     }
                 },
@@ -2060,7 +2060,7 @@ $('#policy_no').change(function() {
 
             console.log(res)
             if (res.status == true) {
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#policy_no').val('');
             }
         },
@@ -2331,10 +2331,10 @@ function featchClient() {
             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.warning(res.message, 'Warning');
             }
 
             $('.close').click()

app/Views/employee_data_list.php

@@ -536,7 +536,7 @@ function get_emp_master_data_for_update_ajax(id) {
                 $('#gender').prop('disabled', false);
                 $('#dob').prop('disabled', false);
 
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
             }
         },
         error: function(xhr, status, error) {
@@ -583,7 +583,7 @@ function update_emp_master_data_submit_function(event, form) {
             $('.loader-mask').delay(350).fadeOut('slow');
 
             if (response.status == true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
 
                 $('.close').click();
 
@@ -599,7 +599,7 @@ function update_emp_master_data_submit_function(event, form) {
                 fetchEmpolyeeList();
 
             } else {
-                toastr.error(response.message, 'ERROR');
+                toastr.error(response.message, 'Error');
             }
         },
         error: function(xhr, status, error) {
@@ -616,7 +616,7 @@ function update_emp_master_data_submit_function(event, form) {
                 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() {
@@ -657,9 +657,9 @@ function send_mail_for_individual_employee_ecard(id) {
                     $('.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) {
@@ -698,7 +698,7 @@ function validateInput(input, table, field) {
 
     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);
@@ -800,12 +800,12 @@ function get_emp_history(input, emp_id) {
             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');
@@ -844,7 +844,7 @@ function downloadInception(){
             empName: empName
         },
         success: function(response) {
-             if (response.status === 'success') {
+             if (response.status === 'Success') {
                 $('<a>', {
                             href: response.downloadUrl,
                             download: '',

app/Views/employee_list.php

@@ -302,14 +302,51 @@ function init() {
     function handleItemClick(e, item) {
         e.preventDefault(); 
         
-        // Execute the stored onclick handler
         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];
+
+                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;
         }
 
@@ -691,9 +728,9 @@ function sendManualEcard(input)
                     $('.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');
                     }
 
                 },

app/Views/employee_upload.php

@@ -38,7 +38,7 @@ option:disabled {
 
                                         <div class="form-group col-md-4">
                                             <label>Branch</label> <br />
-                                            <select name="branch_id" class="form-control" id="branch_id" required>
+                                            <select name="client_branch_id" class="form-control" id="branch_id" required>
                                                 <option value="0">Select</option>
                                             </select>
                                         </div>
@@ -183,7 +183,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();
@@ -247,22 +247,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{
 
@@ -291,7 +291,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 {
@@ -330,7 +330,7 @@ $(document).ready(function() {
                     .data !== "") {
                     toastr.success(
                         'File upload successs, Data validation is in-progress',
-                        'success');
+                        'Success');
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {
                     console.error('no data found', response);
@@ -850,7 +850,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;
     }

app/Views/enrollment_list.php

@@ -811,13 +811,13 @@
                     $('.loader-mask').delay(350).fadeOut('slow');
 
                     if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                        toastr.success('File upload success, Data validation is in-progress', 'success');
+                        toastr.success('File upload success, Data validation is in-progress', 'Success');
                         setTimeout(function() {
                             window.location.href = '<?= base_url("employee/upload/") ?>';
                         }, 600);
                     } else if (response.code === 404 && response.dataStatus === false) {
                         console.error('No data found', response);
-                        toastr.error(response.message, 'error');
+                        toastr.error(response.message, 'Error');
                         setTimeout(function() {
                             window.location.href = '<?= base_url("employee/upload/") ?>';
                         }, 600);
@@ -908,9 +908,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');
                         }
 
                     },

app/Views/file_list.php

@@ -89,7 +89,7 @@
 
                                            echo '<a data-id="' . $file['status'] . '" class="reload" href="#">' . $file['status'] . '</a>';
                                         }
-                                    } else if ($file['status'] == 'success') {
+                                    } else if ($file['status'] == 'Success') {
 
                                         if ($file['action'] == 'inception' || $file['action'] == 'addition' || $file['action'] == 'dependent_addtion') {
                                             $tool_tip_text = "Live(s) : {$file['employee_count']}" . " | Total premium : ₹ " . format_indian_number($file['total'], 2, ',');
@@ -113,13 +113,22 @@
                                         class="mdi mdi-dots-horizontal"></i></a>
                                 <div class="dropdown-menu dropdown-menu-right">
                                     <?php if ($file['status'] == 'failed') { ?>
-                                        <a data-id="<?= htmlspecialchars(json_encode(['client_id' => $file['client_id'], 'client_policy_id' => $file['client_policy_id'], 'client_branch_id' => $file['client_branch_id'], 'action' => $file['action']])) ?>" data-toggle="modal" data-target="#file-upload-modal" class="dropdown-item upload_button" href="#"><i class="mdi mdi-upload mr-2 text-muted font-18 vertical-middle"></i>Re-Upload</a>
+                                        <a data-id="<?= 
+                                            htmlspecialchars(json_encode([
+                                                'client_id' => $file['client_id'], 
+                                                'client_policy_id' => $file['client_policy_id'], 
+                                                'client_branch_id' => $file['client_branch_id'], 
+                                                'enrollment_open_date' => change_date_format($file['enrollment_open_date'] , 'Y-m-d', 'd/m/Y'), 
+                                                'enrollment_close_date' => change_date_format($file['enrollment_close_date'], 'Y-m-d', 'd/m/Y' ), 
+                                                'action' => $file['action']
+                                            ])) 
+                                            ?>" data-toggle="modal" data-target="#file-upload-modal" class="dropdown-item upload_button" href="#"><i class="mdi mdi-upload mr-2 text-muted font-18 vertical-middle"></i>Re-Upload</a>
                                     <?php } ?>
 
                                     <a class="dropdown-item" href="<?= base_url("util/download-file-list/") . $file['id']; ?>"><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
                                     <a data-id="<?php echo $file['id'] ?>" data-toggle="modal" data-target="#full-width-modal-emp-list" class="dropdown-item view_emp_list" href="#"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View</a>
                                     
-                                    <?php if ($file['status'] == 'success') { ?>
+                                    <?php if ($file['status'] == 'Success') { ?>
                                         <a data-id="<?php echo $file['id'] ?>" class="dropdown-item truncate2" href="#"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Truncate</a>
                                     <?php } ?>
 
@@ -170,7 +179,9 @@
                     enctype="multipart/form-data">
                     <input type="hidden" id="file_client_id" name="client_id">
                     <input type="hidden" id="file_policy_id" name="policy_id">
-                    <input type="hidden" id="file_branch_id" name="branch_id">
+                    <input type="hidden" id="file_branch_id" name="client_branch_id">
+                    <input type="hidden" id="file_enrollment_open_date" name="enrollment_open_date">
+                    <input type="hidden" id="file_enrollment_close_date" name="enrollment_close_date">
                     <input type="hidden" id="file_upload_actions" name="upload-action-type">
                     <input type="file" id="fileInput" name="emplist" required
                         accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
@@ -262,6 +273,9 @@ $('body').on('click', '.upload_button', function() {
     $('#file_client_id').val(fileId.client_id)
     $('#file_policy_id').val(fileId.client_policy_id)
     $('#file_branch_id').val(fileId.client_branch_id)
+    $('#file_enrollment_open_date').val(fileId.enrollment_open_date)
+    $('#file_enrollment_close_date').val(fileId.enrollment_close_date)
+    $('#file_branch_id').val(fileId.client_branch_id)
     $('#file_upload_actions').val(fileId.action)
 })
 
@@ -441,7 +455,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) {

app/Views/insurer_branch.php

@@ -292,7 +292,7 @@
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
                 }
             });
@@ -358,7 +358,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -515,10 +515,10 @@
                     // 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');
                         }
                         }
                     },
@@ -527,7 +527,7 @@
                         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');
                     }
                 });
 

app/Views/insurer_export_templete.php

@@ -440,9 +440,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);
@@ -677,9 +677,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);

app/Views/insurer_list.php

@@ -277,10 +277,10 @@ class csvExport {
                     // 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');
                         }
                       }
                   },
@@ -289,7 +289,7 @@ class csvExport {
                       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');
                   }
               });
             }

app/Views/insurer_onboarding.php

@@ -59,7 +59,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',{timeOut: 2000});
+            toastr.warning('First Add the Insurer!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();

app/Views/insurer_or_tpa_data.php

@@ -156,7 +156,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();
@@ -200,7 +200,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) {
 

app/Views/insurer_statement_list.php

@@ -961,7 +961,7 @@ maxDate.setDate(today.getDate() + 180);
                     .data !== "") {
                     toastr.success(
                         'File upload successs',
-                        'success');
+                        'Success');
                     $('.close').click();
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {

app/Views/kyc_docs.php

@@ -201,7 +201,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);
                 }
             });
@@ -241,7 +241,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);
             }        
         });
@@ -304,7 +304,7 @@ $(document).ready(function () {
                         setTimeout(function() {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                     console.log('Something Wrong!', 'warning');                        }, 1000);
+                     console.log('Something Wrong!', 'Warning');                        }, 1000);
                     }
                 });
             }
@@ -352,7 +352,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');
                         }
                         }
                     },
@@ -361,7 +361,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');
                     }
                 });
             }

app/Views/kyc_entity_type_basic_info.php

@@ -86,7 +86,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);
                 }
             });

app/Views/kyc_list.php

@@ -271,12 +271,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');
                     }
                   }
               },
@@ -286,7 +286,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);
               }
           });

app/Views/kyc_onboarding.php

@@ -75,7 +75,7 @@ body {
         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',{timeOut: 2000});
+            toastr.warning('First Add the KYC Entity Type!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();

app/Views/layout/footer_new.php

@@ -0,0 +1,941 @@
+</div> <!-- container -->
+
+</div> <!-- content -->
+
+<!-- Footer Start -->
+<footer class="footer">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-6">
+                <script>
+                    document.write(new Date().getFullYear())
+                </script> &copy; NHANCE
+            </div>
+            <!-- <div class="col-md-6">
+                <div class="text-md-right footer-links d-none d-sm-block">
+                    <a href="javascript:void(0);">About Us</a>
+                    <a href="javascript:void(0);">Help</a>
+                    <a href="javascript:void(0);">Contact Us</a>
+                </div>
+            </div> -->
+        </div>
+    </div>
+</footer>
+<!-- end Footer -->
+
+</div>
+
+<!-- ============================================================== -->
+<!-- End Page content -->
+<!-- ============================================================== -->
+
+
+</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>
+    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>
+    window.addEventListener("load", function() {
+    document.body.style.setProperty("background-color", "white", "important");
+});
+
+</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>
+
+</body>
+
+</html>

app/Views/layout/header.php

@@ -51,7 +51,7 @@
 
 
     <!-- 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 +59,7 @@
     <!-- 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"> -->

app/Views/layout/header_new.php

@@ -51,33 +51,33 @@
 
 
       <!-- 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>
+<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-beta.1/dist/css/select2.min.css" rel="stylesheet" type="text/css">
+<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.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>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
 
     <!-- <link rel="manifest" href="../manifest.json"> -->
 
-    <script>
+   <!--  <script>
-        // if ('serviceWorker' in navigator) {
+        if ('serviceWorker' in navigator) {
-        //     window.addEventListener('load', function() {
+            window.addEventListener('load', function() {
-        //         navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
+                navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
-        //             // console.log('Service Worker registration successful with scope:', registration.scope);
+                    // console.log('Service Worker registration successful with scope:', registration.scope);
-        //         }, function(err) {
+                }, function(err) {
-        //             // console.log('Service Worker registration failed:', err);
+                    // console.log('Service Worker registration failed:', err);
-        //         });
+                });
-        //     });
+            });
-        // }
+        }
-    </script>
+    </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/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 -->
     <script src="https://editor.unlayer.com/embed.js"></script>
@@ -329,84 +329,8 @@
         });
     </script>
 
-    <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 ;
-        }
-
-        .ul-flex{
-            display:flex;
-            flex-flow: column nowrap;
-            justify-content: center;
-            align-content: space-evenly;
-        }
-
-        .top-navbar-div{
-            display:flex;
-            flex-flow:row nowrap;
-            justify-content:space-between;
-        }
-
-        .nav-flex{
-             display:flex;
-            flex-flow: row nowrap;
-            justify-content:end;
-            margin-right:20px;
-        }
-
-        .card-body{
-            background-color:white;
-            padding-left:50px !important;
-            margin-top: 5px;
-        }
-
-        .content-page{
-            background-color: white !important;
-            color:white !important;
-            padding: 0px !important;
-        }
-
-        .footer{
-            background-color:white !important;
-            color:black;
-            margin: 30px !important;
-        }
-
-        html{
-            background-color: white !important;
-        }
-
-        .footer{
-            margin-left:150px;
-        }
-
-        .left-side-menu{
-            margin-left:30px; 
-            margin-top:20px;
-            margin-bottom:5px;
-            border-radius:25px;
-            background-color:#D4F5F6;
-            z-index:700;
-            padding:0px !important;
-            height:90%;
-        }
-
-        label{
-            color:#000;
-        }
-
-
-    </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>
@@ -420,24 +344,219 @@
 
 <!-- <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;">
+<div id="wrapper">
 
+    <!-- Topbar Start -->
+    <div class="navbar-custom">
+        <div class="container-fluid">
+            <ul class="list-unstyled topnav-menu float-right mb-0">
+
+                <!-- <li class="d-none d-lg-block">
+                    <form class="app-search">
+                        <div class="app-search-box dropdown">
+                            <div class="input-group">
+                                <input type="search" class="form-control" placeholder="Search..." id="top-search">
+                                <div class="input-group-append">
+                                    <button class="btn" type="submit">
+                                        <i class="fe-search"></i>
+                                    </button>
+                                </div>
+                            </div> -->
+                            <!-- <div class="dropdown-menu dropdown-lg" id="search-dropdown">
+                                        <div class="dropdown-header noti-title">
+                                            <h5 class="text-overflow mb-2">Found <span class="text-danger">09</span> results</h5>
+                                        </div>
+            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-home mr-1"></i>
+                                            <span>Analytics Report</span>
+                                        </a>
+            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-aperture mr-1"></i>
+                                            <span>How can I help you?</span>
+                                        </a>
+                            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-settings mr-1"></i>
+                                            <span>User profile settings</span>
+                                        </a>
+
+                                        <div class="dropdown-header noti-title">
+                                            <h6 class="text-overflow mb-2 text-uppercase">Users</h6>
+                                        </div>
+
+                                        <div class="notification-list">
+                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                                <div class="media">
+                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-2.jpg" alt="Generic placeholder image" height="32">
+                                                    <div class="media-body">
+                                                        <h5 class="m-0 font-14">Erwin E. Brown</h5>
+                                                        <span class="font-12 mb-0">UI Designer</span>
+                                                    </div>
+                                                </div>
+                                            </a>
+
+                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                                <div class="media">
+                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-5.jpg" alt="Generic placeholder image" height="32">
+                                                    <div class="media-body">
+                                                        <h5 class="m-0 font-14">Jacob Deo</h5>
+                                                        <span class="font-12 mb-0">Developer</span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </div>
+            
+                                    </div>   -->
+                        <!-- </div>
+                    </form>
+                </li> -->
+
+                 <!-- <li class="dropdown notification-list topbar-dropdown"> 
+                    <a class="nav-link dropdown-toggle right-bar-toggle waves-effect waves-light">
+                        <i class="fe-bell noti-icon"></i>
+                        <span class="badge badge-danger rounded-circle noti-icon-badge" id="notification_count">0</span>
+                    </a>
+                </li> -->
+
+                <li class="dropdown notification-list topbar-dropdown">
+                    <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
+                        <img src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" class="rounded-circle">
+                        <span class="pro-user-name ml-1" style="font-size: 16px;">
+                            <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
+                            <!-- <i class="mdi mdi-chevron-down"></i>  -->
+                        </span>
+                    </a> 
+                    <!--<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
+                                 <div class="dropdown-header noti-title">
+                                    <h6 class="text-overflow m-0">Welcome !</h6>
+                                </div>
+    
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-account-circle-line"></i>
+                                    <span>My Account</span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-settings-3-line"></i>
+                                    <span>Settings</span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-wallet-line"></i>
+                                    <span>My Wallet <span class="badge badge-success float-right">3</span> </span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-lock-line"></i>
+                                    <span>Lock Screen</span>
+                                </a> 
+
+ 
+                                 <a href="<?= base_url('/logout'); ?>" class="dropdown-item notify-item">
+                                    <i class="ri-logout-box-line"></i>
+                                    <span>Logout</span>
+                                </a>
+    
+                            </div>
+                <!-- </li> -->
+
+                <!-- <li class="dropdown notification-list">
+                            <a href="javascript:void(0);" class="nav-link right-bar-toggle waves-effect waves-light">
+                                <i class="fe-settings noti-icon"></i>
+                            </a>
+                        </li> -->
+
+                <li class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" class="nav-link waves-effect waves-light">
+                        <i class="ri-logout-box-r-line" style="font-size: 25px;"></i>
+                    </a>
+                </li>
+
+            </ul>
+
+            <!-- LOGO -->
+            <div class="logo-box">
+                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-dark text-center">
+                    <span class="logo-sm">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
+                        <!-- <span class="logo-lg-text-light">NHANCE</span> -->
+                    </span>
+                    <span class="logo-lg">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="20">
+                        <!-- <span class="logo-lg-text-light">M</span> -->
+                    </span>
+                </a>
+
+                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-light text-center">
+                    <span class="logo-sm">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
+                    </span>
+                    <!-- <span class="logo-lg">
+                                <img src="<?= base_url() . "public"; ?>/assets/images/logo-light.png" alt="" height="20">
+                            </span> -->
+                </a>
+            </div>
+
+            <ul class="list-unstyled topnav-menu topnav-menu-left m-0">
+                <li>
+                    <button class="button-menu-mobile waves-effect waves-light">
+                        <i class="fe-menu"></i>
+                    </button>
+                </li>
+
+                <li>
+                    <!-- Mobile menu toggle (Horizontal Layout)-->
+                    <a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
+                        <div class="lines">
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                        </div>
+                    </a>
+                    <!-- End mobile menu toggle-->
+                </li>
+
+
+            </ul>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+    <!-- end Topbar -->
 
     <!-- ========== Left Sidebar Start ========== -->
     <div class="left-side-menu">
 
+
+        <!-- LOGO -->
+        <div class="logo-box">
+            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-dark text-center">
+                <span class="logo-sm">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-sm-dark.png" alt="" height="24">
+                    <!-- <span class="logo-lg-text-light">nHance</span> -->
+                </span>
+                <span class="logo-lg">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-dark.png" alt="" height="20">
+                    <!-- <span class="logo-lg-text-light">N</span> -->
+                </span>
+            </a>
+
+            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-light text-center">
+                <span class="logo-sm">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/nhance_white_logo.svg" alt="" width="130" height="30">
+                </span>
+                <!-- <span class="logo-lg">
+                            <img src="<?= base_url() . "public"; ?>./assets/images/logo-light.png" alt="" height="20">
+                        </span> -->
+            </a>
+        </div>
+
         <div class="h-100" data-simplebar>
 
             <!--- Sidemenu -->
             <div id="sidebar-menu">
-                <ul class="ul-flex" id="side-menu">
+                <ul 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" height="24">
-                        </a>
-                    </li>
-
 
                     <li>
                         <a href="<?= base_url('/dashboard/view') ?>">
@@ -448,16 +567,15 @@
 
                     <li>
                         <a href="<?= base_url('/client/list') ?>">
-                            <img 
+                            <i class="mdi mdi-domain"></i>
-                            src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
                             <span> Clients </span>
                         </a>
                     </li>
 
                     <li>
                         <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                             <img 
+                            <i class="fas fa-user-tie"></i>
-                            src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
+                            <span class="badge badge-success badge-pill float-right">2</span>
                             <span> Action on Policies </span>
                         </a>
                         <div class="collapse" id="sidebarDashboards">
@@ -486,8 +604,8 @@
 
                         <li>
                             <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                                <img 
+                                <i class="ri-database-2-line"></i>
-                                src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
+                                <span class="badge badge-success badge-pill float-right">2</span>
                                 <span> Masters </span>
                             </a>
                             <div class="collapse" id="sidebarDashboards">
@@ -630,31 +748,6 @@
     </div>
     <!-- Left Sidebar End -->
 
-    <!-- Top Bar -->
-        <div class="top-navbar-div" style="margin-left:150px; margin-top:20px;" >
-                <div>
-                    <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>  
-                </div>
-                <div class="nav-flex">
-                    <div>
-                        <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"
-                            >
-                                <img 
-                                style="color: black;"
-                                src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" 
-                                class="rounded-circle">
-                            </a> 
-                    </div>
-                    <div>
-                        <a href="<?= base_url('/logout'); ?>" style="font-size: 16px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;">
-                                <i class="ri-logout-box-r-line" style="font-size: 20px; color:#000;padding:0px;"></i>
-                            </a>
-                    </div>              
-                </div>
-        </div>
-    <!-- End of Top -->
-    
-
     <!-- ============================================================== -->
     <!-- Start Page Content here -->
     <!-- ============================================================== -->

app/Views/layout/header_new_old.php

@@ -0,0 +1,666 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8" />
+    <title><?= isset($page_name) ? $page_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.6.0.min.js"></script>
+
+    <!-- Sweet Alert CDN -->
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.10.4/dist/sweetalert2.all.min.js"></script>
+
+    <!-- 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://cdn.jsdelivr.net/npm/@popperjs/core@2.5.3/dist/umd/popper.min.js"></script>
+
+    <!-- <link rel="manifest" href="../manifest.json"> -->
+
+    <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 -->
+    <script src="https://editor.unlayer.com/embed.js"></script>
+    <!-- <script src="<?= base_url('public/unlayer/js/embed.js') . '' ?>"></script> -->
+    <!-- srinivas -->
+
+    <style>
+
+
+        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages) {
+            min-height: 0;
+        }
+
+        body[data-sidebar-size=condensed] .navbar-custom {
+            left: 155px !important;
+        }
+
+        body[data-sidebar-size=condensed] .logo-box {
+            width: 155px !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;
+        }
+
+        /* 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 */
+            }
+        }
+
+
+        .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);
+        }
+
+        .lead {
+            font-size: 13px;
+        }
+
+        .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;
+        }
+
+        @-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);
+            }
+        }
+
+        .toast-success {
+            background-color: #009688 !important;
+            color: #FFFFFF !important;
+        }
+
+        /* .dataTables_wrapper .text-right {
+                position: relative;
+            } */
+
+        .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;
+        }
+
+
+        .modal-full-width {
+            width: 80% !important;
+            /* width: 95% !important; */
+            /* max-width: none; */
+        }
+
+        .modal-body {
+            /* position: relative;
+                flex: 1 1 auto; */
+            padding: 2rem !important;
+        }
+    </style>
+
+    <style>
+        .text-danger-2 {
+            font-style: italic;
+            color: black !important;
+            /* color: #02a8b5 !important; */
+            font-size: 12px;
+        }
+
+        /* .form-group {
+                margin-bottom: -0.2rem !important;
+            }
+            .form-row{
+                width: 84%;
+            } */
+    </style>
+
+    <style>
+        .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;
+        }
+    </style>
+
+    <style>
+        .toast-body {
+            padding: .75rem;
+            background: aliceblue !important;
+        }
+
+        #messages-list li {
+            margin-top: 0;
+            margin-bottom: -25px;
+            /* Adjust this value to reduce the space */
+        }
+
+        .toast-footer {
+            text-align: right;
+            color: #000;
+            border-top: 1px solid aliceblue;
+            margin-top: 11px;
+            margin-bottom: -6px;
+        }
+
+
+        .right-bar {
+            width: 300px;
+            /* Adjust as needed */
+            overflow: hidden;
+        }
+
+        .fixed-header {
+            position: relative;
+            top: 0;
+            z-index: 1000;
+            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;
+        }
+    </style>
+
+    <script>
+        $(window).on('load', function() {
+            setTimeout(function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').fadeOut('slow');
+            }, 1000);
+        });
+    </script>
+
+    <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 ;
+        }
+
+        .ul-flex{
+            display:flex;
+            flex-flow: column nowrap;
+            justify-content: center;
+            align-content: space-evenly;
+        }
+
+        .top-navbar-div{
+            display:flex;
+            flex-flow:row nowrap;
+            justify-content:space-between;
+        }
+
+        .nav-flex{
+             display:flex;
+            flex-flow: row nowrap;
+            justify-content:end;
+            margin-right:20px;
+        }
+
+        .card-body{
+            background-color:white;
+            padding-left:50px !important;
+            margin-top: 5px;
+        }
+
+        .content-page{
+            background-color: white !important;
+            color:white !important;
+            padding: 0px !important;
+        }
+
+        .footer{
+            background-color:white !important;
+            color:black;
+            margin: 30px !important;
+        }
+
+        html{
+            background-color: white !important;
+        }
+
+        .footer{
+            margin-left:150px;
+        }
+
+        .left-side-menu{
+            margin-left:30px; 
+            margin-top:20px;
+            margin-bottom:5px;
+            border-radius:25px;
+            background-color:#D4F5F6;
+            z-index:700;
+            padding:0px !important;
+            height:90%;
+        }
+
+        label{
+            color:#000;
+        }
+
+
+    </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 class="h-100" 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" height="24">
+                        </a>
+                    </li>
+
+
+                    <li>
+                        <a href="<?= base_url('/dashboard/view') ?>">
+                            <i class="ri-dashboard-line"></i>
+                            <span> Dashboard </span>
+                        </a>
+                    </li>
+
+                    <li>
+                        <a href="<?= base_url('/client/list') ?>">
+                            <img 
+                            src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
+                            <span>Clients</span>
+                        </a>
+                    </li>
+
+                    <li>
+                        <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
+                             <img 
+                            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>
+                            </ul>
+                        </div>
+                    </li>
+
+                    <?php if(get_role_id() == 1 || get_role_id() == 5) { ?>
+
+                        <li>
+                            <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
+                                <img 
+                                src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
+                                <span> Masters </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboards">
+                                <ul class="nav-second-level">
+                                    <!-- <li>
+                                        <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
+                                    </li> -->
+                                    <!-- <li>
+                                        <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
+                                    </li> -->
+                                    <!-- <li>
+                                        <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
+                                    </li> -->
+                                    <!-- <li>
+                                        <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
+                                    </li> -->
+                                    <!-- <li>
+                                        <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
+                                    </li> -->
+                                    <li>
+                                        <a href="<?= base_url('/user/list') ?>"> Users </a>
+                                    </li>
+                                </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> -->
+
+                    <!-- <li>
+                        <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect" style="color: grey;">
+                            <i class="fa fa-info-circle" aria-hidden="true"></i>
+                            <span class="badge badge-success badge-pill float-right">2</span>
+                            <span> App Content Management </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>
+                            </ul>
+                        </div>
+                    </li> -->
+
+                    <!-- leads -->
+                    <!-- <li>
+                        <a href="<?= base_url('/leads/list') ?>">
+                            <i class="mdi mdi-chart-bar"></i>
+                            <span> Leads </span>
+                        </a>
+                    </li> -->
+
+                    <?php if((get_role_id() == 1 || get_role_id() == 5) && (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()))) { ?>
+
+                    <!-- <li>
+                        <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
+                            <i class="mdi mdi-format-list-bulleted"></i>
+                            <span class="badge badge-success badge-pill float-right">2</span>
+                            <span> Policy Transactions </span>
+                        </a>
+                        <div class="collapse" id="sidebarDashboards">
+                            <ul class="nav-second-level">
+                                <li>
+                                    <a href="<?= base_url('/policy_tranction/inception/list') ?>">Policy</a>
+                                </li>
+                                <li>
+                                    <a href="<?= base_url('/policy_tranction/endorsement/list') ?>">Endorsement</a>
+                                </li>
+
+                                <?php if (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>
+
+                                    <li>
+                                        <a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a>
+                                    </li>
+                                    <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('/policy_tranction/report/report-finance-list') ?>">Finance Team</a>
+                                    </li>
+
+                                <?php } ?>
+
+                                <?php if (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+
+                                    <li>
+                                        <a href="<?= base_url('/policy_tranction/report/report-business-list') ?>">Business Team</a>
+                                    </li>
+
+                                <?php } ?>
+                                <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('/dmsSearch') ?>">Documents</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </li> -->
+
+                    <?php } ?>
+
+                </ul>
+            </div>
+            <!-- End Sidebar -->
+
+        </div>
+        <!-- Sidebar -left -->
+
+    </div>
+    <!-- Left Sidebar End -->
+
+    <!-- Top Bar -->
+        <div class="top-navbar-div" style="margin-left:150px; margin-top:20px;" >
+                <div>
+                    <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>  
+                </div>
+                <div class="nav-flex">
+                    <div>
+                        <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"
+                            >
+                                <img 
+                                style="color: black;"
+                                src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" 
+                                class="rounded-circle">
+                            </a> 
+                    </div>
+                    <div>
+                        <a href="<?= base_url('/logout'); ?>" style="font-size: 16px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;">
+                                <i class="ri-logout-box-r-line" style="font-size: 20px; color:#000;padding:0px;"></i>
+                            </a>
+                    </div>              
+                </div>
+        </div>
+    <!-- End of Top -->
+    
+
+    <!-- ============================================================== -->
+    <!-- Start Page Content here -->
+    <!-- ============================================================== -->
+
+    <div class="content-page">
+        <div class="content">
+
+            <!-- Start Content-->
+            <div class="container-fluid"></div>

app/Views/leads_list.php

@@ -270,11 +270,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; ?>
 
 

app/Views/notification.php

@@ -814,13 +814,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', 'Success')
                             }
                         },
                         error: function(xhr, status, error) {
@@ -835,16 +835,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');
         }
 
     }
@@ -981,10 +981,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) {
@@ -1001,7 +1001,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() {
@@ -1033,10 +1033,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) {
@@ -1109,13 +1109,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) {
@@ -1130,16 +1130,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');
         }
 
     }
@@ -1188,8 +1188,8 @@
         <td>
             <form class="ajax" onsubmit="submitAttachmentForm(event, this)">
                 <div class="form-row">
-                    <div class="form-group col-3">
+                    <div class="form-group col-5">
-                        <input type="file" class="file-input__input" name="file" required>
+                        <input type="file" class="file-input__input" name="file">
                     </div>
                     <div class="form-group col-2">
                         <button type="submit" class="btn btn-sm btn-primary">Submit</button>
@@ -1227,8 +1227,8 @@
         <td>
             <form class="ajax" onsubmit="submitAttachmentForm(event, this)">
                 <div class="form-row">
-                    <div class="form-group col-3">
+                    <div class="form-group col-5">
-                        <input type="file" class="file-input__input" name="file" required>
+                        <input type="file" class="file-input__input" name="file">
                     </div>
                     <div class="form-group col-2">
                         <button type="submit" class="btn btn-sm btn-primary">Submit</button>
@@ -1251,8 +1251,8 @@
         <td>
             <form class="ajax" onsubmit="submitAttachmentForm(event, this)">
                 <div class="form-row">
-                    <div class="form-group col-3">
+                    <div class="form-group col-5">
-                        <input type="file" class="file-input__input" name="file" required>
+                        <input type="file" class="file-input__input" name="file">
                     </div>
                     <div class="form-group col-2">
                         <button type="submit" class="btn btn-sm btn-primary">Submit</button>
@@ -1295,7 +1295,7 @@
 
         // Check if a file is selected
         if (!fileInput.files.length) {
-            toastr.warning("Please select a file to upload.");
+            toastr.warning("Please select a file to upload.", "Validation Error");
             return;
         }
 
@@ -1321,10 +1321,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) {
@@ -1341,7 +1341,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() {
@@ -1373,10 +1373,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) {
@@ -1687,7 +1687,7 @@
     //                 setTimeout(function() {
     //                     $('.loader').fadeOut();
     //                     $('.loader-mask').delay(350).fadeOut('slow');
-    //                     toastr.warning('Something Went Wrong!', 'warning');
+    //                     toastr.warning('Something Went Wrong!', 'Warning');
     //                 }, 1000);
     //             }
     //         });
@@ -1747,7 +1747,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -1807,7 +1807,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -1867,7 +1867,7 @@
     //                 setTimeout(function() {
     //                     $('.loader').fadeOut();
     //                     $('.loader-mask').delay(350).fadeOut('slow');
-    //                     toastr.warning('Something Went Wrong!', 'warning');
+    //                     toastr.warning('Something Went Wrong!', 'Warning');
     //                 }, 1000);
     //             }
     //         });
@@ -1928,7 +1928,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -1988,7 +1988,7 @@
     //                 setTimeout(function() {
     //                     $('.loader').fadeOut();
     //                     $('.loader-mask').delay(350).fadeOut('slow');
-    //                     toastr.warning('Something Went Wrong!', 'warning');
+    //                     toastr.warning('Something Went Wrong!', 'Warning');
     //                 }, 1000);
     //             }
     //         });
@@ -2082,7 +2082,7 @@
                     {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });    

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');
                     }
                 });
             }

app/Views/policy_gmc_terms.php

@@ -1461,7 +1461,7 @@ $('body').on('click', '.btnPolicyMaster', function() {
         });
 
     } 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() {

app/Views/policy_gpa_terms.php

@@ -844,7 +844,7 @@ $('body').on('click', '.btnPolicyMaster', function() {
         });
 
     } 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');
     }
 
 });

app/Views/policy_grid.php

@@ -143,7 +143,7 @@
                             </div>
 
                             <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                                <button class="btn btn-primary waves-effect waves-light mr-1" id="btnGridSubmit_2">Submit</button>
+                                <button class="btn btn-primary waves-effect waves-light mr-1 saveButtonChange" id="btnGridSubmit_2">Save</button>
                                 <a class="btn btn-secondary waves-effect waves-light mr-1" id="btnGridrename" onclick="renameRackRateTab(this, null)">Rename</a>
                             </div>
                         </form>
@@ -255,7 +255,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;
     }
 
@@ -363,9 +363,11 @@ $('body').on('click', '.btnPolicyModel', function()
         $('.loader-mask').fadeIn();
 
         if (policy_type_string == 'GPA' || policy_type_id == 6 || policy_type_id == 7) {
+            $('.saveButtonChange').text('Submit');
             $('#add_new_rack_rate_tab_div').hide();
             $('#rack_rate_one').hide();
         } else {
+            $('.saveButtonChange').text('Save');
             $('#add_new_rack_rate_tab_div').show();
             $('#rack_rate_one').show();
         }
@@ -671,7 +673,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);
         }
     });
@@ -2000,7 +2002,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;
@@ -2042,7 +2044,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;
@@ -2083,7 +2085,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2130,7 +2132,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2170,7 +2172,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2216,7 +2218,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2263,7 +2265,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2303,7 +2305,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2353,7 +2355,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2398,7 +2400,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2452,7 +2454,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2488,7 +2490,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -2529,7 +2531,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -3147,7 +3149,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;
@@ -3411,7 +3413,7 @@ function appendNewTab(tabNameData = null, data = null)
                 </div>
 
                 <div class="form-group text-right m-b-0" id="hide_smbt_btn_${tabId}">
-                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnGridSubmit_2_${tabId}">Submit</button>
+                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnGridSubmit_2_${tabId}">Save</button>
                     <a class="btn btn-danger waves-effect waves-light mr-1" id="btnGridremove_2_${tabId}" onclick="removeTab(this, '${tabId}', '${tabName}')">Delete</a>
                     <a class="btn btn-secondary waves-effect waves-light mr-1" id="btnGridrename_${tabId}" onclick="renameRackRateTab(this, '${tabId}', '${tabName}')">Rename</a>
                 </div>
@@ -3589,7 +3591,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({
@@ -3605,7 +3607,7 @@ function removeTab(input, tabID, tabName)
                                 });
                             }
 
-                            // toastr.warning('Failed to remove policy', 'warning');
+                            // toastr.warning('Failed to remove policy', 'Warning');
                         }
                         }
                     },
@@ -3614,7 +3616,7 @@ function removeTab(input, tabID, tabName)
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        console.log('Something Wrong!', 'warning');
+                        console.log('Something Wrong!', 'Warning');
                     }
                 });
             }
@@ -3704,7 +3706,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({
@@ -3723,7 +3725,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
 
                     }
 
-                    // toastr.warning('Failed to remove policy', 'warning');
+                    // toastr.warning('Failed to remove policy', 'Warning');
                 }
                 }
             },
@@ -3732,7 +3734,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
                 console.error(status, error);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                console.log('Something Wrong!', 'warning');
+                console.log('Something Wrong!', 'Warning');
             }
         });
     }
@@ -4021,7 +4023,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;
@@ -4049,7 +4051,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;
@@ -4078,7 +4080,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;
@@ -4107,7 +4109,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;
@@ -4137,7 +4139,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;
@@ -4166,7 +4168,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;
@@ -4195,7 +4197,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;
@@ -4224,7 +4226,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;
@@ -4253,7 +4255,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;
@@ -4282,7 +4284,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;
@@ -4311,7 +4313,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;
@@ -4343,7 +4345,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;
@@ -4371,7 +4373,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;

app/Views/policy_grid_excel.php

@@ -178,7 +178,7 @@ function copyHeaders(unique_id) {
     // //console.log('excel_headers[formatType]', typeof excel_headers[formatType])
 
     if (excel_headers[formatType] == undefined) {
-        toastr.error('Headers not found', 'Warning');
+        toastr.warning('Headers not found', 'Warning');
         return;
     }
 
@@ -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('');
         }

app/Views/policy_transaction_endorsement_form.php

@@ -599,7 +599,7 @@ $(document).on('change', 'input[type="checkbox"][name="co_share_type[]"]', funct
     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);
     }
 });
@@ -667,7 +667,7 @@ $(document).on('click', '[name="co_share_type[]"]', function() {
 
 
     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){
@@ -1443,7 +1443,7 @@ $('#setInsurerCount').on('input', function() {
             addInsurerColumn();
         }
     } else {
-        toastr.warning('Please enter the insurer count', 'WARNING');
+        toastr.warning('Please enter the insurer count', 'Warning');
     }
 });
 

app/Views/policy_transaction_endorsement_list.php

@@ -412,11 +412,11 @@ document.addEventListener("DOMContentLoaded", 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; ?>
 
 

app/Views/policy_transaction_inception_form.php

@@ -1182,7 +1182,7 @@ $(document).ready(function(){
 
             }else{
 
-                toastr.warning('Please select the Owner type', 'WARNING');
+                toastr.warning('Please select the Owner type', 'Warning');
             }
 
 
@@ -1285,7 +1285,7 @@ $(document).on('change', 'input[type="checkbox"][name="co_share_type[]"]', funct
     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);
     }
 });
@@ -1356,7 +1356,7 @@ $(document).on('click', '[name="co_share_type[]"]', function() {
     // 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);
     }else{
 
@@ -1426,7 +1426,7 @@ $(document).ready(function() {
 
         if(!client_id){
             $(this).val('').select2();
-            toastr.warning('Please select the Client', 'WARNING');
+            toastr.warning('Please select the Client', 'Warning');
         } 
 
     });
@@ -2248,7 +2248,7 @@ function co_share_percentage_calculation(input, extra = null){
     });
 
     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)
@@ -2761,7 +2761,7 @@ function addCDAccountNumber(input)
 
 
     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;
     }
@@ -2769,7 +2769,7 @@ function addCDAccountNumber(input)
     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;
         }
     } 
@@ -2777,7 +2777,7 @@ function addCDAccountNumber(input)
     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;
         }
     }
@@ -3635,7 +3635,7 @@ $('#policy_no').change(function(){
 
 //     if (!leader) {
 //         $(this).val('');
-//         toastr.warning('Please select the Leader.', 'WARNING!');
+//         toastr.warning('Please select the Leader.', 'Warning!');
 //     } 
 // });
 
@@ -3660,7 +3660,7 @@ $('#setInsurerCount').on('click', function() {
             addInsurerColumn();  // Ensure this function is defined properly
     //     }
     // } else {
-    //     toastr.warning('Please enter a valid insurer count', 'WARNING');
+    //     toastr.warning('Please enter a valid insurer count', 'Warning');
     // }
 });
 
@@ -4477,7 +4477,7 @@ function validateInput(input, table, field){
 
     checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
         if (isDuplicate) {
-            toastr.warning(message, 'WARNING');
+            toastr.warning(message, 'Warning');
             $(input).val('')
         } 
     });
@@ -4549,7 +4549,7 @@ function checkCDAmountForBasePremium(input) {
 
     // 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;
     }
 
@@ -4569,16 +4569,16 @@ function checkCDAmountForBasePremium(input) {
             if (!response.base_premium_greater_than_balance) {
                 console.log('Base premium is less than or equal to CD balance:', 'SUCCESS');
             } else {
-                toastr.warning('Base premium greater than CD Amount', 'WARNING');
+                toastr.warning('Base premium greater than CD Amount', 'Warning');
                 $(input).val("0")
             }
         } 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');
     });
 }
 

app/Views/policy_transaction_inception_list.php

@@ -511,11 +511,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; ?>
 
 
@@ -1210,7 +1210,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')
             }
         }
 
@@ -1362,7 +1362,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('');
             }
         },
@@ -1647,10 +1647,10 @@ function removePolicyTransaction(input, pt_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);

app/Views/policy_type_basic_info.php

@@ -108,7 +108,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);
                 }
             });

app/Views/policy_type_list.php

@@ -315,10 +315,10 @@ function removePolciyType(element) {
                   // 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');
                       }
                     }
                 },
@@ -327,7 +327,7 @@ function removePolciyType(element) {
                     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');
                   }
             });
         }

app/Views/policy_type_onboarding.php

@@ -74,7 +74,7 @@ body {
 
         if(check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0){
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Policy Type!', 'warning',{timeOut: 2000});
+            toastr.warning('First Add the Policy Type!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();

app/Views/rack_rate_auto_si.php

@@ -195,18 +195,18 @@ $(document).ready(function() {
 
                 if (response.status) {
                     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');
                     }
                 } else {
-                    toastr.error(response.message || 'Unable to get responce', 'ERROR');
+                    toastr.error(response.message || 'Unable to get responce', 'Error');
                 }
             },
             error: function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while Auto SI Form Submit.', 'ERROR');
+                toastr.error('An error occurred while Auto SI Form Submit.', 'Error');
             },
         });
     });
@@ -296,7 +296,7 @@ function getRackRateSIAmountAndAutoSiDataForAutoSI(client_policy_id) {
                     icon: 'warning',
                 })
             } else {
-                toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                toastr.error(response.message || 'Unable to fetch data', 'Error');
                 addRow();
             }
         }
@@ -307,7 +307,7 @@ function getRackRateSIAmountAndAutoSiDataForAutoSI(client_policy_id) {
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);
         console.error(xhr.responseText);
-        toastr.error('An error occurred while checking the SI amount.', 'ERROR');
+        toastr.error('An error occurred while checking the SI amount.', 'Error');
 
         $('.loader').fadeOut();
         $('.loader-mask').delay(350).fadeOut('slow');

app/Views/report_bds.php

@@ -234,7 +234,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);

app/Views/report_bds_filter.php

@@ -522,7 +522,7 @@ function getClientPolicyDataBasedOnClientAndInsuer(){
             appendPolicies(response.data)
             
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);

app/Views/test_members_list.php

@@ -609,7 +609,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) {
@@ -656,7 +656,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();
 
@@ -671,7 +671,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     window.location.reload();
 
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -688,7 +688,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     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() {
@@ -729,9 +729,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) {
@@ -754,7 +754,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);
@@ -1033,12 +1033,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
@@ -1046,7 +1046,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();
             }
@@ -1063,7 +1063,7 @@ function unmapEmployees(){
     })
 
     if(selected.length == 0){
-        toastr.warning('Please select atleast one employee', 'WARNING');
+        toastr.warning('Please select atleast one employee', 'Warning');
         return;
     }
 
@@ -1108,10 +1108,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) {

app/Views/tpa_branch.php

@@ -282,7 +282,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);
                 }
             });
@@ -341,7 +341,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);
             }        
         });
@@ -387,7 +387,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);
                 }
             });
@@ -547,7 +547,7 @@ function removeTPABranch(element) {
                         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');
                     }
                     }
                 },
@@ -556,7 +556,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');
                 }
             });
         }

app/Views/tpa_list.php

@@ -271,10 +271,10 @@ function removeTPA(element) {
                     // 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');
                         }
                       }
                   },
@@ -283,7 +283,7 @@ function removeTPA(element) {
                       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');
                   }
               });
             }

app/Views/tpa_onboarding.php

@@ -74,7 +74,7 @@ body {
 
         if(check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0){
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the TPA!', 'warning',{timeOut: 2000});
+            toastr.warning('First Add the TPA!', 'Warning',{timeOut: 2000});
         }else{
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();

app/Views/variance_report_list.php

@@ -663,7 +663,7 @@ function getClientPolicyDataBasedOnClientAndInsuer(){
             appendPolicies(response.data)
             
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);

app/Views/vehicle_details.php

@@ -386,7 +386,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('');
             }
         },

app/Views/vehicle_master_list.php

@@ -577,10 +577,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');
                         }
                     }
                 },
@@ -589,7 +589,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');
                 }
             });
         }

app/Views/view_rfq.php

@@ -3549,12 +3549,12 @@ function ajaxRequest(formData) {
 
             console.log(res);
             if (res.status == 'success' && res.code == 200) {
-                toastr.success('Mail send Successfully', 'SUCCESS')
+                toastr.success('Mail send Successfully', 'Success')
             } 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')
                 }
             }
 
@@ -3611,7 +3611,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)
             }
@@ -3770,7 +3770,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);
@@ -5157,9 +5157,9 @@ function autoCaluculationForPremiumChildTable(input) {
             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.reload();
@@ -5228,9 +5228,9 @@ function autoCaluculationForPremiumChildTable(input) {
                 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;

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>

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>

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>

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>

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>