diff --git a/.env.sample b/.env.sample
index e834a822..ceb7085a 100755
--- a/.env.sample
+++ b/.env.sample
@@ -120,3 +120,4 @@ FHPL_USER_NAME  =
 FHPL_PASSWORD   = 
 FHPL_GRANT_TYPE = 
 
+METABASE_SECRET_KEY=
\ No newline at end of file
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index b115e0ca..d96ae232 100755
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -19,6 +19,7 @@ use App\Filters\Cors;
 use App\Filters\SecurityInputFilter;
 use App\Filters\GlobalPostFileUploadGuard;
 use App\Filters\AclFilter;
+use App\Filters\RateLimitFilter;
 
 use App\Filters\AuthJWT;
 
@@ -49,6 +50,8 @@ class Filters extends BaseConfig
         'SecurityInputFilter'       => SecurityInputFilter::class,
         'GlobalPostFileUploadGuard'       => GlobalPostFileUploadGuard::class,
         'AclFilter'       => AclFilter::class,
+        'ratelimit' => RateLimitFilter::class,
+        
     ];
 
     /**
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 73afbb74..d9bb6ea9 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -549,7 +549,7 @@ $routes->get('get_ticket_data',"EmployeeRestController::get_ticket_data");
 
 
 //api
-$routes->group("/api", ["filter" => "authJWT"], function ($routes) {
+$routes->group("/api", ["filter" => [ 'ratelimit' , 'authJWT']], function ($routes) {
     $routes->get('get_ticket_type',"EmployeeRestController::get_ticket_type");
     $routes->post("logined", "RestAuthenticationController::logined");
     $routes->post("getId", "RestAuthenticationController::getUserIdFromToken");
@@ -564,7 +564,7 @@ $routes->get("downloadFileTableFile/(:any)", "EmployeeController::downloadFileLi
 
 
 
-$routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($routes) {
+$routes->group("employeeRest", ['filter' => ['ratelimit' , 'appSignature'] ], function ($routes) {
 
     //Employee login api's
     $routes->post("verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
@@ -607,7 +607,7 @@ $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($route
 
 });
 
-$routes->group("employeeRest", ["filter" => ['GlobalPostFileUploadGuard', 'appSignature', 'authJWT']], function ($routes) {
+$routes->group("employeeRest", ["filter" => ['GlobalPostFileUploadGuard', 'ratelimit' , 'appSignature', 'authJWT']], function ($routes) {
 
     $routes->post('logout', 'RestAuthenticationController::logout');
 
@@ -671,7 +671,7 @@ $routes->group("employeeRest", ["filter" => ['GlobalPostFileUploadGuard', 'appSi
     $routes->match(['get','post','put'], 'ticketType', 'ThzController::ticketType');
 
     //this route for nhance website contact form (sales/service)
-    $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($routes) {
+    $routes->group("employeeRest", ['filter' => ['ratelimit' , 'appSignature'] ], function ($routes) {
         $routes->post("ticketSave", "ThzController::ticketSave");
     });
 
@@ -788,7 +788,7 @@ $routes->get('EcardRequest','FhplApiController::EcardRequest');
 $routes->get('HospitalNetwork','MediAssistApiController::HospitalNetwork');
 $routes->get('VidalGetBenefDetails','VidalApiController::VidalGetBenefDetails');
 $routes->get('ClaimDetail','FhplApiController::ClaimDetail');
-$routes->get('SubmitClaim','VidalApiController::SubmitClaim');
+$routes->get('SubmitClaim','HealthIndiaApiController::SubmitClaim');
 $routes->get('IntimateClaim','MediAssistApiController::IntimateClaim');
 $routes->get('IRSubmission','MediAssistApiController::IRSubmission');
 $routes->get('ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate');
diff --git a/app/Controllers/ApiServiceController.php b/app/Controllers/ApiServiceController.php
index 075a7e01..6f2e8ae2 100644
--- a/app/Controllers/ApiServiceController.php
+++ b/app/Controllers/ApiServiceController.php
@@ -28,6 +28,7 @@ class ApiServiceController extends BaseController
     protected $vidal_primary_key;
     protected $icici_primary_key;
     protected $fhpl_primary_key;
+    protected $health_india_primary_key;
 
     public function __construct()
     {
@@ -37,6 +38,7 @@ class ApiServiceController extends BaseController
         $this->vidal_primary_key = getenv('VIDAL_PRIMARY_KEY_CONSTANT');
         $this->icici_primary_key = getenv('ICICI_PRIMARY_KEY_CONSTANT');
         $this->fhpl_primary_key = getenv('FHPL_PRIMARY_KEY_CONSTANT');
+        $this->health_india_primary_key = getenv('HEALTH_INDIA_PRIMARY_KEY_CONSTANT');
     }
 
     //  Push Claims
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 09f34f77..10826d69 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -450,6 +450,8 @@ class ClientController extends AdminController
     public function index()
     {
         $this->myLogger->logme('error', 'Client list function called');
+        // echo "<script>console.log( 'client list function called );</script>";
+    
         $headerData['tab_name'] = 'Clients';
         $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
         //  $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
@@ -2665,439 +2667,154 @@ class ClientController extends AdminController
         return $insert;
     }
 
-
-
     // Save Rack Rate function
     public function createClientPolicyPremium()
     {
-
-        // echo json_encode(['key' => $this->request->getPost()]); die;
-
         try {
-            $data = $this->request->getPost();
-            $sanitized_post_data = sanitizeInputArrayAdvanced($data);
+            // 1. Fetch and Sanitize all input at once
+            $rawPost = $this->request->getPost();
+            $data = sanitizeInputArrayAdvanced($rawPost);
 
-            $client_id = $sanitized_post_data['client_id'] ?? null;
-            $client_policy_id = $sanitized_post_data['client_policy_id'] ?? null;
-            $record    = $this->clientPolicyModel->where('client_policy.id', $client_policy_id)->first();
-            $premium_type = $sanitized_post_data['premium_type'] ?? null;
-            if (!empty($client_id) && $client_id != null) {
-                $client_policy_data = $this->clientPolicyModel->where('id', $client_policy_id)->first();
-                $client_id =  $client_policy_data['client_id'] ?? null;
+            // Extract base variables from the sanitized array
+            $client_id        = $data['client_id'] ?? null;
+            $client_policy_id = $data['client_policy_id'] ?? null;
+            $premium_type     = $data['premium_type'] ?? null;
+            $policy_grid_id   = $data['policy_grid_id'] ?? null;
+            $rack_rate_name   = $data['rack_rate_name'] ?? null;
+            $si_or_bp         = $data['si_or_bp'] ?? null;
+
+            $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+            if (!$record) {
+                return $this->respond(['status' => false, 'message' => 'Policy record not found'], 404);
             }
 
-            $branch_units = $this->getBranchUnitsByBranchId($record['client_branch_id']);
-            $branch_units = json_decode($branch_units);
+            if (empty($client_id)) {
+                $client_id = $record['client_id'];
+            }
 
-            $policy_grid_id = $sanitized_post_data['policy_grid_id'] ?? null;
-            $rack_rate_name = $sanitized_post_data['rack_rate_name'] ?? null;
+            $branch_units_raw = $this->getBranchUnitsByBranchId($record['client_branch_id']);
+            $branch_units = json_decode($branch_units_raw, true);
+            $default_unit = !empty($branch_units) ? $branch_units[0] : null;
 
+            // Relationship Logic
             $relation_data = [
-                'self'          => $sanitized_post_data['self'] ?? 'NA',
-                'spouse'        => $sanitized_post_data['spouse'] ?? 'NA',
-                'childrens'     => $sanitized_post_data['childrens'] ?? 'NA',
-                'parents'       => $sanitized_post_data['parents'] ?? 'NA',
-                'parents-in-law' => $sanitized_post_data['parents-in-law'] ?? 'NA',
+                'self'           => $data['self'] ?? 'NA',
+                'spouse'         => $data['spouse'] ?? 'NA',
+                'childrens'      => $data['childrens'] ?? 'NA',
+                'parents'        => $data['parents'] ?? 'NA',
+                'parents-in-law' => $data['parents-in-law'] ?? 'NA',
             ];
 
-            $relation_data_for_form_submit_check = [
-                $rack_rate_name => [
-                    'self'          => $sanitized_post_data['self'] ?? 'NA',
-                    'spouse'        => $sanitized_post_data['spouse'] ?? 'NA',
-                    'childrens'     => $sanitized_post_data['childrens'] ?? 'NA',
-                    'parents'       => $sanitized_post_data['parents'] ?? 'NA',
-                    'parents-in-law' => $sanitized_post_data['parents-in-law'] ?? 'NA',
-                ]
-            ];
-
-            if ($policy_grid_id == 1 || $policy_grid_id == 2) {
-                $relation_data = [
-                    'self'          => 1,
-                    'spouse'        => 'NA',
-                    'childrens'     => 'NA',
-                    'parents'       => 'NA',
-                    'parents-in-law' => 'NA',
-                ];
+            if (in_array($policy_grid_id, ['1', '2'])) {
+                $relation_data = ['self' => 1, 'spouse' => 'NA', 'childrens' => 'NA', 'parents' => 'NA', 'parents-in-law' => 'NA'];
             }
 
-            // Convert to JSON
             $jsonDataForRelation = json_encode($relation_data);
-            $json_data_relation_data_for_form_submit_check = json_encode($relation_data_for_form_submit_check);
+            $submit_check_json = json_encode([$rack_rate_name => $relation_data]);
 
-            $si_or_bp = $sanitized_post_data['si_or_bp'] ?? null;
-            $basic_multiplier = str_replace(',', '', $sanitized_post_data['basic_multiplier']);
-            $premium_multiplier = str_replace(',', '', $sanitized_post_data['premium_multiplier']);
-            $multiplier = str_replace(',', '', $sanitized_post_data['multiplier']);
-            $basic_pay = str_replace(',', '', $sanitized_post_data['basic_pay']);
-
-            $data = [];
-            $data['client_id'] = $client_id;
-            $data['client_policy_id'] = $client_policy_id;
-            $data['policy_grid_id'] = $policy_grid_id;
-            $data['premium_type'] = $premium_type;
-            $data['rack_rate_name'] = $rack_rate_name;
-            $data['additional_relationship'] = $jsonDataForRelation;
-
-            $premium = [];
-
-            if ($policy_grid_id == '1' || $policy_grid_id == '2') {
-                $this->policyPremium1Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->set('is_active', 0)->update();
+            // Deactivate old records
+            if (in_array($policy_grid_id, ['1', '2'])) {
+                $this->policyPremium1Model->where(['client_id' => $client_id, 'client_policy_id' => $client_policy_id])->set(['is_active' => 0])->update();
             } else {
-                $this->policyPremium2Model->where('client_id', $client_id)->where('client_policy_id', $client_policy_id)->where('rack_rate_name', $rack_rate_name)->set('is_active', 0)->update();
+                $this->policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $client_policy_id, 'rack_rate_name' => $rack_rate_name])->set(['is_active' => 0])->update();
             }
 
+            // Helper closures for cleaning and unit selection
+            $cleanNum = fn($val) => str_replace(',', '', (string)($val ?? '0'));
+            $getUnit  = fn($unitArr, $index) => (empty($unitArr[$index]) || $unitArr[$index] === 'undefined') ? $default_unit : $unitArr[$index];
+
+            $insert = false;
+            $baseInsertData = [
+                'client_id' => $client_id,
+                'client_policy_id' => $client_policy_id,
+                'policy_grid_id' => $policy_grid_id,
+                'premium_type' => $premium_type,
+                'rack_rate_name' => $rack_rate_name,
+                'additional_relationship' => $jsonDataForRelation
+            ];
+
+            // --- Logic Switch based on Grid ID ---
+
             if ($policy_grid_id == '1') {
-
                 if ($si_or_bp == '1') {
-
-                    $premium = str_replace(',', '', $sanitized_post_data['gpa_sum_premium[]']);
-                    $sum_insure = str_replace(',', '', $sanitized_post_data['gpa_sum_si[]']);
-                    $multiplier = $sanitized_post_data['gpa_sum_multiplier'] ?? null;
-                    $unit = $sanitized_post_data['gpa_unit_1[]'] ?? null;
-
-                    for ($i = 0; $i < count($premium); $i++) {
-                        $data['si'] = $sum_insure[$i];
-                        $data['premium'] = $premium[$i];
-                        $data['multiplier'] = $multiplier;
-                        $data['si_or_bp'] = $sanitized_post_data['si_or_bp'] ?? null;
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_sum_premium'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si' => $cleanNum($data['gpa_sum_si'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'multiplier' => $data['gpa_sum_multiplier'] ?? null,
+                            'si_or_bp' => $si_or_bp,
+                            'unit' => $getUnit($data['gpa_unit_1'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
                 } else if ($si_or_bp == '3') {
-
-                    $premium = str_replace(',', '', $sanitized_post_data['gpa_sum_premium2[]']);
-                    $sum_insure = str_replace(',', '', $sanitized_post_data['gpa_sum_si2[]']);
-                    $multiplier = $sanitized_post_data['gpa_sum_multiplier2'] ?? null;
-                    $grade = $sanitized_post_data['gpa_band[]']  ?? null;
-                    $unit = $sanitized_post_data['gpa_unit_3[]']  ?? null;
-
-
-                    for ($i = 0; $i < count($premium); $i++) {
-                        $data['si'] = $sum_insure[$i];
-                        $data['premium'] = $premium[$i];
-                        $data['grade'] = $grade[$i];
-                        $data['multiplier'] = $multiplier;
-                        $data['si_or_bp'] = $sanitized_post_data['si_or_bp'] ?? null;
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_sum_premium2'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si' => $cleanNum($data['gpa_sum_si2'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'grade' => $data['gpa_band'][$i] ?? null,
+                            'multiplier' => $data['gpa_sum_multiplier2'] ?? null,
+                            'si_or_bp' => $si_or_bp,
+                            'unit' => $getUnit($data['gpa_unit_3'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
                 } else if ($si_or_bp == '2') {
-
-                    $premium = str_replace(',', '', $sanitized_post_data['gpa_basic_premium[]']);
-                    $sum_insure = str_replace(',', '', $sanitized_post_data['gpa_basic_si[]']);
-                    $basic_pay = str_replace(',', '', $sanitized_post_data['basic_pay[]']);
-                    $unit = $sanitized_post_data['gpa_unit[]'] ?? null;
-
-
-                    for ($i = 0; $i < count($premium); $i++) {
-
-                        $data['si_or_bp'] = $sanitized_post_data['si_or_bp'] ?? null;
-                        $data['basic_multiplier'] = str_replace(',', '', $sanitized_post_data['basic_multiplier']);
-                        $data['multiplier'] = $sanitized_post_data['premium_multiplier'] ?? null;
-                        $data['basic_pay'] = $basic_pay[$i];
-                        $data['si'] = $sum_insure[$i];
-                        $data['premium'] = $premium[$i];
-                        if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                            $data['unit'] = $branch_units[0];
-                        } else {
-                            $data['unit'] = $unit[$i];
-                        }
-
-                        $policyPremium = $this->policyPremium1Model->insert($data);
+                    $premiums = $data['gpa_basic_premium'] ?? [];
+                    foreach ($premiums as $i => $p) {
+                        $this->policyPremium1Model->insert(array_merge($baseInsertData, [
+                            'si_or_bp' => $si_or_bp,
+                            'basic_multiplier' => $cleanNum($data['basic_multiplier'] ?? 0),
+                            'multiplier' => $cleanNum($data['premium_multiplier'] ?? 0),
+                            'basic_pay' => $cleanNum($data['basic_pay'][$i] ?? 0),
+                            'si' => $cleanNum($data['gpa_basic_si'][$i] ?? 0),
+                            'premium' => $cleanNum($p),
+                            'unit' => $getUnit($data['gpa_unit'] ?? [], $i)
+                        ]));
+                        $insert = true;
                     }
-                } else {
-
-                    $data['premium'] = str_replace(',', '', $sanitized_post_data['gpa_basic_premium']);
-                    $data['si'] = str_replace(',', '', $sanitized_post_data['gpa_basic_si']);
-                    $data['basic_multiplier'] = str_replace(',', '', $sanitized_post_data['basic_multiplier']);
-                    $data['multiplier'] = $sanitized_post_data['premium_multiplier'] ?? null;
-                    $data['basic_pay'] = str_replace(',', '', $sanitized_post_data['basic_pay']);
-                    $data['si_or_bp'] = $sanitized_post_data['si_or_bp'] ?? null;
-
-                    $policyPremium = $this->policyPremium1Model->insert($data);
                 }
-
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '2') {
-
-                $premium = $sanitized_post_data['gpa_premium29[]'] ?? null;
-                $sum_insure = $sanitized_post_data['gpa_si29[]'] ?? null;
-                $unit = $sanitized_post_data['gpa_unit29[]'] ?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium1Model->insert($data);
+            } else if (in_array($policy_grid_id, ['2', '9'])) {
+                $premiums = $data['gpa_premium29'] ?? [];
+                $model = ($policy_grid_id == '2') ? $this->policyPremium1Model : $this->policyPremium2Model;
+                foreach ($premiums as $i => $p) {
+                    $model->insert(array_merge($baseInsertData, [
+                        'premium' => $cleanNum($p),
+                        'si' => $cleanNum($data['gpa_si29'][$i] ?? 0),
+                        'unit' => $getUnit($data['gpa_unit29'] ?? [], $i)
+                    ]));
+                    $insert = true;
                 }
+            } else {
+                // Handles grids 3, 4, 5, 6, 7, 8, 10, 11, 12, 13
+                $pfx = $policy_grid_id . "_";
+                $premiums = $data[$pfx . 'premium'] ?? [];
+                $is_si_array = is_array($data[$pfx . 'si'] ?? null);
 
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '3') {
-
-                $premium = $sanitized_post_data['3_premium[]'] ?? null;
-                $sum_insure = $sanitized_post_data['3_si[]'] ?? null;
-                $unit = $sanitized_post_data['3_unit[]'] ?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium2Model->insert($data);
+                foreach ($premiums as $i => $p) {
+                    $this->policyPremium2Model->insert(array_merge($baseInsertData, [
+                        'premium'      => $cleanNum($p),
+                        'si'           => $cleanNum($is_si_array ? ($data[$pfx . 'si'][$i] ?? 0) : ($data[$pfx . 'si'] ?? 0)),
+                        'unit'         => $getUnit($data[$pfx . 'unit'] ?? [], $i),
+                        'age_from'     => $data[$pfx . 'age_from'][$i] ?? null,
+                        'age_to'       => $data[$pfx . 'age_to'][$i] ?? null,
+                        'grade'        => $data[$pfx . 'grade'][$i] ?? null,
+                        'relationship' => $data[$pfx . 'relationship'][$i] ?? null,
+                        'max_si'       => $cleanNum($data[$pfx . 'max_si'][$i] ?? 0)
+                    ]));
+                    $insert = true;
                 }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '4') {
-
-                $premium = $sanitized_post_data['4_premium[]'] ?? null;
-                $sum_insure = $sanitized_post_data['4_si'] ?? null;
-                $age_from = $sanitized_post_data['4_age_from[]'] ?? null;
-                $age_to = $sanitized_post_data['4_age_to[]'] ?? null;
-                $unit = $sanitized_post_data['4_unit[]'] ?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '5') {
-
-                $premium = $sanitized_post_data['5_premium[]'] ?? null;
-                $sum_insure = $sanitized_post_data['5_si[]']?? null;
-                $age_from = $sanitized_post_data['5_age_from[]']?? null;
-                $age_to = $sanitized_post_data['5_age_to[]']?? null;
-                $unit = $sanitized_post_data['5_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i] || $unit[$i] == 'undefined')) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '6') {
-
-                $premium = $sanitized_post_data['6_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['6_si']?? null;
-                $age_from = $sanitized_post_data['6_age_from[]']?? null;
-                $age_to = $sanitized_post_data['6_age_to[]']?? null;
-                $unit = $sanitized_post_data['6_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '7') {
-                $premium = $sanitized_post_data['7_premium[]'] ?? null;
-                $sum_insure = $sanitized_post_data['7_si[]'] ?? null;
-                $age_from = $sanitized_post_data['7_age_from[]'] ?? null;
-                $age_to = $sanitized_post_data['7_age_to[]'] ?? null;
-                $unit = $sanitized_post_data['7_unit[]'] ?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '8') {
-                $premium = $sanitized_post_data['8_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['8_si[]']?? null;
-                $grade = $sanitized_post_data['8_grade[]']?? null;
-                $unit = $sanitized_post_data['8_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['grade'] = $grade[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '9') {
-
-                $premium = $sanitized_post_data['gpa_premium29[]']?? null;
-                $sum_insure = $sanitized_post_data['gpa_si29[]']?? null;
-                $unit = $sanitized_post_data['gpa_unit29[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '10') {
-                $premium = $sanitized_post_data['10_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['10_si[]']?? null;
-                $age_from = $sanitized_post_data['10_age_from[]']?? null;
-                $age_to = $sanitized_post_data['10_age_to[]']?? null;
-                $unit = $sanitized_post_data['10_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-
-                    $policyPremium = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '11') {
-
-                $premium = $sanitized_post_data['11_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['11_si[]']?? null;
-                $grade = $sanitized_post_data['11_grade[]']?? null;
-                $max_sum_insure = $sanitized_post_data['11_max_si[]']?? null;
-                $unit = $sanitized_post_data['11_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['grade'] = $grade[$i];
-                    $data['max_si'] = str_replace(',', '', $max_sum_insure[$i]);
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '12') {
-
-                $premium = $sanitized_post_data['12_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['12_si[]']?? null;
-                $relationship = $sanitized_post_data['12_relationship[]']?? null;
-                $unit = $sanitized_post_data['12_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['relationship'] = $relationship[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
-            } else if ($policy_grid_id == '13') {
-
-                $premium = $sanitized_post_data['13_premium[]']?? null;
-                $sum_insure = $sanitized_post_data['13_si[]']?? null;
-                $age_from = $sanitized_post_data['13_age_from[]']?? null;
-                $age_to = $sanitized_post_data['13_age_to[]']?? null;
-                $relationship = $sanitized_post_data['13_relationship[]']?? null;
-                $unit = $sanitized_post_data['13_unit[]']?? null;
-
-                for ($i = 0; $i < count($premium); $i++) {
-                    $data['premium'] = str_replace(',', '', $premium[$i]);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
-                    $data['age_from'] = $age_from[$i];
-                    $data['age_to'] = $age_to[$i];
-                    $data['relationship'] = $relationship[$i];
-                    if (empty($unit) || !isset($unit[$i]) || empty($unit[$i])) {
-                        $data['unit'] = $branch_units[0];
-                    } else {
-                        $data['unit'] = $unit[$i];
-                    }
-
-                    $dataa = $this->policyPremium2Model->insert($data);
-                }
-                $data = $sanitized_post_data;
-                $insert = true;
             }
 
             if ($insert) {
-                return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'rack_rate_json' => $json_data_relation_data_for_form_submit_check,], 200);
-            } else {
-                return $this->respond(['status' => false, 'code' => 404, 'data' => $data, 'message' => 'no data found'], 200);
+                return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'rack_rate_json' => $submit_check_json], 200);
             }
+
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No data found'], 200);
         } catch (\Exception $e) {
-            echo 'Error: ' . $e->getMessage() . ' at line no ' . $e->getLine();
+            return $this->respond(['status' => false, 'message' => $e->getMessage() . ' line ' . $e->getLine()], 500);
         }
     }
 
@@ -6731,12 +6448,12 @@ class ClientController extends AdminController
         // $response = $ticketServiceController->getClaimExcelErrorData(["file_id" => 41]);
         // $response = $ticketServiceController->claimDumpOnBoardProcess(["file_id" => 17]);
         // $response = $ticketServiceController->extractExcelData("claims_dump_form_client.xlsx");
-        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 52]); //reliance
-        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 50]); //fhpl
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 51]); //abhi
-        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 48]); //vidal
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 50]); //fhpl
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 53]); //icici
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 54]); //mediassist
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 52]); //reliance
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 48]); //vidal
         // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 48]); //vidal
         // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 54]); //mediassist
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index b279f1f2..a8bd7c44 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -581,6 +581,8 @@ class EmployeeController extends AdminController
              $filePath = ROOTPATH . 'public/sample_excel/sample_multievent_file.xlsx';
         }else if ($actionType == 'bds_upload') {
              $filePath = ROOTPATH . 'public/sample_excel/sample_bds_bulk_upload_excel.xlsx';
+        }else if ($actionType == 'claim_dump_upload') {
+             $filePath = ROOTPATH . 'public/sample_excel/sample_claim_dump_upload_excel.xlsx';
         }
 
         // Check if the file exists
@@ -2744,27 +2746,26 @@ class EmployeeController extends AdminController
     {
     
         $rules = [
-            'emp_code' => [
-                'rules'  => 'required',
-                'errors' => [
-                    'required' => 'Employee Code is missing'
-                ]
-            ],
-
-            'name' => [
-                'rules'  => 'required|min_length[2]|max_length[100]',
-                'errors' => [
-                    'required'   => 'Employee name is required',
-                    'min_length' => 'Name must be at least 2 characters',
-                    'max_length' => 'Name cannot exceed 100 characters'
-                ]
-            ],
-            'gender' => [
-                'rules'  => 'permit_empty|in_list[M,F]',
-                'errors' => [
-                    'in_list' => 'Invalid gender selected'
-                ]
-            ],
+            // 'emp_code' => [
+            //     'rules'  => 'required',
+            //     'errors' => [
+            //         'required' => 'Employee Code is missing'
+            //     ]
+            // ],
+            // 'name' => [
+            //     'rules'  => 'required|min_length[2]|max_length[100]',
+            //     'errors' => [
+            //         'required'   => 'Employee name is required',
+            //         'min_length' => 'Name must be at least 2 characters',
+            //         'max_length' => 'Name cannot exceed 100 characters'
+            //     ]
+            // ],
+            // 'gender' => [
+            //     'rules'  => 'permit_empty|in_list[M,F]',
+            //     'errors' => [
+            //         'in_list' => 'Invalid gender selected'
+            //     ]
+            // ],
             'email_corporate' => [
                 'rules'  => 'required|valid_email',
                 'errors' => [
@@ -2772,7 +2773,6 @@ class EmployeeController extends AdminController
                     'valid_email' => 'Enter a valid email address'
                 ]
             ],
-
             'mobile' => [
                 'rules'  => 'required|numeric|exact_length[10]',
                 'errors' => [
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index dce36dd0..5f8bd879 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2457,6 +2457,7 @@ class EmployeeRestController extends AdminController
         $result = $clientController->view_Deposit($insurerId, $requestFrom = 'rest', $param = ['client_id' => $clientId, 'cd_ac_pk' => $cdAccountPrimaryKey]);
 
         $data['insurer_name'] = $result['insurerName']->name;
+        $data['insurer_short_name'] = $result['insurerName']->short_name;
         $data['account_number'] = $result['insurerName']->cd_master_account_no;
         $data['total_deposit'] = $result['deposiamount']->total_credit;
         $data['total_consumed'] = $result['deposiamount']->total_withdraw;
@@ -2501,6 +2502,12 @@ class EmployeeRestController extends AdminController
 
         $search_data = $this->request->getJSON(true); // Get JSON as associative array
 
+        if ( isset($search_data['client_id']) &&is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+            $client_data = $this->clientModel->where('MD5(id)', $search_data['client_id'])->first();
+            $search_data['client_id'] = $client_data['id'] ?? null;
+        } 
+
+
         $client_id = isset($search_data['client_id']) ? (int) $search_data['client_id'] : 0;
         unset($search_data['client_id']);
         unset($search_data['client_branch_id']);
@@ -2612,7 +2619,7 @@ class EmployeeRestController extends AdminController
         $builder->where('tm.is_active', 1);
 
         if ($client_id > 0) {
-            $builder->where('md5(tm.client_id)', $client_id);
+            $builder->where('tm.client_id', $client_id);
         }
 
         if (!empty($from_date) && !empty($to_date)) {
@@ -3930,10 +3937,14 @@ class EmployeeRestController extends AdminController
             log_message('error', 'Ticket validation | Ticket ID: ' . $ticket_id . ' | Matching active tickets with NULL TPA reference: ' . $count);
 
             if ($count > 0 && $pdf_exist_in_the_file && $tpa_claim_push == true) {
-                // this call for TPA integration
-                $apiServiceController = new ApiServiceController();
-                $apiServiceController->pushClaims($ticket_id);
-                log_message('error', "pushClaims function called with Ticket ID: {$ticket_id}, In Employee Rest Controller");
+                try {
+                    // this call for TPA integration
+                    $apiServiceController = new ApiServiceController();
+                    $apiServiceController->pushClaims($ticket_id);
+                    log_message('error', "pushClaims function called with Ticket ID: {$ticket_id}, In Employee Rest Controller");
+                } catch (\Throwable $e) {
+                    log_message('error', "Error in TPA Claim Push via Benifits or HR : ApiServiceController pushClaims function call for Ticket ID: {$ticket_id}. Error: " . $e->getMessage() . " Trace: " . $e->getTraceAsString());
+                }
             } else {
                 if($tpa_claim_push == false){
                     log_message('error', 'Skip the TPA claim push for IR DOCUMENTS');
@@ -5467,7 +5478,7 @@ class EmployeeRestController extends AdminController
         $client_policy_id = $this->request->getPost('client_policy_id') ?? null;
         $received_data = $this->request->getJSON(true) ?? null;
          // 🔐 Move this to .env in real projects
-        $METABASE_SECRET_KEY = '6a9ec3d833576923ea04078188fe26cad17b5de351ab3ce349dd2c2d07b5d0cd';
+        $METABASE_SECRET_KEY = getenv('METABASE_SECRET_KEY');
 
         $payload = [
             'resource' => [
diff --git a/app/Controllers/HealthindiaapiController.php b/app/Controllers/HealthIndiaApiController.php
similarity index 95%
rename from app/Controllers/HealthindiaapiController.php
rename to app/Controllers/HealthIndiaApiController.php
index 253c97b3..013a9977 100644
--- a/app/Controllers/HealthindiaapiController.php
+++ b/app/Controllers/HealthIndiaApiController.php
@@ -35,14 +35,18 @@ class HealthIndiaApiController extends BaseController
         
         $ch = curl_init();
 
-        curl_setopt_array($ch, [
+         curl_setopt_array($ch, [
             CURLOPT_URL            => $url,
             CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_CUSTOMREQUEST  => 'POST',
+            CURLOPT_POST           => true,
+            CURLOPT_USERPWD        => $username . ':' . $password,
+            CURLOPT_POSTFIELDS     => '{}',
+
             CURLOPT_HTTPHEADER     => [
-                'Authorization: Basic ' . base64_encode($username . ':' . $password),
                 'Content-Type: application/json',
+                'Accept: application/json',
             ],
+
             CURLOPT_TIMEOUT        => 30,
         ]);
 
@@ -75,7 +79,7 @@ class HealthIndiaApiController extends BaseController
         ]);
     }
 
-    public function SubmitClaim($claimId = null)
+    public function SubmitClaim($claimId = 515)
     {
         helper('api');
 
@@ -88,16 +92,19 @@ class HealthIndiaApiController extends BaseController
                 tm.emp_mail as emailId,
                 tm.doa as admissionDate,
                 tm.dod as dischargeDate,
+                tm.hospital_pin_code as hospitalCode,
                 tm.hospital_name as hospitalName,
+                tm.hospital_address as hospitalAddress,
+                tm.hospital_phone_no as hospitalNumber,
                 tm.claim_amount as claimedAmount,
                 tm.tpa_no as memberId,
-                tm.ailment as ailmentDescription,
+                tm.claim_description as ailmentDescription,
                 cp.policy_no as policyNumber,
                 e.emp_code as employeeCode,
                 tn.note as disease,
                 cf.url as filePath,
                 tm.claim_type as claimType,
-                tm.claim_category as benefitType
+                tm.claim_type as benefitType
             ')
             ->join('employees e', 'e.id = tm.emp_id', 'left')
             ->join('client_policy cp', 'tm.client_policy_id = cp.id', 'left')
@@ -107,6 +114,8 @@ class HealthIndiaApiController extends BaseController
             ->get()
             ->getRowArray();
 
+        // dd($data);
+
         if (!$data) {
             log_message('error', "TPA CLAIM PUSH FAILED HEALTH_INDIA | claimId: {$claimId} - Claim not found");
             return;
@@ -161,13 +170,30 @@ class HealthIndiaApiController extends BaseController
             "claimeD_AMOUNT"        => (string) $data['claimedAmount'],
             "datE_OF_ADMISSION"     => date('Y-m-d', strtotime($data['admissionDate'])),
             "ailmenT_DESCRIPTION"   => $data['ailmentDescription'] ?? 'NA',
-            "hospitaL_CODE"         => "", // Not available in your data
+            "hospitaL_CODE"         => $data['hospitalCode'] ?? '',
             "hospitaL_NAME"         => $data['hospitalName'] ?? '',
-            "hospitaL_ADDRESS"      => "", // Not available
-            "hospitaL_NUMBER"       => "", // Not available
+            "hospitaL_ADDRESS"      => $data['hospitalAddress'] ?? '',
+            "hospitaL_NUMBER"       => $data['hospitalNumber'] ?? '',
             "pdF_BYTES"             => [$fileContent]
         ];
 
+        // $body = [
+        //     'policY_NUMBER'        => '141600_POLICY_AWAITED',
+        //     'employeE_CODE'        => 'DECP000',
+        //     'membeR_ID'            => '10662420SE',
+        //     'claiM_TYPE'           => 'Reimbursement',
+        //     'benefiT_TYPE'         => 'IPD',
+        //     'claimeD_AMOUNT'       => '102',
+        //     'datE_OF_ADMISSION'    => '2026-01-19',
+        //     'ailmenT_DESCRIPTION'  => 'Fever',
+        //     'hospitaL_CODE'        => '100900',
+        //     'hospitaL_NAME'        => 'Test',
+        //     'hospitaL_ADDRESS'     => 'YEst',
+        //     'hospitaL_NUMBER'      => '2233445566',
+        //     "pdF_BYTES"             => [$fileContent]
+        // ];
+
+
         $url = getenv('HEALTH_INDIA_BASE_URL') . "/Intimation/GetClaimIntimation";
 
         $headers = [
@@ -175,10 +201,12 @@ class HealthIndiaApiController extends BaseController
             "Content-Type: application/json"
         ];
 
-        log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA | claimId: ' . $claimId . ' | URL: ' . $url . ' | payload: ' . json_encode($body));
+        log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA | claimId: ' . $claimId . ' | URL: ' . $url  );
 
         $response = call_third_party_api($url, 'POST', $headers, $body);
 
+        dd($response);
+
         log_message('error', 'TPA CLAIM PUSH HEALTH_INDIA RESPONSE | claimId: ' . $claimId . ' | response: ' . json_encode($response));
 
         if ($response['status'] != true) {
diff --git a/app/Controllers/ICICILombardController.php b/app/Controllers/ICICILombardController.php
index a91cc147..20ca8bab 100644
--- a/app/Controllers/ICICILombardController.php
+++ b/app/Controllers/ICICILombardController.php
@@ -89,29 +89,28 @@ class ICICILombardController extends AdminController
           $body = [
             "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
             "CDBGAccountNumber" => "CD-MUM-0026",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440012",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440014",
             "MemberDetails" => [
                 [
-                    "MemberEmpId" => "EMPID3625559",
+                    "MemberEmpId" => "EMPID3625560",
                     "DOJ" => "21-MAR-2019",
                     "InsuredName" => "Gowtham",
                     "DOB" => "7-JUL-1993",
                     "Relationship" => "SELF",
                     "Gender" => "MALE",
                     "DOC" => '2025-10-27',
-                    "SumInsured" => "400000",
+                    "SumInsured" => "500000",
                     "EmailId" => "Gowtham@GMAIL.COM",
                     "FlagStatus" => "A"
                 ],
                 [
-                    "MemberEmpId" => "EMPID3625559",
+                    "MemberEmpId" => "EMPID3625560",
                     "DOJ" => "21-MAR-2019",
                     "InsuredName" => "Lavanya",
                     "DOB" => "8-AUG-1970",
                     "Relationship" => "MOTHER",
                     "Gender" => "FEMALE",
                     "DOC" => '2025-10-27',
-                    "SumInsured" => "400000",
                     "EmailId" => "Lavanya@GMAIL.COM",
                     "FlagStatus" => "A"
                 ],
@@ -149,8 +148,8 @@ class ICICILombardController extends AdminController
 
          $body = [
             "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
-            "BatchId" => "3672146",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440012"
+            "BatchId" => "3723144",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440014"
         ];
 
         $response = call_third_party_api($url, 'POST', $headers, $body, true);
@@ -181,10 +180,10 @@ class ICICILombardController extends AdminController
             'Content-Type: application/json'
         ];
 
-        $body = [
+         $body = [
             "PolicyNumber" => "4016/PPN/A/O/53167743/00/000",
-            "IMID" => "3672145",
-            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440011"
+            "IMID" => "201580517901",
+            "CorrelationId" => "550e8400-e29b-41d4-a716-446655440014"
         ];
 
         $response = call_third_party_api($url, 'POST', $headers, $body, true);
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index 8d2eaa6f..7cfc5ab2 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -989,14 +989,15 @@ class TestingController extends BaseController
     {
 
         // 🔐 Move this to .env in real projects
-        $METABASE_SECRET_KEY = '6a9ec3d833576923ea04078188fe26cad17b5de351ab3ce349dd2c2d07b5d0cd';
-
+        $METABASE_SECRET_KEY = getenv('METABASE_SECRET_KEY');
+        $policy_id = $this->request->getGet('client_policy');
+        $policy_id = $policy_id ? $policy_id : 4687;
         $payload = [
             'resource' => [
                 // 'dashboard' => 1
                 'dashboard' => 2
             ],
-            'params' => (object)['client_policy' => 4687],   // MUST be object for Metabase
+            'params' => (object)['client_policy' => $policy_id],   // MUST be object for Metabase
             'exp'    => time() + (10 * 60) // 10 minutes
         ];
         // dd($payload);
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 713a8fb7..827b6587 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -62,7 +62,6 @@ class ThzController extends BaseController
 
     public function ticketSave()
     {
-        try {
             $rules = [
                     'client_id' => [
                         'rules'  => 'permit_empty|integer',
@@ -70,6 +69,7 @@ class ThzController extends BaseController
                             'integer' => 'Invalid client selected'
                         ]
                     ],
+                    
 
                     'mobile' => [
                         'rules'  => 'required|regex_match[/^[0-9]{10}$/]',
@@ -97,17 +97,24 @@ class ThzController extends BaseController
                     ],
 
                     'empcode' => [
-                        'rules'  => 'permit_empty|max_length[50]',
+                        'rules'  => 'permit_empty|alpha_numeric_punct|max_length[50]',
                         'errors' => [
+                            'alpha_numeric_punct' => 'Employee code contains invalid characters.',
                             'max_length' => 'Employee code is too long'
                         ]
                     ],
 
                     'ticket_type' => [
-                        'rules'  => 'required|in_list[Sales,Service]',
+                        'rules'  => 'required',
+                        'errors' => [
+                            'required' => 'Please select a Ticket Type.'
+                        ]
+                    ],
+
+                    'ticket_type' => [
+                        'rules'  => 'required',
                         'errors' => [
                             'required' => 'Ticket Type is required',
-                            'in_list'  => 'Invalid Ticket Type selected'
                         ]
                     ],
 
@@ -119,11 +126,12 @@ class ThzController extends BaseController
                     ],
 
                     'subject' => [
-                        'rules'  => 'required|min_length[5]|max_length[150]',
+                        'rules'  => 'required|min_length[3]|max_length[150]|regex_match[/^[a-zA-Z0-9 .,\-_()&\/\?]+$/]',
                         'errors' => [
-                            'required'   => 'Subject is required',
-                            'min_length' => 'Subject must be at least 5 characters',
-                            'max_length' => 'Subject cannot exceed 150 characters'
+                            'required'    => 'Subject is required.',
+                            'min_length'  => 'Subject must be at least 3 characters long.',
+                            'max_length'  => 'Subject cannot exceed 150 characters',
+                            'regex_match' => 'Subject contains invalid characters (Avoid quotes and special symbols).'
                         ]
                     ],
 
@@ -151,6 +159,7 @@ class ThzController extends BaseController
                     'errors' => $this->validator->getErrors()
                 ]);
             }
+        try {
 
             $request_post_data = $this->request->getPost();
             $data = sanitizeInputArrayAdvanced($request_post_data);
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index abb02e17..9b2c1771 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -3096,7 +3096,7 @@ class TicketController extends BaseController
 
     public function claimDumpUpload()
     {   
-        $data['tab_name'] = "Claim Dupm Upload";
+        $data['tab_name'] = "Claim Dump Upload";
         $data['page_name'] = "Claims";
         $data['tpa_list'] = $this->TPAModel->where('is_active', 1)->findAll();
 
diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 602f0708..f95f547d 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -1844,23 +1844,6 @@ class TicketServiceController extends BaseController
 
     // --------------------------------------------------------------------------------------------------------------------------------
 
-
-    public function tpaClaimImporter($params)
-    {
-        $file_id = $params['file_id'];
-        $tpa_claims_files_data = $this->claimDumpFileModel->where('id', $file_id)->first();
-
-
-        if($this->vidal_primary_key == $tpa_claims_files_data['tpa_id']){
-
-        }else if($this->icici_primary_key == $tpa_claims_files_data['tpa_id']){
-
-        }else{
-            $this->myLogger->logme('error', 'No TPA found to import');
-            return ['status' => false, 'message' => 'No TPA found to import'];
-        }
-    }
-
     public function tpaClaimDumpImporter($params)
     {
         $file_id = $params['file_id'] ?? null; // Move outside try to ensure catch can see it
@@ -1980,45 +1963,6 @@ class TicketServiceController extends BaseController
         }
     }
 
-    public function tpaClaimDumpToTicketMasterImportBatchSeperater($params)
-    {
-        try {
-
-            $file_id = $params['file_id'] ?? null;
-            $fileData = $this->claimDumpFileModel->where('id', $file_id)->first();
-
-            if (!$fileData) {
-                return ['status' => false, 'message' => 'Invalid file ID No file data found to import'];
-            }
-
-            $handler = TpaClaimsImportFactory::make($fileData['tpa_id'] ?? 0);
-            $result = $handler->runTicketMasterInsert($params);
-
-            return $result;
-
-        } catch (\Throwable $th) {
-
-            $this->myLogger->logme("error", 'TICKET_MASTER_CLAIM_IMPORTER_JOB :' .($th->getMessage() . ' --- ' . $th->getLine() . '----' . $th->getTraceAsString()));
-            
-            $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
-                'trace_array' => $th->getTrace(), // full array version (optional)
-                'function' => $th->getTrace()[0]['function'] ?? null,
-                'class' => $th->getTrace()[0]['class'] ?? null,
-            ];
-
-            return [
-                'status'  => false,
-                'message' => $th->getMessage(),
-                'error_data' => json_encode($errorData, JSON_PRETTY_PRINT)
-            ];
-        }
-    }
-
     public function readExcelBySheetName(string $filePath, string $sheetName): array
     {
         if (!file_exists($filePath)) {
diff --git a/app/Filters/RateLimitFilter.php b/app/Filters/RateLimitFilter.php
new file mode 100644
index 00000000..31efe81e
--- /dev/null
+++ b/app/Filters/RateLimitFilter.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Filters\FilterInterface;
+
+class RateLimitFilter implements FilterInterface
+{
+
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $throttler = service('throttler');
+
+        // sanitize IP for cache
+        $key = preg_replace('/[^a-zA-Z0-9_]/', '_', $request->getIPAddress());
+
+        if ($throttler->check($key, 25, MINUTE) === false) {
+            return service('response')
+                ->setStatusCode(429)
+                ->setJSON([
+                    'status'  => 'error',
+                    'message' => 'Too many requests. Try again later.'
+                ]);
+        }
+    }
+
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // nothing
+    }
+}
diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php
index 311182d4..c964bac7 100755
--- a/app/Helpers/JWTToken.php
+++ b/app/Helpers/JWTToken.php
@@ -30,16 +30,16 @@ class JWTToken
         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();
                 $id = $request_data['post_hr_id'];
-                $models->update($id, $data);
+                $models->update($id, $update);
 
             }
             
diff --git a/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
index 3ee5c066..8dcfc672 100644
--- a/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
@@ -148,20 +148,7 @@ class AbhiClaimImportService extends BaseTpaClaimImportService
         }
 
         $builder = $this->db->table('claims_dump_abhi');
-
-        foreach ($data as $value) {
-
-            if (!$builder->insert($value)) {
-
-                // 🔍 Debug purpose
-                log_message('error', print_r($this->db->error(), true));
-                log_message('error', $this->db->getLastQuery());
-
-                return false;
-            }
-        }
-
-        return true;
+        return $builder->insertBatch($data);   
     }
 
 
@@ -321,8 +308,14 @@ class AbhiClaimImportService extends BaseTpaClaimImportService
                     $item['emp_code'] = $employee_data['emp_code'] ?? null;
                     $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
                     $item['emp_mobile']  = $employee_data['mobile'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }
                 } else {
 
                     $reason = 'This employee not exist in our system.';
diff --git a/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
index f2e94cfa..3a6a5777 100644
--- a/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
@@ -92,6 +92,7 @@ abstract class BaseTpaClaimImportService
 
             $message = '';
             $hasExecutedTask = false;
+            $status = true;
 
             // Process Mapped Data
             if (!empty($ticketMasterData['mapped_array'])) {
@@ -102,6 +103,8 @@ abstract class BaseTpaClaimImportService
                 }
                 $message .= 'Ticket Master Claim bulk insert success. ';
                 $hasExecutedTask = true;
+            }else{
+                $status = false;
             }
 
             // Process Rejected Reasons
@@ -113,7 +116,7 @@ abstract class BaseTpaClaimImportService
                 }
                 
                 $message .= empty($ticketMasterData['mapped_array']) 
-                    ? 'Those employees not in our system. ' 
+                    ? 'Those employee or dependent not in our system. ' 
                     : 'Ticket Master Claim rejected reason updated successfully. ';
                 $hasExecutedTask = true;
             }
@@ -126,7 +129,7 @@ abstract class BaseTpaClaimImportService
 
             // 2. Commit the transaction
             $this->db->transCommit();
-            return ['status' => true, 'message' => trim($message)];
+            return ['status' => $status, 'message' => trim($message)];
 
         } catch (\Throwable $th) {
             // 3. Rollback on crash
diff --git a/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
index f4410b55..3ad5dde9 100644
--- a/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
@@ -217,12 +217,9 @@ class FhplClaimImportService extends BaseTpaClaimImportService
             return false;
         }
 
-        $ClaimsDumpFhplModel = new ClaimsDumpFhplModel();
-        $result = $ClaimsDumpFhplModel->insertBatch($data);
-
-        return true;
-
-    }
+        $builder = $this->db->table('claims_dump_fhpl');
+        return $builder->insertBatch($data);   
+     }
 
 
     public function importClaimMaster(array $data): bool
@@ -381,8 +378,14 @@ class FhplClaimImportService extends BaseTpaClaimImportService
                     $item['emp_code'] = $employee_data['emp_code'] ?? null;
                     $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
                     $item['emp_mobile']  = $employee_data['mobile'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
                 } else {
 
                     $reason = 'This employee not exist in our system.';
diff --git a/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
index fb1d731f..2cb09e7a 100644
--- a/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
@@ -135,29 +135,8 @@ class IciciClaimImportService extends BaseTpaClaimImportService
             return false;
         }
 
-        try {
-
-
-            $ClaimsDumpFhplModel = new ClaimsDumpFhplModel();
-            $result = $ClaimsDumpFhplModel->insertBatch($data);
-
-            return true;
-
-        } catch (\Throwable $th) {
-
-            $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
-                'trace_array' => $th->getTrace(), // full array version (optional)
-                'function' => $th->getTrace()[0]['function'] ?? null,
-                'class' => $th->getTrace()[0]['class'] ?? null,
-            ];
-            return false;
-        }
-
+        $builder = $this->db->table('claims_dump_icici');
+        return $builder->insertBatch($data);
     }
 
 
@@ -317,8 +296,14 @@ class IciciClaimImportService extends BaseTpaClaimImportService
                     $item['emp_code'] = $employee_data['emp_code'] ?? null;
                     $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
                     $item['emp_mobile']  = $employee_data['mobile'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
                 } else {
 
                     $reason = 'This employee not exist in our system.';
diff --git a/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
index 0c68ece9..947775f6 100644
--- a/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
@@ -334,8 +334,14 @@ class MediAssistClaimImportService extends BaseTpaClaimImportService
                     $item['emp_code'] = $employee_data['emp_code'] ?? null;
                     $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
                     $item['emp_mobile']  = $employee_data['mobile'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
                 } else {
 
                     $reason = 'This employee not exist in our system.';
diff --git a/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
index a75289a2..30c12e0d 100644
--- a/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
@@ -124,28 +124,8 @@ class RcareClaimImportService extends BaseTpaClaimImportService
             return false;
         }
 
-        try {
-
-            $builder = $this->db->table('claims_dump_reliance');
-            $builder->insertBatch($data);
-
-            return true;
-
-        } catch (\Throwable $th) {
-
-            $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
-                'trace_array' => $th->getTrace(), // full array version (optional)
-                'function' => $th->getTrace()[0]['function'] ?? null,
-                'class' => $th->getTrace()[0]['class'] ?? null,
-            ];
-            dd($errorData);
-            return false;
-        }
+        $builder = $this->db->table('claims_dump_reliance');
+        return $builder->insertBatch($data);
 
     }
 
@@ -305,8 +285,14 @@ class RcareClaimImportService extends BaseTpaClaimImportService
                     $item['emp_code'] = $employee_data['emp_code'] ?? null;
                     $item['emp_mail']  = $employee_data['email_corporate'] ?? null;
                     $item['emp_mobile']  = $employee_data['mobile'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
                 } else {
 
                     $reason = 'This employee not exist in our system.';
diff --git a/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
index 50ef9924..8fc34700 100644
--- a/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
@@ -364,9 +364,8 @@ class VidalClaimImportService extends BaseTpaClaimImportService
         }
         
         $builder = $this->db->table('claims_dump_vidal');
-        $builder->insertBatch($data);
+        return $builder->insertBatch($data);
 
-        return true;
     }
 
 
@@ -541,7 +540,7 @@ class VidalClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['status']] ?? 61;
+                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
                 $item['file_id']    = $file_id;
                 $item['claim_dump_ref_id']    = $row['id'];
                 $item['created_by'] = $file_data['created_by'] ?? null;
@@ -620,8 +619,14 @@ class VidalClaimImportService extends BaseTpaClaimImportService
                     $item['emp_name'] = $employee_data['id'] ?? null;
                     $item['emp_mail']  = $employee_data['insurer_id'] ?? null;
                     $item['emp_mobile']  = $employee_data['tpa_id'] ?? null;
-                    $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
-                    $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    if (!empty($employee_data['insured_emp_id'])) {
+                        $item['insured_emp_id']  = $employee_data['insured_emp_id'] ?? null;
+                        $item['insured_name']  = $employee_data['insured_name'] ?? null;
+                    }else{
+                        $reason = 'This Dependent employee not exist in our system.';
+                        $rejecetd_reason[] = ["id" => $row['id'], "master_reject_reason" => $reason];
+                        continue;
+                    }                
                 }else{
                     $reason = " This policy no ( " . $row['insurer_policy_number'] ." ) does not exist in our system";
                     $rejecetd_reason[$row['id']] = ["ticket_master_insert_reject_reason" => $reason];
diff --git a/app/Models/BdsPlacementModel.php b/app/Models/BdsPlacementModel.php
index 82edfce5..947f8a0f 100644
--- a/app/Models/BdsPlacementModel.php
+++ b/app/Models/BdsPlacementModel.php
@@ -57,6 +57,64 @@ class BdsPlacementModel extends Model
 
 
     public function getClientInstallmentDetails()
+    {
+        // 1. Fetch common data ONCE (Heads, Admins, Business Team)
+        // This saves hundreds of redundant queries
+        $heads = $this->db->table('user_profiles')
+            ->select('email')->where(['role' => 5, 'is_active' => 1])
+            ->get()->getResultArray();
+
+        $admins = $this->db->table('user_profiles')
+            ->select('email')->where(['role' => 1, 'is_active' => 1])
+            ->get()->getResultArray();
+
+        $businessTeam = $this->db->table("user_teams ut")
+            ->select("up.email")
+            ->join('user_profiles up', 'up.id = ut.user_id AND up.is_active = 1')
+            ->where(["ut.team_id" => 7, "ut.is_active" => 1])
+            ->get()->getResultArray();
+
+        // 2. Main Query
+        $builder = $this->db->table("bds_installment_payment_details bipd")
+            ->select("bipd.*, ct.client_name, ct.short_name, cb.branch_name, leads.salse_person_id, cp.policy_no")
+            ->join("policy_transaction pt", "pt.id = bipd.pt_id")
+            ->join("clients ct", "ct.id = pt.client_id")
+            ->join("client_branch cb", "cb.id = pt.client_branch_id")
+            ->join("leads", "leads.id = bipd.lead_id")
+            ->join("client_policy cp", "cp.id = pt.client_policy_id")
+            ->where("bipd.is_active", 1)
+            ->where("bipd.payment_date", date('Y-m-d', strtotime('+15 days')));
+
+        $data = $builder->get()->getResultArray();
+
+        // Loop through to extract sales person details
+        // 3. Simple Loop for Sales Person (Since it relies on a JSON ID)
+        foreach ($data as &$row) {
+            $sales_person_ids = json_decode($row['salse_person_id'], true);
+            $sales_person_id = $sales_person_ids[0] ?? null;
+
+            if ($sales_person_id) {
+                $user = $this->db->table('user_profiles')
+                    ->select('email') // or whatever field
+                    ->where('id', (int)$sales_person_id) // Cast to int for extra safety
+                    ->get()
+                    ->getRowArray();
+
+                $row['sales_person'] = $user['email'] ?? 'N/A';
+            } else {
+                $row['sales_person'] = 'Not Assigned';
+            }
+
+            // Assign the pre-fetched data
+            $row['heads'] = $heads;
+            $row['admins'] = $admins;
+            $row['buisness_team'] = $businessTeam;
+        }
+
+
+        return $data;
+    }
+    public function getClientInstallmentDetails_olds()
     {
 
         $builder = $this->db->table("bds_installment_payment_details bipd")
diff --git a/app/Models/InsurerModel.php b/app/Models/InsurerModel.php
index d264c231..a08b3c9e 100755
--- a/app/Models/InsurerModel.php
+++ b/app/Models/InsurerModel.php
@@ -64,6 +64,7 @@ class InsurerModel extends Model
             ->select('
                 insurers.id,
                 insurers.name,
+                insurers.short_name,
                 cd_master.cd_ac_no AS cd_master_account_no
             ')
             ->join('insurers', 'insurers.id = client_policy.insurer_id')
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 7c3af69c..7b50d11e 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -93,7 +93,7 @@ class TicketMasterModel extends Model
         'required_docs',
         'policy_transaction_id',
         'tpa_claim_type',
-        'tpa_ailments'
+        'tpa_ailments',
         'claim_dump_ref_id',
 
     ];
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index ca47296c..674a0d95 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -1177,7 +1177,7 @@ table.dataTable tbody td {
                     var student_id = $(this).attr('data-id');
                     $.get('<?php echo base_url('user/deactive/');?>'+student_id, function (data) {
                         console.log(data);
-                        toastr.success('User removed successfully', 'success');
+                        toastr.success('User removed successfully', 'Success');
                         window.location.reload()
                     })
                 }
@@ -1969,7 +1969,7 @@ table.dataTable tbody td {
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('')
                 $('#' + submitButId).prop('disabled', true);
             } else{
diff --git a/app/Views/bds_dump_file_list.php b/app/Views/bds_dump_file_list.php
index bd6e23ff..0f7f1cd2 100644
--- a/app/Views/bds_dump_file_list.php
+++ b/app/Views/bds_dump_file_list.php
@@ -182,9 +182,9 @@
                     console.log('Upload successful:', response);
 
                     if (response.status == true) {
-                        toastr.success(response.message, "SUCCESS");
+                        toastr.success(response.message, "Success");
                     } else {
-                        toastr.error(response.message, "ERROR");
+                        toastr.error(response.message, "Error");
                     }
 
                     // Reset form
@@ -222,7 +222,7 @@
                 // Check file size (optional - set max size as needed, e.g., 10MB)
                 var maxSize = 10 * 1024 * 1024; // 10MB in bytes
                 if (file.size > maxSize) {
-                    toastr.warning('File size should not exceed 10MB');
+                    toastr.warning('File size should not exceed 10MB', 'Warning');
                     $(this).val(''); // Clear the input
                     return false;
                 }
diff --git a/app/Views/cd_master_add_modal.php b/app/Views/cd_master_add_modal.php
index d07b87d4..23ca8ce1 100644
--- a/app/Views/cd_master_add_modal.php
+++ b/app/Views/cd_master_add_modal.php
@@ -187,7 +187,7 @@
                     }
 
                 } else {
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
 
                 //this function for reset the form values after submitting the form or closing the form
@@ -214,7 +214,7 @@
                                     toastr.warning(response.message || 'Validation failed', 'Warning');
                                 }
                 }
-                toastr.error('An error occurred while adding the CD account number.', 'ERROR');
+                toastr.error('An error occurred while adding the CD account number.', 'Error');
             }
         });
     });
@@ -338,13 +338,13 @@
                     $('#cd_client_id').val('').select2();
                     $('#insurer_id_for_cd').val('').select2();
                     $('#insurer_branch_id').val('').select2();
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
 
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
         }
     } 
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 754b632c..57c23757 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -312,7 +312,7 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('success')) : ?>
-            toastr.success('<?= session()->getFlashdata('success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('success') ?>', 'Success');
         <?php endif; ?>
     })
  
@@ -381,10 +381,10 @@ table.dataTable thead th {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('CD removed successfully.', 'success');
+                            toastr.success('CD removed successfully.', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove CD.', 'warning');
+                            toastr.warning('Failed to remove CD.', 'Warning');
                         }
                         }
                     },
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 0cf55ed9..1330cded 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -185,7 +185,7 @@
 
                             <div class="form-group col-md-9">
                                 <label>Upload file</label>
-                                &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ]
+                                &nbsp;[ <a href="<?= base_url("util/download-excel/claim_dump_upload"); ?>" id="download_sample_file" style="font-size: small; color:red !important;">Download sample file</a> ]
                                 <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
                             </div>
                             <div class="form-group col-md-3" style="margin-top: 40px;">
@@ -235,7 +235,7 @@
 
             if(client_id){
                 if(!client_policy_id){
-                    toastr.warning('Please select the client policy', 'WARNING');
+                    toastr.warning('Please select the client policy', 'Warning');
                     return;
                 }
             }
@@ -280,9 +280,9 @@
                     console.log('Upload successful:', response);
 
                     if (response.status == true) {
-                        toastr.success(response.message, "SUCCESS");
+                        toastr.success(response.message, "Success");
                     } else {
-                        toastr.error(response.message, "ERROR");
+                        toastr.error(response.message, "Error");
                     }
 
                     // Reset form
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 1c4f0079..cd2b4368 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -566,7 +566,7 @@
     function addDocument() {
 
         if (documentConfig.is_action_freeze) {
-            toastr.warning('Cannot add documents when action is frozen', 'WARNING');
+            toastr.warning('Cannot add documents when action is frozen', 'Warning');
             return;
         }
         
@@ -591,7 +591,7 @@
 
     function removeDocument(index) {
         if (documentConfig.is_action_freeze) {
-            toastr.warning('Cannot remove documents when action is frozen', 'WARNING');
+            toastr.warning('Cannot remove documents when action is frozen', 'Warning');
             return;
         }
 
@@ -599,7 +599,7 @@
 
         // ❗ If document is already received, do not remove
         if (doc.document_received === true) {
-            toastr.warning('Cannot remove a received document', 'WARNING');
+            toastr.warning('Cannot remove a received document', 'Warning');
             return;
         }
 
@@ -640,7 +640,7 @@
 
         const hasEmptyNames = documentConfig.docs.some(doc => !doc.document_name.trim());
         if (hasEmptyNames) {
-            toastr.warning('Please fill in all document names', 'WARNING');
+            toastr.warning('Please fill in all document names', 'Warning');
             return false;
         }
 
@@ -665,15 +665,15 @@
 
             if (response.status) {
                 loadConfiguration(response.data);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while saving docs.', 'ERROR');
+            toastr.error('An error occurred while saving docs.', 'Error');
         });
         
     }
diff --git a/app/Views/claim_mis_file_list.php b/app/Views/claim_mis_file_list.php
index fc636bcb..5d9304ef 100644
--- a/app/Views/claim_mis_file_list.php
+++ b/app/Views/claim_mis_file_list.php
@@ -177,7 +177,7 @@
             ];
 
             if (!fileInput.files || !fileInput.files.length) {
-                toastr.warning('Please select a file', 'WARNING');
+                toastr.warning('Please select a file', 'Warning');
                 return false;
             }
 
@@ -193,7 +193,7 @@
             ) {
                 toastr.warning(
                     'Please upload a valid file (PDF / Excel: .pdf, .xls, .xlsx, .ods)',
-                    'WARNING'
+                    'Warning'
                 );
                 return false;
             }
@@ -221,9 +221,9 @@
                     console.log('Upload successful:', response);
 
                     if (response.status == true) {
-                        toastr.success(response.message, "SUCCESS");
+                        toastr.success(response.message, "Success");
                     } else {
-                        toastr.error(response.message, "ERROR");
+                        toastr.error(response.message, "Error");
                     }
 
                     // Reset form
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index 99ddb30f..c9b1719d 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -44,6 +44,69 @@
         cursor: pointer;
     }
 </style>
+<style>
+    
+.switch-branch-contact {
+  position: relative;
+  display: inline-block;
+  width: 54px;
+  height: 34px;
+}
+
+.switch-branch-contact input { 
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.slider-branch-contact {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.slider-branch-contact:before {
+  position: absolute;
+  content: "";
+  height: 19px;
+  width: 19px;
+  left: 4px;
+  bottom: 4px;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+input:checked + .slider-branch-contact {
+  background-color: #00999E;
+}
+
+input:focus + .slider-branch-contact {
+  box-shadow: 0 0 1px #00999E;
+}
+
+input:checked + .slider-branch-contact:before {
+  -webkit-transform: translateX(26px);
+  -ms-transform: translateX(26px);
+  transform: translateX(26px);
+}
+
+/* Rounded sliders */
+.slider-branch-contact.round-branch-contact {
+  border-radius: 34px;
+}
+
+.slider-branch-contact.round-branch-contact:before {
+  border-radius: 50%;
+}
+</style>
+
 
 <div class="tab-pane fade" id="branch-tab">
     <input type="hidden" id="client_id_for_client_branch" value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
@@ -162,12 +225,12 @@
                                 </select>
                             </div>
                             <div class="form-group col-md-4">
-                                <label class="switch" style="position: relative;top: 43px;left: 20px;">
+                                <label class="switch-branch-contact" style="position: relative;top: 43px;left: 20px;">
                                     <input id="sez" type="checkbox" name="sez">
-                                    <span class="slider round" style="height: 27px;"></span>
+                                    <span class="slider-branch-contact round-branch-contact" style="height: 27px;"></span>
                                 </label>
 
-                                <label for="inception_type" style="position: relative;bottom: 5px;left: 85px;">Enable SEZ</label>
+                                <label for="sez" style="position: relative;bottom: 5px;left: 85px;">Enable SEZ</label>
                             </div>
                         </div>
 
@@ -495,6 +558,36 @@ $("#branch_form").submit(function(event) {
                     if(xhr.status === 409){
                         alert('The Current Branch is Already Existing..!!');
                     }
+                    // if (xhr.status === 400) {
+                    //     let response = JSON.parse(xhr.responseText);
+                    //     if (response.errors) {
+                    //         let errorMessages = "";
+                    //         $.each(response.errors, function (field, message) {
+                    //             errorMessages += `• ${message}<br>`; 
+                    //         });
+                    //         toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                    //     } else {
+                    //         toastr.warning(response.message || 'Validation failed', 'Warning');
+                    //     }
+                    // }
+                    if (xhr.status === 400) {
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                // Only add the message if it hasn't been seen before
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
+                    }
                 }, 300);
             },
             complete: function() {
@@ -967,7 +1060,7 @@ function validateInput(input, table, field, submitButId){
 
     checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
         if (isDuplicate) {
-            toastr.warning(message, 'WARNING');
+            toastr.warning(message, 'Warning');
             // $(input).val('')
             $('#' + submitButId).prop('disabled', true);
         } else{
@@ -1003,7 +1096,7 @@ function validateDuplicateByClientBranch(input, field, submitButId) {
     if (isLocalDuplicate) {
         console.log(`r u n Local`);
         console.log(`duplicate found for ${field}`);
-        toastr.warning(message, 'WARNING');
+        toastr.warning(message, 'Warning');
         $('#' + submitButId).prop('disabled', true);
         return;
     }
@@ -1030,7 +1123,7 @@ function validateDuplicateByClientBranch(input, field, submitButId) {
             if (response.isDuplicate) {
                 console.log(`r u n Server`);
                 console.log(`duplicate found for ${field}`);
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $('#' + submitButId).prop('disabled', true);
             } else {
                 console.log(`No duplicate for ${field}`);
@@ -1075,13 +1168,13 @@ function checkAllFieldsValid(submitButId) {
         $('#' + submitButId).prop('disabled', true);
         // show correct message based on what’s duplicated
         if (emailDuplicates && mobileDuplicates) {
-            toastr.warning("Email and Mobile values are duplicate!", "WARNING");
+            toastr.warning("Email and Mobile values are duplicate!", "Warning");
             console.log('Both Email and Mobile duplicates');
         } else if (emailDuplicates) {
-            toastr.warning("Email duplicate!", "WARNING");
+            toastr.warning("Email duplicate!", "Warning");
             console.log('Cross Check Email duplicates');
         } else if (mobileDuplicates) {
-            toastr.warning("Mobile duplicate!", "WARNING");
+            toastr.warning("Mobile duplicate!", "Warning");
             console.log('Cross Check Mobile duplicates');
         }
         console.log(`btn Dis - true`);
@@ -1127,9 +1220,9 @@ function removeLevelContacts(id){
 
         console.log('Data fetched successfully:', response);
         if (response.status == true) {
-            toastr.success(response.message, 'SUCCESS');
+            toastr.success(response.message, 'Success');
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
 
     }, function(xhr, status, error) {
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index f2d9adac..e9b726a5 100755
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -157,7 +157,7 @@
                         $('#tbody').append(res.data);
                         toastr.success('File uploaded successfully', 'Success');
                     }else{
-                        toastr.warning('File uploaded failed', 'WARNING');
+                        toastr.warning('File uploaded failed', 'Warning');
                     }
                 },
                 error: function (xhr, status, error) {
@@ -165,7 +165,7 @@
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }
             });
         });
@@ -211,7 +211,7 @@
                         $('#other_docs').append(res.data);
                         toastr.success('File uploaded successfully', 'Success');
                     }else{
-                        toastr.warning('File uploaded failed', 'WARNING');
+                        toastr.warning('File uploaded failed', 'Warning');
                     }
 
                     $('#kyc_form').trigger('reset');
@@ -221,7 +221,7 @@
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }
             });
 
diff --git a/app/Views/client_kyc_2.php b/app/Views/client_kyc_2.php
index 28e22522..7a34acc8 100755
--- a/app/Views/client_kyc_2.php
+++ b/app/Views/client_kyc_2.php
@@ -346,7 +346,7 @@
         }
 
         // Invalid format
-        toastr.warning('Invalid file format. Only PDF or Image files are allowed.', 'WARNING!');
+        toastr.warning('Invalid file format. Only PDF or Image files are allowed.', 'Warning');
         $(fileInput).val(''); // clear file
         return false; // Invalid
     }
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 8169b0b0..90bf5f3e 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -489,7 +489,7 @@ $(document).ready(function()
 
 //                     if(res){
 //                     if (res.status == true) {
-//                         toastr.success('Client removed successfully.', 'success');
+//                         toastr.success('Client removed successfully.', 'Success');
 //                         location.reload();
 //                     } else {
 //                         Swal.fire({
@@ -497,7 +497,7 @@ $(document).ready(function()
 //                             text: res.message,
 //                             icon: "warning"
 //                         });
-//                         // toastr.warning(res.message, 'warning');
+//                         // toastr.warning(res.message, 'Warning');
 //                     }
 //                     }
 //                 },
@@ -554,15 +554,15 @@ function removeClient(element)
                     $('.loader-mask').delay(350).fadeOut('slow');
 
                     if (res.status == true) {
-                        toastr.success(res.message, 'success');
+                        toastr.success(res.message, 'Success');
                         location.reload();
                     } else {
                         Swal.fire({
-                            title: "warning!",
+                            title: "Warning!",
                             text: res.message,
                             icon: "warning"
                         });
-                        // toastr.warning(res.message, 'warning');
+                        // toastr.warning(res.message, 'Warning');
                     }
                 },
                 error: function (xhr, status, error) {
@@ -655,10 +655,10 @@ function featchClient(){
                     + '?cd_amt=' + (res.cd_amount ?? 0)
                     + '&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()
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 3a195fe7..d8d5eb68 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -464,7 +464,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -481,7 +481,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#relation_form').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -495,7 +495,7 @@
 
         if (check_client_id == '' || check_client_id == null || check_client_id == 0) {
             $('#BtnAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -512,7 +512,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -529,7 +529,7 @@
 
         if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#notification-tab').hide();
-            toastr.warning('Please Add the Client!', 'warning', {
+            toastr.warning('Please Add the Client!', 'Warning', {
                 timeOut: 2000
             });
         } else {
@@ -719,9 +719,9 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status === true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
-                console.error(response.message, 'WARNING');
+                console.error(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('--- AJAX Error Details ---');
@@ -813,7 +813,7 @@
             if (response.status === true) {
                 $('#hr_access_append_area').empty();
                 $('#hr_access_append_area').append(response.data)
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             } else {
                 console.error(response.message, 'WARNING');
             }
diff --git a/app/Views/client_others_tab.php b/app/Views/client_others_tab.php
index e7f0979c..193eb8b1 100644
--- a/app/Views/client_others_tab.php
+++ b/app/Views/client_others_tab.php
@@ -59,9 +59,9 @@ $(document).ready(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     if (res.status == true) {
-                        toastr.success(res.message, 'SUCCESS');
+                        toastr.success(res.message, 'Success');
                     } else {
-                        toastr.warning(res.message, 'WARNING');
+                        toastr.warning(res.message, 'Warning');
                     }
 
                 },
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index af1c7aa6..db5793fe 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -1837,7 +1837,7 @@ input:checked + .slider_blue::before {
                 // //console.log(res.data.length);
 
                 if (res.data.length == 0) {
-                    toastr.warning('The client does not have any branches.', 'warning');
+                    toastr.warning('The client does not have any branches.', 'Warning');
                     return;
                 }
 
@@ -1978,7 +1978,7 @@ input:checked + .slider_blue::before {
 
                             if(res){
                             if (res.status == true) {
-                                toastr.success('Policy removed successfully.', 'success');
+                                toastr.success('Policy removed successfully.', 'Success');
                                 location.reload();
                             } else {
                                 Swal.fire({
@@ -1986,7 +1986,7 @@ input:checked + .slider_blue::before {
                                     text: res.message,
                                     icon: "warning"
                                 });
-                                // toastr.warning('Failed to remove policy', 'warning');
+                                // toastr.warning('Failed to remove policy', 'Warning');
                             }
                             }
                         },
@@ -2022,7 +2022,7 @@ input:checked + .slider_blue::before {
                 console.log(res);
                 if (res.status == true) {
 
-                    toastr.warning(res.message, 'warning');
+                    toastr.warning(res.message, 'Warning');
                     $('#policy_no').val('');
 
                 }else{
@@ -2300,10 +2300,10 @@ input:checked + .slider_blue::before {
 
                 if(res.status == true){
                     let client_url = '<?= base_url('client/list/') ?>' + res.client_id + '?client_policy_id=' + res.client_policy_id+'#police-tab';
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     window.location.href = client_url;
                 }else{
-                    toastr.success(res.message, 'WARNING');
+                    toastr.success(res.message, 'INFO');
                 }
 
                 $('.close').click()
diff --git a/app/Views/commission_file_upload.php b/app/Views/commission_file_upload.php
index 7d1ca6fd..472e452f 100644
--- a/app/Views/commission_file_upload.php
+++ b/app/Views/commission_file_upload.php
@@ -510,11 +510,11 @@
                     $('#commission_upload_form')[0].reset();
 
                     if (response.code === 200 && response.status === true) {
-                        toastr.success('File upload success', 'SUCCESS');
+                        toastr.success('File upload success', 'Success');
                     } else if (response.code === 404 && response.status === false) {
-                        toastr.error(response.message, 'FAILED');
+                        toastr.error(response.message, 'Failed');
                     } else {
-                        toastr.error('Something went wrong! Try later', 'ERROR');
+                        toastr.error('Something went wrong! Try later', 'Error');
                     }
 
                     $('.close').click();
@@ -527,7 +527,7 @@
                 },
                 error: function(xhr, status, error) {
                     console.error("Request failed:", status, error);
-                    toastr.error('Something went wrong! Try later', 'ERROR');
+                    toastr.error('Something went wrong! Try later', 'Error');
 
                     $('.close').click();
                     $('.loader').fadeOut();
diff --git a/app/Views/commission_rules_list.php b/app/Views/commission_rules_list.php
index 93399920..0b6e0318 100644
--- a/app/Views/commission_rules_list.php
+++ b/app/Views/commission_rules_list.php
@@ -721,11 +721,11 @@
             console.log('rules type', typeof rules);
 
             if (response.status == true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 // rules = response.data;
                 displayRules(response.data);
             }else{
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -739,7 +739,7 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
         
     });
@@ -867,11 +867,11 @@
                     console.log('rules type', typeof rules);
 
                     if (response.status == true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         // rules = response.data;
                         displayRules(response.data);
                     }else{
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
@@ -885,7 +885,7 @@
                     $('.loader-mask').delay(350).fadeOut('slow');
                     console.error('Error fetching data:', error);
                     console.error(xhr.responseText);
-                    toastr.error('An error occurred while fetching the data.', 'ERROR');
+                    toastr.error('An error occurred while fetching the data.', 'Error');
                 });
             }
 
@@ -1033,7 +1033,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
 
     }
diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index f557fdd9..c7759622 100644
--- a/app/Views/drive_file_upload.php
+++ b/app/Views/drive_file_upload.php
@@ -99,10 +99,10 @@ $("#drive_file_upload_form").submit(function(event) {
             $('.loader-mask').delay(350).fadeOut('slow');
 
             if(res.status == true){
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 appendFileTableBody(res.data.pt_files);
             }else{
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
             }
 
             $('#drive_file_upload_form')[0].reset();
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index af15e95c..8f1260cc 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -468,7 +468,7 @@
                     $('#gender').prop('disabled', false);
                     $('#dob').prop('disabled', false);
 
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
             },
             error: function (xhr, status, error) {
@@ -515,7 +515,7 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     
                     $('.close').click();
 
@@ -531,7 +531,7 @@
                     fetchEmpolyeeList();
 
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -557,7 +557,7 @@
                     } else {
                         toastr.warning(response.message || 'Validation failed', 'Warning');
                     }
-                }else{ toastr.warning('Error uploading file', 'WARNING'); }
+                }else{ toastr.warning('Error uploading file', 'Warning'); }
             },
             complete: function() {
                 $('.loader').fadeOut();
@@ -597,9 +597,9 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if(res.status == true){
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                         }else{
-                            toastr.error(res.message, 'ERROR');
+                            toastr.error(res.message, 'Error');
                         }
                     },
                     error: function (xhr, status, error) {
@@ -638,7 +638,7 @@
 
         checkDuplicateTableFieldValue(table, field, data, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $("#btnSubmit").prop('disabled', true);
             }else{
                 $("#btnSubmit").prop('disabled', false);
@@ -737,12 +737,12 @@
                 showModal();
             } else {
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -777,11 +777,11 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status == true && response.data.eCardDownload) {
-                console.log(response.data.message || 'Initiating successafully', 'SUCCESS');
+                console.log(response.data.message || 'Initiating successfully', 'Success');
                 const newTab = window.open(response.data.eCardDownload, '_blank');
                 if (newTab) newTab.focus();
             } else {
-                toastr.error(response.data.message || 'Unable to fetch e-card', 'ERROR');
+                toastr.error(response.data.message || 'Unable to fetch e-card', 'Error');
             }
 
             $('.loader').fadeOut();
@@ -790,7 +790,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
 
@@ -817,10 +817,10 @@
     function reGenerateEcardForSingleFamily(client_policy_id, emp_code)
     {   
         if(!client_policy_id){
-            toastr.warning('Failed to re-Generate E-card', 'WARNING');
+            toastr.warning('Failed to re-Generate E-card', 'Warning');
         }
         if(!emp_code){
-            toastr.warning('Failed to re-Generate E-card', 'WARNING');
+            toastr.warning('Failed to re-Generate E-card', 'Warning');
         }
 
         console.log({client_policy_id, emp_code});
@@ -842,9 +842,9 @@
             console.log('Data fetched successfully:', response);
 
             if (response.dataStatus == true) {
-                toastr.success(response.message || 'Initiating successafully.', 'SUCCESS');
+                toastr.success(response.message || 'Initiating successfully.', 'Success');
             } else {
-                toastr.warning(response.status || 'Unable to regenerate e-card.', 'WARNING');
+                toastr.warning(response.status || 'Unable to regenerate e-card.', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -853,7 +853,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('Unable to regenerate e-card.', 'ERROR');
+            toastr.error('Unable to regenerate e-card.', 'Error');
         });
 
 
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php
index 6f6d74dc..42ee6b08 100755
--- a/app/Views/employee_list.php
+++ b/app/Views/employee_list.php
@@ -739,9 +739,9 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if (res.status == false) {
-                            toastr.info(res.message, 'INFO');
+                            toastr.info(res.message, 'Info');
                         } else {
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                         }
 
                     },
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 54727a92..9c98bf7f 100755
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -182,7 +182,7 @@ $('#file_upload').hide();
 $(document).ready(function() {
 
     <?php if (session()->has('success1')): ?>
-    toastr.success('<?= session()->getFlashdata('success1') ?>', 'success');
+    toastr.success('<?= session()->getFlashdata('success1') ?>', 'Success');
     <?php endif; ?>
     // Initialize select2
     $("#client_id").select2();
@@ -217,22 +217,22 @@ $(document).ready(function() {
 
         if(checkValues() == 'client'){
 
-            toastr.warning('Client is Required', 'warning')
+            toastr.warning('Client is Required', 'Warning')
             return false;
 
         }else if(checkValues() == 'policy'){
 
-            toastr.warning('Policy is Required', 'warning')
+            toastr.warning('Policy is Required', 'Warning')
             return false;
             
         }else if(checkValues() == 'branch'){
 
-            toastr.warning('Branch is Required', 'warning')
+            toastr.warning('Branch is Required', 'Warning')
             return false;
 
         }else if(checkValues() == 'event'){
 
-            toastr.warning('Event is Required', 'warning')
+            toastr.warning('Event is Required', 'Warning')
             return false;
         }else{
 
@@ -261,7 +261,7 @@ $(document).ready(function() {
             // $('#policy_id').mouseover();
             console.log('required');
             // alert('please choose policy for this uploaing event ');
-            toastr.warning('please choose policy for this uploaing event', 'warning')
+            toastr.warning('please choose policy for this uploaing event', 'Warning')
             return false;
 
         } else {
@@ -833,7 +833,7 @@ $('#fetch_enrolled_data').click(function()
     var action = $('#upload-action-type').val();
     // console.log(client_id + '-' + policy_id);
     if (client_id == '0' || policy_id == '0') {
-        toastr.warning('please select the client and policy for this uploaing event', 'warning')
+        toastr.warning('please select the client and policy for this uploaing event', 'Warning')
         $('#full-width-modal').modal('hide');
         return;
     }
@@ -1175,7 +1175,7 @@ function initiateWellnessOnboard(e)
                     }, 300);
 
                         console.log('initiate wellness response', response);
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         $('#onboard_div').hide();
 
                 },
@@ -1261,9 +1261,9 @@ $(document).on('click', '#confirmYes', function() {
                     console.log('API response:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
@@ -1309,9 +1309,9 @@ $(document).on('click', '#confirmNo', function() {
                     console.log('API response:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
 
                     $('.loader').fadeOut();
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index 5e2f79dc..1987dee6 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -428,7 +428,7 @@ $('#uploadForm').submit(function() {
                 .data !== "") {
                 toastr.success(
                     'File upload successs, Data validation is in-progress',
-                    'success');
+                    'Success');
                 $('.close').click()
                 window.location.reload(true);
             } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/frontend_content_list.php b/app/Views/frontend_content_list.php
index e2e62833..b90f8869 100644
--- a/app/Views/frontend_content_list.php
+++ b/app/Views/frontend_content_list.php
@@ -364,10 +364,10 @@
     //                 $('#modalLabel').text('Edit Front End Content');
     //                 appendEditData(response.data);
     //             }else{
-    //                 toastr.success(response.message, 'SUCCESS');
+    //                 toastr.success(response.message, 'Success');
     //             }
     //         } else {
-    //             toastr.warning(response.message, 'WARNING');
+    //             toastr.warning(response.message, 'Warning');
     //         }
 
     //         $('.loader').fadeOut();
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 07b3a9fe..51f008b4 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -451,7 +451,7 @@
                     .data !== "") {
                     toastr.success(
                         'File upload successs, Data validation is in-progress',
-                        'success');
+                        'Success');
                     $('.close').click()
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index da147629..1923286b 100755
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -564,7 +564,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -824,10 +824,10 @@ function toggleAddButton() {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('Insurer branch removed successfully', 'success');
+                            toastr.success('Insurer branch removed successfully', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove insurer branch', 'warning');
+                            toastr.warning('Failed to remove insurer branch', 'Warning');
                         }
                         }
                     },
@@ -836,7 +836,7 @@ function toggleAddButton() {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove insurer branch', 'warning');
+                        toastr.warning('Failed to remove insurer branch', 'Warning');
                     }
                 });
 
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index e006d5a8..5ad3bdc0 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -474,9 +474,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);
@@ -730,9 +730,9 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(res.status == false){
-                    toastr.error(res.message, 'ERROR');
+                    toastr.error(res.message, 'Error');
                 }else{
-                    toastr.success(res.message, 'SUCCESS');
+                    toastr.success(res.message, 'Success');
                 }
 
                 window.location.reload(true);
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 5a25fd9e..05e0dc7e 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -319,10 +319,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('Insurer removed successfully', 'success');
+                toastr.success('Insurer removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove insurer', 'warning');
+                toastr.warning('Failed to remove insurer', 'Warning');
               }
             }
           },
@@ -331,7 +331,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove insurer', 'warning');
+            toastr.warning('Failed to remove insurer', 'Warning');
           }
         });
       }
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 2889ba13..e1bd6ee6 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -75,7 +75,7 @@
 
         if (check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Insurer!', 'warning', {
+            toastr.warning('First Add the Insurer!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index b0baf94d..2e9148ee 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -588,7 +588,7 @@
         <?php endif; ?>
 
         <?php if (session()->has('success')) : ?>
-            toastr.success('<?= session()->getFlashdata('success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('success') ?>', 'Success');
         <?php endif; ?>
 
         $('#import_excel_btn').hide();
@@ -632,7 +632,7 @@
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
                         $$("#import_export_excel_form")[0].reset()
-                        toastr.success('File Download successs', 'success');
+                        toastr.success('File Download successs', 'Success');
 
                     } else if (response.code === 404 && response.status === false) {
 
@@ -1132,12 +1132,12 @@
             
             // Only show message once and if status is false
             if (get_cd_balance?.cd_balance === false && !messageShown) {
-                // toastr.warning('Insufficient CD Balance deducated. Please wait the file will be downloaded', 'WARNING');
+                // toastr.warning('Insufficient CD Balance deducated. Please wait the file will be downloaded', 'Warning');
                 var message1 = 'Insufficient CD Balance deducted. Please wait the file will be downloaded<br>' +
                 '<strong>CD Amount:</strong> ₹' + (cdAmount || 0) + '<br>' +
                 '<strong>Total Amount:</strong> ₹' + (excel_file_amt || 0);
 
-                toastr.warning(message1, 'WARNING', {
+                toastr.warning(message1, 'Warning', {
                     allowHtml: true,
                     timeOut: 10000,
                     extendedTimeOut: 3000
@@ -1190,7 +1190,7 @@
 
                     toastr.warning(
                         `Insufficient CD Balance.<br>Balance: ₹${cd_balance_info.cd_amount}`, 
-                        'WARNING', 
+                        'Warning', 
                         { allowHtml: true }
                     );
 
@@ -1288,7 +1288,7 @@
 
         for (let c of checks) {
             if (!c.val || c.val == 0) {
-                toastr.warning(c.msg, 'WARNING');
+                toastr.warning(c.msg, 'Warning');
                 return;
             }
         }
@@ -1310,15 +1310,15 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status == true) {
-                toastr.success(response.message || 'Initiating successafully', 'SUCCESS');
+                toastr.success(response.message || 'Initiating successafully', 'Success');
             } else {
-                toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                toastr.error(response.message || 'Unable to fetch data', 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
 
@@ -1441,12 +1441,12 @@
         const selectedHRs = $('input[name="hr_emails[]"]:checked');
 
         if (!mailToggle.is(':checked')) {
-            toastr.warning('Please Enable the mail option.', 'WARNING');
+            toastr.warning('Please Enable the mail option.', 'Warning');
             return;
         }
 
         if (selectedHRs.length === 0) {
-            toastr.warning('Please select at least one HR.', 'WARNING');
+            toastr.warning('Please select at least one HR.', 'Warning');
             return;
         }
 
@@ -1489,14 +1489,14 @@
                 console.log('Response Success:', data);
 
                 if (data.status === true) {
-                    toastr.success(data.message, 'SUCCESS');
+                    toastr.success(data.message, 'Success');
                 } else {
-                    toastr.warning(data.message, 'WARNING');
+                    toastr.warning(data.message, 'Warning');
                 }
             },
             error: function (xhr, status, error) {
                 console.error('Response Error:', error);
-                toastr.error('Something went wrong. Please try again.', 'ERROR');
+                toastr.error('Something went wrong. Please try again.', 'Error');
             },
             complete: function () {
                 // Reset button state
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index 4e4a9192..838c9fc4 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -1304,7 +1304,7 @@
                     .data !== "") {
                     toastr.success(
                         'File upload successs',
-                        'success');
+                        'Success');
                     $('.close').click();
                     window.location.reload(true);
                 } else if (response.code === 404 && response.dataStatus === false) {
diff --git a/app/Views/invoice_policy_mapping.php b/app/Views/invoice_policy_mapping.php
index 3c357172..6d3d9fea 100644
--- a/app/Views/invoice_policy_mapping.php
+++ b/app/Views/invoice_policy_mapping.php
@@ -1090,7 +1090,7 @@ function downloadInvoicePdf(){
 function fetchPreviewInvoiceDetails(invoice_id, invoice_no){  
 
     if (!invoice_id) {
-        toastr.warning("Invoice Id not found!", "WARNING");
+        toastr.warning("Invoice Id not found!", "Warning");
         return false;
     }
 
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index ee134535..6fd2ad16 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -159,14 +159,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index 3c6631e5..385817c2 100755
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -264,7 +264,7 @@ $(document).ready(function () {
                                     toastr.warning(response.message || 'Validation failed', 'Warning');
                                 }
                         }
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -427,7 +427,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');
                         }
                         }
                     },
@@ -436,7 +436,7 @@ $(document).ready(function () {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove KYC docs', 'warning');
+                        toastr.warning('Failed to remove KYC docs', 'Warning');
                     }
                 });
             }
diff --git a/app/Views/kyc_entity_type_basic_info.php b/app/Views/kyc_entity_type_basic_info.php
index 9998f144..88c08db9 100755
--- a/app/Views/kyc_entity_type_basic_info.php
+++ b/app/Views/kyc_entity_type_basic_info.php
@@ -88,7 +88,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index be618dd3..342e24d3 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -308,12 +308,12 @@ function removeKYC(element) {
                 // console.log(res.status == true);
                   if(res){
                     if (res.status == true) {
-                      toastr.success('KYC entity removed successfully', 'success');
+                      toastr.success('KYC entity removed successfully', 'Success');
 
                       location.reload();
 
                     } else {
-                      toastr.warning('Failed to remove KYC entity', 'warning');
+                      toastr.warning('Failed to remove KYC entity', 'Warning');
                     }
                   }
               },
@@ -323,7 +323,7 @@ function removeKYC(element) {
                   setTimeout(function() {
                   $('.loader').fadeOut();
                   $('.loader-mask').delay(350).fadeOut('slow');
-                  toastr.warning('Something Wrong!', 'warning');
+                  toastr.warning('Something Wrong!', 'Warning');
               }, 1000);
               }
           });
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index eec84a12..6728620d 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -92,7 +92,7 @@
         console.log(check_policy_type_id.val());
         if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the KYC Entity Type!', 'warning', {
+            toastr.warning('First Add the KYC Entity Type!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 73c56916..9a3b72af 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -1863,9 +1863,9 @@
                                     <li>
                                         <a href="<?= base_url('/ticket/claim-upload') ?>">Claim Dump Upload</a>
                                     </li>
-                                    <li>
+                                    <!-- <li>
                                         <a href="<?= base_url('/claim_mis/list') ?>">Claim MIS Upload</a>
-                                    </li>
+                                    </li> -->
                                     <!-- <li>
                                             <a href="<?= base_url('/ticketList?return_type=web') ?>">Ticket List</a>
                                         </li> -->
diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php
index 75cebd29..07cf83bb 100644
--- a/app/Views/lead_filter.php
+++ b/app/Views/lead_filter.php
@@ -213,13 +213,13 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index ede380ea..44ca3949 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -629,7 +629,7 @@
         var next_reminder_date = flatpickr("#next_reminder_date", {
             dateFormat: "d/m/Y",
             allowInput: false,
-            maxDate: "today"
+            minDate: "today"
         });
 
 
@@ -1111,7 +1111,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 10924bf5..2773b0e2 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -513,7 +513,7 @@ if (isset($selected_lead_type)) {
         }
 
         if(client_type == ""){
-             toastr.warning('Please select the client type', 'WARNING');
+             toastr.warning('Please select the client type', 'Warning');
              $('#client_short_name').val('')
              return;
         }
@@ -528,7 +528,7 @@ if (isset($selected_lead_type)) {
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('')
                 $('#lead_form_submit_btn').prop('disabled', true);
             } else{
@@ -662,7 +662,7 @@ if (isset($selected_lead_type)) {
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
-            toastr.warning("You can't remove the first file field", 'WARNING');
+            toastr.warning("You can't remove the first file field", 'Warning');
             return false;
         }
 
@@ -694,7 +694,7 @@ if (isset($selected_lead_type)) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status == true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             //remove the file field
                             const field = document.getElementById(`fileField_${index}`);
@@ -703,7 +703,7 @@ if (isset($selected_lead_type)) {
                             }
                             
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.warning(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -714,7 +714,7 @@ if (isset($selected_lead_type)) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                        toastr.error('An error occurred while checking the CD amount.', 'Error');
                     });
 
                 }else{
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index ebdf741b..8b61fc90 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -525,7 +525,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
@@ -629,14 +629,22 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 if (xhr.status === 400) {
-                    let response = JSON.parse(xhr.responseText);
-                    if (response.errors) {
-                        $.each(response.errors, function (field, message) {
-                            toastr.warning(message, 'Validation Error');
-                        });
-                    } else {
-                        toastr.warning(response.message || 'Validation failed', 'Warning');
-                    }
+                        let response = JSON.parse(xhr.responseText);
+                        let errorMessages = "";
+                        let seenMessages = []; // Array to store unique messages
+                        if (response.errors) {
+                            $.each(response.errors, function (field, message) {
+                                // Only add the message if it hasn't been seen before
+                                if (!seenMessages.includes(message)) {
+                                    errorMessages += `• ${message}<br>`; 
+                                    seenMessages.push(message); // Mark this message as "seen"
+                                }
+                            });
+
+                            toastr.error(errorMessages, 'Validation Error', { "allowHtml": true });
+                        } else {
+                            toastr.warning(response.message || 'Validation failed', 'Warning');
+                        }
                 }
             }
         });
diff --git a/app/Views/newClientModal-old.php b/app/Views/newClientModal-old.php
index 387578c9..1e2f3347 100644
--- a/app/Views/newClientModal-old.php
+++ b/app/Views/newClientModal-old.php
@@ -142,7 +142,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_add_modal_submit_btn').prop('disabled', true);
diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php
index 7acdbf5a..6fcf603a 100644
--- a/app/Views/newClientModal.php
+++ b/app/Views/newClientModal.php
@@ -143,7 +143,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_add_modal_submit_btn').prop('disabled', true);
diff --git a/app/Views/nhance_branch_list.php b/app/Views/nhance_branch_list.php
index 11725ff2..d91db327 100644
--- a/app/Views/nhance_branch_list.php
+++ b/app/Views/nhance_branch_list.php
@@ -197,10 +197,10 @@
     //                 $('#modalLabel').text('Edit Branch');
     //                 appendEditData(response.data);
     //             }else{
-    //                 toastr.success(response.message, 'SUCCESS');
+    //                 toastr.success(response.message, 'Success');
     //             }
     //         } else {
-    //             toastr.warning(response.message, 'WARNING');
+    //             toastr.warning(response.message, 'Warning');
     //         }
 
     //         $('.loader').fadeOut();
diff --git a/app/Views/notification old.php b/app/Views/notification old.php
index 11cc74ed..c722ce12 100644
--- a/app/Views/notification old.php	
+++ b/app/Views/notification old.php	
@@ -993,7 +993,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1037,7 +1037,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1088,7 +1088,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1131,7 +1131,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1175,7 +1175,7 @@
         //                 {
         //                     $('.loader').fadeOut();
         //                     $('.loader-mask').delay(350).fadeOut('slow');
-        //                     toastr.warning('Something Wrong!', 'warning');
+        //                     toastr.warning('Something Wrong!', 'Warning');
         //                 }, 1000);
         //             }
         //         });
@@ -1219,7 +1219,7 @@
                         {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            toastr.warning('Something Wrong!', 'warning');
+                            toastr.warning('Something Wrong!', 'Warning');
                         }, 1000);
                     }
                 });
@@ -1273,7 +1273,7 @@
                     {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });    
@@ -1361,7 +1361,7 @@ template_name = '';
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -1433,13 +1433,13 @@ template_name = '';
                                 console.log('Parsed respond', respond)
 
                                 if(respond.status == 'success'){
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 }else{
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
                                 
                             }else{
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function (xhr, status, error) {
@@ -1454,16 +1454,16 @@ template_name = '';
 
                 }else{
                     let alert_msg = 'Template ID not exist'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             }else{
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
             
         }else{
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1600,10 +1600,10 @@ template_name = '';
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -1620,7 +1620,7 @@ template_name = '';
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1652,10 +1652,10 @@ template_name = '';
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(res.status == true){
-                   toastr.success(res.message, 'SUCCESS')
+                   toastr.success(res.message, 'Success')
                    addHTMLInput(res.data);
                 }else{
-                   toastr.warning(res.message, 'WARNING')
+                   toastr.warning(res.message, 'Warning')
                 }
             },
             error: function (xhr, status, error) {
@@ -1954,7 +1954,7 @@ $('#account_maneger_summary_mail_form').submit(function (event) {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Went Wrong!', 'warning');
+                    toastr.warning('Something Went Wrong!', 'Warning');
                 }, 1000);
             }
         });
diff --git a/app/Views/notification.php b/app/Views/notification.php
index 7948a3a4..5072ab39 100755
--- a/app/Views/notification.php
+++ b/app/Views/notification.php
@@ -1170,13 +1170,13 @@
                                 console.log('Parsed respond', respond)
 
                                 if (respond.status == 'success') {
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 } else {
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
 
                             } else {
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function(xhr, status, error) {
@@ -1191,16 +1191,16 @@
 
                 } else {
                     let alert_msg = 'Template ID not exist'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             } else {
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
 
         } else {
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1337,10 +1337,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr, status, error) {
@@ -1357,7 +1357,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1389,10 +1389,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (res.status == true) {
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     addHTMLInput(res.data);
                 } else {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 }
             },
             error: function(xhr, status, error) {
@@ -1469,13 +1469,13 @@
                                 console.log('Parsed respond', respond)
 
                                 if (respond.status == 'success') {
-                                    toastr.success(respond.message, 'SUCCESS')
+                                    toastr.success(respond.message, 'Success')
                                 } else {
-                                    toastr.warning(respond.message, 'WARNING')
+                                    toastr.warning(respond.message, 'Warning')
                                 }
 
                             } else {
-                                toastr.warning('Failed to sent mail', 'WARNING')
+                                toastr.warning('Failed to sent mail', 'Warning')
                             }
                         },
                         error: function(xhr, status, error) {
@@ -1490,16 +1490,16 @@
 
                 } else {
                     let alert_msg = 'Template ID not exist , Kindly Save to Send Test Mails ..!!'
-                    toastr.warning(alert_msg, 'WARNING');
+                    toastr.warning(alert_msg, 'Warning');
                 }
 
             } else {
-                toastr.warning('Please enter the valid mail', 'WARNING');
+                toastr.warning('Please enter the valid mail', 'Warning');
             }
 
         } else {
 
-            toastr.warning('Please enter the valid mail', 'WARNING');
+            toastr.warning('Please enter the valid mail', 'Warning');
         }
 
     }
@@ -1552,9 +1552,9 @@
                                     $('.loader-mask').delay(350).fadeOut('slow');
 
                                     if (res.status === true) {
-                                        toastr.success(res.message, 'SUCCESS');
+                                        toastr.success(res.message, 'Success');
                                     } else {
-                                        toastr.warning('Failed to send mail', 'WARNING');
+                                        toastr.warning('Failed to send mail', 'Warning');
                                     }
                                 },
                                 error: function(xhr, status, error) {
@@ -1754,10 +1754,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     addHTMLInput(response.data);
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr, status, error) {
@@ -1774,7 +1774,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Warning');
                 console.error('Upload error:', error);
             },
             complete: function() {
@@ -1808,10 +1808,10 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if (res.status == true) {
-                    toastr.success(res.message, 'SUCCESS')
+                    toastr.success(res.message, 'Success')
                     addHTMLInput(res.data);
                 } else {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 }
             },
             error: function(xhr, status, error) {
@@ -2131,7 +2131,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2185,7 +2185,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2239,7 +2239,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2293,7 +2293,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2348,7 +2348,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2402,7 +2402,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2457,7 +2457,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2512,7 +2512,7 @@
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Went Wrong!', 'warning');
+                        toastr.warning('Something Went Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -2649,7 +2649,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }
         });
@@ -2681,7 +2681,7 @@
             let template_id = $btn.data('id');
             let test_mail = "xyz@gmail.com";
             if(!template_id){
-                toastr.warning('Template ID not exist', 'WARNING');
+                toastr.warning('Template ID not exist', 'Warning');
                 return;
             }
 
@@ -2708,7 +2708,7 @@
                         $btn.data('previewing', true);
 
                     } else {
-                        toastr.warning('Failed to load content', 'WARNING');
+                        toastr.warning('Failed to load content', 'Warning');
                     }
                 },
                 error: function(xhr){
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index ac91143f..db7d0bb1 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -479,7 +479,7 @@
                     console.error('Response Text: ', xhr.responseText);
                 }
 
-                toastr.warning('Error uploading file', 'WARNING');
+                toastr.warning('Error uploading file', 'Werning');
                 console.error('Upload error:', error);
             },
             complete: function() {
diff --git a/app/Views/payout_list.php b/app/Views/payout_list.php
index f9d0dff1..695e0cd9 100644
--- a/app/Views/payout_list.php
+++ b/app/Views/payout_list.php
@@ -381,7 +381,7 @@
 
     function fetchUtrDetails(invoice_id, invoice_no){   
         if (!invoice_id) {
-            toastr.warning("Invoice Id not found!", "WARNING");
+            toastr.warning("Invoice Id not found!", "Warning");
             return false;
         }
 
@@ -413,7 +413,7 @@
             $('#modal_body').append(response.data);
 
             if (response.status == false) {
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -424,14 +424,14 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
     }
 
     function fetchPreviewInvoiceDetails(invoice_id, invoice_no){  
 
         if (!invoice_id) {
-            toastr.warning("Invoice Id not found!", "WARNING");
+            toastr.warning("Invoice Id not found!", "Warning");
             return false;
         }
 
@@ -470,7 +470,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            // toastr.error('An error occurred while fetching the data.', 'ERROR');
+            // toastr.error('An error occurred while fetching the data.', 'Error');
             $('#invoicePreview').empty();
             $('#invoicePreview').append('<div class="text-center p-5 text-muted">No data found</div>');
         });
diff --git a/app/Views/payout_list_handler.php b/app/Views/payout_list_handler.php
index 270ced48..8f32435b 100644
--- a/app/Views/payout_list_handler.php
+++ b/app/Views/payout_list_handler.php
@@ -157,7 +157,7 @@
 
         if(!internalCall){
             if (!pos_id && !status_id && !start_date && !end_date) {
-                toastr.warning("Please select any one filter!", "WARNING");
+                toastr.warning("Please select any one filter!", "Warning");
                 return false;
             }
         }
@@ -184,7 +184,7 @@
             $('#payout_list').append(response.data);
 
             if (response.status == false) {
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -197,7 +197,7 @@
             $('#payout_list').append(response.data);
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
     }
 
diff --git a/app/Views/payout_utr_details.php b/app/Views/payout_utr_details.php
index ee10ded8..0b77eaba 100644
--- a/app/Views/payout_utr_details.php
+++ b/app/Views/payout_utr_details.php
@@ -151,12 +151,12 @@
                 console.log('Data fetched successfully:', response);
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     $('#modal_body').empty();
                     $('#modal_body').append(response.data);
                     window.location.href = '<?= base_url("payout/list") ?>';
                 }else{
-                    toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                    toastr.warning(response.message || 'Unable to fetch data', 'Warning');
                 }
 
                 // Re-enable button
@@ -170,7 +170,7 @@
                 $('.loader-mask').delay(350).fadeOut('slow');
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the data.', 'ERROR');
+                toastr.error('An error occurred while fetching the data.', 'Error');
             },
             complete: function() {
                 $('#utr_submit_btn').prop('disabled', false).text('Add UTR');
@@ -239,9 +239,9 @@
             $('#modal_body').append(response.data);
 
             if (response.status == true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
             }else{
-                toastr.warning(response.message || 'Unable to fetch data', 'WARNING');
+                toastr.warning(response.message || 'Unable to fetch data', 'Warning');
             }
 
             $('.loader').fadeOut();
@@ -252,7 +252,7 @@
             $('.loader-mask').delay(350).fadeOut('slow');
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
         });
 
         utrHasBeenChanged = true;
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 2d8fe5eb..c40ae5b0 100755
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -266,7 +266,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
                 }
             });
@@ -315,7 +315,7 @@ $(document).ready(function () {
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Wrong!', 'warning');
+                    toastr.warning('Something Wrong!', 'Warning');
                 }, 1000);
             }        
         });
@@ -385,7 +385,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
@@ -420,13 +420,13 @@ function removePolicies(element) {
                     // console.log(res.status == true);
                         if(res){
                         if (res.status == true) {
-                            toastr.success('Policy removed successfully', 'success');
+                            toastr.success('Policy removed successfully', 'Success');
                             // $('#branch_table').empty();
                             // location.reload();
                             window.location.href = '<?= base_url("master/policy/list/") ?>' + policy_id_for_reload;
 
                         } else {
-                            toastr.warning('Failed to remove policy', 'warning');
+                            toastr.warning('Failed to remove policy', 'Warning');
                         }
                         }
                     },
@@ -435,7 +435,7 @@ function removePolicies(element) {
                         console.error(status, error);
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Failed to remove policy', 'warning');
+                        toastr.warning('Failed to remove policy', 'Warning');
                     }
                 });
             }
diff --git a/app/Views/policyRegisterModel.php b/app/Views/policyRegisterModel.php
index 719633d4..1310585f 100644
--- a/app/Views/policyRegisterModel.php
+++ b/app/Views/policyRegisterModel.php
@@ -452,7 +452,7 @@
 
                 if (totalSI != allowedSI) {
                     console.log("allowedSI : ", allowedSI, " totalSI : ", totalSI);
-                    toastr.error("Sum Insured Does not Match Allowed Limit", "ERROR");
+                    toastr.error("Sum Insured Does not Match Allowed Limit", "Error");
                     return false;
                 }
                 // console.log("Total SI: ", totalSI);
@@ -475,7 +475,7 @@
         const totalRows = formDataSplitUp.filter(field => field.name === "building[]").length;
 
         if (totalRows != policyDetailsData.location_no) {
-            toastr.error("Please Enter All Risk Address", "ERROR");
+            toastr.error("Please Enter All Risk Address", "Error");
             return;
         }
         // Initialize empty objects for each row
@@ -550,7 +550,7 @@
         const totalRows = formData.filter(field => field.name === "pin_code[]").length;
 
         if (totalRows != policyDetailsData.location_no) {
-            toastr.error("Please Enter All Risk Address", "ERROR");
+            toastr.error("Please Enter All Risk Address", "Error");
             return;
         }
         // Initialize empty objects for each row
@@ -1224,7 +1224,7 @@
         }
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
-        toastr.success("Policy Information Collected ", "SUCCESS");
+        toastr.success("Policy Information Collected ", "Success");
         closeModal();
         changeTerrorism(Number($("#policySI").val()));
         $('.loader').fadeOut();
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index a53b4c54..7fbabc3e 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -1532,7 +1532,7 @@
             });
 
         } else if (gmc_policy_type_id != 'GPA' && gmc_policy_type_id != 'GMC') {
-            // toastr.warning('The terms has no data ', 'warning');
+            // toastr.warning('The terms has no data ', 'Warning');
         }
 
         $(document).ready(function() {
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index e0304ae3..e7a550e8 100755
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -806,7 +806,7 @@
             });
 
         } else if (gpa_policy_type_id != 'GPA' && gpa_policy_type_id != 'GMC') {
-            // toastr.warning("This policy has no policy terms.", 'warning');
+            // toastr.warning("This policy has no policy terms.", 'Warning');
         }
 
     });
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index af786b4b..4c519a97 100755
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -263,7 +263,7 @@ $(document).on('submit', 'form[id^="GridForm_"]', function(event) {
     console.log('checkFamiliFloatersKeysDuplicate', isEqual)
 
     if(isEqual){
-        toastr.warning('Family floaters alerdey exist', 'warning');
+        toastr.warning('Family floaters alerdey exist', 'Warning');
         return false;
     }
 
@@ -671,7 +671,7 @@ $(document).on('change', 'select[id^="grid_"]', function(event)
             setTimeout(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Wrong!', 'warning');
+                toastr.warning('Something Wrong!', 'Warning');
             }, 1000);
         }
     });
@@ -2003,7 +2003,7 @@ function checkDuplicate(unique_id = null)
 
         if (siDuplicates) {
             // highlightDuplicates(duplicateIndices);
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2045,7 +2045,7 @@ function checkDuplicate(unique_id = null)
 
         if (siDuplicates) {
             // highlightDuplicates(duplicateIndices);
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2086,7 +2086,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2133,7 +2133,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2173,7 +2173,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2219,7 +2219,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2266,7 +2266,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (siDuplicates || ageDuplicates) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2306,7 +2306,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2356,7 +2356,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2401,7 +2401,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2455,7 +2455,7 @@ function checkDuplicate(unique_id = null)
         }
 
         if (duplicatesFound) {
-            toastr.warning('Duplicates found!', 'warning');
+            toastr.warning('Duplicates found!', 'Warning');
             return true;
         } else {
             return false;
@@ -2491,7 +2491,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -2532,7 +2532,7 @@ function checkDuplicate(unique_id = null)
 
 
             if (siDuplicates) {
-                toastr.warning('Duplicates found!', 'warning');
+                toastr.warning('Duplicates found!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -3150,7 +3150,7 @@ function checkCheckboxes()
         toastr.warning('You must select at least one checkbox.', 'Warning');
         return false;
     } else if (checkedCount == uncheckedCount) {
-        toastr.warning('You can not select all of the checkboxes', 'Waraning');
+        toastr.warning('You can not select all of the checkboxes', 'Warning');
         return false;
     }
     return true;
@@ -3596,7 +3596,7 @@ function removeTab(input, tabID, tabName)
                                 text: res.message,
                                 icon: "success"
                             });
-                            // toastr.success('Policy removed successfully.', 'success');
+                            // toastr.success('Policy removed successfully.', 'Success');
                         } else {
                             if(res.rr_count > 0){
                                 Swal.fire({
@@ -3612,7 +3612,7 @@ function removeTab(input, tabID, tabName)
                                 });
                             }
 
-                            // toastr.warning('Failed to remove policy', 'warning');
+                            // toastr.warning('Failed to remove policy', 'Warning');
                         }
                         }
                     },
@@ -3711,7 +3711,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
 
                     $('#rack_rate_name').val(newTabName);
 
-                    // toastr.success('Policy removed successfully.', 'success');
+                    // toastr.success('Policy removed successfully.', 'Success');
                 } else {
                     if(res.rr_count > 0){
                         Swal.fire({
@@ -3730,7 +3730,7 @@ function renameRackRateTab(input, unique_id = null, tabName = null)
 
                     }
 
-                    // toastr.warning('Failed to remove policy', 'warning');
+                    // toastr.warning('Failed to remove policy', 'Warning');
                 }
                 }
             },
@@ -4028,7 +4028,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4056,7 +4056,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4085,7 +4085,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4114,7 +4114,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4144,7 +4144,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4173,7 +4173,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4202,7 +4202,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4231,7 +4231,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4260,7 +4260,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4289,7 +4289,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4318,7 +4318,7 @@ function checkValideUnits(unique_id = null)
         console.log('checkValideUnits function uncommonValues', uncommonValues);
 
         if (uncommonValues.length > 0) {
-            toastr.warning('Given unit does not exist in the branch!', 'warning');
+            toastr.warning('Given unit does not exist in the branch!', 'Warning');
             return true;
         } else {
             return false;
@@ -4349,7 +4349,7 @@ function checkValideUnits(unique_id = null)
             console.log('checkValideUnits function uncommonValues', uncommonValues);
 
             if (uncommonValues.length > 0) {
-                toastr.warning('Given unit does not exist in the branch!', 'warning');
+                toastr.warning('Given unit does not exist in the branch!', 'Warning');
                 return true;
             } else {
                 return false;
@@ -4377,7 +4377,7 @@ function checkValideUnits(unique_id = null)
             console.log('checkValideUnits function uncommonValues', uncommonValues);
 
             if (uncommonValues.length > 0) {
-                toastr.warning('Given unit does not exist in the branch!', 'warning');
+                toastr.warning('Given unit does not exist in the branch!', 'Warning');
                 return true;
             } else {
                 return false;
diff --git a/app/Views/policy_grid_excel.php b/app/Views/policy_grid_excel.php
index 10ee30b7..373cf154 100755
--- a/app/Views/policy_grid_excel.php
+++ b/app/Views/policy_grid_excel.php
@@ -203,7 +203,7 @@ function copyHeaders(unique_id) {
 
     //console.log('headerString', headerString);
     navigator.clipboard.writeText(headerString).then(function() {
-        toastr.success('Headers copied to clipboard', 'success');
+        toastr.success('Headers copied to clipboard', 'Success');
     }, function(err) {
         toastr.error(err, 'Could not copy headers:');
     });
@@ -493,7 +493,7 @@ function generateTable(unique_id) {
         // console.log(secondKey)
         if ($('.duplicate').length > 0) {
             //console.log('test');
-            toastr.warning("Duplicates found!", "warning");
+            toastr.warning("Duplicates found!", "Warning");
             $('.excel_table_class').empty();
             $('.excel_textarea').val('');
         }
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 7f6237d2..0e15e129 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -775,13 +775,13 @@
                             }else{
                                 $('#ct_type').val(1)
                                 // addInsurerColumn()
-                                toastr.warning("There is no policy inception data.", 'WARNING!');
+                                toastr.warning("There is no policy inception data.", 'Warning!');
                                 $('#btnSubmit').prop('disabled', true).data('disable', true);
                             }
                         }else{
                             $('#ct_type').val(1)
                             // addInsurerColumn()
-                            toastr.warning(res.message, 'WARNING!');
+                            toastr.warning(res.message, 'Warning!');
                             $('#btnSubmit').prop('disabled', true).data('disable', true);
                         }
                     },
@@ -799,7 +799,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
         }
     });
@@ -819,7 +819,7 @@
 
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
         }else{
             if(client_id && insurer_id){
@@ -2067,7 +2067,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
     }
@@ -2974,7 +2974,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
             } 
         });
diff --git a/app/Views/policy_transaction_endorsement_form_2.php b/app/Views/policy_transaction_endorsement_form_2.php
index b032e005..85564e49 100644
--- a/app/Views/policy_transaction_endorsement_form_2.php
+++ b/app/Views/policy_transaction_endorsement_form_2.php
@@ -649,13 +649,13 @@
                             }else{
                                 $('#ct_type').val(1)
                                 // addInsurerColumn()
-                                toastr.warning("There is no policy inception data.", 'WARNING!');
+                                toastr.warning("There is no policy inception data.", 'Warning!');
                                 $('#btnSubmit').prop('disabled', true).data('disable', true);
                             }
                         }else{
                             $('#ct_type').val(1)
                             // addInsurerColumn()
-                            toastr.warning(res.message, 'WARNING!');
+                            toastr.warning(res.message, 'Warning!');
                             $('#btnSubmit').prop('disabled', true).data('disable', true);
                         }
                     },
@@ -673,7 +673,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
         }
     });
@@ -693,7 +693,7 @@
 
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
         }else{
             if(client_id && insurer_id){
@@ -1946,7 +1946,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
     }
@@ -2825,7 +2825,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
             } 
         });
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 10af48aa..0365496b 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -472,11 +472,11 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('create_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
         <?php endif; ?>
 
         <?php if (session()->has('update_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
         <?php endif; ?>
 
 
@@ -1024,10 +1024,10 @@ table.dataTable thead th {
                     console.log('Data fetched successfully:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         window.location.reload();
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
                 }, function(xhr, status, error) {
                     console.error('Error fetching data:', error);
diff --git a/app/Views/policy_transaction_endorsement_list_2.php b/app/Views/policy_transaction_endorsement_list_2.php
index 60e37342..96ff7fa6 100644
--- a/app/Views/policy_transaction_endorsement_list_2.php
+++ b/app/Views/policy_transaction_endorsement_list_2.php
@@ -470,11 +470,11 @@ table.dataTable thead th {
         <?php endif; ?>
 
         <?php if (session()->has('create_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
         <?php endif; ?>
 
         <?php if (session()->has('update_success')) : ?>
-            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+            toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
         <?php endif; ?>
 
 
@@ -1020,10 +1020,10 @@ table.dataTable thead th {
                     console.log('Data fetched successfully:', response);
 
                     if (response.status === true) {
-                        toastr.success(response.message, 'SUCCESS');
+                        toastr.success(response.message, 'Success');
                         window.location.reload();
                     } else {
-                        toastr.warning(response.message, 'WARNING');
+                        toastr.warning(response.message, 'Warning');
                     }
                 }, function(xhr, status, error) {
                     console.error('Error fetching data:', error);
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 6d29b5a6..2fd4092b 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -1797,7 +1797,7 @@
 
                 }else{
 
-                    toastr.warning('Please select the Owner type', 'WARNING');
+                    toastr.warning('Please select the Owner type', 'Warning');
                 }
 
 
@@ -2065,7 +2065,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }
@@ -2084,7 +2084,7 @@
         // console.log('insurer_id', insurer_id);
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }else{
@@ -2203,7 +2203,7 @@
 
             if (!policy_type_id || !client_id) {
                 $(this).val('').select2();
-                toastr.warning(!policy_type_id ? 'Please select the Policy Type' : 'Please select the Client', 'WARNING');
+                toastr.warning(!policy_type_id ? 'Please select the Policy Type' : 'Please select the Client', 'Warning');
                 return false;
             }
 
@@ -3244,7 +3244,7 @@
         });
 
         if (val_sum > 100) {
-            toastr.warning('Sum of the co-share is greater than 100', 'WARNING');
+            toastr.warning('Sum of the co-share is greater than 100', 'Warning');
         }
 
         // // Find the empty input(s)
@@ -3779,7 +3779,7 @@
 
 
         if(client_id == '' || insurer_id == ''){
-            toastr.warning('Client, Insurer, or both do not exist.', 'WARNING!');
+            toastr.warning('Client, Insurer, or both do not exist.', 'Warning!');
             $(input).val('')
             return false;
         }
@@ -3787,7 +3787,7 @@
         if (isAnyLeaderChecked) {
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('Please select the Leader.', 'WARNING!');
+                toastr.warning('Please select the Leader.', 'Warning!');
                 return false;
             }
         } 
@@ -3795,7 +3795,7 @@
         if(!leader){
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('The CD account number not for the Leader.', 'WARNING!');
+                toastr.warning('The CD account number not for the Leader.', 'Warning!');
                 return false;
             }
         }
@@ -3958,7 +3958,7 @@
         }
 
         if(pt_form_sumbit_handler == 0){
-            toastr.warning('Base premium greater than CD Amount', 'WARNING');
+            toastr.warning('Base premium greater than CD Amount', 'Warning');
             return;
         }
 
@@ -4690,7 +4690,7 @@
 
         if (!client_id || !client_branch_id || !policy_type_id) {
             if(client_type == 1){
-                toastr.warning('Please select the policy type, client and branch', "WARNING");
+                toastr.warning('Please select the policy type, client and branch', "Warning");
                 $('#policy_no').val('');
                 return;
             }
@@ -4710,7 +4710,7 @@
                     console.log('get_client_policy_data_using_policy_no response', res)
 
                     if(res.status == true && res.code == 409){
-                        toastr.warning(res.message,'WARNING');
+                        toastr.warning(res.message,'Warning');
                         $('#policy_no').val("");
                         return;
                     }else{
@@ -4719,7 +4719,7 @@
                         $('#policy_start_date').val('');
                         $('#policy_end_date').val('');
                         $('#tpa').val('').select2();
-                        console.log(res.message, 'warning');
+                        console.log(res.message, 'Warning');
                     }
 
                     // if(res.status == true){                   
@@ -5603,7 +5603,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
                 if(table == 'vehicle'){
                     resetVehicleField();
@@ -5722,7 +5722,7 @@
 
             // Validate inputs
             if (!base_premium || !cd_ac_no) {
-                toastr.warning('Base premium or CD account number is missing', 'WARNING');
+                toastr.warning('Base premium or CD account number is missing', 'Warning');
                 return;
             }
 
@@ -5743,7 +5743,7 @@
 
                 if (response.status) {
                     if (!response.base_premium_greater_than_balance) {
-                        console.log('Base premium is less than or equal to CD balance:', 'SUCCESS');
+                        console.log('Base premium is less than or equal to CD balance:', 'Success');
                         if(differnce_bp_amt !== 0){
                             $('#cd_amt_changed').prop('disabled', false).val(differnce_bp_amt);
                         }else{
@@ -5751,13 +5751,13 @@
                         }
                         $('#pt_form_sumbit_handler').val(1);
                     } else {
-                        toastr.warning('Base premium greater than CD Amount', 'WARNING');
+                        toastr.warning('Base premium greater than CD Amount', 'Warning');
                         $('#cd_amt_changed').prop('disabled', true).val("");
                         $('#pt_form_sumbit_handler').val(0);
                         // $(input).val("0")
                     }
                 } else {
-                    toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                    toastr.error(response.message || 'Unable to fetch data', 'Error');
                 }
 
                 console.log('#################################### End Check CD Amount For Base Premium  Response ####################################');
@@ -5765,7 +5765,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
 
         }else{
@@ -5809,7 +5809,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
         console.log('#################################### END Get CD Amount ####################################');
@@ -5966,12 +5966,12 @@
 
 
         if (vhno === "" && rc === "") {
-            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "WARNING");
+            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "Warning");
             return;
         }
 
         if(vehicle_no_validation == 1){
-            toastr.warning("Invalid Vehicle Number Format", "WARNING");
+            toastr.warning("Invalid Vehicle Number Format", "Warning");
             return;
         }
 
@@ -6024,7 +6024,7 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendVehicles(response.vehicles, response.vehicle_id);
                 appendBranch(response.branches, response.branch_id);
@@ -6041,7 +6041,7 @@
                 }
                 $('#client_type').val(response.data?.client_type ?? "").trigger('change');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -6057,7 +6057,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
         });
@@ -6103,11 +6103,11 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendBranch(response.branches, response.branch_id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -6123,7 +6123,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -6829,7 +6829,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_form_submit_btn').prop('disabled', true);
diff --git a/app/Views/policy_transaction_inception_form_2.php b/app/Views/policy_transaction_inception_form_2.php
index 13c7b309..77f28d19 100644
--- a/app/Views/policy_transaction_inception_form_2.php
+++ b/app/Views/policy_transaction_inception_form_2.php
@@ -1440,7 +1440,7 @@
 
                 }else{
 
-                    toastr.warning('Please select the Owner type', 'WARNING');
+                    toastr.warning('Please select the Owner type', 'Warning');
                 }
 
 
@@ -1669,7 +1669,7 @@
         let isAnyChecked = $('input[type="checkbox"][name="co_share_type[]"]:checked').length > 1;
 
         if (isAnyChecked) {
-            toastr.warning('Only one leader can be selected.', 'WARNING!');
+            toastr.warning('Only one leader can be selected.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }
@@ -1683,7 +1683,7 @@
         var insurer_branch_id = $('#follow_insurer_id_'+uniqueid).find('option:selected').attr('data-bid');
 
         if(insurer == ""){
-            toastr.warning('Please select the insurer.', 'WARNING!');
+            toastr.warning('Please select the insurer.', 'Warning!');
             $(this).prop('checked', false);
             return;
         }else{
@@ -2799,7 +2799,7 @@
     if (userTouched && sum > 100) {
         toastr.warning(
             'Sum of the co-share is greater than 100',
-            'WARNING'
+            'Warning'
         );
     }
 }
@@ -3357,7 +3357,7 @@
 
 
         if(client_id == '' || insurer_id == ''){
-            toastr.warning('Client, Insurer, or both do not exist.', 'WARNING!');
+            toastr.warning('Client, Insurer, or both do not exist.', 'Warning!');
             $(input).val('')
             return false;
         }
@@ -3365,7 +3365,7 @@
         if (isAnyLeaderChecked) {
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('Please select the Leader.', 'WARNING!');
+                toastr.warning('Please select the Leader.', 'Warning!');
                 return false;
             }
         } 
@@ -3373,7 +3373,7 @@
         if(!leader){
             if(cop_yes){
                 $('#cd_ac_no_'+uniqueid).val('');
-                toastr.warning('The CD account number not for the Leader.', 'WARNING!');
+                toastr.warning('The CD account number not for the Leader.', 'Warning!');
                 return false;
             }
         }
@@ -3408,13 +3408,13 @@
 
         //  Missing base data
         if (!client_id || !insurer_id) {
-            toastr.warning('Client or Insurer does not exist.', 'WARNING!');
+            toastr.warning('Client or Insurer does not exist.', 'Warning!');
             return;
         }
 
         //  COP enabled but no leader selected
         if (cop_yes && !isAnyLeaderSelected) {
-            toastr.warning('Please select a Leader.', 'WARNING!');
+            toastr.warning('Please select a Leader.', 'Warning!');
             $input.val('');
             return;
         }
@@ -3424,7 +3424,7 @@
 
             toastr.warning(
                 'CD account number allowed only for Leader.',
-                'WARNING!'
+                'Warning!'
             );
 
             // Clear current select
@@ -3611,7 +3611,7 @@
         }
 
         if(pt_form_sumbit_handler == 0){
-            toastr.warning('Base premium greater than CD Amount', 'WARNING');
+            toastr.warning('Base premium greater than CD Amount', 'Warning');
             return;
         }
 
@@ -4394,7 +4394,7 @@
 
         if (!client_id || !client_branch_id || !policy_type_id) {
             if(client_type == 1){
-                toastr.warning('Please select the policy type, client and branch', "WARNING");
+                toastr.warning('Please select the policy type, client and branch', "Warning");
                 $('#policy_no').val('');
                 return;
             }
@@ -4414,7 +4414,7 @@
                     console.log('get_client_policy_data_using_policy_no response', res)
                     $('.follower_policy_no').val(policy_no);// auto fetched
                     if(res.status == true && res.code == 409){
-                        toastr.warning(res.message,'WARNING');
+                        toastr.warning(res.message,'Warning');
                         $('#policy_no').val("");
                         $('.follower_policy_no').val("");
                         return;
@@ -4424,7 +4424,7 @@
                         $('#policy_start_date').val('');
                         $('#policy_end_date').val('');
                         $('#tpa').val('').select2();
-                        console.log(res.message, 'warning');
+                        console.log(res.message, 'Warning');
                     }
 
                     // if(res.status == true){                   
@@ -5290,7 +5290,7 @@
 
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 $(input).val('')
                 if(table == 'vehicle'){
                     resetVehicleField();
@@ -5409,11 +5409,11 @@
 
             // Validate inputs
             // if (!base_premium || !cd_ac_no) {
-            //     toastr.warning('Base premium or CD account number is missing', 'WARNING');
+            //     toastr.warning('Base premium or CD account number is missing', 'Warning');
             //     return;
             // }
             if (!base_premium) {
-                toastr.warning('Base premium is missing', 'WARNING');
+                toastr.warning('Base premium is missing', 'Warning');
                 return;
             }
 
@@ -5442,13 +5442,13 @@
                         }
                         $('#pt_form_sumbit_handler').val(1);
                     } else {
-                        toastr.warning('Base premium greater than CD Amount', 'WARNING');
+                        toastr.warning('Base premium greater than CD Amount', 'Warning');
                         $('#cd_amt_changed').prop('disabled', true).val("");
                         $('#pt_form_sumbit_handler').val(0);
                         // $(input).val("0")
                     }
                 } else {
-                    toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+                    toastr.error(response.message || 'Unable to fetch data', 'Error');
                 }
 
                 console.log('#################################### End Check CD Amount For Base Premium  Response ####################################');
@@ -5456,7 +5456,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                toastr.error('An error occurred while checking the CD amount.', 'Error');
             });
 
         }else{
@@ -5509,7 +5509,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
 
         console.log('#################################### END Get CD Amount ####################################');
@@ -5665,12 +5665,12 @@
 
 
         if (vhno === "" && rc === "") {
-            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "WARNING");
+            toastr.warning("Please enter any one of these: Vehicle No or Chassis No", "Warning");
             return;
         }
 
         if(vehicle_no_validation == 1){
-            toastr.warning("Invalid Vehicle Number Format", "WARNING");
+            toastr.warning("Invalid Vehicle Number Format", "Warning");
             return;
         }
 
@@ -5723,7 +5723,7 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendVehicles(response.vehicles, response.vehicle_id);
                 appendBranch(response.branches, response.branch_id);
@@ -5740,7 +5740,7 @@
                 }
                 $('#client_type').val(response.data?.client_type ?? "").trigger('change');
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -5756,7 +5756,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
         });
@@ -5802,11 +5802,11 @@
 
             if (response.status == true) {
                 getClientAndBranchAndPolicy(false);
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 appendClients(response.clients, response.client_id);
                 appendBranch(response.branches, response.branch_id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             $('#client_row_div').empty();
@@ -5822,7 +5822,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -6615,7 +6615,7 @@
         checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
             isGSTValidating = false;
             if (isDuplicate) {
-                toastr.warning(message, 'WARNING');
+                toastr.warning(message, 'Warning');
                 // $(input).val('');
                 isGSTValid = false;
                 $('#client_form_submit_btn').prop('disabled', true);
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index cc850c55..56dec406 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -539,11 +539,11 @@ $(document).ready(function(){
     <?php endif; ?>
 
     <?php if (session()->has('create_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
     <?php endif; ?>
 
     <?php if (session()->has('update_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
     <?php endif; ?>
 
 
@@ -1317,7 +1317,7 @@ $(document).ready(function(){
             //     myModal.show();
             // }else{
             //     $('#client_id').val('').change();
-            //     toastr.warning('Please select the client type', 'WARNING')
+            //     toastr.warning('Please select the client type', 'Warning')
             // }
             appendClientForm();
 
@@ -1494,7 +1494,7 @@ $('#cd_ac_no_data').change(function(){
 
             console.log('CD Account Number Responcce', res)
             if(res.status == true){
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cd_ac_no_data').val('');
             }
         },
@@ -1809,10 +1809,10 @@ function removePolicyTransaction(input, pt_id, policy_type_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/policy_transaction_inception_list_2.php b/app/Views/policy_transaction_inception_list_2.php
index c7172902..9a47ffa9 100644
--- a/app/Views/policy_transaction_inception_list_2.php
+++ b/app/Views/policy_transaction_inception_list_2.php
@@ -536,11 +536,11 @@ $(document).ready(function(){
     <?php endif; ?>
 
     <?php if (session()->has('create_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('create_success') ?>', 'Success');
     <?php endif; ?>
 
     <?php if (session()->has('update_success')) : ?>
-        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'success');
+        toastr.success('<?= session()->getFlashdata('update_success') ?>', 'Success');
     <?php endif; ?>
 
 
@@ -1293,7 +1293,7 @@ $(document).ready(function(){
             //     myModal.show();
             // }else{
             //     $('#client_id').val('').change();
-            //     toastr.warning('Please select the client type', 'WARNING')
+            //     toastr.warning('Please select the client type', 'Warning')
             // }
             appendClientForm();
 
@@ -1470,7 +1470,7 @@ $('#cd_ac_no_data').change(function(){
 
             console.log('CD Account Number Responcce', res)
             if(res.status == true){
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cd_ac_no_data').val('');
             }
         },
@@ -1760,10 +1760,10 @@ function removePolicyTransaction(input, pt_id, policy_type_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/policy_type_basic_info.php b/app/Views/policy_type_basic_info.php
index 1bfb3fe3..2f9d6e6a 100755
--- a/app/Views/policy_type_basic_info.php
+++ b/app/Views/policy_type_basic_info.php
@@ -141,7 +141,7 @@ $(document).ready(function () {
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 }
             });
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index bc9ac772..c9a89897 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -357,10 +357,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('Policy type removed successfully', 'success');
+                toastr.success('Policy type removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove policy type', 'warning');
+                toastr.warning('Failed to remove policy type', 'Warning');
               }
             }
           },
@@ -369,7 +369,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove policy type', 'warning');
+            toastr.warning('Failed to remove policy type', 'Warning');
           }
         });
       }
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 392e0cfe..a972675d 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -92,7 +92,7 @@
 
         if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Policy Type!', 'warning', {
+            toastr.warning('First Add the Policy Type!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index f6b8c348..abc5cdfc 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -161,14 +161,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 7fd21f82..934b7fad 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -734,7 +734,7 @@ function getCoShareStatementDetails(pt_id){
             appendTableData(response.data)
             
         } else {
-            toastr.warning(response.message, 'WARNING');
+            toastr.warning(response.message, 'Warning');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);
diff --git a/app/Views/report_bds_filter.php b/app/Views/report_bds_filter.php
index d55ab379..8dcb4da6 100644
--- a/app/Views/report_bds_filter.php
+++ b/app/Views/report_bds_filter.php
@@ -569,7 +569,7 @@
                     appendPolicies(response.data)
 
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/report_bds_new.php b/app/Views/report_bds_new.php
index 1bb808aa..0dfb45ae 100644
--- a/app/Views/report_bds_new.php
+++ b/app/Views/report_bds_new.php
@@ -615,7 +615,7 @@
                 appendTableData(response.data)
                 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 93fbe9d7..2a618e2b 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -637,7 +637,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     $('#email_corporate').val('');
                     $('#mobile').val('');
 
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
             },
             error: function (xhr, status, error) {
@@ -684,7 +684,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 $('.loader-mask').delay(350).fadeOut('slow');
 
                 if(response.status == true){
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     
                     $('.close').click();
 
@@ -699,7 +699,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     window.location.reload();
 
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 } 
             },
             error: function(xhr, status, error) {
@@ -725,9 +725,9 @@ document.addEventListener("DOMContentLoaded", function () {
                     } else {
                         toastr.warning(response.message || 'Validation failed', 'Warning');
                     }
-                }else{ toastr.warning('Error uploading file', 'WARNING'); }
+                }else{ toastr.warning('Error uploading file', 'Warning'); }
 
-                // toastr.warning('Error uploading file', 'WARNING');
+                // toastr.warning('Error uploading file', 'Warning');
                 // console.error('Upload error:', error);
             },
             complete: function() {
@@ -768,9 +768,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) {
@@ -793,7 +793,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);
@@ -1072,12 +1072,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
@@ -1085,7 +1085,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();
             }
@@ -1102,7 +1102,7 @@ function unmapEmployees(){
     })
 
     if(selected.length == 0){
-        toastr.warning('Please select atleast one employee', 'WARNING');
+        toastr.warning('Please select atleast one employee', 'Warning');
         return;
     }
 
@@ -1147,10 +1147,10 @@ function unmapEmployees(){
                         $('.loader-mask').delay(350).fadeOut('slow');
 
                         if (res.status === true) {
-                            toastr.success(res.message, 'SUCCESS');
+                            toastr.success(res.message, 'Success');
                             window.location.reload();
                         } else {
-                            toastr.error(res.message, 'ERROR');
+                            toastr.error(res.message, 'Error');
                         }
                     },
                     error: function (xhr, status, error) {
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 84d8f4cf..0ee4c871 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -162,9 +162,10 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
 
                 <div class="form-group col-md-5 ">
                   <label for="mobile">Mobile<span class="text-danger">*</span></label>
-                  <input type="text" class="form-control app-field-grey" id="mobile" placeholder="Enter Mobile Number"
+                  <input type="tel" class="form-control app-field-grey" id="mobile" placeholder="Enter Mobile Number"
                         name="mobile" 
-                        pattern="^[0-9]{10}$" required maxlength="10"
+                        required pattern="[0-9]{10}" maxlength="10" inputmode="numeric"
+                        oninput="this.value=this.value.replace(/[^0-9]/g,'');"
                         title="Please enter a valid 10-digit mobile number">
                 </div>
 
@@ -192,7 +193,6 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
               <input type="email" class="form-control" id="email" 
                      name="email" placeholder="Enter Email"
                      required
-                     pattern="[^@\s]+@[^@\s]+\.[^@\s]+"
                      title="Please enter a valid email address">
             </div>
 
@@ -438,25 +438,25 @@ beccause = dataTables_length and dataTables_paginate need in same line thats why
 
         // Validation checks
         if (message.length === 0) {
-          toastr.error('Message cannot be empty', 'Warning');
+          toastr.warning('Message cannot be empty', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (message.length > 1500) {
-          toastr.error('Message cannot exceed 1500 characters', 'Warning');
+          toastr.warning('Message cannot exceed 1500 characters', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (subject.length === 0) {
-          toastr.error('Subject cannot be empty', 'Warning');
+          toastr.warning('Subject cannot be empty', 'Warning');
           form.classList.add('was-validated');
           return;
         }
 
         if (subject.length > 150) {
-          toastr.error('Subject cannot exceed 150 characters', 'Warning');
+          toastr.warning('Subject cannot exceed 150 characters', 'Warning');
           form.classList.add('was-validated');
           return;
         }
@@ -706,7 +706,7 @@ $(document).ready(function() {
       subjectCounter.textContent = `${subjectLength}/150`;
 
       if (subjectLength > 150) {
-        toastr.error('Subject cannot exceed 150 characters', 'Warning');
+        toastr.warning('Subject cannot exceed 150 characters', 'Warning');
         subjectInput.classList.add('is-invalid');
       } else {
         subjectInput.classList.remove('is-invalid');
@@ -722,7 +722,7 @@ $(document).ready(function() {
       messageCounter.textContent = `${messageLength}/1500`;
 
       if (messageLength > 1500) {
-        toastr.error('Message cannot exceed 1500 characters', 'Warning');
+        toastr.warning('Message cannot exceed 1500 characters', 'Warning');
         messageInput.classList.add('is-invalid');
       } else {
         messageInput.classList.remove('is-invalid');
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 91c916b8..914eb751 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -491,7 +491,7 @@ data-backdrop="static"
             messageCounter.textContent = `${messageLength}/1500`;
 
             if (messageLength > 1500) {
-                toastr.error('Message cannot exceed 1500 characters', 'Warning');
+                toastr.warning('Message cannot exceed 1500 characters', 'Warning');
                 messageInput.classList.add('is-invalid');
             } else {
                 messageInput.classList.remove('is-invalid');
diff --git a/app/Views/ticket_auto_query.php b/app/Views/ticket_auto_query.php
index 7c493e8c..a6651e8d 100644
--- a/app/Views/ticket_auto_query.php
+++ b/app/Views/ticket_auto_query.php
@@ -176,7 +176,7 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     let message = response.message;
-                    toastr.error(message, 'ERROR');
+                    toastr.error(message, 'Error');
                 }
 
                 window.location.reload();
@@ -184,7 +184,7 @@
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the report page.', 'ERROR');
+                toastr.error('An error occurred while fetching the report page.', 'Error');
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index b21b1345..35df8a96 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -222,7 +222,7 @@
         var isValid = $('#ticket_form_data').parsley().validate();
 
         if (!isValid) {
-            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
+            toastr.warning('Form validation failed. Please check the required fields.', 'Warning');
             return false;
         }
 
@@ -250,9 +250,9 @@
 
                 if (response.status === true) {
                     location.reload();
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 } else {
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
@@ -378,16 +378,16 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status) {
-                toastr.success(response.message || 'Status updated successfully', 'SUCCESS');
+                toastr.success(response.message || 'Status updated successfully', 'Success');
                 window.location.reload(true);
             } else {
-                toastr.warning(response.message || 'Failed to update status', 'WARNING');
+                toastr.warning(response.message || 'Failed to update status', 'Warning');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while saving docs.', 'ERROR');
+            toastr.error('An error occurred while saving docs.', 'Error');
         });
     }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php
index 17a6715e..9b141783 100644
--- a/app/Views/ticket_form_handler.php
+++ b/app/Views/ticket_form_handler.php
@@ -740,7 +740,7 @@
         var isValid = $('#ticket_form_data').parsley().validate();
 
         if (!isValid) {
-            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
+            toastr.warning('Form validation failed. Please check the required fields.', 'Warning');
             return false;
         }
 
@@ -769,13 +769,13 @@
                 console.log('Form submitted response:', response);
 
             if (response.status === true) {
-                toastr.success(response.message, 'SUCCESS');
+                toastr.success(response.message, 'Success');
                 window.location.href = '<?= base_url('ticket/list') ?>';
             } else {
                 if(response.code == 409){
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }else{
-                    toastr.error(response.message, 'ERROR');
+                    toastr.error(response.message, 'Error');
                 }
             }
 
@@ -814,12 +814,12 @@
             console.log('Data fetched successfully:', response);
 
             if (response.status) {
-                console.log(response.message, 'SUCCESS');
+                console.log(response.message, 'Success');
                 appendEmployee(response.data, 'search_by_client_employee');
                 setClientAndInsurerData(response.dataForClientAndInsurer);
                 setClientPolicyData(input);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             // Hide loader
@@ -829,7 +829,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
@@ -890,7 +890,7 @@
                 appendACMS(response.acms)
 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
                 appendACMS(response.acms);
                 unSetClientPolicy();
                 unSetClientAndInsurerData()
@@ -902,7 +902,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetch data.', 'ERROR');
+            toastr.error('An error occurred while fetch data.', 'Error');
 
             // Hide loader
             $('.loader').fadeOut();
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index fc467dfb..da6b20be 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -386,10 +386,10 @@ function removeClaim(input, ticket_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index 9cda359e..ba3cf875 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -424,7 +424,7 @@
                             toastr.success('Template saved successfully!', 'Success');
                             location.reload();
                         } else if (res.status == false) {
-                            toastr.error('Failed to Save Data', 'error');
+                            toastr.error('Failed to Save Data', 'Error');
                         }
 
                     },
@@ -443,7 +443,7 @@
                                 } else {
                                     toastr.warning(response.message || 'Validation failed', 'Warning');
                                 }
-                            } else{toastr.error('Something Wrong!', 'warning');}
+                            } else{toastr.error('Something Wrong!', 'Warning');}
                         }, 1000);
                     }
                 });
@@ -552,7 +552,7 @@
                             });
                         }
                     } else {
-                        toastr.error('Data Not Found', 'error');
+                        toastr.error('Data Not Found', 'Error');
                     }
                 }
                 $('.loader').fadeOut();
@@ -564,7 +564,7 @@
                 setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Something Went Wrong!', 'warning');
+                    toastr.warning('Something Went Wrong!', 'Warning');
                 }, 1000);
             }
         });
diff --git a/app/Views/ticket_note.php b/app/Views/ticket_note.php
index 42ccd4ee..c92e5ec0 100644
--- a/app/Views/ticket_note.php
+++ b/app/Views/ticket_note.php
@@ -42,7 +42,7 @@ $(document).ready(function() {
             setTimeout(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Went Wrong!', 'warning');
+                toastr.warning('Something Went Wrong!', 'Warning');
             }, 1000);
         }
     })
@@ -79,14 +79,14 @@ $(document).ready(function() {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_reports.php b/app/Views/ticket_reports.php
index 08785950..0cb76b64 100644
--- a/app/Views/ticket_reports.php
+++ b/app/Views/ticket_reports.php
@@ -129,14 +129,14 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            toastr.error('An error occurred while fetching the report page.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/ticket_search.php b/app/Views/ticket_search.php
index e248afb1..ea470c39 100644
--- a/app/Views/ticket_search.php
+++ b/app/Views/ticket_search.php
@@ -259,13 +259,13 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message, 'ERROR');
+                toastr.error(message, 'Error');
             }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the data.', 'ERROR');
+            toastr.error('An error occurred while fetching the data.', 'Error');
 
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -303,13 +303,13 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                     let message = response.message;
-                    toastr.error(message, 'ERROR');
+                    toastr.error(message, 'Error');
                 }
 
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while fetching the data.', 'ERROR');
+                toastr.error('An error occurred while fetching the data.', 'Error');
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/tpa_basic_info.php b/app/Views/tpa_basic_info.php
index b0ee3724..4dce8a77 100755
--- a/app/Views/tpa_basic_info.php
+++ b/app/Views/tpa_basic_info.php
@@ -327,7 +327,7 @@
                         setTimeout(function() {
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
-                            console.log('Something Wrong!', 'warning');                        
+                            console.log('Something Wrong!', 'Warning');                        
                             // Handle validation errors (CI4)
                             if (xhr.status === 400) {
                                 let response = JSON.parse(xhr.responseText);
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index d3da93aa..c95dd734 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -488,7 +488,7 @@ $(document).ready(function () {
                                     toastr.warning(response.message || 'Validation failed', 'Warning');
                                 }
                         }
-                        toastr.warning('Something Wrong!', 'warning');
+                        toastr.warning('Something Wrong!', 'Warning');
                     }, 1000);
                 },
                 complete: function() {
@@ -556,7 +556,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);
             }        
         });
@@ -610,7 +610,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);
                 }
             });
@@ -866,10 +866,10 @@ function removeTPABranch(element) {
                 // console.log(res.status == true);
                     if(res){
                     if (res.status == true) {
-                        toastr.success('TPA branch removed successfully', 'success');
+                        toastr.success('TPA branch removed successfully', 'Success');
                         location.reload();
                     } else {
-                        toastr.warning('Failed to remove TPA branch', 'warning');
+                        toastr.warning('Failed to remove TPA branch', 'Warning');
                     }
                     }
                 },
@@ -878,7 +878,7 @@ function removeTPABranch(element) {
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Failed to remove TPA branch', 'warning');
+                    toastr.warning('Failed to remove TPA branch', 'Warning');
                 }
             });
         }
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index bec11d92..4f606a9f 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -314,10 +314,10 @@
             // console.log(res.status == true);
             if (res) {
               if (res.status == true) {
-                toastr.success('TPA removed successfully', 'success');
+                toastr.success('TPA removed successfully', 'Success');
                 location.reload();
               } else {
-                toastr.warning('Failed to remove TPA', 'warning');
+                toastr.warning('Failed to remove TPA', 'Warning');
               }
             }
           },
@@ -326,7 +326,7 @@
             console.error(status, error);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-            toastr.warning('Failed to remove TPA', 'warning');
+            toastr.warning('Failed to remove TPA', 'Warning');
           }
         });
       }
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index 9c5edb72..902517c3 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -90,7 +90,7 @@
 
         if (check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the TPA!', 'warning', {
+            toastr.warning('First Add the TPA!', 'Warning', {
                 timeOut: 2000
             });
         } else {
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 144df61f..207af9b1 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -899,7 +899,7 @@
                 appendPolicies(response.data)
 
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
diff --git a/app/Views/vehicle_details.php b/app/Views/vehicle_details.php
index f4bb4e27..3b57d4dd 100644
--- a/app/Views/vehicle_details.php
+++ b/app/Views/vehicle_details.php
@@ -395,7 +395,7 @@ $('#cost_center').change(function() {
 
             console.log(res)
             if (res.status == true) {
-                toastr.warning(res.message, 'warning');
+                toastr.warning(res.message, 'Warning');
                 $('#cost_center').val('');
             }
         },
diff --git a/app/Views/vehicle_docs.php b/app/Views/vehicle_docs.php
index 07081588..5409ce0a 100644
--- a/app/Views/vehicle_docs.php
+++ b/app/Views/vehicle_docs.php
@@ -102,10 +102,10 @@ $("#vehicle_file_upload_form").submit(function(event) {
             console.log(res);
 
             if(res.status == true){
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 appendVehicleFileTableBody(res.vehicle_docs);
             }else{
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
             }
 
             $('#vehicle_file_upload_form')[0].reset();
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index b153b534..d0ef7767 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -636,10 +636,10 @@ function removeVehicleMasterData(element) {
                     // console.log(res.status == true);
                     if (res) {
                         if (res.status == true) {
-                            toastr.success('Vehicle Data removed successfully.', 'success');
+                            toastr.success('Vehicle Data removed successfully.', 'Success');
                             location.reload();
                         } else {
-                            toastr.warning('Failed to remove Vehicle Data.', 'warning');
+                            toastr.warning('Failed to remove Vehicle Data.', 'Warning');
                         }
                     }
                 },
@@ -648,7 +648,7 @@ function removeVehicleMasterData(element) {
                     console.error(status, error);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                    console.log('Something Wrong!', 'warning');
+                    console.log('Something Wrong!', 'Warning');
                 }
             });
         }
diff --git a/app/Views/vehicle_type_list.php b/app/Views/vehicle_type_list.php
index 53456a0f..8927d756 100644
--- a/app/Views/vehicle_type_list.php
+++ b/app/Views/vehicle_type_list.php
@@ -982,7 +982,7 @@
                     var student_id = $(this).attr('data-id');
                     $.get('<?php echo base_url('user/deactive/');?>'+student_id, function (data) {
                         console.log(data);
-                        toastr.success('User removed successfully', 'success');
+                        toastr.success('User removed successfully', 'Success');
                         window.location.reload()
                     })
                 }
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 5d332d35..79cf9a97 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -2037,7 +2037,7 @@ rfqTable.addEventListener('click', function(e) {
         Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the row?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -2934,7 +2934,7 @@ function removeProposal(event) {
     Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the Proposal?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -2995,7 +2995,7 @@ function removeInsurer(event) {
      Swal.fire({
         title: 'Are you sure?',
         text: "Do you want to remove the insurer?",
-        icon: 'warning',
+        icon: 'Warning',
         showCancelButton: true,
         confirmButtonColor: '#d33',
         cancelButtonColor: '#3085d6',
@@ -3212,7 +3212,7 @@ function changeInsurer(event) {
     console.log('proposel Name', proposal_name);
 
     if(proposal_name == null || proposal_name == ""){
-        toastr.warning("Could not change the insurer", "WARNING")
+        toastr.warning("Could not change the insurer", "Warning")
         return;
     }
 
@@ -3349,7 +3349,7 @@ function changeInsurerData(event, newInsurerName, dataId){
 
 
     }else{
-        toastr.warning("Could not change the insurer", "WARNING")
+        toastr.warning("Could not change the insurer", "Warning")
         return;
     }
 }
@@ -4276,7 +4276,7 @@ function constructURL(url_type) {
         if (validationStatus){
             constructURL_ForInsurerAndClientMailSend();
         }else{
-            toastr.error("All Client Mail ID's Should Contain Same Domain","ERROR");
+            toastr.error("All Client Mail ID's Should Contain Same Domain","Error");
         }
     }else if(url_type == 2){ 
         constructURL_ForInternalMailSend()
@@ -4555,17 +4555,17 @@ function ajaxRequest(formData) {
             $('.loader-mask').delay(350).fadeOut('slow');
 
             console.log(res);
-            if (res.status == 'success' && res.code == 200) {
-                toastr.success('Mail sent Successfully', 'SUCCESS')
+            if (res.status == 'Success' && res.code == 200) {
+                toastr.success('Mail sent Successfully', 'Success')
                 if(res.is_placement == true){
                     clearInterval(intervalId);
                     console.log('******** Intervel Cleared ********')
                 }
             } else {
                 if (res.messgae) {
-                    toastr.error(res.messgae, 'ERROR')
+                    toastr.error(res.messgae, 'Error')
                 } else {
-                    toastr.error('Mail send failed', 'ERROR')
+                    toastr.error('Mail send failed', 'Error')
                 }
             }
 
@@ -4622,7 +4622,7 @@ function getInsurerBranchContacts(input){
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
             if(res.status == false){
-                toastr.warning(res.message, 'WARNING')
+                toastr.warning(res.message, 'Warning')
             }else{
                 appendInsurerContact(res.data)
             }
@@ -4798,7 +4798,7 @@ function getMailContent(id){
            console.log(response);
            $('#'+id).val(response.data)
         } else {
-            toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+            toastr.error(response.message || 'Unable to fetch data', 'Error');
         }
     }, function(xhr, status, error) {
         console.error('Error fetching data:', error);
@@ -4872,7 +4872,7 @@ function checkTheTableDataChanged(redirect_type, url){
             //PLACEMENT MAIL SEND
             showModal(3);
             // if(demography_file_status == "failed"){
-            //     toastr.warning('Member Demography file validation failed. Please re-upload', 'WARNING');
+            //     toastr.warning('Member Demography file validation failed. Please re-upload', 'Warning');
             // }else{
             //     showModal(3);
             // }
@@ -6416,14 +6416,14 @@ function appendMultiFileData(data) {
 
             if (response.status == true) {
                 if(input == 1){
-                    console.log(response.message, 'SUCCESS');
+                    console.log(response.message, 'Success');
                     showTinyToast();
                 }else{
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 }
                 $('#rfq_primaryKey').val(response.id);
             } else {
-                toastr.warning(response.message, 'WARNING');
+                toastr.warning(response.message, 'Warning');
             }
 
             if(input != 1){
@@ -6494,9 +6494,9 @@ function appendMultiFileData(data) {
                 console.log('Data sent successfully:', response);
 
                 if (response.status == true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
 
                 window.location.href = '<?= base_url('rfq/list/') ?>' + lead_id + '/' + 2;
@@ -7017,7 +7017,7 @@ function appendMultiFileData(data) {
                            console.log('Data fetched successfully:', response);
 
                            if (response.status === true) {
-                               toastr.success(response.message, 'SUCCESS');
+                               toastr.success(response.message, 'Success');
                                $("#no_of_installment").closest('.form-group').hide();
                                $('#no_of_installment').val("");
                                $('#installment_form_row').empty();
@@ -7044,7 +7044,7 @@ function appendMultiFileData(data) {
                                     dateFormat: 'd-m-Y',
                                 });
                            } else {
-                               toastr.error(response.message, 'WARNING');
+                               toastr.error(response.message, 'Warning');
                            }
 
                            $('.loader').fadeOut();
@@ -7055,7 +7055,7 @@ function appendMultiFileData(data) {
                            $('.loader-mask').delay(350).fadeOut('slow');
                            console.error('Error fetching data:', error);
                            console.error(xhr.responseText);
-                           toastr.error('An error occurred while removing the installment.', 'ERROR');
+                           toastr.error('An error occurred while removing the installment.', 'Error');
                        });
                    }else{
                        // alert("Inside else");
@@ -7174,14 +7174,14 @@ function appendMultiFileData(data) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             $this.closest('.form-row').remove();
                             let updated_row_count = $('#installment_form_row .form-row').length;
                             $('#no_of_installment').val(updated_row_count);
                             console.log("after remove row_count", updated_row_count);
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -7192,7 +7192,7 @@ function appendMultiFileData(data) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while removing the installment.', 'ERROR');
+                        toastr.error('An error occurred while removing the installment.', 'Error');
                     });
                 }
             });
@@ -7255,10 +7255,10 @@ function appendMultiFileData(data) {
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $installmentContainer.find('.form-row').slice(-remove_count).remove();
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -7269,7 +7269,7 @@ function appendMultiFileData(data) {
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         $('#no_of_installment').val(row_count);
@@ -7381,7 +7381,7 @@ function appendMultiFileData(data) {
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
-            toastr.warning("You can't remove the first file field", 'WARNING');
+            toastr.warning("You can't remove the first file field", 'Warning');
             return false;
         }
 
@@ -7413,7 +7413,7 @@ function appendMultiFileData(data) {
                         console.log('Data fetched successfully:', response);
 
                         if (response.status == true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             //remove the file field
                             const field = document.getElementById(`fileField_${index}`);
@@ -7422,7 +7422,7 @@ function appendMultiFileData(data) {
                             }
                             
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -7433,7 +7433,7 @@ function appendMultiFileData(data) {
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+                        toastr.error('An error occurred while checking the CD amount.', 'Error');
                     });
 
                 }else{
@@ -7480,14 +7480,14 @@ function appendMultiFileData(data) {
                 console.log('uploadMultiFileFromRfq reponse', res);
 
                 if(res.status == true){
-                    toastr.success(res.message, 'SUCCESS');
+                    toastr.success(res.message, 'Success');
                     $('#multiFileAppendArea').empty();
                     $('.attachmet_row').empty();
                     $('#multiFileAppendArea').append(res.document_data);
                     $('.attachmet_row').html(res.attachment_html);
                     window.location.reload();
                 }else{
-                    toastr.warning(res.message, 'WARNING');
+                    toastr.warning(res.message, 'Warning');
                 }
 
                 // Hide loader
@@ -7562,10 +7562,10 @@ function appendMultiFileData(data) {
         sendAjaxRequestForGlobal(url, 'POST', requestData, function(res) {
 
             if (res.status == true) {
-                toastr.success(res.message, 'SUCCESS');
+                toastr.success(res.message, 'Success');
                 checkMemberDataValidationStatus(res.lead_id)
             } else {
-                toastr.warning(res.message, 'WARNING');
+                toastr.warning(res.message, 'Warning');
                 // Hide loader
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
@@ -7575,7 +7575,7 @@ function appendMultiFileData(data) {
             clearInterval(interval);
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while validation.', 'ERROR');
+            toastr.error('An error occurred while validation.', 'Error');
             console.error("❌ Error checking validation status:", err);
             // Hide loader
             $('.loader').fadeOut();
@@ -7609,10 +7609,10 @@ function appendMultiFileData(data) {
                 if (res.code === 200 && res.data.status != "pending") {
 
                     clearInterval(interval); // stop checking
-                    if(res.data.status == 'success'){
-                        toastr.success("✅ Validation Completed status : " + res.data.status, 'SUCCESS');
+                    if(res.data.status == 'Success'){
+                        toastr.success("✅ Validation Completed status : " + res.data.status, 'Success');
                     }else{
-                        toastr.warning("✅ Validation Completed status : " + res.data.status, 'WARNING');
+                        toastr.warning("✅ Validation Completed status : " + res.data.status, 'Warning');
                     }
 
                     window.location.reload();
@@ -7633,7 +7633,7 @@ function appendMultiFileData(data) {
                 clearInterval(interval);
                 console.error('Error fetching data:', error);
                 console.error(xhr.responseText);
-                toastr.error('An error occurred while validation.', 'ERROR');
+                toastr.error('An error occurred while validation.', 'Error');
                 console.error("❌ Error checking validation status:", err);
                 // Hide loader
                 $('.loader').fadeOut();
@@ -7692,7 +7692,7 @@ function appendMultiFileData(data) {
 
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            // toastr.error('An error occurred while fetching demography.', 'ERROR');
+            // toastr.error('An error occurred while fetching demography.', 'Error');
             // Hide loader
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index a1292e11..e55ed4a2 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -2992,7 +2992,7 @@
         // Save all tables' data to localStorage
         localStorage.setItem('allTablesJsonData', JSON.stringify(allTablesData));
         // // console.log('All tables data saved:', allTablesData);
-        // toastr.success("RFQ Saved Successfully", "SUCCESS");
+        // toastr.success("RFQ Saved Successfully", "Success");
         // If needed, reconstruct tables from JSON (implement jsonToTable accordingly)
 
         return allTablesData;
@@ -5048,16 +5048,16 @@
 
                 // // console.log(res);
                 if (res.status == 'success' && res.code == 200) {
-                    toastr.success('Mail send Successfully', 'SUCCESS');
+                    toastr.success('Mail send Successfully', 'Success');
                     if(res.is_placement == true){
                         clearInterval(intervalId);
                         console.log('******** Intervel Cleared ********')
                     }
                 } else {
                     if (res.messgae) {
-                        toastr.error(res.messgae, 'ERROR')
+                        toastr.error(res.messgae, 'Error')
                     } else {
-                        toastr.error('Mail send failed', 'ERROR')
+                        toastr.error('Mail send failed', 'Error')
                     }
                 }
 
@@ -5113,7 +5113,7 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 if (res.status == false) {
-                    toastr.warning(res.message, 'WARNING')
+                    toastr.warning(res.message, 'Warning')
                 } else {
                     appendInsurerContact(res.data)
                 }
@@ -5490,7 +5490,7 @@
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $("#no_of_installment").hide();
                                 $("#payment_date").show();
                                 $("#utr_no").show();
@@ -5515,7 +5515,7 @@
                                     dateFormat: 'd-m-Y',
                                 });
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -5526,7 +5526,7 @@
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         // alert("Inside else");
@@ -5592,10 +5592,10 @@
                             console.log('Data fetched successfully:', response);
 
                             if (response.status === true) {
-                                toastr.success(response.message, 'SUCCESS');
+                                toastr.success(response.message, 'Success');
                                 $installmentContainer.find('.form-row').slice(-remove_count).remove();
                             } else {
-                                toastr.error(response.message, 'WARNING');
+                                toastr.error(response.message, 'Warning');
                             }
 
                             $('.loader').fadeOut();
@@ -5606,7 +5606,7 @@
                             $('.loader-mask').delay(350).fadeOut('slow');
                             console.error('Error fetching data:', error);
                             console.error(xhr.responseText);
-                            toastr.error('An error occurred while removing the installment.', 'ERROR');
+                            toastr.error('An error occurred while removing the installment.', 'Error');
                         });
                     }else{
                         $('#no_of_installment').val(row_count);
@@ -5704,14 +5704,14 @@
                         console.log('Data fetched successfully:', response);
 
                         if (response.status === true) {
-                            toastr.success(response.message, 'SUCCESS');
+                            toastr.success(response.message, 'Success');
 
                             $this.closest('.form-row').remove();
                             let updated_row_count = $('#installment_form_row .form-row').length;
                             $('#no_of_installment').val(updated_row_count);
                             console.log("after remove row_count", updated_row_count);
                         } else {
-                            toastr.error(response.message, 'WARNING');
+                            toastr.error(response.message, 'Warning');
                         }
 
                         $('.loader').fadeOut();
@@ -5722,7 +5722,7 @@
                         $('.loader-mask').delay(350).fadeOut('slow');
                         console.error('Error fetching data:', error);
                         console.error(xhr.responseText);
-                        toastr.error('An error occurred while removing the installment.', 'ERROR');
+                        toastr.error('An error occurred while removing the installment.', 'Error');
                     });
                 }
             });
diff --git a/app/Views/view_rfq_non_eb_new.php b/app/Views/view_rfq_non_eb_new.php
index f2293ebb..abc4f3ad 100644
--- a/app/Views/view_rfq_non_eb_new.php
+++ b/app/Views/view_rfq_non_eb_new.php
@@ -3271,7 +3271,7 @@
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            toastr.error('An error occurred while checking the CD amount.', 'ERROR');
+            toastr.error('An error occurred while checking the CD amount.', 'Error');
         });
     }
 
diff --git a/public/sample_excel/sample_claim_dump_upload_excel.xlsx b/public/sample_excel/sample_claim_dump_upload_excel.xlsx
new file mode 100644
index 00000000..93b0d758
Binary files /dev/null and b/public/sample_excel/sample_claim_dump_upload_excel.xlsx differ