From a863e376238a89c6216e45ff86cd09257b0c9eba Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 25 Feb 2026 19:26:37 +0530
Subject: [PATCH 01/12] FIX_ISSUE

---
 app/Controllers/SalesController.php | 104 ++++++++++++++++++++++++++--
 1 file changed, 99 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index 904217b1..459b919b 100644
--- a/app/Controllers/SalesController.php
+++ b/app/Controllers/SalesController.php
@@ -7,6 +7,7 @@ use App\Models\SalesActualLeadModel;
 use App\Models\SalesContactPersonModel;
 use App\Models\SalesActivityModel;
 use App\Models\SalesLeadNoteModel;
+use App\Models\UserModel;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\API\ResponseTrait;
 
@@ -18,6 +19,7 @@ class SalesController extends BaseController
     protected $contactModel;
     protected $activityModel;
     protected $noteModel;
+    protected $userModel;
 
     public function __construct()
     {
@@ -25,6 +27,7 @@ class SalesController extends BaseController
         $this->contactModel = new SalesContactPersonModel();
         $this->activityModel = new SalesActivityModel();
         $this->noteModel = new SalesLeadNoteModel();
+        $this->userModel = new UserModel();
     }
 
     
@@ -142,9 +145,11 @@ class SalesController extends BaseController
             ]);
 
             // 2. Handle follow-up if requested
+            $google_calender_response = [];
             if (!empty($data['schedule_followup']) && $data['schedule_followup'] === 'yes') {
+
                 $activity = $this->activityModel->find($id);
-                $this->activityModel->insert([
+                $activity_data = [
                     'lead_id'        => $activity['lead_id'],
                     'activity_type'  => $data['followup_type'],
                     'notes'          => $data['followup_notes'],
@@ -152,10 +157,14 @@ class SalesController extends BaseController
                     'assigned_to'    => $activity['assigned_to'],
                     'status'         => 'pending',
                     'created_by'     => $this->getUserId()
-                ]);
+                ];
+                $this->activityModel->insert($activity_data);
+
+                // add google calender event
+                $google_calender_response = $this->addCalenderEvent($activity_data);
             }
 
-            return $this->respond(['status' => 'success', 'message' => 'Activity updated']);
+            return $this->respond(['status' => 'success', 'message' => 'Activity updated', 'google_calender_response' => $google_calender_response]);
         } catch (\Exception $e) {
             return $this->failServerError($e->getMessage());
         }
@@ -463,7 +472,8 @@ class SalesController extends BaseController
                 'total' => $result['total'],
                 'limit' => $limit,
                 'offset' => $offset
-            ]);
+            ], 200);
+
         } catch (\Exception $e) {
             return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
         }
@@ -542,6 +552,9 @@ class SalesController extends BaseController
             if (!$this->activityModel->insert($data)) {
                 return $this->fail($this->activityModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
+            
+            // add google calender event
+            $response = $this->addCalenderEvent($data);
 
             $activityId = $this->activityModel->getInsertID();
             $activity = $this->activityModel->find((int)$activityId);
@@ -549,7 +562,8 @@ class SalesController extends BaseController
             return $this->respondCreated([
                 'status' => 'success',
                 'message' => 'Activity created successfully',
-                'data' => $activity
+                'data' => $activity,
+                'google_calender_response' => $response
             ]);
         } catch (\Exception $e) {
             return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
@@ -928,4 +942,84 @@ class SalesController extends BaseController
 
         return $achievedAmountData[0]['achieved_amount'] ?? 0.00;
     }
+
+    public function addCalenderEvent($input)
+    {
+        try {
+
+            log_message('error', '[GOOGLE_CALENDER] Calendar Event Input: ' . json_encode($input));
+
+            /* ---------------- VALIDATION ---------------- */
+
+            if (empty($input['lead_id']) || empty($input['assigned_to']) || empty($input['scheduled_date'])) {
+                log_message('error', '[GOOGLE_CALENDER] Calendar Event Missing Required Data');
+                return [
+                    'status' => false,
+                    'message' => 'Required data missing'
+                ];
+            }
+
+            /* ---------------- FETCH DATA ---------------- */
+
+            $lead_data = $this->leadModel
+                ->where('lead_id', $input['lead_id'])
+                ->first();
+
+            if (!$lead_data) {
+                log_message('error', '[GOOGLE_CALENDER] Lead Not Found: ' . $input['lead_id']);
+                return [
+                    'status' => false,
+                    'message' => 'Lead not found'
+                ];
+            }
+
+            $user_data = $this->userModel
+                ->where('id', $input['assigned_to'])
+                ->first();
+
+            if (!$user_data) {
+                log_message('error', '[GOOGLE_CALENDER] User Not Found: ' . $input['assigned_to']);
+                return [
+                    'status' => false,
+                    'message' => 'Assigned user not found'
+                ];
+            }
+
+            /* ---------------- SUMMARY ---------------- */
+
+            $summary = ucfirst($input['activity_type']) . 
+                    ' with ' . 
+                    $lead_data['company_name'];
+
+            /* ---------------- GOOGLE PAYLOAD ---------------- */
+
+            $eventData = [
+                'summary'      => $summary,
+                'meeting_date' => $input['scheduled_date'],
+                'description'  => $input['notes'] ?? '',
+                'emails'       => [$user_data['email']],
+            ];
+
+            log_message('error', '[GOOGLE_CALENDER] Google Calendar Payload: ' . json_encode($eventData));
+
+            /* ---------------- API CALL ---------------- */
+
+            $response = add_google_calender_event($eventData);
+
+            log_message('error', '[GOOGLE_CALENDER] Google Calendar Response: ' . json_encode($response));
+
+            return $response;
+
+        } catch (\Throwable $e) {
+
+            log_message('error', '[GOOGLE_CALENDER] Calendar Event Exception: ' . $e->getMessage());
+            log_message('error', '[GOOGLE_CALENDER] Calendar Event Trace: ' . $e->getTraceAsString());
+
+            return [
+                'status' => false,
+                'message' => 'Calendar event failed',
+                'error' => $e->getMessage()
+            ];
+        }
+    }
 }
\ No newline at end of file

From 57ff91a9c8d18d0d367984719123fa183611be1a Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Thu, 26 Feb 2026 09:20:00 +0530
Subject: [PATCH 02/12] FIX_SalesTracker2

---
 app/Config/Acl.php                            |   4 +
 app/Config/Routes.php                         |   3 +-
 app/Controllers/SalesController.php           | 166 ++++-
 app/Views/layout/header.php                   |   6 +-
 app/Views/sales/activity_view.php             | 700 ++++--------------
 .../sales/branch_level_dashboard_view.php     | 244 ++++--
 .../sales/sales_manager_level_dashboard.php   | 176 ++++-
 app/Views/sales/tracker_view.php              |  50 +-
 8 files changed, 638 insertions(+), 711 deletions(-)

diff --git a/app/Config/Acl.php b/app/Config/Acl.php
index 86760bb0..2960595f 100644
--- a/app/Config/Acl.php
+++ b/app/Config/Acl.php
@@ -30,6 +30,10 @@ class Acl
         '#^/util/download_log#' => ['roles' => [ADMIN_ROLE_ID]],
         '#^/metaDashboardDemo#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]],
         '#^/metaTpaDashboardDemo#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]],
+        '#^/sales/dashboard#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, STAFF_ROLE_ID]],
+        '#^/sales#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, STAFF_ROLE_ID]],
+
+
 
         // ===================== PUBLIC DOWNLOADS / FORMS =====================
         '#^/download-#' => ['public' => true],
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index d7353cb7..403ab622 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -912,7 +912,7 @@ $routes->group('sales', function($routes) {
 
     $routes->get('/', 'SalesController::index');
     
-    $routes->get('activities', 'SalesController::activities');
+    $routes->get('loadactivities', 'SalesController::loadactivities');
 
     $routes->get('page/(:segment)', 'SalesController::noPage/$1');
     
@@ -996,6 +996,7 @@ $routes->group('sales', function($routes) {
 
 
     //Dashboard
+    $routes->get('dashboard', 'SalesController::dashboard');
     $routes->get('branchLevelDashboard', 'SalesController::branchLevelDashboard');
     $routes->get('salesManagerLevelDashboard', 'SalesController::salesManagerLevelDashboard');
 });
diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index 459b919b..3de595f8 100644
--- a/app/Controllers/SalesController.php
+++ b/app/Controllers/SalesController.php
@@ -35,12 +35,11 @@ class SalesController extends BaseController
         $data = $this->getSalesStaffData();
         
         $data['tab_name']  = 'Leads';
-        $data['page_name'] = 'Leads';
-        
+        $data['page_name'] = 'Leads';       
         return $this->loadLayout('sales/tracker_view', $data);
     }
 
-    public function activities(){
+    public function loadactivities(){
         $data = $this->getSalesStaffData();
         
         $data['tab_name']  = 'Activities';
@@ -49,6 +48,7 @@ class SalesController extends BaseController
         $data['leads'] = $this->leadModel->select('lead_id, company_name')
                                          ->orderBy('lead_id', 'DESC')
                                          ->findAll();
+
         
         return $this->loadLayout('sales/activity_view', $data);
     }
@@ -59,42 +59,36 @@ class SalesController extends BaseController
     private function getSalesStaffData(): array
     {
         $db = \Config\Database::connect();
-        $logged_user_id = get_session_userid(); 
+        $logged_user_id = get_session_userid();
+        $role             = get_role_id();
+        $team_id          = user_team();
 
         $data = [
             'users' => [],
             'sales_manager_ids' => []
         ];
 
-        // Get the Branch ID, Role, Team, and Name of the logged-in user
-        $row = $db->table('user_profiles up')
-          ->select('up.id, up.first_name, up.last_name, up.nhance_branch_id, up.role, ut.team_id')
-          ->join('user_teams ut', 'ut.user_id = up.id', 'left')
-          ->where('up.is_active', 1)
-          ->where('up.id', $logged_user_id)
-          ->get()
-          ->getRow();
-
+         $row = $db->table('user_profiles')->select('*')
+          ->where('is_active', 1)->where('id', $logged_user_id)
+          ->get()->getRow();
+    
         $nhance_branch_id = $row ? $row->nhance_branch_id : null;
-        $role             = $row ? $row->role : null;
-        $team_id          = $row ? $row->team_id : null;
-
+    
         // Is the logged-in user a Sales Manager? (Role 4, Team 5)
-        if ($role == 4 && $team_id == 5) {
-            
+        if ($role == 4 && in_array(5, $team_id)) {    
             $data['sales_manager_ids'] = [$logged_user_id];
             
             $data['users'] = [
                 [
                     'id'               => $row->id,
-                    'sales_manager'    => trim($row->first_name . ' ' . $row->last_name),
+                    'first_name'    => $row->first_name,
                     'nhance_branch_id' => $nhance_branch_id
                 ]
             ];
 
         } 
         // Otherwise fetch ALL sales managers in this branch
-        elseif ($nhance_branch_id) {
+        elseif (in_array($role,[1,2,3,4,5])) {
             
             $data['users'] = $db->table('user_profiles up')
                                 ->select('up.id, up.first_name, up.last_name, up.nhance_branch_id')
@@ -779,11 +773,59 @@ class SalesController extends BaseController
 
 
     // ==================== Dashboard ====================
+    public function dashboard(){
 
-    public function branchLevelDashboard()
+        $logged_user_id   = get_session_userid();
+        $role             = get_role_id();
+        $team_id          = user_team();
+        $payload          = $this->request->getGet();
+
+        $db = \Config\Database::connect();
+
+        $row = $db->table('user_profiles')
+          ->select('*')
+          ->where('is_active', 1)
+          ->where('id', $logged_user_id)
+          ->get()
+          ->getRowArray();
+
+        $nhance_branch_id = $row ? $row['nhance_branch_id'] : null;
+
+        // dd($logged_user_id, $nhance_branch_id, $role, $team_id );
+
+        if (in_array($role,[5])) {
+
+            $sales_manager_ids = array_column(
+                $db->table('user_profiles up')
+                    ->select('up.id')
+                    ->join('user_teams ut', 'ut.user_id = up.id')
+                    ->where([
+                        'up.is_active'        => 1,
+                        'ut.is_active'        => 1,
+                        'up.role'             => 4,
+                        'ut.team_id'          => 5,
+                        'up.nhance_branch_id' => $nhance_branch_id
+                    ])
+                    ->get()
+                    ->getResultArray(),
+                'id'
+            );
+            $this->branchLevelDashboard($nhance_branch_id,$sales_manager_ids);
+  
+        } 
+        elseif ($role == 4 && in_array(5, $team_id)) {    
+            $sales_manager_ids = [$logged_user_id];
+            $this->salesManagerLevelDashboard($logged_user_id,$sales_manager_ids, $payload);
+        }
+        
+    }
+
+    public function branchLevelDashboard($branchId,$sales_manager_ids)
     {
+        $data['tab_name']  = 'Dashboard';
+        $data['page_name'] = 'Dashboard';
         // Hardcoded branch ID as requested
-        $branchId = 1;
+        // $branchId = 1;
 
         try {
             // 1. Lead Statistics
@@ -798,11 +840,24 @@ class SalesController extends BaseController
 
             // 3. Team Performance (Aggregating activity counts per user)
             $db = \Config\Database::connect();
+            // Final safe check
+            if (empty($sales_manager_ids)) {
+                // No valid IDs — skip queries or return empty
+                $teamPerformance  = [];
+                $recentActivities = [];
+                $leadsOverview    = [];
+            } else {
+
+                if (empty($sales_manager_ids) || !is_array($sales_manager_ids)) {
+                    $sales_manager_ids = array_filter((array) $sales_manager_ids); // removes null, "", 0
+                }
+
             $teamPerformance = $db->table('user_profiles as u')
                 ->select('u.first_name, u.last_name, u.profile as role, 
                         (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id) as total_acts,
                         (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id AND status = "completed") as done_acts')
                 ->where('u.nhance_branch_id', $branchId)
+                ->whereIn('u.id', $sales_manager_ids)
                 ->where('u.is_active', 1)
                 ->get()->getResultArray();
 
@@ -812,11 +867,48 @@ class SalesController extends BaseController
                 ->orderBy('sales_activities.scheduled_date', 'DESC')
                 ->limit(6)
                 ->findAll();
+            
+                $sales_manager_ids = array_values(array_map('intval', $sales_manager_ids));
+                $recentActivities = $db->table('sales_activities sa')
+                                    ->select('sa.activity_id,sa.lead_id,sa.activity_type,sa.scheduled_date,sa.status,sa.assigned_to,sal.company_name,up.first_name AS assigned_to_name')
+                                    ->join('(SELECT lead_id, MAX(company_name) AS company_name FROM sales_actual_leads GROUP BY lead_id) sal','sal.lead_id = sa.lead_id','left')
+                                    ->join('user_profiles up', 'up.id = sa.assigned_to', 'left')
+                                    ->orderBy('sa.scheduled_date', 'DESC')
+                                    ->limit(6)
+                                    ->whereIn('sa.assigned_to', $sales_manager_ids)
+                                    ->get()->getResultArray();
+
+                // 5. All Leads Overview
+                $leadsOverview = $db->table('sales_actual_leads sal')
+                            ->select('sal.lead_id,sal.company_name,sal.status,up.first_name AS assigned_to,
+                                COUNT(DISTINCT sa.activity_id) AS activities,
+                                COUNT(DISTINCT l.id) AS opportunities
+                            ')
+                            ->join('user_profiles up', 'up.id = sal.assigned_to', 'left')
+                            ->join('sales_activities sa', 'sa.lead_id = sal.lead_id', 'left')
+                            ->join('leads l', 'l.actual_lead_id = sal.lead_id', 'left')
+                            ->groupBy('sal.lead_id, sal.company_name, sal.status, up.first_name')
+                            ->having('COUNT(DISTINCT sa.activity_id) + COUNT(DISTINCT l.id) >', 0)  // ← this line
+                            ->orderBy('sal.created_at', 'DESC')
+                            ->whereIn('sal.assigned_to', $sales_manager_ids)
+                            ->get()
+                            ->getResultArray();
+            }
+            
+            // 6. activityBreakdown
+            $total = $db->table('sales_activities')->countAll();
+
+            $activityBreakdown = $db->table('sales_activities')
+                ->select("activity_type, COUNT(*) AS total, ROUND(COUNT(*) * 100.0 / {$total}, 0) AS percentage", false)
+                ->groupBy('activity_type')
+                ->orderBy('total', 'DESC')
+                ->get()
+                ->getResultArray();
+
+            $teamPerformance = array_filter($teamPerformance, function($row) {
+                return ($row['total_acts'] + $row['done_acts']) > 0;
+            });
 
-            // 5. All Leads Overview
-            $leadsOverview = $this->leadModel->select('sales_actual_leads.*, user_profiles.first_name, user_profiles.last_name')
-                ->join('user_profiles', 'user_profiles.id = sales_actual_leads.assigned_to', 'left')
-                ->findAll();
 
             $data = [
                 'total_leads'      => $stats['total'],
@@ -825,7 +917,10 @@ class SalesController extends BaseController
                 'pipeline_value'   => '15.0L', // Hardcoded placeholder from PDF [cite: 14]
                 'team'             => $teamPerformance,
                 'recent_acts'      => $recentActivities,
-                'leads_overview'   => $leadsOverview
+                'leads_overview'   => $leadsOverview,
+                'activity_breakdown'=> $activityBreakdown,
+                'tab_name'      => "Sales Dashboard",
+                'page_name'     => "Sales Dashboard"
             ];
 
             // dd($data);
@@ -839,16 +934,15 @@ class SalesController extends BaseController
         }
     }
 
-
-    public function salesManagerLevelDashboard()
+    public function salesManagerLevelDashboard($userId,$sales_manager_ids, $payload = [])
     {
-        $userId = get_session_userid();
+        // $userId = get_session_userid();
         // $userId = 1;
         $db = \Config\Database::connect();
 
         try {
 
-            $payload = $this->request->getGet();
+            // $payload = $this->request->getGet();
             $current_fin_year = $payload['fy'] ?? getCurrentFinancialYear();
 
             
@@ -858,8 +952,12 @@ class SalesController extends BaseController
                 ->orderBy('fy_year', 'desc')
                 ->get()
                 ->getResultArray();
+
             $fin_years = array_column($fin_years, 'fy_year');
-            $fin_years[] = '2024-2025';
+
+            if(empty($fin_years)){
+                $fin_years[] = $current_fin_year;
+            }
 
             $target = $db->table('sales_target')
                 ->where('user_id', $userId)
@@ -907,7 +1005,9 @@ class SalesController extends BaseController
                 'recent_leads'  => $recentLeads,
                 'fin_years'     => $fin_years,
                 'display_fin_years'     => format_financial_year($current_fin_year),
-                'user_name'     => get_session_userdata()->first_namee ?? ''
+                'user_name'     => get_session_userdata()->first_namee ?? '',
+                'tab_name'      => "Sales Dashboard",
+                'page_name'     => "Sales Dashboard"
             ];
 
             // dd($data);
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 61e63b23..67198829 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -2077,7 +2077,7 @@
                             </a>
                         </li>
                     <?php } ?>
-                    <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 4]) || in_array(SALES_TEAM_ID, user_team())) { ?>
                         <li class="li-seperate" id="app-sales-tracker-li">
                             <a id="app_sales_tracker" href="#sidebarSalesTrackermenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
                                 <img
@@ -2087,13 +2087,13 @@
                             <div class="collapse" id="sidebarSalesTrackermenu">
                                 <ul class="nav-second-level">
                                     <li>
-                                        <a href="<?= base_url('/sales/page/Dashboard') ?>"> <i class="ri-dashboard-line"></i> Dashboard </a>
+                                        <a href="<?= base_url('/sales/dashboard') ?>"> <i class="ri-dashboard-line"></i> Dashboard </a>
                                     </li>
                                     <li>
                                         <a href="<?= base_url('/sales') ?>"> <i class="ri-group-line"></i> Leads </a>
                                     </li>
                                     <li>
-                                        <a href="<?= base_url('/sales/activities') ?>"><i class="ri-flashlight-line"></i> Activities </a>
+                                        <a href="<?= base_url('/sales/loadactivities') ?>"><i class="ri-flashlight-line"></i> Activities </a>
                                     </li>
                                     <!-- <li>
                                         <a href="<?= base_url('/sales/page/Opportunities') ?>"> <i class="ri-checkbox-circle-line"></i> Opportunities </a>
diff --git a/app/Views/sales/activity_view.php b/app/Views/sales/activity_view.php
index 4c5f939b..b997a73f 100644
--- a/app/Views/sales/activity_view.php
+++ b/app/Views/sales/activity_view.php
@@ -75,6 +75,7 @@
     .status-not-a-prospects { background: #ffebee;  color: #d32f2f; }
     .status-pending { background: #fff3e0; color: #f57c00; }
     .status-completed { background: #e8f5e9; color: #388e3c; }
+    .status-unknown { background: #000; color: #fff; }
 
     /* Modals */
     .modal { display: none; position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); z-index: 2000; align-items: center; justify-content: center; }
@@ -143,7 +144,7 @@
 
     
 </style>
-<!-- copy of tracker_view -->
+
 <div class="main-content">
     <hr class="my-0">
     <div class="lead-header">
@@ -159,7 +160,7 @@
             <div class="lead-actions">
                 <input type="text" class="search-input" id="mainSearch"
                     placeholder="Search activities..." onkeyup="fetchActivities(false)">
-                <button class="btn-primary" onclick="openModal('addActivityModal')">
+                <button class="btn-primary" onclick="openMainActivityModal()">
                     + Add Activity
                 </button>
             </div>
@@ -183,64 +184,6 @@
 
 </div>
 
-<div class="modal" id="addActivityModal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Add Lead</h4>
-                <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('addActivityModal')">&times;</button>
-            </div>
-            <form class="parsley-examples" id="addLeadForm" enctype="multipart/form-data"> 
-                    <hr class="my-0">
-                    <div class="modal-body p-4">
-                        <div class="form-group">
-                            <div class="col-12 mb-1">
-                                    <div class="col-xl-12 col-lg-12 col-md-12">
-                                        <label class="form-label">Company Name<span class="text-danger">*</span></label>
-                                        <input type="text" class="form-control" name="company_name" style="width: 100%;" placeholder="Enter Company Name" oninput="this.value = this.value.replace(/[^A-Za-z\s]/g, '')" required>
-                                    </div>
-                            </div>
-                            <div class="form-row mb-1">
-                                <div class="col-md-12 ml-3" style="width: 97%;">
-                                    <label class="form-label">Email</label>
-                                    <input type="email" class="form-control" name="email" style="width: 100%;" placeholder="Enter the Email" oninput="this.value = this.value.replace(/[^a-zA-Z0-9@.\-_+]/g, '')">
-                                </div>
-                                <div class="col-md-12" style="width: 94%;">
-                                    <label class="form-label">Phone</label>
-                                    <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')">
-                                </div>
-                            </div>
-                            <div class="form-row mb-1">
-                                <div class="col-md-12 ml-3" style="width: 97%;">
-                                    <label class="form-label">Status<span class="text-danger">*</span></label>
-                                    <select name="status" class="form-control" style="width: 100%;" required>
-                                        <option value="New">New</option>
-                                        <option value="Potential">Potential</option>
-                                        <option value="Prospects">Prospects</option>
-                                        <option value="Not a Prospects">Not a Prospects</option>
-                                    </select>
-                                </div>
-                                <div class="col-md-12" style="width: 94%;">
-                                    <label class="form-label">Assign To<span class="text-danger">*</span></label>
-                                    <select name="assigned_to" class="form-control searchable" style="width: 100%;" required>
-                                        <option value="">Select User</option>
-                                        <?php foreach($users as $user): ?>
-                                            <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?> </option>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="form-group text-right mb-0">
-                            <button type="button" class="btn-primary" style="background:#eee; color:#333; margin-right:10px;" onclick="closeModal('addActivityModal')">Cancel</button>
-                            <button type="submit" class="btn-primary">Create Lead</button>
-                        </div>
-                    </div>                       
-            </form>
-        </div>
-</div>
-
 <div class="modal" id="leadDetailModal">
     <div class="modal-content" style="max-width: 850px;">
         <div class="modal-header">
@@ -295,7 +238,7 @@
         <form class="parsley-examples" id="activityForm" enctype="multipart/form-data"> 
          <hr class="my-0">
          <div class="modal-body p-4">
-        
+            <input type="hidden" id="act_string_flag"> <!-- ADD THIS -->
             
             <div class="form-group">
                 <label class="form-label">Select Lead <span class="text-danger">*</span></label>
@@ -306,15 +249,15 @@
                 </select>
             </div>
             <div class="form-group">
-                <label class="form-label">Activity Type</label>
+                <label class="form-label">Activity Type <span class="text-danger">*</span></label>
                 <div class="activity-types" id="typeButtons">
-                    <button type="button" class="activity-type-btn active" onclick="selectType('Call', this)">📞 Call</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Email', this)">✉️ Email</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Meeting', this)">📅 Meeting</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Visit', this)">🚗 Visit</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Demo', this)">🎬 Demo</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Share', this)">📄 Share Docs</button>
-                    <button type="button" class="activity-type-btn" onclick="selectType('Todo', this)">✓ To Do</button>
+                    <button type="button" class="activity-type-btn d_activity_type active" data-type="Call" onclick="selectType('Call', this)">📞 Call</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Email" onclick="selectType('Email', this)">✉️ Email</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Meeting" onclick="selectType('Meeting', this)">📅 Meeting</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Visit" onclick="selectType('Visit', this)">🚗 Visit</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🎬 Demo</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Share" onclick="selectType('Share', this)">📄 Share Docs</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Todo" onclick="selectType('Todo', this)">✓ To Do</button>
                 </div>
             </div>
             <div class="form-group">
@@ -362,6 +305,7 @@
         
             <input type="hidden" id="comp_id">
             <input type="hidden" id="lead_id">
+            <input type="hidden" id="string_flag">
             <div class="form-group">
                 <label class="form-label">Outcome / Notes <span class="text-danger">*</span></label>
                 <textarea id="comp_notes" class="search-input" style="width:100%; height:80px;" required placeholder="What happened? Any next steps?" rows="3" required></textarea>
@@ -456,124 +400,6 @@
     </div>
 </div>
 
-<div class="modal" id="editLeadModal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Edit Lead</h4>
-                <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('editLeadModal')">&times;</button>
-            </div>
-            <form class="parsley-examples" id="editLeadForm" enctype="multipart/form-data"> 
-                    <hr class="my-0">
-                    <input type="hidden" class="form-control" id="hidden_lead_id" name="lead_id">
-                    <div class="modal-body p-4">
-                        <div class="form-group">
-                            <div class="col-12 mb-1">
-                                    <div class="col-xl-12 col-lg-12 col-md-12">
-                                        <label class="form-label">Company Name <span class="text-danger">*</span></label>
-                                        <input type="text" class="form-control" name="company_name" style="width: 100%;" placeholder="Enter Company Name" oninput="this.value = this.value.replace(/[^A-Za-z\s]/g, '')" required>
-                                    </div>
-                            </div>
-                            <div class="form-row mb-1">
-                                <div class="col-md-12 ml-3" style="width: 97%;">
-                                    <label class="form-label">Email</label>
-                                    <input type="email" class="form-control" name="email" style="width: 100%;" placeholder="Enter the Email" oninput="this.value = this.value.replace(/[^a-zA-Z0-9@.\-_+]/g, '')">
-                                </div>
-                                <div class="col-md-12" style="width: 94%;">
-                                    <label class="form-label">Phone</label>
-                                    <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')">
-                                </div>
-                            </div>
-                            <div class="col-12 mb-1">
-                                    <div class="col-xl-12 col-lg-12 col-md-12">
-                                        <label class="form-label">Address</label>
-                                        <textarea id="address" name="address" class="form-control" style="width:100%; height:100px;" placeholder="Enter full Address"></textarea>
-                                    </div>
-                            </div>
-                            <div class="form-row mb-1">
-                                <div class="col-md-12 ml-3" style="width: 97%;">
-                                    <label class="form-label">WebSite</label>
-                                    <input type="text" class="form-control" name="website" style="width: 100%;" placeholder="Enter the Website">
-                                </div>
-                                <div class="col-md-12" style="width: 94%;">
-                                    <label class="form-label">GST Number</label>
-                                    <input type="text" class="form-control" name="gst_number" style="width: 100%;" placeholder="Enter the GST Number"  oninput="this.value = this.value.replace(/[^a-zA-Z0-9]/g, '').toUpperCase()" maxlength="15"
-                                            pattern="^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z][0-9A-Z]Z[0-9A-Z]$">
-                                </div>
-                            </div>
-                            
-                                <div class="col-12 mb-1" style="padding-left: 25px;">
-                                    <label class="form-label">Contact Persons</label>
-                                    <div id="contactPersonsContainer">
-                                        <div id="savedContactsContainer"> <span id="NoData"> <center><i> No contact persons added yet </i> </center> </span> </div>
-                                    </div>
-                                </div>
-
-                            <div class="col-12 mb-1 ml-1 ">
-                                
-                                    <div class="row g-2 align-items-center">
-                                
-                                        <div class="col-md-5" style="padding-left: 20px;">
-                                            <input type="text"
-                                                class="form-control"
-                                                id="contact_name"
-                                                placeholder="Contact Person Name"
-                                                oninput="this.value=this.value.replace(/[^A-Za-z\s]/g,'')">
-                                        </div>
-
-                                        <div class="col-md-4">
-                                            <input type="text"
-                                                class="form-control"
-                                                id="contact_mobile"
-                                                placeholder="Contact Mobile Number"
-                                                maxlength="10"
-                                                oninput="this.value=this.value.replace(/[^0-9]/g,'')">
-                                        </div>
-
-                                        <div class="col-md-3" style="padding-right: 4%;">
-                                            <button type="button"
-                                                    id="btnSaveContact"
-                                                    class="btn btn-sm w-100"
-                                                    style="background:#ff6a3d;border:none;color:white;">
-                                                + Save Contact
-                                            </button>
-                                        </div>
-
-                                
-                                </div>
-                            </div>
-                            
-                            <div class="form-row mb-1">
-                                <div class="col-md-12 ml-3" style="width: 97%;">
-                                    <label class="form-label">Status <span class="text-danger">*</span></label>
-                                    <select name="status" class="form-control" style="width: 100%;" required>
-                                        <option value="New">New</option>
-                                        <option value="Potential">Potential</option>
-                                        <option value="Prospects">Prospects</option>
-                                        <option value="Not a Prospects">Not a Prospects</option>
-                                    </select>
-                                </div>
-                                <div class="col-md-12" style="width: 94%;">
-                                    <label class="form-label">Assign To <span class="text-danger">*</span> </label>
-                                    <select name="assigned_to" class="form-control searchable" style="width: 100%;" required>
-                                        <option value="">Select User</option>
-                                        <?php foreach($users as $user): ?>
-                                            <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?> </option>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="form-group text-right mb-0">
-                            <button type="button" class="btn-primary" style="background:#eee; color:#333; margin-right:10px;" onclick="closeModal('editLeadModal')">Cancel</button>
-                            <button type="submit" class="btn-primary">Update Lead</button>
-                        </div>
-                    </div>                       
-            </form>
-        </div>
-</div>
-
 <script>
 $(document).ready(function() {
     resetFlatpicker();
@@ -605,6 +431,8 @@ function resetFlatpicker(){
 
 const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🎬", Share: "📄", Todo: "✓" };
 const salesManagerIds = <?= json_encode($sales_manager_ids ?? []) ?>;
+console.log("***********************");
+console.log(salesManagerIds);return;
 const API = '<?= base_url('sales') ?>';
 let filter = 'all';
 let lead_id = null;
@@ -617,8 +445,6 @@ let currentOffset = 0;
 
 
 function openModal(id) { document.getElementById(id).classList.add('active'); resetFlatpicker(); }
-// function closeModal(id) { document.getElementById(id).classList.remove('active'); }
-
 
 function closeModal(id) {
     const modal = document.getElementById(id);
@@ -633,9 +459,9 @@ function closeModal(id) {
 
         // Specific cleanup for your "Activity" logic
         if (id === 'activityModal') {
-            selectedType = 'Call'; // Reset your global activity type variable
-            $('.activity-type-btn').removeClass('active'); // Remove 'active' from all activity buttons
-            $(`.activity-type-btn[data-type="${selectedType}"]`).addClass('active'); // Find the specific button for 'Call' and make it active
+            selectedType = 'Call';
+            $('#typeButtons .d_activity_type').removeClass('active');
+            $('#typeButtons .d_activity_type[data-type="Call"]').addClass('active');
         }
         
         // Specific cleanup for "Complete" modal (hidden follow-up sections)
@@ -649,18 +475,22 @@ function closeModal(id) {
         // Specific action for leadDetailModal
         if (id === 'leadDetailModal') {
             switchTab('activity'); // Reset the tab back to 'activity'
-            document.getElementById('btn_add_opportunity').classList.style.display = 'none'; // Hide the button
+            document.getElementById('btn_add_opportunity').style.display = 'none';
         }
     }
 }
 
+function openMainActivityModal() {
+    document.getElementById('act_string_flag').value = "frommain"; // ✅ flag for main
+    openModal('activityModal');
+}
+
 function selectType(val, el) {
     document.querySelectorAll('.activity-type-btn').forEach(b => b.classList.remove('active'));
     el.classList.add('active');
     selectedType = val;
 }
 
-
 function selectFollowUpActivityType(val, el) {
     document.querySelectorAll('.f_activity_type').forEach(b => b.classList.remove('active'));
     el.classList.add('active');
@@ -675,7 +505,6 @@ function setFilter(val, el) {
     fetchActivities();
 }
 
-
 async function fetchActivities(isLoadMore = false) {
     const q = document.getElementById('mainSearch').value;
     const grid = document.getElementById('activitiesGrid');
@@ -692,6 +521,9 @@ async function fetchActivities(isLoadMore = false) {
             </div>
     </div>`;
 
+    console.log("function here");
+    console.log(salesManagerIds);
+    // return;
     // 2. 🛑 SHORT-CIRCUIT: If no sales manager IDs exist, show empty state and stop!
     if (typeof salesManagerIds === 'undefined' || salesManagerIds.length === 0) {
         console.log("No Sales Manager IDs found. Skipping API call.");
@@ -718,7 +550,7 @@ async function fetchActivities(isLoadMore = false) {
     }
 
     // 5. Build URL with dynamic offset
-    const url = `${API}/activities?status=${filter === 'all' ? '' : filter}&search=${q}&limit=${limit}&offset=${currentOffset}`;
+    let url = `${API}/activities?status=${filter === 'all' ? '' : filter}&search=${q}&limit=${limit}&offset=${currentOffset}`;
     // url += `&assigned_to=${salesManagerIds.join(',')}`; // We already proved it exists above!
     if (typeof salesManagerIds !== 'undefined' && salesManagerIds.length > 0) {
         url += `&assigned_to=${salesManagerIds.join(',')}`;
@@ -774,7 +606,7 @@ async function fetchActivities(isLoadMore = false) {
                         </div>
                         
                             <div class="activity-actions">
-                                <button class="btn-complete" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id})">
+                                <button style="display:${a.status == 'completed' ? 'none' : 'block'};" class="btn-complete" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id},'frommain')">
                                     ✓ Complete
                                 </button>
                                 <button class="btn-view" onclick="viewDetail(${a.lead_id})">
@@ -815,13 +647,13 @@ async function fetchActivities(isLoadMore = false) {
     }
 }
 
-
 // 2. Detail Logic
 async function viewDetail(id) {
+    console.log("i am here");
     lead_id = id;
-    const res = await fetch(`${API}/leads/${id}`);
-    const json = await res.json();
-    const l = json.data;
+    let res = await fetch(`${API}/leads/${id}`);
+    let json = await res.json();
+    let l = json.data;
 
     document.getElementById('det_company').innerText = l.company_name;
     document.getElementById('det_email').innerText = l.email || 'N/A';
@@ -843,8 +675,12 @@ async function viewDetail(id) {
     } else { document.getElementById('box_owner').style.display = 'none'; }
     
     const badge = document.getElementById('det_status_badge');
-    badge.innerText = l.status;
-    badge.className = `lead-status status-${l.status.toLowerCase().replace(' ', '-')}`;
+    // Use a fallback string like 'unknown' or 'pending'
+    let status = l.status || 'unknown';
+
+    badge.innerText = status;
+    badge.className = `lead-status status-${status.toLowerCase().replace(' ', '-')}`;
+
     const oppBtn = document.getElementById('btn_add_opportunity');
     if (l.status === 'Prospects') {
         oppBtn.style.display = 'inline-block';
@@ -856,6 +692,7 @@ async function viewDetail(id) {
     renderCard(l.opportunities || []);
     openModal('leadDetailModal');
 }
+
 function renderCard(opps) {
     const cont = document.getElementById('opportunitiesContainer');
     
@@ -897,6 +734,7 @@ function renderCard(opps) {
             </div>`;
     }).join('') : `<div class="empty-state"> <div class="empty-icon">💼</div> No opportunities yet. Add one to get started!</div>`;
 }
+
 function renderTimeline(acts) {
     const cont = document.getElementById('timelineContainer');
 
@@ -919,8 +757,8 @@ function renderTimeline(acts) {
             hour12: true
         });
 
-// Then use the variable in your HTML:
-// <span style="font-size:11px; color:#999">${formattedDate}</span>
+    // Then use the variable in your HTML:
+    // <span style="font-size:11px; color:#999">${formattedDate}</span>
 
         return `
             <div class="timeline-item">
@@ -935,7 +773,7 @@ function renderTimeline(acts) {
                     </div>
                     <div style="font-size:13px; color:#444;"></div>
                     ${a.status === 'pending' ? 
-                        `<button class="btn-primary" style="padding:4px 10px; font-size:11px; margin-top:8px;" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id})">Mark Complete</button>` : 
+                        `<button class="btn-primary" style="padding:4px 10px; font-size:11px; margin-top:8px;" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id},'frompopup')">Mark Complete</button>` : 
                         `<div style="font-size:12px; color:#388e3c; margin-top:8px; font-weight:500;">✓ Outcome: ${a.completion_notes}</div>`
                     }
                 </div>
@@ -943,15 +781,16 @@ function renderTimeline(acts) {
         `;
     }).join('') : `<div class="empty-state"><div class="empty-icon">✓</div> No activities yet. Add one to get started!</div>`;
 }
+
 function openActivityModal() {
     document.getElementById('act_owner').value = global_lead_assigned_to;
     document.getElementById('act_owner').dispatchEvent(new Event('change'));
     document.getElementById('act_lead_id').value = lead_id;
     document.getElementById('act_lead_id').dispatchEvent(new Event('change'));
-    openModal('activityModal');
+    document.getElementById('act_string_flag').value = "frompopup"; 
 }
 
-function openComp(id, assigned_to, lead_id) {
+function openComp(id, assigned_to, lead_id, string_flag) {
     document.getElementById('completeForm').reset();
     document.getElementById('f_notes').removeAttribute('required');
     document.getElementById('f_date').removeAttribute('required');
@@ -959,6 +798,7 @@ function openComp(id, assigned_to, lead_id) {
     document.getElementById('comp_id').value = id;
     document.getElementById('lead_id').value = lead_id;
     document.getElementById('f_assigned_to').value = assigned_to;
+    document.getElementById('string_flag').value = string_flag;
     document.getElementById('f_assigned_to').dispatchEvent(new Event('change'));
     document.getElementById('f_typeButtons').querySelectorAll('.f_activity_type')
             .forEach(btn => btn.classList.remove('active'));
@@ -971,7 +811,6 @@ function openOpportunityModal() {
     openModal('opportunityModal');
 }
 
-
 function switchTab(tabName) {
     //Default Activity Tab how to resset here 
     // 1. Hide all tab content
@@ -993,260 +832,6 @@ function switchTab(tabName) {
     document.getElementById('tab_' + tabName).classList.add('active');
 }
 
-// Add Lead Form Submissions
-document.getElementById('addLeadForm').onsubmit = async (e) => {
-    e.preventDefault();
-
-    // Just grab the button variables first, DO NOT disable yet
-    const submitBtn = e.target.querySelector('button[type="submit"]');
-    const originalBtnText = submitBtn.innerText;
-
-    const data = Object.fromEntries(new FormData(e.target).entries());
-
-    let companyName = data.company_name?.trim();
-    let email = data.email?.trim();
-    let phone = data.phone?.trim();
-    
-    let companyRegex = /^[A-Za-z\s]+$/;
-    let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    let phoneRegex = /^\+?[0-9\s]{10,20}$/; // Phone regex (+, numbers, spaces allowed, 10-20 length)
-
-    // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field
-    function showError(message, fieldName) {
-        toastr.warning(message, 'Validation Error');
-        setTimeout(function() {
-            $('[name="' + fieldName + '"]').focus();
-        }, 100);
-    }
-
-    // --- VALIDATION CHECKS (Button is still normal here) ---
-    if (!companyName && !email && !phone && !data.assigned_to) {
-        toastr.warning('Please fill in all the required fields.');
-        return; 
-    }
-
-    if (!companyName) {
-        return showError('Company Name is required.', 'company_name');
-    }
-
-    if (!companyRegex.test(companyName)) {
-        return showError('Company Name can contain only letters and spaces.', 'company_name');
-    }
-
-    if (companyName.length < 2) {
-        return showError('Company Name must be at least 2 characters.', 'company_name');
-    }
-
-    if (!email && !phone) {
-        return showError("Either Email or Phone number is required.", 'email'); 
-    }
-
-    if (email && !emailRegex.test(email)) {
-        return showError("Please enter a valid email address.", 'email');
-    }
-
-    if (phone && !phoneRegex.test(phone)) {
-        return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
-    }
-
-    if (!data.status) {
-        return showError("Please select a status.", 'status');
-    }
-
-    if (!data.assigned_to) {
-        return showError("Please Select the user to be Assigned.", 'assigned_to');
-    }
-
-    // --- ALL VALIDATION PASSED: Now disable button ---
-    submitBtn.disabled = true;
-    submitBtn.innerText = 'Creating...';
-
-    try {
-        const res = await fetch(`${API}/leads`, {
-            method: 'POST',
-            headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify(data)
-        });
-        if(res.ok) { 
-            toastr.success('Leads Created Successfully'); 
-            closeModal('addActivityModal'); 
-            fetchActivities(); 
-            e.target.reset(); 
-            $(e.target).find('.searchable').trigger('change');
-        } else {
-            let err = await res.json();
-            if (res.status === 400) {
-                let errorMessages = "";
-                let seenMessages = [];
-                let isFirstError = true;
-                $('.form-control').removeClass('is-invalid');
-
-                if (err.messages) {
-                    Object.entries(err.messages).forEach(([field, message]) => {
-                        let inputElement = $('[name="' + field + '"]');
-            
-                        if (inputElement.length > 0) {
-                            inputElement.addClass('is-invalid');
-                            if (isFirstError) {
-                                setTimeout(function() { inputElement.focus(); }, 100); 
-                                isFirstError = false; 
-                            }
-                        }
-                        if (!seenMessages.includes(message)) {
-                            errorMessages += `• ${message}<br>`;
-                            seenMessages.push(message);
-                        }
-                    });
-                    toastr.error(errorMessages, 'Validation Error', { allowHtml: true });
-                } else {
-                    toastr.warning(err.message || 'Validation failed', 'Warning');
-                }
-            } else {
-                toastr.error(err.message || 'Error adding lead');
-            }
-        }
-    } catch (err) {
-        toastr.error("A network error occurred.");
-    } finally {
-        // ALWAYS runs to reset button
-        submitBtn.disabled = false;
-        submitBtn.innerText = originalBtnText;
-    }
-};
-
-
-
-// Edit Lead Form Submissions
-document.getElementById('editLeadForm').onsubmit = async (e) => {
-    e.preventDefault();
-    
-    // Just grab the button variables first, DO NOT disable yet
-    const submitBtn = e.target.querySelector('button[type="submit"]');
-    const originalBtnText = submitBtn.innerText;
-
-    const data = Object.fromEntries(new FormData(e.target).entries());
-    console.log("Lead :", data);
-    
-    let leadId = data.lead_id?.trim();
-    let companyName = data.company_name?.trim();
-    let email = data.email?.trim();
-    let phone = data.phone?.trim();
-    let gst = data.gst_number?.trim();
-    
-    let companyRegex = /^[A-Za-z\s]+$/;
-    let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    let phoneRegex = /^\+?[0-9\s]{10,20}$/;
-    let gstRegex = /^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z][0-9A-Z]Z[0-9A-Z]$/;
-
-    // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field
-    function showError(message, fieldName) {
-        toastr.warning(message, 'Validation Error');
-        setTimeout(function() {
-            $('[name="' + fieldName + '"]').focus();
-        }, 100);
-    }
-
-    // --- VALIDATION CHECKS (Button is still normal here) ---
-    if (!companyName && !email && !phone && !data.assigned_to) {
-        toastr.warning('Please fill in all the required fields.');
-        return;
-    }
-
-    if (!companyName) {
-        return showError('Company Name is required.', 'company_name');
-    }
-
-    if (!companyRegex.test(companyName)) {
-        return showError('Company Name can contain only letters and spaces.', 'company_name');
-    }
-
-    if (companyName.length < 2) {
-        return showError('Company Name must be at least 2 characters.', 'company_name');
-    }
-
-    if (!email && !phone) {
-        return showError("Either Email or Phone number is required.", 'email'); 
-    }
-
-    if (email && !emailRegex.test(email)) {
-        return showError("Please enter a valid email address.", 'email');
-    }
-
-    if (phone && !phoneRegex.test(phone)) {
-        return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
-    }
-
-    if (gst && !gstRegex.test(gst)) {
-        return showError("Please enter a valid GST Number (e.g., 22AAAAA0000A1Z5).", 'gst_number');
-    }
-
-    if (!data.status) {
-        return showError("Please select a status.", 'status');
-    }
-
-    if (!data.assigned_to) {
-        return showError("Please Select the user to be Assigned.", 'assigned_to');
-    }
-
-    // --- ALL VALIDATION PASSED: Now disable button ---
-    submitBtn.disabled = true;
-    submitBtn.innerText = 'Updating...';
-
-    try {
-        const res = await fetch(`${API}/leads/${leadId}`, {
-            method: 'PUT',
-            headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify(data)
-        });
-        
-        if(res.ok) { 
-            toastr.success('Leads Updated Successfully'); 
-            closeModal('editLeadModal'); 
-            fetchActivities(); 
-            e.target.reset(); 
-            $('#savedContactsContainer').empty(); 
-            $('#NoData').show(); 
-        } else {
-            let err = await res.json();
-            if (res.status === 400) {
-                let errorMessages = "";
-                let seenMessages = [];
-                let isFirstError = true;
-                $('.form-control').removeClass('is-invalid');
-
-                if (err.messages) {
-                    Object.entries(err.messages).forEach(([field, message]) => {
-                        let inputElement = $('[name="' + field + '"]');
-            
-                        if (inputElement.length > 0) {
-                            inputElement.addClass('is-invalid');
-                            if (isFirstError) {
-                                setTimeout(function() { inputElement.focus(); }, 100); 
-                                isFirstError = false; 
-                            }
-                        }
-                        if (!seenMessages.includes(message)) {
-                            errorMessages += `• ${message}<br>`;
-                            seenMessages.push(message);
-                        }
-                    });
-                    toastr.error(errorMessages, 'Validation Error', { allowHtml: true });
-                } else {
-                    toastr.warning(err.message || 'Validation failed', 'Warning');
-                }
-            } else {
-                toastr.error(err.message || 'Error updating lead');
-            }
-        }
-    } catch (err) {
-        toastr.error("A network error occurred.");
-    } finally {
-        // ALWAYS runs to reset button
-        submitBtn.disabled = false;
-        submitBtn.innerText = originalBtnText;
-    }
-};
-
 // Activity Form Submissions
 document.getElementById('activityForm').onsubmit = async (e) => {
     e.preventDefault();
@@ -1256,6 +841,8 @@ document.getElementById('activityForm').onsubmit = async (e) => {
     let actNotes = document.getElementById('act_notes').value.trim();
     let actOwner = document.getElementById('act_owner').value.trim();
     let actLead = document.getElementById('act_lead_id').value.trim();
+    let flag = document.getElementById('act_string_flag').value; 
+
 
     // 2. Perform Validation
     if (!actLead) {
@@ -1268,8 +855,13 @@ document.getElementById('activityForm').onsubmit = async (e) => {
         return;
     }
 
+    const hasDefaultActiveType = document.querySelector('#typeButtons .d_activity_type.active');
+    if (!hasDefaultActiveType) {
+        toastr.warning('Please select an activity type.');
+        return;
+    }
     if (!selectedType) {
-        toastr.warning('Please select activity type');
+        toastr.warning('Please select an activity type.');
         return;
     }
 
@@ -1311,7 +903,11 @@ document.getElementById('activityForm').onsubmit = async (e) => {
         if (res.ok) { 
             toastr.success('Activity Created Successfully'); 
             closeModal('activityModal'); 
-            viewDetail(document.getElementById('act_lead_id').value); // Make sure lead_id is passed correctly
+            if (flag === "frompopup") { 
+                viewDetail(document.getElementById('act_lead_id').value);
+            } else { 
+                window.location.reload(); 
+            }
         } else {
             toastr.error('Failed to create activity.');
         }
@@ -1329,6 +925,8 @@ document.getElementById('activityForm').onsubmit = async (e) => {
 // Activity Timeline - complete Form Submissions
 document.getElementById('completeForm').onsubmit = async (e) => {
     e.preventDefault();
+
+    let flag = document.getElementById('string_flag').value; //"frompopup" 
     
     // 1. Grab button variables first, DO NOT disable yet
     const submitBtn = e.target.querySelector('button[type="submit"]');
@@ -1354,9 +952,14 @@ document.getElementById('completeForm').onsubmit = async (e) => {
         let fDate = document.getElementById('f_date').value.trim();
         let fAssigned = document.getElementById('f_assigned_to').value.trim();
 
+        const hasActiveType = document.querySelector('#f_typeButtons .f_activity_type.active');
+        if (!hasActiveType) {
+            toastr.warning('Please select the next activity type.');
+            return;
+        }
         // FIX: Check your global variable, not the undefined DOM element
         if (!selectedFollowUpActivityType) {
-            toastr.warning('Please Pickup Next Activity Type');
+            toastr.warning('Please select the next activity type.');
             return;
         }
 
@@ -1425,7 +1028,13 @@ document.getElementById('completeForm').onsubmit = async (e) => {
             
             // Final Actions
             closeModal('completeModal');
-            viewDetail(leadId); 
+            
+            if (flag === "frompopup") { 
+                viewDetail(leadId); 
+            } else if (flag === "frommain") { 
+                window.location.reload();
+            }
+            
             e.target.reset();
             selectedFollowUpActivityType = ''; // Reset global variable
             
@@ -1458,6 +1067,7 @@ document.getElementById('completeForm').onsubmit = async (e) => {
         submitBtn.innerText = originalBtnText;
     }
 };
+
 function submitToRedirectwithactualLeadIDUrl(){
 
         
@@ -1516,16 +1126,26 @@ document.getElementById('do_follow').addEventListener('change', function () {
 });
 
 document.getElementById('btnSaveContact').onclick = async (e) => {
-    // Use .value instead of .val()
-    let name = document.getElementById('contact_name').value.trim();
-    let mobile = document.getElementById('contact_mobile').value.trim();
-    let lead_id = document.getElementById('lead_id').value.trim();
+    e.preventDefault(); // Prevent accidental form submission
 
+    // 1. Get and Trim Values
+    const nameInput = document.getElementById('contact_name');
+    const mobileInput = document.getElementById('contact_mobile');
+    const leadIdInput = document.getElementById('lead_id');
+
+    const name = nameInput.value.trim();
+    const mobile = mobileInput.value.trim();
+    const lead_id = leadIdInput.value.trim();
+
+    // 2. Simple Client-Side Validation
     if (!name || !mobile) {
         return toastr.warning('Please enter both contact person name and mobile number.');
     }
-
     let payload = { lead_id: lead_id, name: name, mobile: mobile };
+    // Reset previous error states
+    document.querySelectorAll('.is-invalid').forEach(el => el.classList.remove('is-invalid'));
+
+    
     
     try {
         const res = await fetch(`${API}/contacts`, {
@@ -1534,19 +1154,19 @@ document.getElementById('btnSaveContact').onclick = async (e) => {
             body: JSON.stringify(payload)
         });
 
-        const result = await res.json(); // Get the response body
+        const result = await res.json(); 
 
         if (res.ok) {
-            // Clear inputs
-            document.getElementById('contact_name').value = '';
-            document.getElementById('contact_mobile').value = '';
+            // Success: Clear inputs
+            nameInput.value = '';
+            mobileInput.value = '';
             
-            // Hide "No Data" message
+            // Hide "No Data" message if it exists
             const noData = document.getElementById('NoData');
             if(noData) noData.style.display = 'none';
 
-            // Create the HTML string
-            let contactHtml = `
+            // Generate HTML for the new contact
+            const contactHtml = `
                 <div class="contact-card d-flex justify-content-between align-items-center mb-2 p-2" 
                      style="background: #f8f8f8; border-radius: 8px;" 
                      data-id="${result.data.contact_id}">
@@ -1554,45 +1174,44 @@ document.getElementById('btnSaveContact').onclick = async (e) => {
                         <div class="fw-bold">${result.data.name}</div>
                         <div class="text-muted">${result.data.mobile}</div>
                     </div>
-                    <button type="button" 
-                            class="btn btn-danger btn-sm btnRemoveContact" 
-                            data-id="${result.data.contact_id}">
-                        Remove
-                    </button>
+                    <div>
+                        <button type="button" 
+                                class="btn btn-danger btn-sm btnRemoveContact" 
+                                data-id="${result.data.contact_id}">
+                            Remove
+                        </button>
+                    </div>
                 </div>
             `;
 
-            // <button type="button" 
+             // <button type="button" 
                             // class="btn btn-secondary btn-sm btnEditContact" 
                             // data-id="${result.data.contact_id}">
                         // Update
                     // </button>
-            // Append to container using Vanilla JS
+            // Append to container
             document.getElementById('savedContactsContainer').insertAdjacentHTML('beforeend', contactHtml);
             toastr.success('Contact saved successfully');
         } else {
-            let err = await res.json();
+            // Handle Errors using the 'result' we already parsed
             if (res.status === 400) {
                 let errorMessages = "";
                 let seenMessages = [];
-                if (err.messages) {
-                    Object.entries(err.messages).forEach(([field, message]) => {
-                        let inputElement = $('[name="' + field + '"]');
-            
-                        if (inputElement.length > 0) {
-                            // Make the field box turn red so the user sees it immediately
-                            inputElement.addClass('is-invalid');
+                let isFirstError = true; // Fixed: Variable initialization
 
-                            // Focus on the first error field
+                if (result.messages) {
+                    Object.entries(result.messages).forEach(([field, message]) => {
+                        // Find element by name attribute (Vanilla JS)
+                        let inputElement = document.querySelector(`[name="${field}"]`);
+            
+                        if (inputElement) {
+                            inputElement.classList.add('is-invalid');
                             if (isFirstError) {
-                                // The 100ms delay safely bypasses Bootstrap's modal focus block
-                                setTimeout(function() {
-                                    inputElement.focus();
-                                }, 100); 
-                                
+                                setTimeout(() => inputElement.focus(), 100); 
                                 isFirstError = false; 
                             }
                         }
+
                         if (!seenMessages.includes(message)) {
                             errorMessages += `• ${message}<br>`;
                             seenMessages.push(message);
@@ -1600,16 +1219,15 @@ document.getElementById('btnSaveContact').onclick = async (e) => {
                     });
                     toastr.error(errorMessages, 'Validation Error', { allowHtml: true });
                 } else {
-                    toastr.warning(err.message || 'Validation failed', 'Warning');
+                    toastr.warning(result.message || 'Validation failed');
                 }
+            } else {
+                toastr.error(result.message || 'An error occurred while saving.');
             }
-            else {
-                toastr.error(err.message || 'Error adding lead');
-            }
-    }
+        }
     } catch (error) {
-        console.error(error);
-        toastr.error('An error occurred');
+        console.error("Fetch Error:", error);
+        toastr.error('Network error or server is unreachable.');
     }
 };
     
@@ -1645,73 +1263,6 @@ document.getElementById('savedContactsContainer').onclick = async (e) => {
     }
 };
 
-async function openEditLeadModal(id) {
-    // 1. Reset UI State
-    document.getElementById('hidden_lead_id').value = id;
-    const container = $('#savedContactsContainer');
-    // Remove only previous contact cards, keep the NoData span for now
-    container.find('.contact-card').remove();
-    
-    try {
-        // 2. Fetch Lead Details
-        const response = await fetch(`${API}/leads/${id}`);
-        if (!response.ok) throw new Error('Failed to fetch lead');
-        
-        const result = await response.json();
-        
-        // IMPORTANT: Your data is nested inside result.data
-        const lead = result.data; 
-
-        // 3. Populate Form Fields
-        const form = document.getElementById('editLeadForm');
-        
-        // Mapping fields carefully
-        form.querySelector('[name="company_name"]').value = lead.company_name || '';
-        form.querySelector('[name="email"]').value = lead.email || '';
-        form.querySelector('[name="phone"]').value = lead.phone || '';
-        form.querySelector('[name="address"]').value = lead.address || '';
-        form.querySelector('[name="website"]').value = lead.website || '';
-        form.querySelector('[name="gst_number"]').value = lead.gst_number || '';
-        form.querySelector('[name="status"]').value = lead.status || 'New';
-        form.querySelector('[name="assigned_to"]').value = lead.assigned_to || '';
-        $(form.querySelector('[name="assigned_to"]')).trigger('change');
-
-        // 4. Handle Contact Persons (Looping through the nested array)
-        const contacts = lead.contact_persons; // Array from your JSON
-
-        if (contacts && contacts.length > 0) {
-            $('#NoData').hide();
-            
-            contacts.forEach(contact => {
-                let contactHtml = `
-                    <div class="contact-card d-flex justify-content-between align-items-center mb-2 p-3" 
-                         style="background: #f8f8f8; border-radius: 8px;" 
-                         data-id="${contact.contact_id}">
-                        <div>
-                            <div class="fw-bold">${contact.name}</div>
-                            <div class="text-muted">${contact.mobile}</div>
-                        </div>
-                        <button type="button" 
-                                class="btn btn-danger btn-sm btnRemoveContact" 
-                                data-id="${contact.contact_id}">
-                            Remove
-                        </button>
-                    </div>`;
-                container.append(contactHtml);
-            });
-        } else {
-            $('#NoData').show();
-        }
-
-        // 5. Open the Modal
-        openModal('editLeadModal');
-
-    } catch (error) {
-        console.error("Error loading lead data:", error);
-        alert("Could not load lead details. Check console for details.");
-    }
-}
-
 function convertDBFormatted(input) {
 
     if (!input) return null;
@@ -1739,6 +1290,7 @@ function convertDBFormatted(input) {
         seconds.padStart(2, '0')
     );
 }
+
 fetchActivities();
 
 </script>
\ No newline at end of file
diff --git a/app/Views/sales/branch_level_dashboard_view.php b/app/Views/sales/branch_level_dashboard_view.php
index 3a9d13cc..66d98d13 100644
--- a/app/Views/sales/branch_level_dashboard_view.php
+++ b/app/Views/sales/branch_level_dashboard_view.php
@@ -9,6 +9,38 @@
     .stat-change { font-size: 11px; margin-top: 8px; font-weight: 600; }
     .text-success { color: #48bb78; }
 
+    .card-hero { 
+    background: white; 
+    padding: 25px; 
+    border-radius: 12px; 
+    border: 1px solid #edf2f7; 
+    box-shadow: 0 4px 6px rgba(0,0,0,0.05);
+    position: relative;
+    overflow: hidden;
+    transition: transform 0.2s ease;
+}
+
+/* The Gradient Overlay Effect */
+.card-hero::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 4px; /* Thin line at the top */
+    background: linear-gradient(90deg, #4facfe 0%, #00f2fe 100%);
+}
+
+.card-hero:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 10px 15px rgba(0,0,0,0.1);
+}
+
+/* Optional: Subtle Background Gradient */
+.card-hero.gradient-bg {
+    background: linear-gradient(135deg, #ffffff 0%, #f8faff 100%);
+}
+
     .main-grid { display: grid; grid-template-columns: 2fr 1fr; gap: 20px; margin-bottom: 30px; }
     .table-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; }
     
@@ -29,10 +61,18 @@
     .status-pill { padding: 4px 12px; border-radius: 20px; font-size: 11px; font-weight: 700; display: inline-block; }
     .status-completed { background: #f0fff4; color: #38a169; }
     .status-pending { background: #fffaf0; color: #dd6b20; }
+    .status-new { background: #e3f2fd; color: #1976d2; }
+    .status-potential { background: #fff3e0; color: #f57c00; }
+    .status-prospects { background: #e8f5e9; color: #388e3c; }
+    .status-not-a-prospects { background: #ffebee;  color: #d32f2f; }
+
+    .empty-state { text-align: center; padding: 60px 20px; color: #999; }
+    .empty-icon { width: 80px; height: 80px; margin: 0 auto 20px; background: #f5f5f5; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-size: 36px; }
+
 </style>
 
 <div class="dash-container">
-    <div class="top-header">
+    <!-- <div class="top-header">
         <div>
             <h2 style="font-weight: 800; color: #1a202c; font-size: 24px;">Dashboard</h2>
             <p style="color: #718096; font-size: 14px; margin-top: 4px;">Overview of your branch</p>
@@ -40,29 +80,34 @@
         <div style="position: relative;">
             <input type="text" placeholder="Search leads, activities....." style="background:white; padding:12px 20px; border-radius:10px; border:1px solid #e2e8f0; width: 350px; font-size: 13px;">
         </div>
-    </div>
+    </div> -->
 
     <div class="stat-cards">
-        <div class="card">
-            <div class="stat-val">4</div>
+        <div class="card-hero">
+            <div class="stat-val"><?php echo $total_leads; ?></div>
             <div class="stat-label">Total Leads</div>
-            <div class="stat-change text-success">↑ 12% this month</div>
+            <!-- <div class="stat-change text-success">↑ 12% this month</div> -->
         </div>
-        <div class="card">
-            <div class="stat-val">6</div>
+        <div class="card-hero">
+            <div class="stat-val"><?php echo $total_activities ?></div>
             <div class="stat-label">Total Activities</div>
-            <div class="stat-change text-success">↑ 5% this month</div>
+            <!-- <div class="stat-change text-success">↑ 5% this month</div> -->
         </div>
-        <div class="card">
-            <div class="stat-val">1</div>
+        <div class="card-hero">
+            <div class="stat-val"><?php echo ($total_activities - $completed_acts) ?></div>
+            <div class="stat-label">Pending Activities</div>
+            <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
+        </div>
+        <div class="card-hero">
+            <div class="stat-val"><?php echo $completed_acts ?></div>
             <div class="stat-label">Completed Activities</div>
-            <div class="stat-change text-success">↑ 15% this month</div>
+            <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
         </div>
-        <div class="card">
+        <!-- <div class="card">
             <div class="stat-val">₹15.0L</div>
             <div class="stat-label">Pipeline Value</div>
             <div class="stat-change text-success">↑ 18% this month</div>
-        </div>
+        </div> -->
     </div>
 
     <div class="main-grid">
@@ -81,62 +126,117 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td><strong>Venba Infotech</strong></td>
-                        <td>
-                            <div style="color: #ff6b35; font-weight: 700; font-size: 11px;">CALL</div>
-                            <div style="font-size: 12px; color: #718096;">John Doe</div>
-                        </td>
-                        <td style="color: #4a5568; font-weight: 500;">20 Feb 2026</td>
-                        <td><span class="status-pill status-completed">Completed</span></td>
-                    </tr>
-                    <tr>
-                        <td><strong>Acme Corporation</strong></td>
-                        <td>
-                            <div style="color: #ff6b35; font-weight: 700; font-size: 11px;">EMAIL</div>
-                            <div style="font-size: 12px; color: #718096;">John Doe</div>
-                        </td>
-                        <td style="color: #4a5568; font-weight: 500;">20 Feb 2026</td>
-                        <td><span class="status-pill status-pending">Pending</span></td>
-                    </tr>
+                    <?php if (!empty($recent_acts)): ?>
+                        <?php foreach ($recent_acts as $a): ?>
+                            <?php
+                                $activityIcons = [
+                                    'Call'    => '📞',
+                                    'Email'   => '✉️',
+                                    'Meeting' => '📅',
+                                    'Visit'   => '🚗',
+                                    'Demo'    => '🎬',
+                                    'Share'   => '📄',
+                                    'Todo'    => '✓'
+                                ];
+                                $icon = $activityIcons[$a['activity_type']] ?? '📌';
+                                $statusClass = strtolower(str_replace(' ', '-', $a['status']));
+                                $formattedDate = date('d M Y', strtotime($a['scheduled_date']));
+                            ?>
+                            <tr>
+                                <td><strong><?= esc($a['company_name']) ?></strong></td>
+                                <td>
+                                    <div style="color: #ff6b35; font-weight: 700; font-size: 11px;">
+                                        <?= $icon ?> <?= strtoupper(esc($a['activity_type'])) ?>
+                                    </div>
+                                    <div style="font-size: 12px; color: #718096;">
+                                        <?= esc($a['assigned_to_name'] ?? 'ID: ' . $a['assigned_to']) ?>
+                                    </div>
+                                </td>
+                                <td style="color: #4a5568; font-weight: 500;"><?= $formattedDate ?></td>
+                                <td><span class="status-pill status-<?= $statusClass ?>"><?= ucfirst(esc($a['status'])) ?></span></td>
+                            </tr>
+                        <?php endforeach; ?>
+                    <?php else: ?>
+                        <tr>
+                            <td colspan="4">
+                                <div class="empty-state">
+                                    <div class="empty-icon">✓</div> No activities found
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endif; ?>
                 </tbody>
             </table>
         </div>
 
         <div>
             <div class="card">
+                
                 <h3 style="font-size: 16px; font-weight: 700; margin-bottom: 15px;">Sales Team Performance</h3>
-                <div class="team-member">
-                    <div class="member-img" style="background: #ff6b35;">V</div>
-                    <div style="flex: 1;">
-                        <div style="font-weight: 700; font-size: 14px;">Venkat 3.0</div>
-                        <div style="font-size: 11px; color: #718096;">Sales Manager</div>
-                    </div>
-                    <div class="act-stats">
-                        <div class="total">6 acts</div>
-                        <div class="done">1 done</div>
-                    </div>
-                </div>
-                <div class="team-member">
-                    <div class="member-img" style="background: #4a5568;">P</div>
-                    <div style="flex: 1;">
-                        <div style="font-weight: 700; font-size: 14px;">Pavi_the_Staff V</div>
-                        <div style="font-size: 11px; color: #718096;">Sales Staff</div>
-                    </div>
-                    <div class="act-stats">
-                        <div class="total">0 acts</div>
-                        <div class="done">0 done</div>
-                    </div>
-                </div>
-            </div>
+                <?php foreach ($team as $member) {
+                    $firstLetter = strtoupper(substr($member['first_name'], 0, 1));
+                    $fullName = $member['first_name'] . ' ' . $member['last_name'];
+                    $totalActs = $member['total_acts'];
+                    $doneActs = $member['done_acts'];
+                    $role = $member['role']; // fix your DB first
+                    
+                    // Random or consistent color based on name
+                    $colors = ['#ff6b35', '#667eea', '#48bb78', '#ed8936', '#9f7aea'];
+                    $colorIndex = abs(crc32($member['first_name'])) % count($colors);
+                    $color = $colors[$colorIndex];
+    
+                    echo "
+                    <div class='team-member'>
+                        <div class='member-img' style='background: {$color};'>{$firstLetter}</div>
+                        <div style='flex: 1;'>
+                            <div style='font-weight: 700; font-size: 14px;'>{$fullName}</div>
+                            <div style='font-size: 11px; color: #718096;'>{$role}</div>
+                        </div>
+                        <div class='act-stats'>
+                            <div class='total'>{$totalActs} acts</div>
+                            <div class='done'>{$doneActs} done</div>
+                        </div>
+                    </div>";
+                } ?>
 
+                
             <div class="card breakdown-card">
                 <h3 style="font-size: 15px; font-weight: 700; margin-bottom: 20px;">Activity Breakdown</h3>
-                <div class="breakdown-item"><span><span class="dot" style="background: #ff6b35;"></span> Call</span><strong>42%</strong></div>
+                <!-- <div class="breakdown-item"><span><span class="dot" style="background: #ff6b35;"></span> Call</span><strong>42%</strong></div>
                 <div class="breakdown-item"><span><span class="dot" style="background: #48bb78;"></span> Email</span><strong>25%</strong></div>
                 <div class="breakdown-item"><span><span class="dot" style="background: #4299e1;"></span> Meeting</span><strong>18%</strong></div>
                 <div class="breakdown-item"><span><span class="dot" style="background: #ecc94b;"></span> Visit</span><strong>10%</strong></div>
-                <div class="breakdown-item"><span><span class="dot" style="background: #9f7aea;"></span> Demo</span><strong>5%</strong></div>
+                <div class="breakdown-item"><span><span class="dot" style="background: #9f7aea;"></span> Demo</span><strong>5%</strong></div> -->
+                <?php
+                    $activityConfig = [
+                        'Call'    => ['color' => '#ff6b35', 'icon' => '📞'],
+                        'Email'   => ['color' => '#48bb78', 'icon' => '✉️'],
+                        'Meeting' => ['color' => '#4299e1', 'icon' => '📅'],
+                        'Visit'   => ['color' => '#ecc94b', 'icon' => '🚗'],
+                        'Demo'    => ['color' => '#9f7aea', 'icon' => '🎬'],
+                        'Share'   => ['color' => '#ed8936', 'icon' => '📄'],
+                        'Todo'    => ['color' => '#718096', 'icon' => '✓'],
+                    ];
+                    ?>
+
+                    <?php if (!empty($activity_breakdown)): ?>
+                        <?php foreach ($activity_breakdown as $item): ?>
+                            <?php 
+                                $type   = $item['activity_type'];
+                                $color  = $activityConfig[$type]['color'] ?? '#718096';
+                                $icon   = $activityConfig[$type]['icon']  ?? '📌';
+                            ?>
+                            <div class="breakdown-item">
+                                <span>
+                                    <span class="dot" style="background: <?= $color ?>;"></span>
+                                    <?= $icon ?> <?= esc($type) ?>
+                                </span>
+                                <strong><?= $item['percentage'] ?>%</strong>
+                            </div>
+                        <?php endforeach; ?>
+                    <?php else: ?>
+                        <div class="empty-state">No activities found</div>
+                    <?php endif; ?>
             </div>
         </div>
     </div>
@@ -157,20 +257,24 @@
                 </tr>
             </thead>
             <tbody>
-                <tr>
-                    <td><strong>Venba Infotech</strong></td>
-                    <td><span style="background: #edf2f7; color: #4a5568; font-size: 10px; padding: 3px 10px; border-radius: 12px; font-weight: 700; text-transform: uppercase;">New</span></td>
-                    <td style="color: #4a5568;">John Doe</td>
-                    <td><div style="text-align: center; font-weight: 700;">1</div></td>
-                    <td><div style="text-align: center; font-weight: 700;">1</div></td>
-                </tr>
-                <tr>
-                    <td><strong>Acme Corporation</strong></td>
-                    <td><span style="background: #fff3e0; color: #f57c00; font-size: 10px; padding: 3px 10px; border-radius: 12px; font-weight: 700; text-transform: uppercase;">Potential</span></td>
-                    <td style="color: #4a5568;">John Doe</td>
-                    <td><div style="text-align: center; font-weight: 700;">1</div></td>
-                    <td><div style="text-align: center; font-weight: 700;">0</div></td>
-                </tr>
+                <?php if (!empty($leads_overview)): ?>
+                    <?php foreach ($leads_overview as $lead): ?>
+                        <?php $statusClass = strtolower(str_replace(' ', '-', $lead['status'])); ?>
+                        <tr>
+                            <td><strong><?= esc($lead['company_name']) ?></strong></td>
+                            <td><span class="status-pill status-<?= $statusClass ?>"><?= esc($lead['status']) ?></span></td>
+                            <td><?= esc($lead['assigned_to'] ?? 'Unassigned') ?></td>
+                            <td><div style="text-align: center; font-weight: 700;"><?= $lead['activities'] ?></div></td>
+                            <td><div style="text-align: center; font-weight: 700;"><?= $lead['opportunities'] ?></div></td>
+                        </tr>
+                    <?php endforeach; ?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="5">
+                            <div class="empty-state">No leads found</div>
+                        </td>
+                    </tr>
+                <?php endif; ?>
             </tbody>
         </table>
     </div>
diff --git a/app/Views/sales/sales_manager_level_dashboard.php b/app/Views/sales/sales_manager_level_dashboard.php
index e103759c..5fc0483e 100644
--- a/app/Views/sales/sales_manager_level_dashboard.php
+++ b/app/Views/sales/sales_manager_level_dashboard.php
@@ -19,6 +19,35 @@
     
     .lead-initial { width: 35px; height: 35px; background: #f0f0f0; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-weight: bold; color: #ff6b35; }
     .status-pill { font-size: 10px; padding: 2px 10px; border-radius: 12px; font-weight: 600; }
+
+    /* Modals */
+    .modal { display: none; position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); z-index: 2000; align-items: center; justify-content: center; }
+    .modal.active { display: flex; }
+    .modal-content { background: white; border-radius: 12px; width: 90%; max-width: 800px; max-height: 90vh; overflow-y: auto; display: flex; flex-direction: column; }
+    .modal-header { padding: 5px 25px; border-bottom: 1px solid #e0e0e0; display: flex; justify-content: space-between; align-items: center; }
+    .modal-body { padding: 25px; flex: 1; }
+    .form-group { margin-bottom: 20px; }
+    .form-label { display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; }
+    .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 15px; }
+
+    .empty-state { text-align: center; padding: 60px 20px; color: #999; }
+    .empty-icon { width: 80px; height: 80px; margin: 0 auto 20px; background: #f5f5f5; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-size: 36px; }
+    input, select, textarea { background-color: white !important; border-radius: 6px !important; box-shadow: none !important; border-color: #ddd !important; }
+    input, select, textarea { width: 400px; padding: 10px 15px; border: 1px solid #e0e0e0; border-radius: 8px; font-size: 14px; outline: none; }
+    input:focus, select:focus, textarea:focus { border-color: #ff6b35; outline: none; /* removes blue browser outline */ }
+    .modal .form-control { transition: 0.2s ease; }
+
+    .modal .form-control:focus { border-color: #ff6b35; box-shadow: 0 0 0 2px rgba(255, 107, 53, 0.2);
+        outline: none;
+    }
+
+    .btn-primary { background: #ff6b35; color: white; border: none; padding: 10px 20px; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 500; transition: all 0.2s; }
+    .btn-primary:hover { background: #ff5722; transform: translateY(-1px); }
+    .btn-complete { background: #4caf50; color: white; border: none;padding: 8px 16px; border-radius: 6px; cursor: pointer; font-size: 13px; transition: all 0.2s;}
+    .btn-complete:hover { background: #4caf50; transform: translateY(-1px); }
+    .btn-view { background: #f0f0f0; color: #666; border: none; padding: 8px 16px; border-radius: 6px; cursor: pointer; font-size: 13px; transition: all 0.2s;}
+    .btn-view:hover { background: #f0f0f0; transform: translateY(-1px); }
+
 </style>
 
 <div class="my-dash">
@@ -82,7 +111,7 @@
                     <div style="font-weight:600; font-size:14px; color: #333;"><?= $u['company_name'] ?></div>
                     <div style="font-size:11px; color:#999; margin-top: 3px;"><?= strtoupper($u['activity_type'] ?? 'EMAIL') ?> - <?= date('d Mar Y', strtotime($u['scheduled_date'])) ?></div>
                 </div>
-                <button class="badge-done">✓ Mark as completed</button>
+                <button class="badge-done" onclick="openComp(<?= $u['activity_id'] ?>,<?= $u['lead_id'] ?>)">✓ Mark as completed</button>
             </div>
             <?php endforeach; ?>
         </div>
@@ -105,20 +134,141 @@
     </div>
 </div>
 
+<div class="modal" id="completeModal">
+    <div class="modal-content" style="max-width: 675px;">
+        <div class="modal-header">
+            <h3>Complete Activity</h3>
+            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('completeModal')">&times;</button>
+        </div>
+        <form class="parsley-examples" id="completeForm" enctype="multipart/form-data"> 
+         <hr class="my-0">
+         <div class="modal-body p-4">
+        
+            <input type="hidden" id="comp_id">
+            <input type="hidden" id="lead_id">
+            <div class="form-group">
+                <label class="form-label">Outcome / Notes <span class="text-danger">*</span></label>
+                <textarea id="comp_notes" class="search-input" style="width:100%; height:80px;" required placeholder="What happened? Any next steps?" rows="3" required></textarea>
+            </div>
+         </div>
+         <div class="modal-footer">
+                        <div class="form-group text-right mb-0">
+                               <button type="button" class="btn-primary" style="background:#eee; color:#333; margin-right:10px;" onclick="closeModal('completeModal')">Cancel</button>
+                               <button type="submit" class="btn-primary">Submit Outcome</button>
+                        </div>
+         </div>
+        </form>
+    </div>
+</div>
+
 <script>
 
-document.addEventListener('DOMContentLoaded', function () {
-    const params = new URLSearchParams(window.location.search);
-    const fy = params.get('fy');
-    if (fy) {
-        document.getElementById('financial_year').value = fy;
-    }
-});
+    const API = '<?= base_url('sales') ?>';
+    function openModal(id) { document.getElementById(id).classList.add('active');  }
 
-function onFinancialYearChange(select) {
-    const url = new URL(window.location.href);
-    url.searchParams.set('fy', select.value);
-    window.location.href = url.toString();
-}
+    function openComp(id, lead_id) {
+
+        document.getElementById('completeForm').reset();
+        document.getElementById('comp_id').value = id;
+        document.getElementById('lead_id').value = lead_id;
+        openModal('completeModal');
+    }
+    document.getElementById('completeForm').onsubmit = async (e) => {
+        e.preventDefault();
+        
+        // 1. Grab button variables first, DO NOT disable yet
+        const submitBtn = e.target.querySelector('button[type="submit"]');
+        const originalBtnText = submitBtn.innerText;
+        
+        // 2. Capture values into variables
+        const activityId = document.getElementById('comp_id').value;
+        const leadId = document.getElementById('lead_id').value;
+        
+        // This creates a TRUE or FALSE boolean
+        let compNotes = document.getElementById('comp_notes').value.trim();
+
+        // --- VALIDATION CHECKS (Button is still normal here) ---
+        if (compNotes === '') {
+            toastr.warning('Completion notes is required');
+            return;
+        }
+
+        // --- ALL VALIDATION PASSED: Now disable button ---
+        submitBtn.disabled = true;
+        submitBtn.innerText = 'Submitting...';
+
+        try {
+            const payload = {
+                completion_notes: compNotes, // Use the already trimmed variable
+                create_followup: 'no',
+            };
+            
+            // Mark current activity complete
+            const res = await fetch(`${API}/activities/${activityId}/complete`, {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify(payload)
+            });
+
+            if (res.ok) {
+                toastr.success('Updated Successfully');
+                // Final Actions
+                closeModal('completeModal');
+                
+                e.target.reset();
+
+                window.location.reload();
+                
+            } else {
+                let err = await res.json();
+                if (res.status === 400) {
+                    let errorMessages = "";
+                    let seenMessages = [];
+
+                    if (err.messages) {
+                        Object.entries(err.messages).forEach(([field, message]) => {
+                            if (!seenMessages.includes(message)) {
+                                errorMessages += `• ${message}<br>`;
+                                seenMessages.push(message);
+                            }
+                        });
+                        toastr.error(errorMessages, 'Validation Error', { allowHtml: true });
+                    } else {
+                        toastr.warning(err.message || 'Validation failed', 'Warning');
+                    }
+                } else {
+                    toastr.error(err.message || 'Error completing activity');
+                }
+            }
+        } catch (err) {
+            toastr.error("A network error occurred.");
+        } finally {
+            // ALWAYS runs to reset button
+            submitBtn.disabled = false;
+            submitBtn.innerText = originalBtnText;
+        }
+    };
+
+    function closeModal(id) {
+        const modal = document.getElementById(id);
+        if (modal) {
+            modal.classList.remove('active'); // Hide the modal
+            const form = modal.querySelector('form'); // Find the form inside this specific modal
+        }
+    }
+
+    document.addEventListener('DOMContentLoaded', function () {
+        const params = new URLSearchParams(window.location.search);
+        const fy = params.get('fy');
+        if (fy) {
+            document.getElementById('financial_year').value = fy;
+        }
+    });
+
+    function onFinancialYearChange(select) {
+        const url = new URL(window.location.href);
+        url.searchParams.set('fy', select.value);
+        window.location.href = url.toString();
+    }
 
 </script>
\ No newline at end of file
diff --git a/app/Views/sales/tracker_view.php b/app/Views/sales/tracker_view.php
index d2c3085d..389ec1a1 100644
--- a/app/Views/sales/tracker_view.php
+++ b/app/Views/sales/tracker_view.php
@@ -276,15 +276,17 @@
          <div class="modal-body p-4">
         
             <input type="hidden" id="act_lead_id">
-            <label class="form-label">Activity Type</label>
+            <label class="form-label">Activity Type <span class="text-danger">*</span></label>
             <div class="activity-types" id="typeButtons">
-                <button type="button" class="activity-type-btn active" onclick="selectType('Call', this)">📞 Call</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Email', this)">✉️ Email</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Meeting', this)">📅 Meeting</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Visit', this)">🚗 Visit</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Demo', this)">🎬 Demo</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Share', this)">📄 Share Docs</button>
-                <button type="button" class="activity-type-btn" onclick="selectType('Todo', this)">✓ To Do</button>
+                
+                <button type="button" class="activity-type-btn d_activity_type active" data-type="Call" onclick="selectType('Call', this)">📞 Call</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Email" onclick="selectType('Email', this)">✉️ Email</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Meeting" onclick="selectType('Meeting', this)">📅 Meeting</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Visit" onclick="selectType('Visit', this)">🚗 Visit</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🎬 Demo</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Share" onclick="selectType('Share', this)">📄 Share Docs</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Todo" onclick="selectType('Todo', this)">✓ To Do</button>
+                
             </div>
             <div class="form-group">
                 <label class="form-label">Notes <span class="text-danger">*</span></label>
@@ -650,11 +652,11 @@ function closeModal(id) {
 
         // Specific cleanup for your "Activity" logic
         if (id === 'activityModal') {
-            selectedType = 'Call'; // Reset your global activity type variable
-            $('.activity-type-btn').removeClass('active'); // Remove 'active' from all activity buttons
-            $(`.activity-type-btn[data-type="${selectedType}"]`).addClass('active'); // Find the specific button for 'Call' and make it active
+            selectedType = 'Call';
+            $('#typeButtons .d_activity_type').removeClass('active');
+            $('#typeButtons .d_activity_type[data-type="Call"]').addClass('active'); // ✅
         }
-        
+
         // Specific cleanup for "Complete" modal (hidden follow-up sections)
         if (id === 'completeModal') {
             const fUpSection = document.getElementById('f_up');
@@ -666,7 +668,7 @@ function closeModal(id) {
         // Specific action for leadDetailModal
         if (id === 'leadDetailModal') {
             switchTab('activity'); // Reset the tab back to 'activity'
-            document.getElementById('btn_add_opportunity').classList.style.display = 'none'; // Hide the button
+            document.getElementById('btn_add_opportunity').style.display = 'none';
         }
     }
 }
@@ -1294,11 +1296,15 @@ document.getElementById('activityForm').onsubmit = async (e) => {
         toastr.warning('Notes is required');
         return;
     }
-
-    if (!selectedType) {
-        toastr.warning('Please select activity type');
+    const hasDefaultActiveType = document.querySelector('#typeButtons .d_activity_type.active');
+    if (!hasDefaultActiveType) {
+        toastr.warning('Please select an activity type.');
         return;
     }
+    if (!selectedType) {
+            toastr.warning('Please select an activity type.');
+            return;
+    }
 
     if (!feFormat.trim()) {
         toastr.warning('Scheduled date & time is required');
@@ -1337,6 +1343,11 @@ document.getElementById('activityForm').onsubmit = async (e) => {
 
         if (res.ok) { 
             toastr.success('Activity Created Successfully'); 
+            selectedType = 'Call'; // Reset your global activity type variable    
+            // Remove 'active' from all activity buttons
+            $('.activity-type-btn').removeClass('active'); 
+            // Add 'active' to the specific button using backticks for the template literal
+            $(`.activity-type-btn[onclick*="'${selectedType}'"]`).addClass('active');
             closeModal('activityModal'); 
             viewDetail(document.getElementById('act_lead_id').value); // Make sure lead_id is passed correctly
         } else {
@@ -1382,8 +1393,13 @@ document.getElementById('completeForm').onsubmit = async (e) => {
         let fAssigned = document.getElementById('f_assigned_to').value.trim();
 
         // FIX: Check your global variable, not the undefined DOM element
+        const hasActiveType = document.querySelector('#f_typeButtons .f_activity_type.active');
+        if (!hasActiveType) {
+            toastr.warning('Please select the next activity type.');
+            return;
+        }
         if (!selectedFollowUpActivityType) {
-            toastr.warning('Please Pickup Next Activity Type');
+            toastr.warning('Please select the next activity type.');
             return;
         }
         // if (!selectedFollowUpActivityType) {

From 6f3032d20d9e7d5351558841c6ee3cc6fb022c99 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Thu, 26 Feb 2026 09:51:35 +0530
Subject: [PATCH 03/12] FIX_SalesTracker3

---
 app/Views/sales/activity_view.php | 16 ++++++++++------
 app/Views/sales/tracker_view.php  | 12 +++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/Views/sales/activity_view.php b/app/Views/sales/activity_view.php
index b997a73f..46833e9f 100644
--- a/app/Views/sales/activity_view.php
+++ b/app/Views/sales/activity_view.php
@@ -431,8 +431,7 @@ function resetFlatpicker(){
 
 const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🎬", Share: "📄", Todo: "✓" };
 const salesManagerIds = <?= json_encode($sales_manager_ids ?? []) ?>;
-console.log("***********************");
-console.log(salesManagerIds);return;
+
 const API = '<?= base_url('sales') ?>';
 let filter = 'all';
 let lead_id = null;
@@ -1124,8 +1123,9 @@ document.getElementById('do_follow').addEventListener('change', function () {
         selectedFollowUpActivityType = ''; // Reset global variable
     }
 });
-
-document.getElementById('btnSaveContact').onclick = async (e) => {
+const btnSaveContact = document.getElementById('btnSaveContact');
+if (btnSaveContact) {
+    btnSaveContact.onclick = async (e) => {
     e.preventDefault(); // Prevent accidental form submission
 
     // 1. Get and Trim Values
@@ -1229,9 +1229,12 @@ document.getElementById('btnSaveContact').onclick = async (e) => {
         console.error("Fetch Error:", error);
         toastr.error('Network error or server is unreachable.');
     }
-};
+ };
+}
     
-document.getElementById('savedContactsContainer').onclick = async (e) => {
+const savedContactsContainer = document.getElementById('savedContactsContainer');
+if (savedContactsContainer) {
+    savedContactsContainer.onclick = async (e) => {
     // Check if the clicked element is a Remove button
     if (e.target.classList.contains('btnRemoveContact')) {
         const btn = e.target;
@@ -1262,6 +1265,7 @@ document.getElementById('savedContactsContainer').onclick = async (e) => {
         }
     }
 };
+}
 
 function convertDBFormatted(input) {
 
diff --git a/app/Views/sales/tracker_view.php b/app/Views/sales/tracker_view.php
index 389ec1a1..3ceb43a6 100644
--- a/app/Views/sales/tracker_view.php
+++ b/app/Views/sales/tracker_view.php
@@ -1580,7 +1580,9 @@ document.getElementById('do_follow').addEventListener('change', function () {
     }
 });
 
-document.getElementById('btnSaveContact').onclick = async (e) => {
+const btnSaveContact = document.getElementById('btnSaveContact');
+if (btnSaveContact) {
+    btnSaveContact.onclick = async (e) => {
     // Use .value instead of .val()
     let name = document.getElementById('contact_name').value.trim();
     let mobile = document.getElementById('contact_mobile').value.trim();
@@ -1677,8 +1679,11 @@ document.getElementById('btnSaveContact').onclick = async (e) => {
         toastr.error('An error occurred');
     }
 };
-    
-document.getElementById('savedContactsContainer').onclick = async (e) => {
+}
+const savedContactsContainer = document.getElementById('savedContactsContainer');
+if (savedContactsContainer) {
+    savedContactsContainer.onclick = async (e) => {
+
     // Check if the clicked element is a Remove button
     if (e.target.classList.contains('btnRemoveContact')) {
         const btn = e.target;
@@ -1709,6 +1714,7 @@ document.getElementById('savedContactsContainer').onclick = async (e) => {
         }
     }
 };
+}
 
 async function openEditLeadModal(id) {
     // 1. Reset UI State

From 98c0cea642b1788169a67d951e329997e794370e Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Thu, 26 Feb 2026 12:28:23 +0530
Subject: [PATCH 04/12] FEAT_GSHEET_POC

---
 app/Config/Routes.php                     |   9 +-
 app/Controllers/GoogleSheetController.php |  76 +++++++-
 app/Controllers/TestingController.php     |   2 +-
 app/Libraries/GoogleSheetLib.php          | 208 +++++++++++++++++++++-
 app/Views/gsheet_editor.php               |  26 ++-
 gdrive-demo-394007-5b1d856b0c5b.json      |  13 --
 nhance-app-google-drive.json              |  13 --
 nhance-ee8d1-e3c5269b1ec7.json            |  13 ++
 8 files changed, 322 insertions(+), 38 deletions(-)
 delete mode 100644 gdrive-demo-394007-5b1d856b0c5b.json
 delete mode 100644 nhance-app-google-drive.json
 create mode 100644 nhance-ee8d1-e3c5269b1ec7.json

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index efde3147..fc5ee993 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -11,10 +11,11 @@ $routes->options('(:any)', function() {
 });
 
 $routes->group('sheet', function ($routes) {
-    $routes->get('(:any)', 'GoogleSheetController::editor/$1');
-    $routes->get('(:any)/fetch', 'GoogleSheetController::fetch/$1');
-    $routes->post('(:any)/save', 'GoogleSheetController::save/$1');
-    $routes->get('(:any)/download', 'GoogleSheetController::download/$1');
+    $routes->post('create', 'GoogleSheetController::create');
+    $routes->get('(:segment)/fetch', 'GoogleSheetController::fetch/$1');
+    $routes->post('(:segment)/save', 'GoogleSheetController::save/$1');
+    $routes->get('(:segment)/download', 'GoogleSheetController::download/$1');
+    $routes->get('(:segment)', 'GoogleSheetController::editor/$1');
 });
 
 
diff --git a/app/Controllers/GoogleSheetController.php b/app/Controllers/GoogleSheetController.php
index e51f81ab..cfdd98fc 100644
--- a/app/Controllers/GoogleSheetController.php
+++ b/app/Controllers/GoogleSheetController.php
@@ -6,6 +6,35 @@ use CodeIgniter\Controller;
 class GoogleSheetController extends Controller
 {
     protected GoogleSheetLib $sheetLib;
+    public $config = [
+
+    'permissions' => [
+        'editors' => [
+            'vitvelz@gmail.com', 'velz1990@gmail.com','venkateshraman786@gmail.com'
+            // 'group:rfq-editors@company.com'
+        ],
+        'viewers' => [],
+    ],
+
+     'protections' => [
+        [
+            'range' => 'RFQ Page!B12:C12',
+            'users' => [ //allowed users to edit this cell range
+                'velz1990@gmail.com','vitvelz@gmail.com','firebase-adminsdk-mcdfe@nhance-ee8d1.iam.gserviceaccount.com'
+            ],
+            'groups' => []
+        ],
+        [
+            'range' => 'Claims Page!A1',
+            'users' => [
+                'velz1990@gmail.com','venkateshraman786@gmail.com','firebase-adminsdk-mcdfe@nhance-ee8d1.iam.gserviceaccount.com'
+            ],
+            'groups' => []
+        ]
+    ],
+
+    'parentFolderId' => '19uySI-PSFQfFpZvMSnBtirXbwfCTXFBL', // RFQ folder
+];
 
     public function __construct()
     {
@@ -23,10 +52,16 @@ class GoogleSheetController extends Controller
     /* ---------- FETCH ---------- */
     public function fetch(string $sheetId)
     {
-        // $data = $this->sheetLib->read($sheetId);
+        $data = $this->sheetLib->read($sheetId);
         // print_rr($data);die;
-        // return $this->response->setJSON($data);
-        echo 'Hi';
+        return $this->response->setJSON($data);
+        // echo 'Hi';
+    }
+
+    public function sample(string $sheetId)
+    {
+        echo $sheetId;
+
     }
 
     /* ---------- SAVE ---------- */
@@ -63,4 +98,39 @@ class GoogleSheetController extends Controller
             )
             ->setBody($content);
     }
+
+     public function create()
+    {
+        try {
+            $config = config('RfqConfig');
+            // #$lib = new RfqGoogleSheetLib();
+
+            // $templateId = $this->request->getPost('templateId');
+            // if (!$templateId) {
+            //     throw new \Exception('Template ID missing');
+            // }
+
+            // $newSheetId = $this->sheetLib->copyTemplate(
+            //     $templateId,
+            //     'RFQ_' . date('Ymd_His'),
+            //     $this->config['parentFolderId']
+            // );
+            $newSheetId = '1GXNDNXoWriClb5HCqPYd2GAY1T8aie_Hos0yAOoTaC0';
+            // $this->sheetLib->applyPermissions($newSheetId, $this->config['permissions']);
+            $this->sheetLib->applyProtections($newSheetId, $this->config['protections']);
+
+            return $this->response->setJSON([
+                'status' => 'success',
+                'url'    => $this->sheetLib->sheetUrl($newSheetId)
+            ]);
+
+        } catch (\Throwable $e) {
+            return $this->response
+                ->setStatusCode(500)
+                ->setJSON([
+                    'status'  => 'error',
+                    'message' => $e->getMessage()
+                ]);
+        }
+    }
 }
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index 66957ea8..098c2105 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -999,7 +999,7 @@ class TestingController extends BaseController
                 // 'dashboard' => 1
                 'dashboard' => $database_id
             ],
-            'exp'    => time() + (10 * 60) // 10 minutes
+            'exp'    => time() + (10 * 60), // 10 minutes
         ];
 
         if(!empty($policy_id)){
diff --git a/app/Libraries/GoogleSheetLib.php b/app/Libraries/GoogleSheetLib.php
index 5bdb9464..a04ab1e9 100644
--- a/app/Libraries/GoogleSheetLib.php
+++ b/app/Libraries/GoogleSheetLib.php
@@ -4,6 +4,7 @@ use Google_Client;
 use Google_Service_Sheets;
 use Google_Service_Drive;
 use Google_Service_Sheets_ValueRange;
+use Google_Service_Sheets_BatchUpdateSpreadsheetRequest;
 
 class GoogleSheetLib
 {
@@ -11,13 +12,14 @@ class GoogleSheetLib
     protected Google_Service_Sheets $sheets;
     protected Google_Service_Drive $drive;
 
+
     public function __construct()
     {
         $this->client = new Google_Client();
 
         // Service account JSON
         $this->client->setAuthConfig(
-            ROOTPATH . 'gdrive-demo-394007-5b1d856b0c5b.json'
+            ROOTPATH . 'nhance-ee8d1-e3c5269b1ec7.json'
         );
 
         // IMPORTANT for service account
@@ -32,11 +34,12 @@ class GoogleSheetLib
         // Init services
         $this->sheets = new Google_Service_Sheets($this->client);
         $this->drive  = new Google_Service_Drive($this->client);
+
     }
 
     /* ===================== READ ===================== */
 
-    public function read(string $spreadsheetId, string $range = 'Sheet1')
+    public function read(string $spreadsheetId, string $range = 'RFQ Page')
     {
         $response = $this->sheets
             ->spreadsheets_values
@@ -77,4 +80,205 @@ class GoogleSheetLib
 
         return $response->getBody()->getContents();
     }
+
+
+    /* ================= COPY TEMPLATE ================= */
+
+    public function copyTemplate(string $templateId, string $name, string $folderId): string
+    {
+        $file = $this->drive->files->copy(
+            $templateId,
+            new \Google_Service_Drive_DriveFile([
+                'name'    => $name,
+                'parents' => [$folderId],
+
+            ]),[
+            'supportsAllDrives' => true, 
+            'fields' => 'id, name, parents'
+        ]
+        );
+
+        return $file->id;
+    }
+
+    /* ================= PERMISSIONS ================= */
+
+    public function applyPermissions(string $fileId, array $permissions)
+    {
+        foreach ($permissions['editors'] as $email) {
+            $this->createPermission($fileId, $email, 'writer');
+        }
+
+        foreach ($permissions['viewers'] as $email) {
+            $this->createPermission($fileId, $email, 'reader');
+        }
+    }
+
+    private function createPermission(string $fileId, string $email, string $role)
+    {
+        $type = str_starts_with($email, 'group:') ? 'group' : 'user';
+        $email = str_replace('group:', '', $email);
+
+        $this->drive->permissions->create(
+            $fileId,
+            new \Google_Service_Drive_Permission([
+                'type'         => $type,
+                'role'         => $role,
+                'emailAddress' => $email
+            ]),
+            ['sendNotificationEmail' => false,'supportsAllDrives' => true]
+        );
+    }
+
+    /* ================= PROTECTIONS ================= */
+
+    public function applyProtectionsold(string $spreadsheetId, array $ranges)
+    {
+        $spreadsheet = $this->sheets->spreadsheets->get($spreadsheetId);
+        $sheetId = $spreadsheet->getSheets()[0]->getProperties()->getSheetId();
+
+        $requests = [];
+
+        foreach ($ranges as $range) {
+            [$sheetName, $a1] = explode('!', $range);
+
+            $requests[] = [
+                'addProtectedRange' => [
+                    'protectedRange' => [
+                        'range' => [
+                            'sheetId' => $sheetId
+                        ],
+                        'warningOnly' => false
+                    ]
+                ]
+            ];
+        }
+
+        $this->sheets->spreadsheets->batchUpdate(
+            $spreadsheetId,
+            new Google_Service_Sheets_BatchUpdateSpreadsheetRequest([
+                'requests' => $requests
+            ])
+        );
+    }
+
+
+    public function applyProtections(string $spreadsheetId, array $protections)
+{
+    // Fetch spreadsheet metadata
+    $spreadsheet = $this->sheets->spreadsheets->get(
+        $spreadsheetId,
+        ['fields' => 'sheets(properties(sheetId,title,gridProperties))']
+    );
+
+    // Map sheet names
+    $sheetMap = [];
+    foreach ($spreadsheet->getSheets() as $sheet) {
+        $props = $sheet->getProperties();
+        $sheetMap[$props->getTitle()] = [
+            'sheetId'  => $props->getSheetId(),
+            'rowCount' => $props->getGridProperties()->getRowCount(),
+            'colCount' => $props->getGridProperties()->getColumnCount(),
+        ];
+    }
+
+    $requests = [];
+
+    foreach ($protections as $protection) {
+
+        $rangeStr = $protection['range'];
+
+        if (!str_contains($rangeStr, '!')) {
+            throw new \Exception("Invalid range format: {$rangeStr}");
+        }
+
+        [$sheetName, $a1] = explode('!', $rangeStr, 2);
+
+        if (!isset($sheetMap[$sheetName])) {
+            throw new \Exception("Sheet not found: {$sheetName}");
+        }
+
+        $sheetMeta = $sheetMap[$sheetName];
+
+        $gridRange = $this->convertA1ToGridRange(
+            $a1,
+            $sheetMeta['sheetId'],
+            $sheetMeta['rowCount'],
+            $sheetMeta['colCount']
+        );
+
+        $protectedRange = [
+            'range' => $gridRange,
+            'description' => 'RFQ Protected Area',
+            'warningOnly' => false,
+            'editors' => [
+                'users'  => $protection['users']  ?? [],
+                'groups' => $protection['groups'] ?? []
+            ]
+        ];
+
+        $requests[] = [
+            'addProtectedRange' => [
+                'protectedRange' => $protectedRange
+            ]
+        ];
+    }
+
+    if (!empty($requests)) {
+        $batch = new \Google_Service_Sheets_BatchUpdateSpreadsheetRequest([
+            'requests' => $requests
+        ]);
+
+        $this->sheets->spreadsheets->batchUpdate($spreadsheetId, $batch);
+    }
+
+    return true;
+}
+
+    /* ================= URL ================= */
+
+    public function sheetUrl(string $sheetId): string
+    {
+        return "https://docs.google.com/spreadsheets/d/{$sheetId}/edit";
+    }
+
+
+   private function convertA1ToGridRange($a1, $sheetId, $maxRows, $maxCols)
+{
+    if (preg_match('/^([A-Z]+)(\d+)(?::([A-Z]+)(\d+))?$/i', $a1, $m)) {
+
+        $startCol = $this->colToIndex($m[1]);
+        $startRow = intval($m[2]) - 1;
+
+        if (!empty($m[3])) {
+            $endCol = $this->colToIndex($m[3]) + 1;
+            $endRow = intval($m[4]);
+        } else {
+            $endCol = $startCol + 1;
+            $endRow = $startRow + 1;
+        }
+
+        return [
+            'sheetId' => $sheetId,
+            'startRowIndex' => $startRow,
+            'endRowIndex' => $endRow,
+            'startColumnIndex' => $startCol,
+            'endColumnIndex' => $endCol
+        ];
+    }
+
+    throw new \Exception("Unsupported A1 format: {$a1}");
+}
+
+private function colToIndex($letters)
+{
+    $letters = strtoupper($letters);
+    $index = 0;
+    for ($i = 0; $i < strlen($letters); $i++) {
+        $index = $index * 26 + (ord($letters[$i]) - 64);
+    }
+    return $index - 1;
+}
+
+
 }
diff --git a/app/Views/gsheet_editor.php b/app/Views/gsheet_editor.php
index 93f40957..e3c9f316 100644
--- a/app/Views/gsheet_editor.php
+++ b/app/Views/gsheet_editor.php
@@ -16,6 +16,28 @@
 
 <button onclick="save()">💾 Save</button>
 <button onclick="download()">⬇ Download</button>
+<button onclick="createRfq()">🚀 Create RFQ</button>
+
+<div id="result" style="margin-top:15px;"></div>
+
+<script>
+function createRfq() {
+    fetch('<?php echo base_url() ?>' +'/sheet/create', {
+        method: 'POST',
+        headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+        body: 'templateId=1efHU8EBkjTZTzOx115xRrtgz3kwvvVp0p5GbrvREfiw'
+    })
+    .then(r => r.json())
+    .then(res => {
+        if (res.status === 'success') {
+            document.getElementById('result').innerHTML =
+                `<a href="${res.url}" target="_blank">Open RFQ Sheet</a>`;
+        } else {
+            alert(res.message);
+        }
+    });
+}
+</script>
 
 <hr>
 
@@ -26,9 +48,9 @@
 const sheetId = "<?= esc($sheetId) ?>";
 alert('second');
 /* ---------- LOAD ---------- */
-fetch('<?php echo base_url() ?>' + `/sheet/${sheetId}/fetch`)
-    .then(r => r.json())
+fetch('<?php echo base_url() ?>' + `sheet/${sheetId}/fetch`)
     .then(r => r.json())
+    // .then(r => r.json())
     .then(render);
 
 function render(data) {
diff --git a/gdrive-demo-394007-5b1d856b0c5b.json b/gdrive-demo-394007-5b1d856b0c5b.json
deleted file mode 100644
index d2c85363..00000000
--- a/gdrive-demo-394007-5b1d856b0c5b.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "gdrive-demo-394007",
-  "private_key_id": "5b1d856b0c5b13e52b5210d381ce7ae02204f666",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9tqkwe8XEuvDJ\ngDAKHn7FzFgkmor9sEZPkjofVJ1dK0RpD1mMVw38BzzMsEo8Y8aojNKj9FcgJPI+\nMiSwvoHDVGxPuyz2Q7o8BS7WdM83Sn69CBGn+0s+YjsyQ5pQBeu1YZ3erjckyA1M\nX0a0qXSFRm7dN0pwDIk0SP9/pl5iAKEtakuXn/Q+lSIpHz6OUgQy8bCjn91poMtF\nhL1YR/7k8ZttjQiFSCTzQ6e3IJmVbqY9UZ2hc4zVicLVSLM2x17M1CCVrsXoceOj\nQoYEeCqP2qJjGA29CB66xpXetuOFcll/ZHiNBhSekOBbJIKFG8WfTKaFn4hu2HX6\nzbJLse5FAgMBAAECggEAXK8qxWcS3eQ+0xLvZWI0qUoGHgvqr7o4/5L/FmNuZiBH\nUdSP+UJmsKSQjafq/Mn6OkpidntfPXMPbldtGXRZTSanq+RUORQpnj0h/uAehHK+\nrHeOuLTKs/Wl2g6xCzt5RqokSLBwfGXIKXG6x3SqWppoe2cR1OArAAJR4PlUzyeM\nP0HkZcVMDrXkshpbi/7yk1Yol5CTJjUrXT4cH2eFSih+eu5UxI/uEdxu86XnaB+V\nBDS94nSQffaMem3YLRSQpPWMHJts3NM2eoxpVy3NqbyHH0Jzr47T5+pdnk5AZX8v\nMu7L0FYgUmGli8W9/jV43lUi9z147EpNC1ugySICGQKBgQDeT3i9mBO1HQB+3y05\n4ao9YKWtR7RHTIiMBkekRs58xxWIq75+bsJtLMy0GsHOJHbpdfDU2AtcasYXVm/L\nc960AR7Qm0mdhQi5CG7XfFTvkc+RhsFoCAYOnbdInr1D+s7NsyOgdYvzh9HYIiJ/\nm8MzeGQia/4tlO+UNq7UK0sfowKBgQDadpe0OCynXEiziSY/aBT9mrjplXJSJUeR\nX5/pUrBV++mYt+LJU0Q+4op0Qf+PUJwp72O1v3T9h4ox2BcrYUMI17dJZ5HG46BG\n6Sjh+mZzLCTN9L6AVgRzK/5CUpsL+oPpClzGQK+1uJ+YKZD086YBuQi2JiG6uBxk\n7VLzATZ49wKBgQC3ZHgGb95SGoq+Hv4AMdluqLwEJpLh/pDmcofHTWIqLVHmXUfY\npSZfSgXUzf3zQMGX9mOmMlOs+ahQuE2hWQTvGb2B+ZjRCV4Yxowp17d5qp/BPZlv\naK8Wf6Ujk1AvNEhGCPHq/Q1m6TSDSCWNf8GYREjW3J/immrJqhKvlMd0YQKBgQCM\nf2CpQsdVCwCmljnG5YU6ZFsvvjE7q0YPtFP/lnJZmh1tXjW4DJkDaGZqxlc5MDp+\nrbqOlIcE1jqGO9cKyw51jWYPC1CxfIsDj8f/LS7eOzGgUxqBJtDN0SlANigI2CAl\nq8hmqAtY71eUYIcdQeUtjnaPzo46q1V3gzmplsoVmQKBgDCzaBbFY1bKW+xPPC98\nutYS7cGYtTq241zafSXx/qmpZB2QwFsR3rmZ9msCEBb3TY4Ew+hUi7+SP3ycSU1s\nkwIO/9DaZhFBRA9jbwbu4zdB2Niamfo79epqJ8vhJ6TA2d5xRSGbHWkGymWV/e0p\na74mh5hQ0lqI4MSeArFrJwwF\n-----END PRIVATE KEY-----\n",
-  "client_email": "gsheet@gdrive-demo-394007.iam.gserviceaccount.com",
-  "client_id": "108808196910972902964",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/gsheet%40gdrive-demo-394007.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}
diff --git a/nhance-app-google-drive.json b/nhance-app-google-drive.json
deleted file mode 100644
index 9a5f94aa..00000000
--- a/nhance-app-google-drive.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "nhance-app-4fedb",
-  "private_key_id": "e764472bb4a0c9226d172f7aebdd2eb785c5fca8",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCzyKk6yQqLZHnL\n8+qRwMHtIhV3kR6bYuCol7LTU/aRyTZpFafewJ/6y5bMvvHaRSaohuuTjDhp5H+w\nf7DAiWO06C/YdgZ/tv3dPM8FnkOEnwxUXVgJskK+srJ4g6zsYkT+0DNI0qMJRW5m\n0jv+HKPJ0axCAPcUZUVtraV/HFHF7pJp4oWMFD5X7Jhv7kbW3TetJofSN3SvRvr8\nyfCiVGzqgF0Gx0Tgd25GTMOuRXTGoTlQeDHFMm19g8YY1de0Ol9WqFey6E8e6a/h\nw8KHGdywgsI+q5yF0EIUdxKc6U9Bea25k0YnKHSCsJjJTVlKW+xlxR6wA1yuBb66\n2dAhEzldAgMBAAECggEACEssKpb5dadVPdt+PJ2r58CueD1JfRL8i/p98hhjY9bo\niJEXSFDfI6aYFp22ZYKfWNK3wMimr5SuPIB5F6C4gn3b+y95ERPQtg/AkyDgB39M\nBjZNW4EnabAWFWlc2FJknjnd+JcmLnhoy+h/gpnKoOkbYISDFKQWJfJtRvLE/1on\nhKvnhEkO++93HZp6KPYA21BQIWt6q6gYjjjwxQIHE0Vg30bZC8ciNVaVlmOnpoKW\nlsQ3+TL+b6vDsSxez4hSqWlua7wWL6JgKvyGw6FGiDLGjvTEvVQ0cvfykCDmO5td\nWvVihTMOMXEMx+iVAUOXJLrSPOFGXxSHL9jilqCn0QKBgQDu4P64sE5T15rA+83B\neRMyQUfLru/oxyQ7pAbgRk4nwQj1mXcdD3/RpHF6jg0rt0msRjkzkqyWiJN0qsZ9\nlQY7h0I8pu8dxFhbd7LLcPaNV+OpNAokG06dBK8qhuMcZBlRfvJ3ye5L/Dk0Z7A4\nPw6/OxySns+kzfxtPdpJTNeqFQKBgQDAq2BXm+MsjqjZm2Z1LFMgZcjRLUu4ylMC\n9W3jqd35dBypcafAJ3TqhPLsx+HyWuC+GLMWohx3XGU7oZabGg1zuWAS8A4hnogZ\nk47OT3OYHDaT65HFmSAGJy1UFVvESUdiVzPqO3Xn9dYvRIw6By2b09w+kD1oxmE0\nvAh5UFAMKQKBgHg06plfxxqzzWE9lS290qYgaZOaxYla5OXKRdeIKX4hynNktab/\nDLAfUyd74i7UfhNeBxznu0fJFILKCTZazpcYGoHQ81UEX/4vPt7XSoqX5q1XzZ6b\nyzSCje8Vj6XSzVbQTg1vpSXBl7vCTdAQE0ix40/48L6bFWKXlIf8Ti59AoGAd8UR\nKuT5H6W/SSbVVlmrgyRC5eWmgMUlPV2cZj4egwevGZZRlZ3xjCgBazgGOUZNF177\nVUKJN5n0RFF68ggL/LhsBNm9ryCBsoSL7axuS0yekO2LvK4nvit0fiSY2zhCa9uR\npjY4YW3tK40NLrVvoMLe0vWPdyZ7HvEUw3UtjaECgYAMoonkNACD7EyWesAQzjpD\ntAL5ByXtFkMqMMr8ELLoDU2D5+qzb6gu0+GuYzGvxtYQHz2L+cP7yonn8IRBrAO1\njZCi2Mn1qOYecSGBnv6rotcagMALXwExkymjjVxPLiOae7A01sxSFDpqtRBww2JA\ngFsHNMpkQ1KmZu7LW0q1fg==\n-----END PRIVATE KEY-----\n",
-  "client_email": "only-drive-access@nhance-app-4fedb.iam.gserviceaccount.com",
-  "client_id": "116214376249781337850",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/only-drive-access%40nhance-app-4fedb.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}
diff --git a/nhance-ee8d1-e3c5269b1ec7.json b/nhance-ee8d1-e3c5269b1ec7.json
new file mode 100644
index 00000000..afafcff4
--- /dev/null
+++ b/nhance-ee8d1-e3c5269b1ec7.json
@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "nhance-ee8d1",
+  "private_key_id": "e3c5269b1ec7d22e7a297f5273edf3eda6010c0a",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC4+7yRGBAow7GR\nrcBSwXVkBd7U001YC8nZ6GmbfhZSktn4pd4C7r/VGmJMcHdo4CVkt+omY9hEWy3Y\n2k7xvwTBJOxo+A4GENduzUpRucVD5UNs4CKajVmI97FV+2wgeLYR9lLswrSXkQvo\nCRDi/w0EwQ7ZdfPyYfuUUBSdAytiwtGHEJaHBQ4qanNvstFu6FJcCkaq+Sbn6Ool\nHN7lgS/V5NhuBakNOm8EBBaN8Xp13afjHvyFEHalnY8xpNNXNVlBljYIPzYFxXFN\nFL/Iz7XX8dBD0tVwfQGDpD5OCPh8FeIg39dgbRxU3Q+Awv3CX9eoEW1j3bPYo7Lw\nmh8K3fohAgMBAAECggEAEQXPCfxQmSrwOPg0zEjHDTyb3DKGGdw0p772YChy7gfB\nudrfR2s1SWtWo8y7tSTfVaZPcvEmnzYgZ3LB56EAIBs0pP1viO/20aVgBlpI99Q6\ntEobiEs9DViOpkHVs71EzMb1Emcugde6sUOLg5NPkHu8BDErERSJBFJ3bliy0heN\nwAwYKXCB3ro3ryUE5+pRS6ibt8vLEBbk3T3bEW8A1wfWnUo0V+Wf5KXsCO8BvD8Z\nE/i0JgpAkZksWs+keBSLbdWBONNV1GrbxezoZXA8aPPlcaD0bZdLDlszXguq8DGO\nbjr0SI7Hx78/jAQhiFkdNMkLvZMIoU7VVnQSibsBKwKBgQD04PMi6CO6kpKG/ZDw\nR6tuAU8DkUgSjvOquUeGkguyfhK/G5fg3w8yCpLAPoh8ZEGL4zZy+ZoAsHWLv44O\nmXjTOKut5o1puswM8vPobDAinddCWs6U6VWKkkRw27AuyKcnLCpvnRBg/Iw+lSTQ\nzG0KCd8Zn2+a0Cjo9hlF6F2pAwKBgQDBYmvV+cADTRjhostukDK71aKsRhMu1OH4\nRK2uX3f9rde1aSnIcp0PDzn24V7I9skT6zhOCPTF6SEFH35eO3z7kOA26hokOMb2\nz7Bh+EDnx5zQmWwcj0yNwbCeTl7gKWz2o3AuMc8zK6I2+buYJJnjoazUyqQtKhqz\nnPs3woY9CwKBgDHjwqVR9jWEtyWZc3YApAR9b8OiTbS6OxqFNPVNu+RZmygkTwUZ\nbNcdIFjaZKQzKMd/OxChmaaaTNhz5lVDH0KpQRDk79qim//nX5nysLvcvIZgScY8\n45ifxCHaIELnzmZEsUCcF0IrMcduS1nezDhHWpS1zt8TmcIcoXmEpdBRAoGAEtKs\nomAz415evJ+m43Ufqw7JTbFobpeEAzFUInPibwu7wkmhKoSVawDVaIVZP4Bd5BVy\nHo5anOTrNN9y4mMx8B6S5GV28+2e2CkxBuguESFpzxgP4NvF3MpskYwZSgJeO8d+\nxNBOVbG6kVVPgCiX3gM/mlq7DjZZ8P+nqC7D+C8CgYAMeN/ByvGaYSN5bVVntOcT\noDiMWfBBToc9irhNSZsCwghXmNugPKguDbRTi7n/Iqf/HljwUx0HBtXkIgZvDDiW\nQrGSCozd9g2WFx/2OSJv4GU+eUM1GFr0mLFDaAUNzvjwHTkG+2STof8VowaGRx68\n7Z50l5hXKv3i0n5ykhPWUg==\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-mcdfe@nhance-ee8d1.iam.gserviceaccount.com",
+  "client_id": "105441165052433248287",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-mcdfe%40nhance-ee8d1.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

From cc504d06ea420127a6f5983c82b9d2c1a0c7b7e0 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 26 Feb 2026 14:05:03 +0530
Subject: [PATCH 05/12] FIX_CD_AC_ERROR_DISPLAY

---
 app/Views/cd_master_add_modal.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Views/cd_master_add_modal.php b/app/Views/cd_master_add_modal.php
index 2d9c0143..9ff01a91 100644
--- a/app/Views/cd_master_add_modal.php
+++ b/app/Views/cd_master_add_modal.php
@@ -68,6 +68,7 @@
                                 <div class="form-group col-md-6">
                                     <label for="mobile">CD Account Number<span class="text-danger">*</span></label>
                                     <input type="text" class="form-control" id="cd_ac_no_for_cd_master" name="cd_ac_no" onkeypress="return onlyNumbers(event)" required data-parsley-type="digits">
+                                    <small style="margin-left: 10px;font-size: 10px;"><span class="text-danger" id="cd_ac_no_for_cd_master_errorr"></span></small>
                                 </div>
                             
                                 <div class="form-group col-md-6">
@@ -126,12 +127,15 @@
 
                 console.log(res)
                 if(res.status == true){
-                    toastr.warning(res.message, 'warning');
+
+                    $('#cd_ac_no_for_cd_master_errorr').text(res.message);
+                    // toastr.warning(res.message, 'warning');
                     // $('#cd_ac_no').val('');
                     $('#cd_master_btn_Submit').prop('disabled',true);
                     return;
                 }
                 $('#cd_master_btn_Submit').prop('disabled',false);
+                $('#cd_ac_no_for_cd_master_errorr').text('');
             },
             error: function (xhr, status, error) {
                 console.error(xhr.responseText);

From d655abe31e238b2de0de45ddee37fc5f5dda36d5 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:18:09 +0530
Subject: [PATCH 06/12] FIX_SalesTracker4

---
 app/Controllers/LeadsController.php           |  24 +--
 app/Controllers/SalesController.php           | 115 +++++++------
 app/Views/layout/header.php                   |   2 +-
 app/Views/lead_filter.php                     |   2 +-
 app/Views/leads_dash.php                      |   4 +-
 app/Views/leads_form.php                      |   8 +-
 app/Views/leads_form_handler.php              |   4 +-
 app/Views/leads_list.php                      |  16 +-
 app/Views/leads_non_eb.php                    |   6 +-
 app/Views/sales/activity_view.php             | 160 ++----------------
 .../sales/branch_level_dashboard_view.php     |  35 ++--
 .../sales/sales_manager_level_dashboard.php   |  80 ++++++++-
 app/Views/sales/tracker_view.php              |  24 ++-
 13 files changed, 219 insertions(+), 261 deletions(-)

diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 2c2d9bcf..cfe01bbe 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -302,8 +302,8 @@ class LeadsController extends BaseController
 
     public function viewLeadsList()
     {
-        $data['tab_name'] = 'Leads';
-        $data['page_name'] = 'Leads';
+        $data['tab_name'] = 'Opportunities';
+        $data['page_name'] = 'Opportunities';
 
         // Set basic data
         $data['issuer'] = $this->issuer;
@@ -372,7 +372,7 @@ class LeadsController extends BaseController
 
             'lead_type' => [
                 'rules'  => 'integer',
-                'errors' => ['required' => 'Lead Type is required']
+                'errors' => ['required' => 'Opportunity Type is required']
             ],
             'issuer' => [
                 'rules'  => 'required',
@@ -934,10 +934,10 @@ class LeadsController extends BaseController
         }
 
         if (count($insertCount) > 0) {
-            return $this->respond(['status' => true, 'lead_id' => $insert, 'message' => 'New Lead created successfully', 'data' => $data], 200);
+            return $this->respond(['status' => true, 'lead_id' => $insert, 'message' => 'New Opportunity created successfully', 'data' => $data], 200);
         }
 
-        return $this->respond(['status' => false, 'lead_id' => $insert, 'message' => "Failed to create Lead", 'data' => $data], 200);
+        return $this->respond(['status' => false, 'lead_id' => $insert, 'message' => "Failed to create Opportunity", 'data' => $data], 200);
     }
 
     private function updateOldLead($id, $data)
@@ -946,9 +946,9 @@ class LeadsController extends BaseController
 
             $this->insertMultiFilesData($data[0]['multi_file_data'], $id, $data[0]['lead_form_type']);
             $this->insertLeadStatus($id, $data[0]['status'], 3);
-            return $this->respond(['status' => true, 'lead_id' => $id, 'message' => "Lead updated successfully", 'data' => $data], 200);
+            return $this->respond(['status' => true, 'lead_id' => $id, 'message' => "Opportunity updated successfully", 'data' => $data], 200);
         }
-        return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Lead", 'data' => $data], 200);
+        return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Opportunity", 'data' => $data], 200);
     }
 
     // Get the Single Lead data for edit uisng ajax (do not delete)
@@ -1305,7 +1305,7 @@ class LeadsController extends BaseController
 
         if (!$lead_data) {
             // Handle case where lead doesn't exist
-            throw new \Exception('Lead not found');
+            throw new \Exception('Opportunity not found');
         }
 
         // 4. Conditional query - only fetch if needed
@@ -1494,7 +1494,7 @@ class LeadsController extends BaseController
         $lead_id = $data['lead_id'] ?? null;
 
         if (!$lead_id) {
-            return $this->respond(['status' => false, 'message' => 'Lead ID is required'], 400);
+            return $this->respond(['status' => false, 'message' => 'Opportunity ID is required'], 400);
         }
 
         $rfq_created = $this->RFQModel->where('lead_id', $lead_id)->where('is_active', 1)->countAllResults();
@@ -2796,7 +2796,7 @@ class LeadsController extends BaseController
         $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $lead_data['file_name'];
 
         if (!$lead_data) {
-            return ['status' => 'failed', 'message' => 'Lead data not found'];
+            return ['status' => 'failed', 'message' => 'Opportunity data not found'];
         }
 
         try{
@@ -5583,7 +5583,7 @@ class LeadsController extends BaseController
         //  dd($file_name_with_path);
 
         if (!$lead_data) {
-            return ['status' => 'failed', 'message' => 'Lead data not found'];
+            return ['status' => 'failed', 'message' => 'Opportunity data not found'];
         }
 
         if ($lead_data['file_name']) {
@@ -6579,7 +6579,7 @@ class LeadsController extends BaseController
                 return $this->respond([
                     'status'  => false,
                     'code'    => 400,
-                    'message' => 'Lead ID is required'
+                    'message' => 'Opportunity ID is required'
                 ], 400);
             }
 
diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index 3de595f8..a830542e 100644
--- a/app/Controllers/SalesController.php
+++ b/app/Controllers/SalesController.php
@@ -88,7 +88,7 @@ class SalesController extends BaseController
 
         } 
         // Otherwise fetch ALL sales managers in this branch
-        elseif (in_array($role,[1,2,3,4,5])) {
+        elseif (in_array($role,[1,5])) {
             
             $data['users'] = $db->table('user_profiles up')
                                 ->select('up.id, up.first_name, up.last_name, up.nhance_branch_id')
@@ -793,7 +793,7 @@ class SalesController extends BaseController
 
         // dd($logged_user_id, $nhance_branch_id, $role, $team_id );
 
-        if (in_array($role,[5])) {
+        if (in_array($role,[1,5])) {
 
             $sales_manager_ids = array_column(
                 $db->table('user_profiles up')
@@ -822,36 +822,46 @@ class SalesController extends BaseController
 
     public function branchLevelDashboard($branchId,$sales_manager_ids)
     {
-        $data['tab_name']  = 'Dashboard';
-        $data['page_name'] = 'Dashboard';
         // Hardcoded branch ID as requested
         // $branchId = 1;
 
         try {
-            // 1. Lead Statistics
-            $stats = $this->leadModel->getLeadStats(); // Using existing model method
-
-            // 2. Activity Statistics
-            $activityStats = [
-                'total'     => $this->activityModel->countAllResults(),
-                'completed' => $this->activityModel->where('status', 'completed')->countAllResults(),
-                'pending'   => $this->activityModel->where('status', 'pending')->countAllResults(),
-            ];
-
-            // 3. Team Performance (Aggregating activity counts per user)
-            $db = \Config\Database::connect();
-            // Final safe check
-            if (empty($sales_manager_ids)) {
+          $sales_manager_ids = array_values(array_map('intval', $sales_manager_ids));
+          
+          // Final safe check
+          if (empty($sales_manager_ids)) {
                 // No valid IDs — skip queries or return empty
-                $teamPerformance  = [];
-                $recentActivities = [];
-                $leadsOverview    = [];
-            } else {
+                $total_leads        = 0;
+                $total_activity     = 0;
+                $total_completed_activity = 0;
+                $total_pending_activity   = 0;
+                $pending_activities = [];
+                $recent_activities      = [];
+                $teamPerformance    = [];
+                
+                $leadsOverview      = [];
+          } else {
 
-                if (empty($sales_manager_ids) || !is_array($sales_manager_ids)) {
-                    $sales_manager_ids = array_filter((array) $sales_manager_ids); // removes null, "", 0
-                }
+            if (empty($sales_manager_ids) || !is_array($sales_manager_ids)) {
+                $sales_manager_ids = array_filter((array) $sales_manager_ids); // removes null, "", 0
+            }
+            
+            // 1. Lead Statistics
+            $total_leads = $this->leadModel->whereIn('assigned_to', $sales_manager_ids)->countAllResults(); // Use countAllResults, NOT countAll
+            // echo $this->leadModel->getLastQuery();die();
+            
+            // 2. Total activity
+            $total_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->countAllResults();
 
+            // 3. Completed  activity
+            $total_completed_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->where('status', 'completed')->countAllResults();
+
+            // 4. Pending  activity
+            $total_pending_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->where('status', 'pending')->countAllResults();
+            
+            $db = \Config\Database::connect();
+            
+            // 5. Team Performance
             $teamPerformance = $db->table('user_profiles as u')
                 ->select('u.first_name, u.last_name, u.profile as role, 
                         (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id) as total_acts,
@@ -861,25 +871,25 @@ class SalesController extends BaseController
                 ->where('u.is_active', 1)
                 ->get()->getResultArray();
 
-            // 4. Recent Activities (Joining for Lead Names)
-            $recentActivities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name')
+            // 6. Recent Activities (Joining for Lead Names)
+            $recent_activities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name')
                 ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id')
                 ->orderBy('sales_activities.scheduled_date', 'DESC')
                 ->limit(6)
                 ->findAll();
             
-                $sales_manager_ids = array_values(array_map('intval', $sales_manager_ids));
-                $recentActivities = $db->table('sales_activities sa')
-                                    ->select('sa.activity_id,sa.lead_id,sa.activity_type,sa.scheduled_date,sa.status,sa.assigned_to,sal.company_name,up.first_name AS assigned_to_name')
-                                    ->join('(SELECT lead_id, MAX(company_name) AS company_name FROM sales_actual_leads GROUP BY lead_id) sal','sal.lead_id = sa.lead_id','left')
+            // 7. Pending Activities (List)
+            $pending_activities = $db->table('sales_activities sa')
+                                    ->select('sa.activity_id,sa.lead_id,sa.activity_type,sa.scheduled_date,sa.status,sa.assigned_to,sal.company_name,up.first_name AS assigned_to_name,sa.notes')
                                     ->join('user_profiles up', 'up.id = sa.assigned_to', 'left')
+                                    ->join('sales_actual_leads sal', 'sal.lead_id = sa.lead_id', 'left') // ✅ ADD THIS
                                     ->orderBy('sa.scheduled_date', 'DESC')
-                                    ->limit(6)
                                     ->whereIn('sa.assigned_to', $sales_manager_ids)
+                                    ->where('sa.status', 'pending')
                                     ->get()->getResultArray();
 
-                // 5. All Leads Overview
-                $leadsOverview = $db->table('sales_actual_leads sal')
+            // 8. All Leads Overview
+            $leadsOverview = $db->table('sales_actual_leads sal')
                             ->select('sal.lead_id,sal.company_name,sal.status,up.first_name AS assigned_to,
                                 COUNT(DISTINCT sa.activity_id) AS activities,
                                 COUNT(DISTINCT l.id) AS opportunities
@@ -888,39 +898,34 @@ class SalesController extends BaseController
                             ->join('sales_activities sa', 'sa.lead_id = sal.lead_id', 'left')
                             ->join('leads l', 'l.actual_lead_id = sal.lead_id', 'left')
                             ->groupBy('sal.lead_id, sal.company_name, sal.status, up.first_name')
-                            ->having('COUNT(DISTINCT sa.activity_id) + COUNT(DISTINCT l.id) >', 0)  // ← this line
+                            // ->having('COUNT(DISTINCT sa.activity_id) + COUNT(DISTINCT l.id) >', 0)  // ← this line
                             ->orderBy('sal.created_at', 'DESC')
                             ->whereIn('sal.assigned_to', $sales_manager_ids)
                             ->get()
                             ->getResultArray();
-            }
             
-            // 6. activityBreakdown
-            $total = $db->table('sales_activities')->countAll();
-
+            // 9. Activity BrakDown
             $activityBreakdown = $db->table('sales_activities')
-                ->select("activity_type, COUNT(*) AS total, ROUND(COUNT(*) * 100.0 / {$total}, 0) AS percentage", false)
+                ->select("activity_type, COUNT(*) AS total, ROUND(COUNT(*) * 100.0 / {$total_activity}, 0) AS percentage", false)
+                ->whereIn('assigned_to', $sales_manager_ids) 
                 ->groupBy('activity_type')
                 ->orderBy('total', 'DESC')
                 ->get()
                 ->getResultArray();
-
-            $teamPerformance = array_filter($teamPerformance, function($row) {
-                return ($row['total_acts'] + $row['done_acts']) > 0;
-            });
-
-
+          }
             $data = [
-                'total_leads'      => $stats['total'],
-                'total_activities' => $activityStats['total'],
-                'completed_acts'   => $activityStats['completed'],
-                'pipeline_value'   => '15.0L', // Hardcoded placeholder from PDF [cite: 14]
-                'team'             => $teamPerformance,
-                'recent_acts'      => $recentActivities,
-                'leads_overview'   => $leadsOverview,
+                'total_leads'       => $total_leads,
+                'total_acts'        => $total_activity,
+                'total_completed_acts'  => $total_completed_activity,
+                'total_pending_acts'=> $total_pending_activity,
+                'pipeline_value'    => '15.0L', // Hardcoded placeholder from PDF [cite: 14]
+                'team'              => $teamPerformance,
+                'recent_acts'       => $recent_activities,
+                'pending_acts'      => $pending_activities,
+                'leads_overview'    => $leadsOverview,
                 'activity_breakdown'=> $activityBreakdown,
-                'tab_name'      => "Sales Dashboard",
-                'page_name'     => "Sales Dashboard"
+                'tab_name'          => "Sales Dashboard",
+                'page_name'         => "Sales Dashboard"
             ];
 
             // dd($data);
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 67198829..f5109843 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -2073,7 +2073,7 @@
                             <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
-                                <span> Leads </span>
+                                <span> Opportunities </span>
                             </a>
                         </li>
                     <?php } ?>
diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php
index 07cf83bb..620d4a08 100644
--- a/app/Views/lead_filter.php
+++ b/app/Views/lead_filter.php
@@ -39,7 +39,7 @@
                                         </div>
 
                                         <div class="form-group col-md-3">
-                                            <label for="filter_lead_type"> Lead Type <span class="text-danger"></span></label>
+                                            <label for="filter_lead_type"> Opportunity Type <span class="text-danger"></span></label>
                                             <select class="form-control" id="filter_lead_type" name="filter_lead_type">
                                                 <option value="0">Select</option>
                                                 <?php
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index 4fec7de9..0833c740 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -165,10 +165,10 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
             <div class="leadTypeTile">
                 <div class="card dash-card" onclick="hide_and_show_tile(1,1)">
                     <div class="card-block">
-                        <h4 class="mb-3">Leads</h4>
+                        <h4 class="mb-3">opportunities</h4>
                         <h2 ><span class="span-color"><?= isset($lead_data) ? $lead_data['total'] : 0 ?></span>
                         </h2>
-                        <h6><span class="text-danger">Lead Tracker</span></h6>
+                        <h6><span class="text-danger">Opportunity Tracker</span></h6>
                     </div>
                 </div>
             </div>
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index 87868d39..edf5bebb 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -124,7 +124,7 @@
                             <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;">
                                 <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
                             </a>
-                            <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                            <span class="title-text" id="page_title" style="position: relative;">Add Opportunity</span>
                         </h4>
                     </div>
                     <form role="form" class="parsley-examples" method="post" id="leads_form_id"
@@ -139,9 +139,9 @@
                                 <div class="form-row">
 
                                     <div class="form-group col-md-4">
-                                        <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                        <label for="lead_type">Opportunity Type<span class="text-danger">*</span></label>
                                         <select class="form-control" id="lead_type" name="lead_type" required>
-                                            <option value="">Select Lead Type</option>
+                                            <option value="">Select Opportunity Type</option>
                                             <?php
                                             if (isset($lead_type) && count($lead_type)) {
                                                 foreach ($lead_type as $key => $value) {
@@ -739,7 +739,7 @@
 
                     hide_list_show_add();
 
-                    var page_title = 'Edit Lead';
+                    var page_title = 'Edit Opportunity';
 
                     $('#page_title').text(page_title);
                     $('#leads_primarykey').val(res.data.id);
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 01960410..69b7b665 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -954,7 +954,7 @@ if (isset($selected_lead_type)) {
                 
                 hide_list_show_add();
 
-                $('#page_title').text('Edit Lead');
+                $('#page_title').text('Edit Opportunity');
                 $('#leads_primarykey').val(data.id || '');
                 $('#actual_lead_id').val(data.actual_lead_id || 0);
                 $('#policy_start_date').val(data.policy_end_date || '');
@@ -1129,7 +1129,7 @@ if (isset($selected_lead_type)) {
                     }
                 }
 
-                $('#page_title').text('Edit Lead');
+                $('#page_title').text('Edit Opportunity');
                 $('#leads_primarykey').val(data.id || '');
                 $('#actual_lead_id').val(data.actual_lead_id || 0);
                 $('#policy_start_date').val(data.policy_end_date || '');
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index 98b9f232..7ad9f74a 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -151,7 +151,7 @@ table.dataTable tbody td {
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
-                        <h4 style="position: relative;">Leads List</h4>
+                        <h4 style="position: relative;">Opportunities List</h4>
                     </div>
 
                     <div class="col-3" id="status_change" style="text-align: right; position: relative;top: 56px; left: 291px;">
@@ -165,7 +165,7 @@ table.dataTable tbody td {
                             <thead class="bg-light">
                                 <tr>
                                     <th><div class="column-header">S.No &nbsp;</div></th>
-                                    <th><div class="column-header">Lead Type &nbsp;</div></th>
+                                    <th><div class="column-header">Opportunity Type &nbsp;</div></th>
                                     <th><div class="column-header">Issuer &nbsp;</div></th>
                                     <th><div class="column-header">Client Type &nbsp;</div></th>
                                     <th><div class="column-header">Client / Branch &nbsp;</div></th>
@@ -257,7 +257,7 @@ table.dataTable tbody td {
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Select Lead Type</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">Select Opportunity Type</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -265,14 +265,14 @@ table.dataTable tbody td {
                 <div class="radio-option selected" onclick="selectOption(this, 'lead_eb')">
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="lead_form_type" id="lead_eb" value="1" checked>
-                        <label class="form-check-label" for="lead_eb">Lead EB</label>
+                        <label class="form-check-label" for="lead_eb">EB</label>
                     </div>
                 </div>
                 
                 <div class="radio-option" onclick="selectOption(this, 'lead_non_eb')">
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="lead_form_type" id="lead_non_eb" value="2">
-                        <label class="form-check-label" for="lead_non_eb">Lead Non-EB</label>
+                        <label class="form-check-label" for="lead_non_eb">Non-EB</label>
                     </div>
                 </div>
             </div>
@@ -467,7 +467,7 @@ table.dataTable tbody td {
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [            
                     {
-                            text: 'Add',
+                            text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
                             className: 'btn app-btn-primary  mr-2',
                             action: function(e, dt, node, config) { 
                                 openLeadTypeAskModal();
@@ -481,7 +481,7 @@ table.dataTable tbody td {
                                     {
                                         extend: 'csv',
                                         text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
-                                        title: 'Policy-Tranction-Inception-List',
+                                        title: 'Opportunity-List',
                                         className: 'app-btn-primary ',
                                         exportOptions: {
                                             columns: ':not(:last-child)'
@@ -523,7 +523,7 @@ table.dataTable tbody td {
         // let Lead_type = $('#openLeadTypeAskModal').val()
         let Lead_type = $('input[name="lead_form_type"]:checked').val();
         console.log('Lead_type ', Lead_type)
-        let url = '<?=base_url('/util/getLeadNonEB/')?>' + Lead_type
+        let url = '<?=base_url('/util/getLeadNonEB/')?>' + Lead_type + '/0';
         console.log('url ', url)
         window.location.href = url;
 
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index 6d2049f0..e41f6026 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -66,7 +66,7 @@
                         <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;" type="button" id="btnAdd">
                             <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
                         </a>
-                        <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                        <span class="title-text" id="page_title" style="position: relative;">Add Opportunity</span>
                     </h4>
                 </div>
                 <form role="form" class="parsley-examples" method="post" id="leads_non_eb_form_id"
@@ -81,9 +81,9 @@
                         <div class="form-row">
 
                             <div class="form-group col-md-4">
-                                <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                <label for="lead_type">Opportunity Type<span class="text-danger">*</span></label>
                                 <select class="form-control" id="lead_type" name="lead_type" required>
-                                    <option value="">Select Lead Type</option>
+                                    <option value="">Select Opportunity Type</option>
                                     <?php
                                     if (isset($lead_type) && count($lead_type)) {
                                         foreach ($lead_type as $key => $value) {
diff --git a/app/Views/sales/activity_view.php b/app/Views/sales/activity_view.php
index 46833e9f..58d81c9f 100644
--- a/app/Views/sales/activity_view.php
+++ b/app/Views/sales/activity_view.php
@@ -255,7 +255,7 @@
                     <button type="button" class="activity-type-btn d_activity_type" data-type="Email" onclick="selectType('Email', this)">✉️ Email</button>
                     <button type="button" class="activity-type-btn d_activity_type" data-type="Meeting" onclick="selectType('Meeting', this)">📅 Meeting</button>
                     <button type="button" class="activity-type-btn d_activity_type" data-type="Visit" onclick="selectType('Visit', this)">🚗 Visit</button>
-                    <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🎬 Demo</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🖥️ Demo</button>
                     <button type="button" class="activity-type-btn d_activity_type" data-type="Share" onclick="selectType('Share', this)">📄 Share Docs</button>
                     <button type="button" class="activity-type-btn d_activity_type" data-type="Todo" onclick="selectType('Todo', this)">✓ To Do</button>
                 </div>
@@ -274,8 +274,8 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-label">Assigned To</label>
-                    <select id="act_owner" class="search-input searchable" style="width:100%">
+                    <label class="form-label">Assigned To <span class="text-danger">*</span></label>
+                    <select id="act_owner" class="search-input searchable" style="width:100%" required>
                         <?php foreach($users as $user): ?>
                             <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?></option>
                         <?php endforeach; ?>
@@ -325,7 +325,7 @@
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Email', this)">✉️ Email</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Meeting', this)">📅 Meeting</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Visit', this)">🚗 Visit</button>
-                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Demo', this)">🎬 Demo</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Demo', this)">🖥️ Demo</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Share', this)">📄 Share Docs</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Todo', this)">✓ To Do</button>
                     
@@ -429,7 +429,7 @@ function resetFlatpicker(){
     });
 }
 
-const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🎬", Share: "📄", Todo: "✓" };
+const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🖥️", Share: "📄", Todo: "✓" };
 const salesManagerIds = <?= json_encode($sales_manager_ids ?? []) ?>;
 
 const API = '<?= base_url('sales') ?>';
@@ -480,6 +480,10 @@ function closeModal(id) {
 }
 
 function openMainActivityModal() {
+    document.getElementById('act_owner').value = "";
+    document.getElementById('act_owner').dispatchEvent(new Event('change'));
+    document.getElementById('act_lead_id').value = "";
+    document.getElementById('act_lead_id').dispatchEvent(new Event('change'));
     document.getElementById('act_string_flag').value = "frommain"; // ✅ flag for main
     openModal('activityModal');
 }
@@ -786,7 +790,8 @@ function openActivityModal() {
     document.getElementById('act_owner').dispatchEvent(new Event('change'));
     document.getElementById('act_lead_id').value = lead_id;
     document.getElementById('act_lead_id').dispatchEvent(new Event('change'));
-    document.getElementById('act_string_flag').value = "frompopup"; 
+    document.getElementById('act_string_flag').value = "frompopup";
+    openModal('activityModal'); 
 }
 
 function openComp(id, assigned_to, lead_id, string_flag) {
@@ -1123,150 +1128,7 @@ document.getElementById('do_follow').addEventListener('change', function () {
         selectedFollowUpActivityType = ''; // Reset global variable
     }
 });
-const btnSaveContact = document.getElementById('btnSaveContact');
-if (btnSaveContact) {
-    btnSaveContact.onclick = async (e) => {
-    e.preventDefault(); // Prevent accidental form submission
-
-    // 1. Get and Trim Values
-    const nameInput = document.getElementById('contact_name');
-    const mobileInput = document.getElementById('contact_mobile');
-    const leadIdInput = document.getElementById('lead_id');
-
-    const name = nameInput.value.trim();
-    const mobile = mobileInput.value.trim();
-    const lead_id = leadIdInput.value.trim();
-
-    // 2. Simple Client-Side Validation
-    if (!name || !mobile) {
-        return toastr.warning('Please enter both contact person name and mobile number.');
-    }
-    let payload = { lead_id: lead_id, name: name, mobile: mobile };
-    // Reset previous error states
-    document.querySelectorAll('.is-invalid').forEach(el => el.classList.remove('is-invalid'));
-
     
-    
-    try {
-        const res = await fetch(`${API}/contacts`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(payload)
-        });
-
-        const result = await res.json(); 
-
-        if (res.ok) {
-            // Success: Clear inputs
-            nameInput.value = '';
-            mobileInput.value = '';
-            
-            // Hide "No Data" message if it exists
-            const noData = document.getElementById('NoData');
-            if(noData) noData.style.display = 'none';
-
-            // Generate HTML for the new contact
-            const contactHtml = `
-                <div class="contact-card d-flex justify-content-between align-items-center mb-2 p-2" 
-                     style="background: #f8f8f8; border-radius: 8px;" 
-                     data-id="${result.data.contact_id}">
-                    <div>
-                        <div class="fw-bold">${result.data.name}</div>
-                        <div class="text-muted">${result.data.mobile}</div>
-                    </div>
-                    <div>
-                        <button type="button" 
-                                class="btn btn-danger btn-sm btnRemoveContact" 
-                                data-id="${result.data.contact_id}">
-                            Remove
-                        </button>
-                    </div>
-                </div>
-            `;
-
-             // <button type="button" 
-                            // class="btn btn-secondary btn-sm btnEditContact" 
-                            // data-id="${result.data.contact_id}">
-                        // Update
-                    // </button>
-            // Append to container
-            document.getElementById('savedContactsContainer').insertAdjacentHTML('beforeend', contactHtml);
-            toastr.success('Contact saved successfully');
-        } else {
-            // Handle Errors using the 'result' we already parsed
-            if (res.status === 400) {
-                let errorMessages = "";
-                let seenMessages = [];
-                let isFirstError = true; // Fixed: Variable initialization
-
-                if (result.messages) {
-                    Object.entries(result.messages).forEach(([field, message]) => {
-                        // Find element by name attribute (Vanilla JS)
-                        let inputElement = document.querySelector(`[name="${field}"]`);
-            
-                        if (inputElement) {
-                            inputElement.classList.add('is-invalid');
-                            if (isFirstError) {
-                                setTimeout(() => inputElement.focus(), 100); 
-                                isFirstError = false; 
-                            }
-                        }
-
-                        if (!seenMessages.includes(message)) {
-                            errorMessages += `• ${message}<br>`;
-                            seenMessages.push(message);
-                        }
-                    });
-                    toastr.error(errorMessages, 'Validation Error', { allowHtml: true });
-                } else {
-                    toastr.warning(result.message || 'Validation failed');
-                }
-            } else {
-                toastr.error(result.message || 'An error occurred while saving.');
-            }
-        }
-    } catch (error) {
-        console.error("Fetch Error:", error);
-        toastr.error('Network error or server is unreachable.');
-    }
- };
-}
-    
-const savedContactsContainer = document.getElementById('savedContactsContainer');
-if (savedContactsContainer) {
-    savedContactsContainer.onclick = async (e) => {
-    // Check if the clicked element is a Remove button
-    if (e.target.classList.contains('btnRemoveContact')) {
-        const btn = e.target;
-        const contactId = btn.dataset.id; // Get data-id
-        const card = btn.closest('.contact-card'); // Find the parent card
-
-        try {
-            const res = await fetch(`${API}/contacts/${contactId}`, {
-                method: 'DELETE',
-            });
-
-            if (res.ok) {
-                card.remove(); // Remove from DOM
-                toastr.success('Contact removed successfully');
-
-                // Check if container is empty to show "No Data"
-                const container = document.getElementById('savedContactsContainer');
-                if (container.querySelectorAll('.contact-card').length === 0) {
-                    const noData = document.getElementById('NoData');
-                    if(noData) noData.style.display = 'block';
-                }
-            } else {
-                toastr.error('Failed to remove contact');
-            }
-        } catch (error) {
-            console.error(error);
-            toastr.error('An error occurred');
-        }
-    }
-};
-}
-
 function convertDBFormatted(input) {
 
     if (!input) return null;
diff --git a/app/Views/sales/branch_level_dashboard_view.php b/app/Views/sales/branch_level_dashboard_view.php
index 66d98d13..7f3789f4 100644
--- a/app/Views/sales/branch_level_dashboard_view.php
+++ b/app/Views/sales/branch_level_dashboard_view.php
@@ -89,17 +89,17 @@
             <!-- <div class="stat-change text-success">↑ 12% this month</div> -->
         </div>
         <div class="card-hero">
-            <div class="stat-val"><?php echo $total_activities ?></div>
+            <div class="stat-val"><?php echo $total_acts ?></div>
             <div class="stat-label">Total Activities</div>
             <!-- <div class="stat-change text-success">↑ 5% this month</div> -->
         </div>
         <div class="card-hero">
-            <div class="stat-val"><?php echo ($total_activities - $completed_acts) ?></div>
+            <div class="stat-val"><?php echo $total_pending_acts ?></div>
             <div class="stat-label">Pending Activities</div>
             <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
         </div>
         <div class="card-hero">
-            <div class="stat-val"><?php echo $completed_acts ?></div>
+            <div class="stat-val"><?php echo $total_completed_acts ?></div>
             <div class="stat-label">Completed Activities</div>
             <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
         </div>
@@ -113,8 +113,8 @@
     <div class="main-grid">
         <div class="card">
             <div class="table-header">
-                <h3 style="font-size: 16px; font-weight: 700;">Recent Activities - All Team</h3>
-                <span style="color: #718096; font-size: 12px; font-weight: 600;">6 activities</span>
+                <h3 style="font-size: 16px; font-weight: 700;">Pending Activities - All Team</h3>
+                <span style="color: #718096; font-size: 12px; font-weight: 600;"><?= count($pending_acts) . ' ' . (count($pending_acts) == 1 ? 'activity' : 'activities') ?></span>
             </div>
             <table>
                 <thead>
@@ -126,21 +126,21 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <?php if (!empty($recent_acts)): ?>
-                        <?php foreach ($recent_acts as $a): ?>
+                    <?php if (!empty($pending_acts)): ?>
+                        <?php foreach ($pending_acts as $a): ?>
                             <?php
                                 $activityIcons = [
                                     'Call'    => '📞',
                                     'Email'   => '✉️',
                                     'Meeting' => '📅',
                                     'Visit'   => '🚗',
-                                    'Demo'    => '🎬',
+                                    'Demo'    => '🖥️',
                                     'Share'   => '📄',
                                     'Todo'    => '✓'
                                 ];
                                 $icon = $activityIcons[$a['activity_type']] ?? '📌';
                                 $statusClass = strtolower(str_replace(' ', '-', $a['status']));
-                                $formattedDate = date('d M Y', strtotime($a['scheduled_date']));
+                                $formattedscheduledDate = date('M d, Y, h:i A', strtotime($a['scheduled_date']));
                             ?>
                             <tr>
                                 <td><strong><?= esc($a['company_name']) ?></strong></td>
@@ -151,8 +151,11 @@
                                     <div style="font-size: 12px; color: #718096;">
                                         <?= esc($a['assigned_to_name'] ?? 'ID: ' . $a['assigned_to']) ?>
                                     </div>
+                                    <!-- <div style="font-size: 12px; color: #718096;">
+                                        <?= esc($a['notes'] ?? 'ID: ' . $a['assigned_to']) ?>
+                                    </div> -->
                                 </td>
-                                <td style="color: #4a5568; font-weight: 500;"><?= $formattedDate ?></td>
+                                <td style="color: #4a5568; font-weight: 500;"><?= $formattedscheduledDate ?></td>
                                 <td><span class="status-pill status-<?= $statusClass ?>"><?= ucfirst(esc($a['status'])) ?></span></td>
                             </tr>
                         <?php endforeach; ?>
@@ -213,7 +216,7 @@
                         'Email'   => ['color' => '#48bb78', 'icon' => '✉️'],
                         'Meeting' => ['color' => '#4299e1', 'icon' => '📅'],
                         'Visit'   => ['color' => '#ecc94b', 'icon' => '🚗'],
-                        'Demo'    => ['color' => '#9f7aea', 'icon' => '🎬'],
+                        'Demo'    => ['color' => '#9f7aea', 'icon' => '🖥️'],
                         'Share'   => ['color' => '#ed8936', 'icon' => '📄'],
                         'Todo'    => ['color' => '#718096', 'icon' => '✓'],
                     ];
@@ -228,7 +231,7 @@
                             ?>
                             <div class="breakdown-item">
                                 <span>
-                                    <span class="dot" style="background: <?= $color ?>;"></span>
+                                    <span style="background: <?= $color ?>;"></span>
                                     <?= $icon ?> <?= esc($type) ?>
                                 </span>
                                 <strong><?= $item['percentage'] ?>%</strong>
@@ -244,7 +247,13 @@
     <div class="card">
         <div class="table-header">
             <h3 style="font-size: 16px; font-weight: 700;">All Leads Overview</h3>
-            <span style="color: #718096; font-size: 12px; font-weight: 600;">Click a lead to see details</span>
+            <!-- <span style="color: #718096; font-size: 12px; font-weight: 600;">Click a lead to see details</span> -->
+             <a href="<?= base_url('sales') ?>" 
+                style="color: #718096; font-size: 12px; font-weight: 600; text-decoration: none; padding: 4px 8px; transition: color 0.2s ease; display: inline-block; cursor: pointer;"
+                onmouseover="this.style.color='#ff6b35';"
+                onmouseout="this.style.color='#718096';">
+                Click a lead to see details 
+            </a>
         </div>
         <table>
             <thead>
diff --git a/app/Views/sales/sales_manager_level_dashboard.php b/app/Views/sales/sales_manager_level_dashboard.php
index 5fc0483e..b9cbbf41 100644
--- a/app/Views/sales/sales_manager_level_dashboard.php
+++ b/app/Views/sales/sales_manager_level_dashboard.php
@@ -48,6 +48,23 @@
     .btn-view { background: #f0f0f0; color: #666; border: none; padding: 8px 16px; border-radius: 6px; cursor: pointer; font-size: 13px; transition: all 0.2s;}
     .btn-view:hover { background: #f0f0f0; transform: translateY(-1px); }
 
+/* Fix for the grid layout on smaller screens */
+@media (max-width: 992px) {
+    .dashboard-grid { grid-template-columns: 1fr; }
+}
+
+/* Fix for inputs inside modal rows */
+input, select, textarea { 
+    width: 100%; /* Change from 400px to 100% */
+    box-sizing: border-box; /* Ensures padding doesn't add to width */
+    padding: 10px 15px; 
+    border: 1px solid #e0e0e0; 
+    border-radius: 8px; 
+    font-size: 14px; 
+}
+
+
+
 </style>
 
 <div class="my-dash">
@@ -99,13 +116,15 @@
         </div>
     </div>
 
+    
+
     <div class="dashboard-grid">
         <div class="list-card">
             <div style="display:flex; justify-content:space-between; margin-bottom:15px; align-items: center;">
                 <h3 style="font-size:16px; font-weight: 700; margin: 0;">My Upcoming Activities</h3>
                 <span style="color:#ff6b35; font-size:12px; font-weight: 600;"><?= $acts['pending'] ?> pending</span>
             </div>
-            <?php foreach($upcoming as $u): ?>
+            <!-- <?php foreach($upcoming as $u): ?>
             <div class="list-item">
                 <div>
                     <div style="font-weight:600; font-size:14px; color: #333;"><?= $u['company_name'] ?></div>
@@ -113,13 +132,41 @@
                 </div>
                 <button class="badge-done" onclick="openComp(<?= $u['activity_id'] ?>,<?= $u['lead_id'] ?>)">✓ Mark as completed</button>
             </div>
+            <?php endforeach; ?> -->
+            <?php foreach($upcoming as $u): 
+                    $activityIcons = [ 'Call'    => '📞', 'Email'   => '✉️', 'Meeting' => '📅', 'Visit'   => '🚗', 'Demo'    => '🖥️', 'Share'   => '📄', 'Todo'    => '✓' ];
+                    $icon = $activityIcons[$u['activity_type']] ?? '📌';
+                    $formattedscheduledDate = date('M d, Y, h:i A', strtotime($u['scheduled_date']));
+            ?>
+                <div class="list-item" style="display: flex; align-items: center; gap: 15px;">
+                    <div class="lead-initial" style="flex-shrink: 0;">
+                        <?= $icon ?>
+                    </div>
+
+                    <div style="flex-grow: 1; display: flex; flex-direction: column; min-width: 0;">
+                        <div style="font-weight: 700; font-size: 14px; color: #333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                            <?= esc($u['company_name']) ?>
+                        </div>
+                        <div style="font-size: 11px; color: #999; margin-top: 2px; white-space: nowrap;">
+                            <span style="color: #ff6b35; font-weight: 600;"><?= strtoupper($u['activity_type'] ?? 'EMAIL') ?></span> 
+                            - <?= $formattedscheduledDate ?>
+                        </div>
+                    </div>
+
+                    <div style="flex-shrink: 0;">
+                        <button class="badge-done" onclick="openComp(<?= $u['activity_id'] ?>, <?= $u['lead_id'] ?>)">
+                            ✓ Mark as completed
+                        </button>
+                    </div>
+                </div>
             <?php endforeach; ?>
         </div>
 
+    
         <div class="list-card">
             <h3 style="font-size:16px; font-weight: 700; margin-bottom:20px;">My Recent Leads</h3>
             <?php foreach($recent_leads as $rl): ?>
-            <div class="list-item">
+            <!-- <div class="list-item">
                 <div style="display:flex; gap:12px; align-items:center;">
                     <div class="lead-initial"><?= substr($rl['company_name'], 0, 1) ?></div>
                     <div>
@@ -128,6 +175,35 @@
                     </div>
                 </div>
                 <span class="status-pill" style="background: #e3f2fd; color: #1976d2;"><?= $rl['status'] ?></span>
+            </div> -->
+            <div class="list-item" style="display: flex; align-items: center; gap: 15px; padding: 12px 0; border-bottom: 1px solid #f9f9f9;">
+                
+                <div style="flex-shrink: 0;">
+                    <div class="avatar-title" 
+                        style="background-color: #f1f3fa; width: 42px; height: 42px; border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #1976d2; font-weight: 700; font-size: 16px;">
+                        <?php 
+                            $firstLetter = !empty($rl['company_name']) ? substr($rl['company_name'], 0, 1) : '?';
+                            echo strtoupper(esc($firstLetter)); 
+                        ?>
+                    </div>
+                </div>
+
+                <div style="flex-grow: 1; min-width: 0;">
+                    <div style="font-weight: 600; font-size: 14px; color: #333; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
+                        <?= esc($rl['company_name']) ?>
+                    </div>
+                    <div style="font-size: 11px; color: #999; margin-top: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
+                        <?= esc($rl['email']) ?>
+                    </div>
+                </div>
+
+                <div style="flex-shrink: 0;">
+                    <span class="status-pill" 
+                        style="background: #e3f2fd; color: #1976d2; padding: 4px 10px; border-radius: 12px; font-size: 10px; font-weight: 600; white-space: nowrap;">
+                        <?= esc($rl['status']) ?>
+                    </span>
+                </div>
+
             </div>
             <?php endforeach; ?>
         </div>
diff --git a/app/Views/sales/tracker_view.php b/app/Views/sales/tracker_view.php
index 3ceb43a6..392b307b 100644
--- a/app/Views/sales/tracker_view.php
+++ b/app/Views/sales/tracker_view.php
@@ -185,7 +185,8 @@
                                 </div>
                                 <div class="col-md-12" style="width: 94%;">
                                     <label class="form-label">Phone</label>
-                                    <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')">
+                                    <!-- <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')"> -->
+                                    <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" maxlength="10" oninput="this.value = this.value.replace(/[^0-9]/g, '').substring(0, 10);">
                                 </div>
                             </div>
                             <div class="form-row mb-1">
@@ -283,7 +284,7 @@
                 <button type="button" class="activity-type-btn d_activity_type" data-type="Email" onclick="selectType('Email', this)">✉️ Email</button>
                 <button type="button" class="activity-type-btn d_activity_type" data-type="Meeting" onclick="selectType('Meeting', this)">📅 Meeting</button>
                 <button type="button" class="activity-type-btn d_activity_type" data-type="Visit" onclick="selectType('Visit', this)">🚗 Visit</button>
-                <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🎬 Demo</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Demo" onclick="selectType('Demo', this)">🖥️ Demo</button>
                 <button type="button" class="activity-type-btn d_activity_type" data-type="Share" onclick="selectType('Share', this)">📄 Share Docs</button>
                 <button type="button" class="activity-type-btn d_activity_type" data-type="Todo" onclick="selectType('Todo', this)">✓ To Do</button>
                 
@@ -352,7 +353,7 @@
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Email', this)">✉️ Email</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Meeting', this)">📅 Meeting</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Visit', this)">🚗 Visit</button>
-                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Demo', this)">🎬 Demo</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Demo', this)">🖥️ Demo</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Share', this)">📄 Share Docs</button>
                     <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Todo', this)">✓ To Do</button>
                     
@@ -502,7 +503,8 @@
                                 </div>
                                 <div class="col-md-12" style="width: 94%;">
                                     <label class="form-label">Phone</label>
-                                    <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')">
+                                    <!-- <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" oninput="this.value = this.value.replace(/[^\d\s+]/g, '')"> -->
+                                         <input type="text" class="form-control" name="phone" style="width: 100%;" placeholder="Enter the Phone Number" maxlength="10" oninput="this.value = this.value.replace(/[^0-9]/g, '').substring(0, 10);">
                                 </div>
                             </div>
                             <div class="col-12 mb-1">
@@ -934,7 +936,7 @@ function renderCard(opps) {
 }
 function renderTimeline(acts) {
     const cont = document.getElementById('timelineContainer');
-    const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🎬", Share: "📄", Todo: "✓" };
+    const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🖥️", Share: "📄", Todo: "✓" };
 
     if (acts.length === 0) {
         cont.classList.add('no-line');
@@ -1044,7 +1046,8 @@ document.getElementById('addLeadForm').onsubmit = async (e) => {
     
     let companyRegex = /^[A-Za-z\s]+$/;
     let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    let phoneRegex = /^\+?[0-9\s]{10,20}$/; // Phone regex (+, numbers, spaces allowed, 10-20 length)
+    // let phoneRegex = /^\+?[0-9\s]{0,10}$/; // Phone regex (+, numbers, spaces allowed, 10-20 length)
+    let phoneRegex = /^\d{10}$/;
 
     // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field
     function showError(message, fieldName) {
@@ -1081,7 +1084,8 @@ document.getElementById('addLeadForm').onsubmit = async (e) => {
     }
 
     if (phone && !phoneRegex.test(phone)) {
-        return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
+        // return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
+        return showError("Phone number can contain only numbers (10 digits)", 'phone');
     }
 
     if (!data.status) {
@@ -1170,7 +1174,8 @@ document.getElementById('editLeadForm').onsubmit = async (e) => {
     
     let companyRegex = /^[A-Za-z\s]+$/;
     let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    let phoneRegex = /^\+?[0-9\s]{10,20}$/;
+    // let phoneRegex = /^\+?[0-9\s]{10,20}$/;
+    let phoneRegex = /^\d{10}$/;
     let gstRegex = /^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z][0-9A-Z]Z[0-9A-Z]$/;
 
     // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field
@@ -1208,7 +1213,8 @@ document.getElementById('editLeadForm').onsubmit = async (e) => {
     }
 
     if (phone && !phoneRegex.test(phone)) {
-        return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
+        // return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone');
+        return showError("Phone number can contain only numbers (10 digits)", 'phone');
     }
 
     if (gst && !gstRegex.test(gst)) {

From 6c45fc9249dda0ba9d603c222f15f1c47b571abf Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:20:22 +0530
Subject: [PATCH 07/12] FIX_ISSUE

---
 app/Views/leads_form_handler.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 01960410..93d6440c 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -604,7 +604,8 @@ if (isset($selected_lead_type)) {
 
         let isFirstField = container.childElementCount === 0; // Check if it's the first field
         let placeholder = isFirstField ? 'First file must be Demography.' : '';
-        let accept = isFirstField ? '.xls,.xlsx' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
+        let accept_text = isFirstField ? 'First file: Excel only (.xls, .xlsx)' : 'Files: PDF, Excel (.xlsx, .xls), Images (.png, .jpg, .jpeg)';
 
         
         if(selected_lead_form_type != 1){
@@ -640,12 +641,12 @@ if (isset($selected_lead_type)) {
 
                 <div class="col-auto" style="align-content: center;">
                     <label>File Upload </label> <br>
-                    <span class="text-danger">PDF | Excel (XLSX, XLS) | Images (PNG, JPG)</span>                
                 </div>
                 <div class="col-md-3">
                     <div class="input-icon">
                         <input type="file" class="form-control" id="file_name_${fileIndex}" name="file_name_${increment}[]" accept="${accept}" style="background: #F5FFFF !important;">
                         <i class="mdi mdi-upload additional-icon"></i>
+                        <small style="margin-left: 10px;font-size: 10px;"><span class="text-danger">${accept_text}</span></small>
                     </div>
                 </div>
 

From a3cb96ce74f822439c769900a9a11284a75b8c73 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:27:26 +0530
Subject: [PATCH 08/12] HR token issue

---
 app/Controllers/RestAuthenticationController.php |  5 +++--
 app/Filters/AuthJWT.php                          | 16 +++++++++++++---
 app/Helpers/JWTToken.php                         |  8 ++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index e4c474a1..ab536240 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -648,7 +648,8 @@ class RestAuthenticationController extends AdminController
                 'function' => $th->getTrace()[0]['function'] ?? null,
                 'class' => $th->getTrace()[0]['class'] ?? null,
             ];
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $th, 'error_data' => $errorData],500);
+            log_message('error', 'Error Data: ' . json_encode($errorData));
+            return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
         }
     }
 
@@ -2345,7 +2346,7 @@ class RestAuthenticationController extends AdminController
         }
 
         $decoded = $result['decoded'];
-        $userId  = $decoded['id'] ?? null;
+        $userId  = $decoded['post_hr_id'] ?? null;
 
         if (!$userId) {
             return $this->respond([
diff --git a/app/Filters/AuthJWT.php b/app/Filters/AuthJWT.php
index ec34d902..45f4517a 100755
--- a/app/Filters/AuthJWT.php
+++ b/app/Filters/AuthJWT.php
@@ -115,9 +115,19 @@ class AuthJWT implements FilterInterface
         }
 
         // Refresh sliding expiration
-        $model->update($id, [
-            'token_time_out' => time() + getenv('TOKENTIMEOUT')
-        ]);
+        $newExpiry = time() + getenv('TOKENTIMEOUT');
+
+        if (!isset($decoded['emp_code'])) {
+            // HR user: refresh token_time_out across all branches (same mobile/email)
+            // so switching branches doesn't cause an unexpected expiry
+            $field = !empty($user['mobile']) ? 'mobile' : 'email';
+            $model->where($field, $user[$field])
+                  ->where('contact_type', 'client')
+                  ->where('is_active', 1)
+                  ->update(null, ['token_time_out' => $newExpiry]);
+        } else {
+            $model->update($id, ['token_time_out' => $newExpiry]);
+        }
 
         return true;
     }
diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php
index c964bac7..f671197a 100755
--- a/app/Helpers/JWTToken.php
+++ b/app/Helpers/JWTToken.php
@@ -136,7 +136,7 @@ class JWTToken
             $token = $jwtParts[0];
 
             try {
-                $decoded = JWT::decode($token, new Key("secret", 'HS512'));
+                $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
                 return json_encode(['status' => true, 'message' => 'Token is valid', 'data' =>$decoded->data->id ]);
             } catch (ExpiredException $e) {
                 return json_encode(['status' => false, 'message' => 'Token has expired']);
@@ -158,7 +158,7 @@ class JWTToken
         $jwtParts = explode(' ', $jwt);
         $token = $jwtParts[1];    
         
-        $decoded = JWT::decode($token, new Key("secret", 'HS512'));
+        $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
         return $decoded->id;
     }
 
@@ -169,7 +169,7 @@ class JWTToken
         $jwtParts = explode(' ', $jwt);
         $token = $jwtParts[1];    
         
-        $decoded = JWT::decode($token, new Key("secret", 'HS512'));
+        $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
         return $decoded->role;
     }
 
@@ -181,7 +181,7 @@ class JWTToken
         $jwtParts = explode(' ', $jwt);
         $token = $jwtParts[1];    
         
-        $decoded = JWT::decode($token, new Key("secret", 'HS512'));
+        $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
         return $decoded;
     }
 

From 7c95e0fa0d4feda9da47e2304665cf9d296d9fa9 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:27:42 +0530
Subject: [PATCH 09/12] FIX_ISSUE

---
 app/Views/rfq/multi_files.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Views/rfq/multi_files.php b/app/Views/rfq/multi_files.php
index bea6da48..94f62f2e 100644
--- a/app/Views/rfq/multi_files.php
+++ b/app/Views/rfq/multi_files.php
@@ -8,6 +8,8 @@ $increment = 1;
         $isFirstField = ($index === 0);
         $placeholder = $isFirstField ? 'First file must be Demography.' : '';
         $accept = $isFirstField ? '.xls,.xlsx' : '.xls,.xlsx,.pdf,.jpg,.jpeg,.png';
+        $accept_text = $isFirstField ? 'First file: Excel only (.xls, .xlsx)' : 'Files: PDF, Excel (.xlsx, .xls), Images (.png, .jpg, .jpeg)';
+
         $displayIndex = $index + 1;
 ?>
 
@@ -35,6 +37,7 @@ $increment = 1;
             <div class="input-icon">
                     <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" onchange="showFileName(this, <?= $displayIndex ?>)" style="background: #F5FFFF !important;">
                     <i class="mdi mdi-upload additional-icon"></i>
+                    <small style="margin-left: 10px;font-size: 10px;"><span class="text-danger"><?= $accept_text ?></span></small>                
             </div> 
         </div>
 
@@ -67,6 +70,7 @@ $increment = 1;
                             <input type="file" class="form-control" id="file_name_1" 
                                 name="file_name_1[]" accept=".xls,.xlsx" onchange="showFileName(this, 1)" style="background: #F5FFFF !important;">
                             <i class="mdi mdi-upload additional-icon"></i>
+                            <small style="margin-left: 10px;font-size: 10px;"><span class="text-danger">First file: Excel only (.xls, .xlsx)</span></small>                
                         </div>
                     </div>
                     <div class="col-auto">

From 92879308a5c73d1dc36af827fcbc49bee340c7aa Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:43:41 +0530
Subject: [PATCH 10/12] FIX_ISSUE

---
 app/Views/client_onboarding.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index c63e00a6..928836a0 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -273,9 +273,7 @@
             <div class="card-body">
                 <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
-                        <h4 style="position: relative;">Client Onboarding <span id="client_heading"><?php if (isset($client)) {
-                                                                                echo ' - ' . $client['client_name'];
-                                                                            } ?></h4></span>
+                        <h4 style="position: relative;">Client Onboarding <span id="client_heading"><?php if (isset($client)) { echo ' - ' . $client['client_name']; } ?></span> </h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("client/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>

From 83e059553070b86d7658aeff0f89ce6380b640a5 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Thu, 26 Feb 2026 15:47:16 +0530
Subject: [PATCH 11/12] FIX_VAPT_ISSUE_FILE_UPLOAD_VALIDTION

---
 app/Config/Constants.php                      |   43 +-
 .../AppContentManagementController.php        |   17 +-
 app/Controllers/ClaimsUploadController.php    |    7 +
 app/Controllers/ClientController.php          |   16 +-
 app/Controllers/EmployeeRestController.php    | 2421 ++++++++---------
 app/Controllers/LeadsController.php           |    2 +-
 app/Controllers/MasterController.php          |   16 +-
 app/Controllers/NotificationController.php    |    2 +-
 .../PolicyTransactionController.php           |    2 +-
 app/Controllers/RuleImportController.php      |    8 +
 app/Controllers/TicketController.php          |    6 +-
 app/Controllers/UserController.php            |   11 +-
 app/Helpers/utility_helper.php                |  829 +++---
 13 files changed, 1662 insertions(+), 1718 deletions(-)

diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 5cd84385..d47699d8 100755
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -35,11 +35,11 @@ defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.
  */
 defined('SECOND') || define('SECOND', 1);
 defined('MINUTE') || define('MINUTE', 60);
-defined('HOUR')   || define('HOUR', 3600);
-defined('DAY')    || define('DAY', 86400);
-defined('WEEK')   || define('WEEK', 604800);
-defined('MONTH')  || define('MONTH', 2_592_000);
-defined('YEAR')   || define('YEAR', 31_536_000);
+defined('HOUR') || define('HOUR', 3600);
+defined('DAY') || define('DAY', 86400);
+defined('WEEK') || define('WEEK', 604800);
+defined('MONTH') || define('MONTH', 2_592_000);
+defined('YEAR') || define('YEAR', 31_536_000);
 defined('DECADE') || define('DECADE', 315_360_000);
 
 /*
@@ -67,16 +67,16 @@ defined('DECADE') || define('DECADE', 315_360_000);
  |       http://tldp.org/LDP/abs/html/exitcodes.html
  |
  */
-defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0);        // no errors
-defined('EXIT_ERROR')          || define('EXIT_ERROR', 1);          // generic error
-defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3);         // configuration error
-defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4);   // file not found
-defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5);  // unknown class
+defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0);               // no errors
+defined('EXIT_ERROR') || define('EXIT_ERROR', 1);                   // generic error
+defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3);                 // configuration error
+defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4);     // file not found
+defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5);   // unknown class
 defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7);     // invalid user input
-defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8);       // database error
-defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9);      // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125);    // highest automatically-assigned error code
+defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7);         // invalid user input
+defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8);             // database error
+defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9);           // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125);         // highest automatically-assigned error code
 
 /**
  * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
@@ -115,4 +115,19 @@ define('ACCOUNT_MANAGER_ROLE_ID', 3);
 define('STAFF_ROLE_ID', 4);
 define('HEAD_ROLE_ID', 5);
 
+/**
+ * @Upload Allowed Extensions by Business Context
+ */
+define('UPLOAD_ALLOWED_EXTENSIONS', [
+    'jpg', 'jpeg', 'png', 'gif', 'webp', 'svg',
+    'pdf', 'doc', 'docx', 'odt', 'rtf',
+    'xls', 'xlsx', 'ods', 'csv', 'txt',
+]);
 
+define('UPLOAD_EXT_IMAGES', ['jpg', 'jpeg', 'png']);
+define('UPLOAD_EXT_KYC_DOCS', ['pdf', 'jpg', 'jpeg', 'png']);
+define('UPLOAD_EXT_CLAIM_DOCS', ['pdf', 'jpg', 'jpeg', 'png']);
+define('UPLOAD_EXT_POLICY_DOCS', ['pdf', 'jpg', 'jpeg', 'png', 'xls', 'xlsx']);
+define('UPLOAD_EXT_LEAD_FILES', ['xls', 'xlsx', 'pdf', 'jpg', 'jpeg', 'png']);
+define('UPLOAD_EXT_EXCEL', ['xls', 'xlsx', 'ods', 'csv']);
+define('UPLOAD_EXT_MAIL_ATTACHMENTS', ['pdf', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx']);
diff --git a/app/Controllers/AppContentManagementController.php b/app/Controllers/AppContentManagementController.php
index a7032a4c..a53d90d0 100755
--- a/app/Controllers/AppContentManagementController.php
+++ b/app/Controllers/AppContentManagementController.php
@@ -101,23 +101,22 @@ class AppContentManagementController extends AdminController
 
                 $file = $this->request->getFile('advertise_image');
                 $client_id = $sanitized_post_data['client_id'] ?? null;
-                //1) original file name for vaildations
-                $fileName = $file->getClientName(); //original file name for vaildations
-                $existing = $this->addImgModel->where('name', $fileName)->where('client_id', $fileName)->where('is_active', 1)->first();
-                if($existing){ return $this->respond(['status' => false, 'message' => 'This file has already been uploaded in active state.'], 400); }
-
-                //skip 1) and use this 
-                // $fileName = $file->getRandomName(); // Same Name Multiple time upload means different name
 
                 if (!$file || !$file->isValid()) {
                     return $this->respond(['status' => false, 'message' => 'No file uploaded or invalid file.'], 400);
                 }
 
-                // $uploadPath = WRITEPATH . 'uploads/advertiseImage/';
+                if (!validate_upload_extension($file, UPLOAD_EXT_IMAGES)) {
+                    return $this->respond(['status' => false, 'message' => 'Only JPG, JPEG, PNG files are allowed.'], 400);
+                }
+
+                $fileName = sanitize_upload_filename($file->getClientName());
+                $existing = $this->addImgModel->where('name', $fileName)->where('client_id', $client_id)->where('is_active', 1)->first();
+                if($existing){ return $this->respond(['status' => false, 'message' => 'This file has already been uploaded in active state.'], 400); }
+
                 $uploadPath = ROOTPATH . 'public/uploads/add_image_upload/';
                 if (!is_dir($uploadPath)) mkdir($uploadPath, 0755, true);
 
-                
                 $file->move($uploadPath, $fileName);
 
                 $id = $sanitized_post_data['add_image_id'] ?? null;
diff --git a/app/Controllers/ClaimsUploadController.php b/app/Controllers/ClaimsUploadController.php
index 02c9a187..a704ba3b 100644
--- a/app/Controllers/ClaimsUploadController.php
+++ b/app/Controllers/ClaimsUploadController.php
@@ -26,6 +26,13 @@ class ClaimsUploadController extends BaseController
             ], 400);
         }
 
+        if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+            return $this->respond([
+                'status' => 'failed',
+                'message' => 'Only Excel files (xls, xlsx, ods, csv) are allowed.'
+            ], 400);
+        }
+
         $data = [
             'client_id'        => $this->request->getPost('client_id'),
             'tpa_id'           => $this->request->getPost('tpa_id'),
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 195ce4b9..62989198 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -1051,7 +1051,7 @@ class ClientController extends AdminController
         
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('client_logo'), $uploadFilePath);
+        $file_name = file_Upload($this->request->getFile('client_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
         $data   = $this->request->getPost();
         $sanitized_post_data = sanitizeInputArrayAdvanced($data);
         $sanitized_post_data['created_by'] = get_session_userid();
@@ -1149,7 +1149,7 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error', 'edit client general info function called');
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('client_logo'), $uploadFilePath);
+        $file_name = file_Upload($this->request->getFile('client_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
         $id                 = $this->request->getPost('PrimaryKey');
 
         $data               = $this->request->getPost();
@@ -1191,7 +1191,7 @@ class ClientController extends AdminController
         // print_r($data); die;
         unset($data['file_name']);
         $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
-        $File = file_Upload($this->request->getFile('file_name'), $uploadFilePath);
+        $File = file_Upload($this->request->getFile('file_name'), $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
         if (!empty($File)) {
 
             $data['file_name'] = $File;
@@ -1257,7 +1257,7 @@ class ClientController extends AdminController
         
         $file = $this->request->getFile('file_name');
 
-        $fileName = file_Upload($file, $uploadFilePath);
+        $fileName = file_Upload($file, $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
 
         if (!empty($fileName)) {
             $sanitized_data['file_name'] = $fileName;
@@ -1313,7 +1313,7 @@ class ClientController extends AdminController
         
         $file = $this->request->getFile('file_name');
 
-        $fileName = file_Upload($file, $uploadFilePath);
+        $fileName = file_Upload($file, $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
 
         if (!empty($fileName)) {
             $sanitized_data['file_name'] = $fileName;
@@ -1400,7 +1400,7 @@ class ClientController extends AdminController
         $file = $this->request->getFile('file_name');
 
         $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
-        $fileName = file_Upload($file, $uploadFilePath);
+        $fileName = file_Upload($file, $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
 
         if (!empty($fileName)) {
             $sanitized_data['file_name'] = $fileName;
@@ -1472,7 +1472,7 @@ class ClientController extends AdminController
         
         if ($uploadedFile && $uploadedFile->isValid() && !$uploadedFile->hasMoved()) {
             
-            $new_file_name = file_Upload($uploadedFile, $uploadFilePath);
+            $new_file_name = file_Upload($uploadedFile, $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
             if (!$new_file_name) {
                 return $this->respond(['status' => false, 'code' => 500, 'message' => 'New file upload failed on server.'], 200);
             }
@@ -3479,7 +3479,7 @@ class ClientController extends AdminController
 
                 if (!empty($docName) && $file->isValid() && !$file->hasMoved()) {
                     // Upload the file
-                    $uploadedFileName = file_Upload_for_lead($file, $uploadFilePath);
+                    $uploadedFileName = file_Upload_for_lead($file, $uploadFilePath, UPLOAD_EXT_KYC_DOCS);
 
                     if ($uploadedFileName) {
                         // Prepare data for each document upload
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 5c87df6c..3a0bea5b 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -1,77 +1,50 @@
 <?php
-
 namespace App\Controllers;
 
-use App\Helpers\MailHelper;
-use App\Helpers\NhanceWelnessSsoHelper;
-
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\ResponseInterface;
-use Psr\Log\LoggerInterface;
-
-use App\Helpers\sendMailNotification;
-
-use App\Controllers\VidalApiController;
-use App\Controllers\ICICILombardController;
+use App\Controllers\EmployeeServiceController;
+use App\Controllers\Jobs;
 use App\Controllers\MediAssistApiController;
-
+use App\Controllers\TicketController;
+use App\Helpers\MailHelper;
+use App\Helpers\sendMailNotification;
+use App\Models\AddImgModel;
+use App\Models\AuditHistoryModel;
+use App\Models\BatchFileModel;
+use App\Models\ClaimFilesModel;
+use App\Models\ClientBranchModel;
+use App\Models\ClientDepositModel;
+use App\Models\ClientModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientRMModel;
 use App\Models\EmployeeModel;
 use App\Models\EmployeePolicyModel;
-use App\Models\ClientModel;
-use App\Models\ClientRMModel;
-use App\Models\PolicesModel;
-use App\Models\RelationshipModel;
+use App\Models\EmployeeRetailPolicy;
+use App\Models\FEContentModel;
 use App\Models\FileModel;
-use App\Models\ClientPolicyModel;
+use App\Models\HRAccessControlModel;
+use App\Models\HrFileUploadModel;
+use App\Models\InsurerModel;
+use App\Models\NotificationModel;
+use App\Models\PolicesModel;
 use App\Models\PolicyPremium1Model;
 use App\Models\PolicyPremium2Model;
+use App\Models\PolicyTransactionModel;
 use App\Models\PolicyTypeModel;
-use App\Models\NotificationModel;
-use App\Models\UserModel;
-use App\Models\FEContentModel;
-use App\Models\AddImgModel;
-use App\Models\ClientBranchModel;
-use App\Models\AuditHistoryModel;
+use App\Models\PTFileModel;
+use App\Models\RelationshipModel;
 use App\Models\TicketClaimStatusModel;
+use App\Models\TicketMailTemplateModel;
 use App\Models\TicketMasterModel;
 use App\Models\TicketMessageModel;
-use App\Models\HRAccessControlModel;
-use App\Models\InsurerModel;
-use App\Models\HrFileUploadModel;
-use App\Models\EmployeeRetailPolicy;
-use App\Models\BatchFileModel;
-use App\Models\ClientDepositModel;
-use App\Models\PTFileModel;
-
-
-
-use App\Controllers\Jobs;
-use App\Controllers\JobWorker;
-use App\Controllers\TicketController;
-
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\IOFactory;
-
-use CodeIgniter\API\ResponseTrait;
-use Illuminate\Http\Request;
-
-use App\Controllers\EmployeeServiceController;
-use App\Models\ClaimFilesModel;
-use App\Models\PolicyTransactionModel;
-use App\Models\TicketMailTemplateModel;
 use App\Models\TpaApiSeviceModel;
 use App\Models\UserActivityHistoryModel;
-use Composer\Pcre\Preg;
-use Kreait\Firebase\Factory;
-use Kreait\Firebase\Messaging\CloudMessage;
-use Kreait\Firebase\Messaging\Notification;
-use Kreait\Firebase\Exception\MessagingException;
-
+use App\Models\UserModel;
+use CodeIgniter\API\ResponseTrait;
 use Firebase\JWT\JWT;
-
+use Illuminate\Http\Request;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 class EmployeeRestController extends AdminController
 {
@@ -109,49 +82,47 @@ class EmployeeRestController extends AdminController
     protected $batchFileModel;
     protected $UserActivityHistoryModel;
 
-
     public function __construct()
     {
         // helper('utility');
         set_session_context('Employee');
-        $this->myLogger = \Config\Services::mylogger();
-        $this->employeeModel = new EmployeeModel();
-        $this->employeePolicyModel = new EmployeePolicyModel();
-        $this->clientModel = new ClientModel();
-        $this->clientRMModel = new ClientRMModel();
-        $this->policesModel = new PolicesModel();
-        $this->relationshipModel = new RelationshipModel();
-        $this->fileModel = new FileModel();
-        $this->clientPolicyModel = new ClientPolicyModel();
-        $this->policyPremium1Model = new PolicyPremium1Model();
-        $this->policyPremium2Model = new PolicyPremium2Model();
-        $this->policyTypeModel = new PolicyTypeModel();
-        $this->notificationModel = new NotificationModel();
-        $this->userModel = new UserModel();
-        $this->feContentModel = new FEContentModel();
-        $this->addImgModel = new AddImgModel();
-        $this->clientBranchModel = new ClientBranchModel();
-        $this->auditHistoryModel = new AuditHistoryModel();
-        $this->claimStatusModel = new TicketClaimStatusModel();
-        $this->ticketMaster = new TicketMasterModel();
-        $this->ticketMessage = new TicketMessageModel();
+        $this->myLogger             = \Config\Services::mylogger();
+        $this->employeeModel        = new EmployeeModel();
+        $this->employeePolicyModel  = new EmployeePolicyModel();
+        $this->clientModel          = new ClientModel();
+        $this->clientRMModel        = new ClientRMModel();
+        $this->policesModel         = new PolicesModel();
+        $this->relationshipModel    = new RelationshipModel();
+        $this->fileModel            = new FileModel();
+        $this->clientPolicyModel    = new ClientPolicyModel();
+        $this->policyPremium1Model  = new PolicyPremium1Model();
+        $this->policyPremium2Model  = new PolicyPremium2Model();
+        $this->policyTypeModel      = new PolicyTypeModel();
+        $this->notificationModel    = new NotificationModel();
+        $this->userModel            = new UserModel();
+        $this->feContentModel       = new FEContentModel();
+        $this->addImgModel          = new AddImgModel();
+        $this->clientBranchModel    = new ClientBranchModel();
+        $this->auditHistoryModel    = new AuditHistoryModel();
+        $this->claimStatusModel     = new TicketClaimStatusModel();
+        $this->ticketMaster         = new TicketMasterModel();
+        $this->ticketMessage        = new TicketMessageModel();
         $this->employeeRetailPolicy = new EmployeeRetailPolicy();
 
-        $this->ticketController = new TicketController();
-        $this->hrAccessControlModel    = new HRAccessControlModel();
-        $this->insurerModel    = new InsurerModel();
-        $this->hrFileUploadModel = new HrFileUploadModel();
+        $this->ticketController         = new TicketController();
+        $this->hrAccessControlModel     = new HRAccessControlModel();
+        $this->insurerModel             = new InsurerModel();
+        $this->hrFileUploadModel        = new HrFileUploadModel();
         $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
-        $this->batchFileModel  = new BatchFileModel();
-        $this->UserActivityHistoryModel  = new UserActivityHistoryModel();
+        $this->batchFileModel           = new BatchFileModel();
+        $this->UserActivityHistoryModel = new UserActivityHistoryModel();
     }
 
-
     public function getEmployeeProfile()
     {
         try {
-            $emp_code = $this->request->getGet('emp_code');
-            $client_id = $this->request->getGet('client_id');
+            $emp_code         = $this->request->getGet('emp_code');
+            $client_id        = $this->request->getGet('client_id');
             $client_branch_id = $this->request->getGet('client_branch_id');
             if ($emp_code) {
                 $relationship = 'self';
@@ -175,12 +146,12 @@ class EmployeeRestController extends AdminController
                     ->first();
 
                 if (null !== $this->request->getGet('client_policy_id')) {
-                    $date_coverage = $this->employeePolicyModel->where('employee_id', $employee['id'])->where('client_policy_id', $this->request->getGet('client_policy_id'))->get()->getRow()->date_coverage;
+                    $date_coverage             = $this->employeePolicyModel->where('employee_id', $employee['id'])->where('client_policy_id', $this->request->getGet('client_policy_id'))->get()->getRow()->date_coverage;
                     $employee['date_coverage'] = $date_coverage;
                 }
 
-                $result = $employee;
-                $AccountManagerDetails =  $this->clientRMModel->select('client_rm.* , user_profiles.*')
+                $result                = $employee;
+                $AccountManagerDetails = $this->clientRMModel->select('client_rm.* , user_profiles.*')
                     ->join('user_profiles', 'client_rm.user_id = user_profiles.id', 'left')
                     ->where('client_rm.client_id', $client_id)
                     ->where('client_rm.level', 3)
@@ -201,7 +172,7 @@ class EmployeeRestController extends AdminController
         try {
             $data = $this->request->getJSON();
             if ($data) {
-                $id = $data->id;
+                $id       = $data->id;
                 $employee = $this->employeeModel->where('is_active', 1)->update($id, $data);
 
                 if ($employee) {
@@ -223,10 +194,10 @@ class EmployeeRestController extends AdminController
         try {
             $emp_code = $this->request->getGet('emp_code');
             if ($emp_code) {
-                $employee = $this->employeeModel->where('is_active', 1)->where('emp_code', $emp_code)->findAll();
+                $employee      = $this->employeeModel->where('is_active', 1)->where('emp_code', $emp_code)->findAll();
                 $dateConverter = function ($item) {
                     if ($item['dob'] !== '0000-00-00') {
-                        $dateTime = \DateTime::createFromFormat('Y-m-d', $item['dob']);
+                        $dateTime    = \DateTime::createFromFormat('Y-m-d', $item['dob']);
                         $item['dob'] = $dateTime->format('d-m-Y');
                     }
                     return $item;
@@ -251,9 +222,9 @@ class EmployeeRestController extends AdminController
                 $updatedCount = 0;
 
                 foreach ($data as $item) {
-                    $id = $item->id;
+                    $id        = $item->id;
                     $item->dob = $this->convertDateFormatYMD($item->dob);
-                    $employee = $this->employeeModel->where('is_active', 1)->update($id, (array)$item);
+                    $employee  = $this->employeeModel->where('is_active', 1)->update($id, (array) $item);
                     if ($employee) {
                         $updatedCount++;
                     }
@@ -272,7 +243,6 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function addEmployeeAndDependence()
     {
         try {
@@ -290,21 +260,21 @@ class EmployeeRestController extends AdminController
 
                     if (isset($item->id)) {
                         //update old data
-                        $id = $item->id;
+                        $id                       = $item->id;
                         $item->family_floater_key = $this->RelationshipMap($item->relationship);
-                        $item->gender = $this->GenderMap($item->relationship, $item->emp_code);
-                        $item->dob = $this->convertDateFormatYMD($item->dob);
-                        $item->emp_status = 'draft';
-                        $employee = $this->employeeModel->where('is_active', 1)->update($id, (array)$item);
+                        $item->gender             = $this->GenderMap($item->relationship, $item->emp_code);
+                        $item->dob                = $this->convertDateFormatYMD($item->dob);
+                        $item->emp_status         = 'draft';
+                        $employee                 = $this->employeeModel->where('is_active', 1)->update($id, (array) $item);
                         if ($employee) {
                             $Count++;
                         }
                     } else {
                         //create new data
                         $item->family_floater_key = $this->RelationshipMap($item->relationship);
-                        $item->gender = $this->GenderMap($item->relationship, $item->emp_code);
-                        $item->dob = $this->convertDateFormatYMD($item->dob);
-                        $item->emp_status = 'draft';
+                        $item->gender             = $this->GenderMap($item->relationship, $item->emp_code);
+                        $item->dob                = $this->convertDateFormatYMD($item->dob);
+                        $item->emp_status         = 'draft';
 
                         $employee = $this->employeeModel->insert($item);
 
@@ -339,7 +309,7 @@ class EmployeeRestController extends AdminController
 
     public function getEmployeePayableValue($client_policy_id, $relationship)
     {
-        $terms =  $this->clientPolicyModel->where('id', $client_policy_id)->get()->getRow()->policy_terms;
+        $terms = $this->clientPolicyModel->where('id', $client_policy_id)->get()->getRow()->policy_terms;
 
         if (isset(json_decode($terms)->is_payable_employee)) {
             $is_payable_obj = json_decode($terms)->is_payable_employee;
@@ -360,8 +330,8 @@ class EmployeeRestController extends AdminController
     {
 
         if ($basic_cover_si == null) {
-            $client_policy = $this->clientPolicyModel->where('id', $client_policy_id)->where('client_id', $client_id)->first();
-            $policy_terms = json_decode($client_policy['policy_terms']);
+            $client_policy  = $this->clientPolicyModel->where('id', $client_policy_id)->where('client_id', $client_id)->first();
+            $policy_terms   = json_decode($client_policy['policy_terms']);
             $basic_cover_si = $policy_terms->sum_insured;
         }
 
@@ -373,16 +343,16 @@ class EmployeeRestController extends AdminController
                 ->where('client_policy_id', $client_policy_id)
                 ->where('employee_id', $employee_id)
                 ->where('is_active', 1)
-                ->set(array('basic_cover_si' => $basic_cover_si))
+                ->set(['basic_cover_si' => $basic_cover_si])
                 ->update();
         } else {
 
-            $data['employee_id'] = $employee_id;
+            $data['employee_id']      = $employee_id;
             $data['client_policy_id'] = $client_policy_id;
-            $data['basic_cover_si'] = $basic_cover_si;
+            $data['basic_cover_si']   = $basic_cover_si;
             $data['payable_employee'] = $payable_employee;
-            $data['status'] = 'draft';
-            $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id);
+            $data['status']           = 'draft';
+            $data['date_coverage']    = $this->getEmployeeCoverageDate($emp_code, $client_policy_id);
 
             $this->employeePolicyModel->insert($data);
         }
@@ -408,7 +378,7 @@ class EmployeeRestController extends AdminController
                             ->where('client_policy_id', $value['policy_details']['client_policy_id'])
                             ->where('employee_id', $value['temp']['emp_id'])
                             ->where('is_active', 1)
-                            ->set(array('basic_cover_si' => $value['policy_details']['basic_cover_si'], 'premium' => $value['policy_details']['premium'], 'rata_premimum' => $value['policy_details']['rata_premimum'], 'gst' => $value['policy_details']['gst']))
+                            ->set(['basic_cover_si' => $value['policy_details']['basic_cover_si'], 'premium' => $value['policy_details']['premium'], 'rata_premimum' => $value['policy_details']['rata_premimum'], 'gst' => $value['policy_details']['gst']])
                             ->update();
                     }
                 }
@@ -418,7 +388,7 @@ class EmployeeRestController extends AdminController
 
     public function getEmployeeCoverageDate($emp_code, $client_policy_id)
     {
-        $empData = $this->employeeModel->where('emp_code', $emp_code)->where('relationship', 'self')->where('is_active', 1)->first();;
+        $empData = $this->employeeModel->where('emp_code', $emp_code)->where('relationship', 'self')->where('is_active', 1)->first();
         if ($empData) {
             $empPolicyData = $this->employeePolicyModel->select('employee_polices.employee_id,employee_polices.client_policy_id,employee_polices.date_coverage,client_policy.policy_type_id,client_policy.base_policy')
                 ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id', 'left')
@@ -457,12 +427,11 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function RelationshipMap($value)
     {
 
         if ($value === 'Mother' || $value === 'Father') {
-            return  'parent';
+            return 'parent';
         } else if ($value === 'Son' || $value === 'Daughter') {
             return 'child';
         } else if ($value === 'Father in Law' || $value === 'Mother in Law') {
@@ -476,14 +445,14 @@ class EmployeeRestController extends AdminController
     {
 
         if ($value === 'Mother' || $value === 'Daughter' || $value === 'Mother in Law') {
-            return  'F';
+            return 'F';
         } else if ($value === 'Son' || $value === 'Father' || $value === 'Father in Law') {
             return 'M';
         } else if ($value === 'Spouse') {
 
             $Gender = $this->employeeModel->where('emp_code', $empCode)->where('relationship', 'Self')->get()->getRow()->gender;
             if ($Gender == 'M') {
-                return  'F';
+                return 'F';
             } else {
                 return 'M';
             }
@@ -521,12 +490,12 @@ class EmployeeRestController extends AdminController
             if ($this->request->getGet('id')) {
                 $this->employeeModel->where('id', $this->request->getGet('id'))
                     ->where('is_active', 1)
-                    ->set(array('is_active' => 0))
+                    ->set(['is_active' => 0])
                     ->update();
 
                 $this->employeePolicyModel->where('employee_id', $this->request->getGet('id'))
                     ->where('is_active', 1)
-                    ->set(array('is_active' => 0))
+                    ->set(['is_active' => 0])
                     ->update();
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
             } else {
@@ -556,16 +525,15 @@ class EmployeeRestController extends AdminController
                     ->where('is_active', 1)
                     ->findAll();
 
-
                 if ($checkIfExist) {
 
-                    $empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id,  $value->employee_id, $value->basic_cover_si);
+                    $empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id, $value->employee_id, $value->basic_cover_si);
                 } else {
 
-                    $data['employee_id'] = $value->employee_id;
+                    $data['employee_id']      = $value->employee_id;
                     $data['client_policy_id'] = $value->client_policy_id;
-                    $data['basic_cover_si'] = $value->basic_cover_si;
-                    $data['status'] = 'draft';
+                    $data['basic_cover_si']   = $value->basic_cover_si;
+                    $data['status']           = 'draft';
 
                     $this->employeePolicyModel->insert($data);
                 }
@@ -610,7 +578,7 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $empData =   $this->employeePolicyModel->getEmployeePolicy(client_id: $this->request->getGet('client_id'), policy_id: $this->request->getGet('client_policy_id'), status: 0, branch_id: $this->request->getGet('client_branch_id'), status_type: 'inactive');
+            $empData = $this->employeePolicyModel->getEmployeePolicy(client_id: $this->request->getGet('client_id'), policy_id: $this->request->getGet('client_policy_id'), status: 0, branch_id: $this->request->getGet('client_branch_id'), status_type: 'inactive');
 
             if ($empData) {
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
@@ -626,24 +594,24 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $empData =   $this->employeePolicyModel->getEmployeePolicy(client_id: $this->request->getGet('client_id'), policy_id: $this->request->getGet('client_policy_id'), status: 0, branch_id: $this->request->getGet('client_branch_id'));
+            $empData = $this->employeePolicyModel->getEmployeePolicy(client_id: $this->request->getGet('client_id'), policy_id: $this->request->getGet('client_policy_id'), status: 0, branch_id: $this->request->getGet('client_branch_id'));
 
             if (count($empData)) {
                 // Define headers and map database fields to Excel fields
                 $headers = [
-                    'Employee Code' => 'emp_code',
-                    'Name' => 'name',
-                    'Relationship' => 'relationship',
-                    'DOB' => 'dob',
-                    'Gender' => 'gender',
-                    'Mobile' => 'mobile',
-                    'Email' => 'email_corporate',
-                    'SI' => 'basic_cover_si',
-                    'Premium' => 'rata_premimum',
-                    'Policy Name' => 'policy_name',
+                    'Employee Code'       => 'emp_code',
+                    'Name'                => 'name',
+                    'Relationship'        => 'relationship',
+                    'DOB'                 => 'dob',
+                    'Gender'              => 'gender',
+                    'Mobile'              => 'mobile',
+                    'Email'               => 'email_corporate',
+                    'SI'                  => 'basic_cover_si',
+                    'Premium'             => 'rata_premimum',
+                    'Policy Name'         => 'policy_name',
                     'Insurer Branch Name' => 'insurer_branch_name',
-                    'TPA Name' => 'tpa_name',
-                    'Status' => 'emp_status'
+                    'TPA Name'            => 'tpa_name',
+                    'Status'              => 'emp_status',
                 ];
 
                 // Create a new Spreadsheet object
@@ -670,9 +638,8 @@ class EmployeeRestController extends AdminController
                     $row++;
                 }
 
-
                 // Set the header for download
-                $filename =  $empData[0]['policy_name'] . '-Enrolment.xlsx';
+                $filename = $empData[0]['policy_name'] . '-Enrolment.xlsx';
                 header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
                 header('Content-Disposition: attachment;filename="' . $filename . '"');
                 header('Cache-Control: max-age=0');
@@ -696,7 +663,7 @@ class EmployeeRestController extends AdminController
     public function getClientPolicy()
     {
         try {
-            $ClientPolicyData =  $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id, policies.id as policy_id,policies.policy_type_id as policy_type_id, policies.name as policy_name , client_policy.is_addon as is_addon')
+            $ClientPolicyData = $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id, policies.id as policy_id,policies.policy_type_id as policy_type_id, policies.name as policy_name , client_policy.is_addon as is_addon')
                 ->join('policies', 'client_policy.policy_id = policies.id', 'left')
                 ->where('client_policy.client_id', $this->request->getGet('client_id'))
                 ->findAll();
@@ -727,16 +694,23 @@ class EmployeeRestController extends AdminController
     public function employeeUpload()
     {
         try {
-            $file = $this->request->getFile('file');
-            $client_id = $this->request->getPost('client_id');
+            $file             = $this->request->getFile('file');
+            $client_id        = $this->request->getPost('client_id');
             $client_branch_id = $this->request->getPost('client_branch_id');
-            $policy_id = $this->request->getPost('policy_id');
+            $policy_id        = $this->request->getPost('policy_id');
 
-            $client_data = $this->clientModel->where('id', $client_id)->first();
+            if (!$file || !$file->isValid()) {
+                return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'No file uploaded or invalid file.'], 200);
+            }
+
+            if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+                return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Only Excel files (xls, xlsx, ods, csv) are allowed.'], 200);
+            }
+
+            $client_data  = $this->clientModel->where('id', $client_id)->first();
             $notification = $this->notificationModel->where('client_id', $client_id)->where('template_name', 'member_welcome_mail')->first();
 
-
-            $jwt = $this->request->getHeaderLine('Authorization');
+            $jwt      = $this->request->getHeaderLine('Authorization');
             $jwtParts = explode(' ', $jwt);
 
             $token = $jwtParts[1];
@@ -746,36 +720,34 @@ class EmployeeRestController extends AdminController
             // get the employee id from token
             $employee_id = $decodedPayload['id'];
 
-
             $client_policy = $this->clientPolicyModel->where('id', $policy_id)->where('client_id', $client_id)->where('client_branch_id', $client_branch_id)->first();
             if ($client_policy) {
-                $policy = $this->policesModel->where('id', $client_policy['policy_id'])->first();
+                $policy           = $this->policesModel->where('id', $client_policy['policy_id'])->first();
                 $policy_permium_1 = $this->policyPremium1Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->first();
                 $policy_permium_2 = $this->policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->first();
 
                 $sum_insured_amount_for_check_employee_1 = isset($policy_permium_1['si']) ? $policy_permium_1['si'] : null;
                 $sum_insured_amount_for_check_employee_2 = isset($policy_permium_2['si']) ? $policy_permium_2['si'] : null;
 
-                $is_moved = $file->move(WRITEPATH . 'uploads/excel');
-                $filename = $file->getName();
+                $fileName            = sanitize_upload_filename($file->getName());
+                $is_moved            = $file->move(WRITEPATH . 'uploads/excel', $fileName);
+                $filename            = $file->getName();
                 $file_name_with_path = WRITEPATH . "/uploads/excel/" . $filename;
 
-                //make an entry in DB 
+                                                                                                                                                                                                                                                                  //make an entry in DB
                 $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $employee_id, 'status' => 'inprogress', 'action' => 'enrollment', 'client_branch_id' => $client_branch_id]); //here field policy_id have client_policy_id and not policy id from policy master
 
                 $this->myLogger->logme("error", '{file_id} - client uploaded success', ['file_id' => $file_id]);
 
                 $empServiceController = new EmployeeServiceController();
-                $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]);
+                $result               = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]);
                 if (isset($result['error_summary']) && count($result['error_summary'])) {
                     $result = $empServiceController->getExcelErrorData($file_id);
                     return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "The data format is invalid. Click 'Next' to view details.", 'data' => $result], 200);
                 }
 
-
-
                 //check the file exist or not
-                if (!file_exists($file_name_with_path)) {
+                if (! file_exists($file_name_with_path)) {
                     session()->setFlashdata('error', 'File not found');
                     return redirect()->to(base_url('employee/upload'));
                 }
@@ -786,11 +758,11 @@ class EmployeeRestController extends AdminController
                 $sheet = $spreadsheet->getActiveSheet();
 
                 // Get the highest row and column numbers
-                $highestRow = $sheet->getHighestRow();
+                $highestRow    = $sheet->getHighestRow();
                 $highestColumn = $sheet->getHighestColumn();
 
                 $highestRowAndColumn = $sheet->getHighestRowAndColumn();
-                $data = $sheet->rangeToArray('A1:' . $highestRowAndColumn['column'] . $highestRowAndColumn['row']);
+                $data                = $sheet->rangeToArray('A1:' . $highestRowAndColumn['column'] . $highestRowAndColumn['row']);
 
                 // $extractData['file_name']= $filename;
                 // $extractData['client_id']= $client_id;
@@ -806,9 +778,9 @@ class EmployeeRestController extends AdminController
                 // if (count($data[0]) == 11) {
                 //     $value = ['Sno','Emp_Code','Name','DOJ','Gender','Relation','DOB','Mail','Mobile','SI','Grade'];
                 //     $check_miss_match = [];
-                //     for ($i=0; $i <count($value) ; $i++) { 
+                //     for ($i=0; $i <count($value) ; $i++) {
                 //         if ($data[0][$i] != $value[$i]) {
-                //             $check_miss_match[]=$data[0][$i]; 
+                //             $check_miss_match[]=$data[0][$i];
                 //         }
                 //     }
                 //     if (count($check_miss_match) > 0) {
@@ -842,7 +814,7 @@ class EmployeeRestController extends AdminController
                         }
                     }
                 }
-                $dataToInsert = [];
+                $dataToInsert   = [];
                 $basic_cover_si = [];
                 foreach ($extra['0'] as $index => $id) {
                     $relation = '';
@@ -863,7 +835,7 @@ class EmployeeRestController extends AdminController
                     $doj = $extra['3'][$index];
                     $dob = $extra['6'][$index];
 
-                    // Change date format for $doj
+                                                                      // Change date format for $doj
                     $doj_new_format = date('Y-m-d', strtotime($doj)); // $doj_new_format will be "2001-02-12"
 
                     // Change date format for $dob
@@ -871,28 +843,28 @@ class EmployeeRestController extends AdminController
 
                     // Your existing code here
                     $emp_code = isset($extra['1'][$index]) ? $extra['1'][$index] : 0;
-                    $name = $extra['2'][$index];
+                    $name     = $extra['2'][$index];
 
                     if ($emp_code != 0 && $name != '' || $name != null) {
                         $record = [
                             // 'id' => $id,
-                            'emp_code' => $emp_code,
-                            'name' => $name,
+                            'emp_code'           => $emp_code,
+                            'name'               => $name,
                             // Check if the 'doj' key exists before accessing it
-                            'doj' => $doj_new_format,
-                            'gender' => $extra['4'][$index],
-                            'relationship' => ucfirst(trim($extra['5'][$index])),
+                            'doj'                => $doj_new_format,
+                            'gender'             => $extra['4'][$index],
+                            'relationship'       => ucfirst(trim($extra['5'][$index])),
                             'family_floater_key' => $relation,
-                            'dob' => $dob_new_format,
-                            'email_corporate' => $extra['7'][$index],
-                            'mobile' => $extra['8'][$index],
-                            'client_id' => $client_id,
-                            'emp_status' => 'draft',
-                            'band' => $extra['10'][$index],
-                            'basic_pay' => $extra['11'][$index],
-                            'unit' => isset($extra['12'][$index]) ? $extra['12'][$index] : null,
-                            'client_branch_id' => $client_branch_id,
-                            'date_coverage' => $extra['13'][$index] != "" && $extra['13'][$index] != null ? change_date_format($extra['13'][$index], 'd-M-Y', 'Y-m-d') : null
+                            'dob'                => $dob_new_format,
+                            'email_corporate'    => $extra['7'][$index],
+                            'mobile'             => $extra['8'][$index],
+                            'client_id'          => $client_id,
+                            'emp_status'         => 'draft',
+                            'band'               => $extra['10'][$index],
+                            'basic_pay'          => $extra['11'][$index],
+                            'unit'               => isset($extra['12'][$index]) ? $extra['12'][$index] : null,
+                            'client_branch_id'   => $client_branch_id,
+                            'date_coverage'      => $extra['13'][$index] != "" && $extra['13'][$index] != null ? change_date_format($extra['13'][$index], 'd-M-Y', 'Y-m-d') : null,
 
                         ];
                         $basic_cover_si_value = null;
@@ -922,19 +894,19 @@ class EmployeeRestController extends AdminController
                         $record2 = [
                             'basic_cover_si' => $basic_cover_si_value,
                         ];
-                        $dataToInsert[] = $record;
+                        $dataToInsert[]   = $record;
                         $basic_cover_si[] = $basic_cover_si_value;
                     }
                 }
 
-                $count = 0;
+                $count     = 0;
                 $wholeData = []; // Initialize an empty array to store employee email.
 
                 for ($a = 0; $a < count($dataToInsert); $a++) {
                     $date_coverage = $dataToInsert[$a]['date_coverage'];
                     unset($dataToInsert[$a]['date_coverage']);
                     $employee = $this->employeeModel->checkExistingEmployee($dataToInsert[$a], $client_branch_id);
-                    $emp_id = 0;
+                    $emp_id   = 0;
 
                     $data_after_gpa_or_gmc = [];
                     if ($client_policy['policy_type_id'] == 1) {
@@ -945,18 +917,17 @@ class EmployeeRestController extends AdminController
                         $data_after_gpa_or_gmc = $dataToInsert[$a];
                     }
                     date_default_timezone_set('Asia/Kolkata');
-                    $current_timestamp = time();
+                    $current_timestamp   = time();
                     $formatted_date_time = date('Y-m-d H:i:s', $current_timestamp);
 
                     if ($employee) {
 
-
-                        $emp_id = $employee['id'];
-                        $id = $emp_id;
-                        $data_after_gpa_or_gmc['id'] = $id;
+                        $emp_id                              = $employee['id'];
+                        $id                                  = $emp_id;
+                        $data_after_gpa_or_gmc['id']         = $id;
                         $data_after_gpa_or_gmc['updated_by'] = $employee_id;
                         $data_after_gpa_or_gmc['updated_at'] = $formatted_date_time;
-                        $result = $this->employeeModel->save($data_after_gpa_or_gmc);
+                        $result                              = $this->employeeModel->save($data_after_gpa_or_gmc);
                         if ($result) {
                             $log_message = 'Update Employee - ' . $employee['name'] . '(' . $employee['emp_code'] . ') with PK ' . $employee['id'];
                             $this->myLogger->logme('error', ('Update - ' . $employee['id'] . ' - ' . $employee['emp_code'] . ' - ' . $employee['name']));
@@ -966,36 +937,35 @@ class EmployeeRestController extends AdminController
                             $result = false;
                             if (count($data_after_gpa_or_gmc) != 0) {
                                 $data_after_gpa_or_gmc['created_by'] = $employee_id;
-                                $result = $this->employeeModel->insert($data_after_gpa_or_gmc);
+                                $result                              = $this->employeeModel->insert($data_after_gpa_or_gmc);
                             }
                             $emp_id = $result;
                             if ($result) {
                                 $emp = $this->employeeModel->where('id', $result)->get()->getResult();
 
-                                $policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();;
-
+                                $policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();
 
                                 $log_message = 'Insert Employee- ' . $dataToInsert[$a]['name'] . '(' . $dataToInsert[$a]['emp_code'] . ') with PK ';
-                                $this->myLogger->logme('error', ('Insert - ' .  $dataToInsert[$a]['emp_code'] . ' - ' . $dataToInsert[$a]['name']));
+                                $this->myLogger->logme('error', ('Insert - ' . $dataToInsert[$a]['emp_code'] . ' - ' . $dataToInsert[$a]['name']));
                             }
                         }
                     }
                     $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id, 'client_policy_id' => $policy_id]);
 
                     $emp_policy_data = [
-                        'employee_id' => $emp_id,
+                        'employee_id'      => $emp_id,
                         'client_policy_id' => $policy_id,
-                        'status' => 'draft',
-                        'date_coverage' => $date_coverage,
+                        'status'           => 'draft',
+                        'date_coverage'    => $date_coverage,
                         'payable_employee' => check_pay_by_employee_or_company($client_policy['policy_terms'], $dataToInsert[$a]['relationship']),
-                        'basic_cover_si' => isset($basic_cover_si[$a]) ? $basic_cover_si[$a] : null,
-                        'file_id' => isset($employee_policy['file_id']) && $employee_policy['file_id'] != '' ? $employee_policy['file_id'] : $file_id,
+                        'basic_cover_si'   => isset($basic_cover_si[$a]) ? $basic_cover_si[$a] : null,
+                        'file_id'          => isset($employee_policy['file_id']) && $employee_policy['file_id'] != '' ? $employee_policy['file_id'] : $file_id,
                     ];
 
                     // print_r($employee_policy); die;
                     if ($employee_policy) {
                         foreach ($employee_policy as $existing_policy) {
-                            $emp_policy_data['id'] = $existing_policy['id'];
+                            $emp_policy_data['id']         = $existing_policy['id'];
                             $emp_policy_data['updated_at'] = $formatted_date_time;
                             $this->employeePolicyModel->save($emp_policy_data);
                         }
@@ -1004,22 +974,22 @@ class EmployeeRestController extends AdminController
                         $emp_policy_id = $this->employeePolicyModel->insert($emp_policy_data);
                     }
 
-                    if (isset($notification) && $notification['enabled'] == 1 && !empty($notification['mail_content'])) {
+                    if (isset($notification) && $notification['enabled'] == 1 && ! empty($notification['mail_content'])) {
 
                         //trigger
                         // $wholeData=[];
-                        if ($dataToInsert[$a]['relationship'] == 'Self' && isset($dataToInsert[$a]['email_corporate']) && !empty($dataToInsert[$a]['email_corporate'])) {
+                        if ($dataToInsert[$a]['relationship'] == 'Self' && isset($dataToInsert[$a]['email_corporate']) && ! empty($dataToInsert[$a]['email_corporate'])) {
 
                             $params['dataToInsert'] = $dataToInsert[$a];
                             $params['notification'] = $notification;
-                            $params['client_data'] = $client_data;
-                            $params['common'] = [
-                                'client_id' => $client_id,
-                                'client_branch_id' => $client_branch_id,
-                                'client_policy_id' => $policy_id,
+                            $params['client_data']  = $client_data;
+                            $params['common']       = [
+                                'client_id'          => $client_id,
+                                'client_branch_id'   => $client_branch_id,
+                                'client_policy_id'   => $policy_id,
                                 'employee_policy_id' => $emp_policy_id ?? null,
-                                'employee_id' => $emp_id,
-                                'mail_type' => 'member_welcome_mail',
+                                'employee_id'        => $emp_id,
+                                'mail_type'          => 'member_welcome_mail',
                             ];
 
                             $wholeData[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params);
@@ -1029,13 +999,12 @@ class EmployeeRestController extends AdminController
                         // if($count == 20 || $a == count($dataToInsert)-1){
                         //     if (count($wholeData) > 0) {
                         //         $job_details  = new Jobs();
-                        //         $r = Jobs::addJob(['job_name' => 'bulk_mail','payload' => $wholeData]); 
+                        //         $r = Jobs::addJob(['job_name' => 'bulk_mail','payload' => $wholeData]);
                         //         $wholeData = [];
                         //         $count = 0;
                         //     }
                         // }
 
-
                         // if ($dataToInsert[$a]['email_corporate'] != null || $dataToInsert[$a]['email_corporate'] != ''  &&  $dataToInsert[$a]['relationship'] == 'Self') {
 
                     }
@@ -1043,14 +1012,14 @@ class EmployeeRestController extends AdminController
 
                 // print_r($wholeData); die;
 
-                // for bulk mail queue job push 
-                if (!empty($wholeData) && count($wholeData) > 0) {
+                // for bulk mail queue job push
+                if (! empty($wholeData) && count($wholeData) > 0) {
 
                     $wholeData = array_chunk($wholeData, 20);
 
                     foreach ($wholeData as $key => $value) {
-                        $job_details  = new Jobs();
-                        $r = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $value]);
+                        $job_details = new Jobs();
+                        $r           = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $value]);
                     }
                 }
 
@@ -1064,14 +1033,13 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     //-------------------------------------
     public function getAgeRange($terms, $familyFloatesValue)
     {
 
         $ageRangeArray = ['self' => ['min' => 18, 'max' => 60], 'spouse' => ['min' => 18, 'max' => 60], 'child' => ['min' => 0, 'max' => 25], 'elders' => ['min' => 18, 'max' => 60]];
 
-        $ageKey = (preg_replace('/\d/', '', $familyFloatesValue) == 'parent' || preg_replace('/\d/', '', $familyFloatesValue) == 'parent_in_law') ?  'elders' :  preg_replace('/\d/', '', $familyFloatesValue);
+        $ageKey = (preg_replace('/\d/', '', $familyFloatesValue) == 'parent' || preg_replace('/\d/', '', $familyFloatesValue) == 'parent_in_law') ? 'elders' : preg_replace('/\d/', '', $familyFloatesValue);
         if (isset($terms->age_ratio)) {
             return $terms->age_ratio->$ageKey;
         } else {
@@ -1083,14 +1051,14 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $id = $this->request->getGet('id');
-            $emp_code = $this->request->getGet('emp_code');
-            $client_id = $this->request->getGet('client_id');
+            $id               = $this->request->getGet('id');
+            $emp_code         = $this->request->getGet('emp_code');
+            $client_id        = $this->request->getGet('client_id');
             $client_branch_id = $this->request->getGet('client_branch_id');
-            $login_by_hr = $this->request->getGet('login_by_hr');
+            $login_by_hr      = $this->request->getGet('login_by_hr');
 
             // This is an array containing keys to be removed from the terms and conditions array
-            $keysToRemove  = ["removable_keys"];
+            $keysToRemove = ["removable_keys"];
             // Retrieve employee policy data by passing the employee primary key
             $empPolicy = $this->employeeModel->getEmployeePolicy($id);
             // dd($empPolicy);
@@ -1101,7 +1069,6 @@ class EmployeeRestController extends AdminController
                 ->where('is_active', 1)
                 ->where('is_addon_value', 0)->findAll();
 
-
             if ($empPolicy) {
 
                 $result = [];
@@ -1109,16 +1076,15 @@ class EmployeeRestController extends AdminController
                     // Reset employee array
                     $empData = $employeeData;
 
-
                     // Removes specific keys from the decoded array and assigns the result to $refusingData
-                    $decodedArray = json_decode($array->Policy_Terms);
-                    $refusingData = (object) array_diff_key((array) $decodedArray, array_flip($keysToRemove));
+                    $decodedArray        = json_decode($array->Policy_Terms);
+                    $refusingData        = (object) array_diff_key((array) $decodedArray, array_flip($keysToRemove));
                     $array->Policy_Terms = $refusingData;
 
-                    // Retrieve slab rate and grid master data by passing the ClientPolicyId and ClientId 
+                    // Retrieve slab rate and grid master data by passing the ClientPolicyId and ClientId
                     $getSlabAndGridData = $this->policesModel->getPolicySlabRatesForEmpOnboard($array->ClientPolicyId, $array->ClientId);
-                    $array->SlabRates = $getSlabAndGridData['slab_rates'];
-                    $array->GridMaster = $getSlabAndGridData['grid_master'];
+                    $array->SlabRates   = $getSlabAndGridData['slab_rates'];
+                    $array->GridMaster  = $getSlabAndGridData['grid_master'];
 
                     if ($array->tpa_id != null) {
                         $array->eCardDownload = base_url('download-e-card/') . $array->rand_string . '/1';
@@ -1126,55 +1092,51 @@ class EmployeeRestController extends AdminController
                         $array->eCardDownload = null;
                     }
 
-
                     // Construct value for policy type GPA
                     // $getSlabAndGridData['grid_master']['policy_type'] == "GPA"
                     if ($array->policy_type_id == 1 && $this->request->getGet('policy') == 'GPA') {
 
-                        $si_value = 0;
+                        $si_value         = 0;
                         $si_premium_value = 0;
-                        $si_gst_value = 0;
+                        $si_gst_value     = 0;
 
                         // Filter employee data where the family_floater_key is 'self'
-                        $selfData = array_filter($empData, fn($arr) => trim(strtolower($arr['family_floater_key'])) === 'self');
+                        $selfData        = array_filter($empData, fn($arr) => trim(strtolower($arr['family_floater_key'])) === 'self');
                         $employee_policy = $this->employeePolicyModel->where('employee_id', $selfData[0]['id'])->where('client_policy_id', $array->ClientPolicyId)->where('is_active', 1)->get()->getRow();
-                        $si_value = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
+                        $si_value        = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
                         if (isset($employee_policy->payable_employee) && $employee_policy->payable_employee == 1) {
                             $si_premium_value = $si_premium_value + $employee_policy->rata_premimum;
-                            $si_gst_value = $si_gst_value + $employee_policy->gst;
+                            $si_gst_value     = $si_gst_value + $employee_policy->gst;
                         }
 
-                        $self['is_value_exist'] = true;
+                        $self['is_value_exist']             = true;
                         $self['data']['family_floater_key'] = 'self';
-                        $self['data']['employee_id'] = $id;
-                        $self['data']['relationship'] = 'Self';
-                        $self['data']['name'] = $selfData[0]['name'];
-                        $self['data']['dob'] = $this->convertDateFormatDMY($selfData[0]['dob']);
-                        $self['data']['mobile'] = $selfData[0]['mobile'];
-                        $self['data']['client_policy_id'] = $array->ClientPolicyId;
-                        $self['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
+                        $self['data']['employee_id']        = $id;
+                        $self['data']['relationship']       = 'Self';
+                        $self['data']['name']               = $selfData[0]['name'];
+                        $self['data']['dob']                = $this->convertDateFormatDMY($selfData[0]['dob']);
+                        $self['data']['mobile']             = $selfData[0]['mobile'];
+                        $self['data']['client_policy_id']   = $array->ClientPolicyId;
+                        $self['data']['basic_cover_si']     = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
 
                         $array->mapped_family_floaters = $self;
-                        $array->type = 'GPA';
-                        $array->si_value = $si_value;
-                        $array->si_premium_value = $si_premium_value;
-                        $array->si_gst_value = $si_gst_value;
-
-
+                        $array->type                   = 'GPA';
+                        $array->si_value               = $si_value;
+                        $array->si_premium_value       = $si_premium_value;
+                        $array->si_gst_value           = $si_gst_value;
 
                         $res = [];
                         array_push($res, $array);
-                        $EDLIPolicy =  $this->getAdditionalGPAPolicy($employeeData, 6, $emp_code, $client_id, $client_branch_id, $login_by_hr);
+                        $EDLIPolicy = $this->getAdditionalGPAPolicy($employeeData, 6, $emp_code, $client_id, $client_branch_id, $login_by_hr);
                         if ($EDLIPolicy) {
                             array_push($res, $EDLIPolicy);
                         }
-                        $GTLIPolicy =  $this->getAdditionalGPAPolicy($employeeData, 7, $emp_code, $client_id, $client_branch_id, $login_by_hr);
+                        $GTLIPolicy = $this->getAdditionalGPAPolicy($employeeData, 7, $emp_code, $client_id, $client_branch_id, $login_by_hr);
                         if ($GTLIPolicy) {
                             array_push($res, $GTLIPolicy);
                         }
                         return $this->respond(['status' => 'success', 'code' => 200, 'data' => $res], 200);
 
-
                         // Return result
                         if ($this->request->getGet('policy') == 'GPA') {
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $array], 200);
@@ -1184,8 +1146,6 @@ class EmployeeRestController extends AdminController
                         // $getSlabAndGridData['grid_master']['policy_type'] == "GMC"
                     } else if ($array->policy_type_id == 2 && $this->request->getGet('policy') == 'GMC') {
 
-
-
                         // Map family floaters that already exist in the employee table
                         $familyFloates = $array->Policy_Terms->family_floaters;
 
@@ -1193,26 +1153,26 @@ class EmployeeRestController extends AdminController
                         $array->notes = $this->FloterNotesConvertion($familyFloates);
 
                         if ($getSlabAndGridData['slab_rates'][0]['premium_type'] == 1 || $getSlabAndGridData['slab_rates'][0]['premium_type'] == 3) {
-                            $array->floter_text_heading = 'Floater Sum Insured';
+                            $array->floter_text_heading     = 'Floater Sum Insured';
                             $array->floter_text_description = 'This is a floater sum insured. A floater is a type of sum insured that provides coverage to more than one member ot a family at the same time. Simply put, its a single insurance cover for the entire family.';
                         } else {
-                            $array->floter_text_heading = 'Sum Insured';
+                            $array->floter_text_heading     = 'Sum Insured';
                             $array->floter_text_description = '';
                         }
 
-                        // remove parent and parent-in-law from familyFloaters 
+                        // remove parent and parent-in-law from familyFloaters
                         if ($familyFloates->{'either-parents-pil'} != 0) {
                             unset($familyFloates->parents);
                             unset($familyFloates->parents_in_law);
                         }
                         $floters = $this->FloterConvertion($familyFloates);
 
-                        $data = [];
-                        $dependent_and_si_value = 0;
+                        $data                           = [];
+                        $dependent_and_si_value         = 0;
                         $dependent_and_si_premium_value = 0;
-                        $dependent_and_si_gst_value = 0;
+                        $dependent_and_si_gst_value     = 0;
                         foreach ($floters as $familyFloatesValue) {
-                            $dependent =   preg_replace('/\d/', '', $familyFloatesValue);
+                            $dependent = preg_replace('/\d/', '', $familyFloatesValue);
 
                             if (count($empData)) {
                                 foreach ($empData as $key => $value) {
@@ -1230,16 +1190,15 @@ class EmployeeRestController extends AdminController
                                             }
                                         }
 
-                                        $temp['is_value_exist'] = true;
+                                        $temp['is_value_exist']             = true;
                                         $temp['data']['family_floater_key'] = $familyFloatesValue;
-                                        $temp['data']['employee_id'] = $value['id'];
-                                        $temp['data']['relationship'] = $value['relationship'];
-                                        $temp['data']['name'] = $value['name'];
-                                        $temp['data']['dob'] = $this->convertDateFormatDMY($value['dob']);
-                                        $temp['data']['client_policy_id'] = $array->ClientPolicyId;
-                                        $temp['data']['form_type'] = $dependent;
-                                        $temp['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
-
+                                        $temp['data']['employee_id']        = $value['id'];
+                                        $temp['data']['relationship']       = $value['relationship'];
+                                        $temp['data']['name']               = $value['name'];
+                                        $temp['data']['dob']                = $this->convertDateFormatDMY($value['dob']);
+                                        $temp['data']['client_policy_id']   = $array->ClientPolicyId;
+                                        $temp['data']['form_type']          = $dependent;
+                                        $temp['data']['basic_cover_si']     = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
 
                                         $temp['data']['age_validation'] = $this->getAgeRange($decodedArray, $familyFloatesValue);
 
@@ -1252,11 +1211,9 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-
-
                         // Remove Unwanted floter key from floters array based on either-parents-pil  term value
                         if ($familyFloates->{'either-parents-pil'} == 1 && count($floters)) {
-                            $count_parent = 0;
+                            $count_parent        = 0;
                             $count_parent_in_law = 0;
                             foreach ($floters as $value) {
                                 if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1273,7 +1230,7 @@ class EmployeeRestController extends AdminController
                                 $floters = array_filter($floters, fn($value) => strpos($value, 'parent') === false || strpos($value, 'parent_in_law') !== false);
                             }
                         } else if ($familyFloates->{'either-parents-pil'} == 2 && count($floters)) {
-                            $count_parent = 0;
+                            $count_parent        = 0;
                             $count_parent_in_law = 0;
                             foreach ($floters as $value) {
                                 if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1292,12 +1249,11 @@ class EmployeeRestController extends AdminController
                         if (count($floters)) {
                             foreach ($floters as $familyFloatesValue) {
 
-                                $temp2['is_value_exist'] = false;
+                                $temp2['is_value_exist']             = false;
                                 $temp2['data']['family_floater_key'] = $familyFloatesValue;
-                                $temp2['data']['client_policy_id'] = $array->ClientPolicyId;
-                                $temp2['data']['button_name'] = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
-                                $temp2['data']['form_type'] = preg_replace('/\d/', '', $familyFloatesValue);
-
+                                $temp2['data']['client_policy_id']   = $array->ClientPolicyId;
+                                $temp2['data']['button_name']        = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
+                                $temp2['data']['form_type']          = preg_replace('/\d/', '', $familyFloatesValue);
 
                                 $temp2['data']['age_validation'] = $this->getAgeRange($decodedArray, $familyFloatesValue);
 
@@ -1305,23 +1261,23 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-                        $array->mapped_family_floaters = $data;
-                        $array->type = "GMC";
-                        $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
-                        $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
-                        $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
+                        $array->mapped_family_floaters                            = $data;
+                        $array->type                                              = "GMC";
+                        $array->family_floaters_of_dependent_and_si_value         = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
+                        $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
+                        $array->family_floaters_of_dependent_and_gst_value        = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
 
                         $checkGmcParentsPolicyExist = $this->clientPolicyModel->select('client_policy.id as ClientPolicyId , client_policy.client_id as ClientId, client_policy.policy_type_id as policy_type_id, policy_type.long_name as Policy_Name , client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type  as inception_type , client_policy.policy_terms as Policy_Terms')
                             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
-                            ->where('client_policy.policy_type_id',  3)
-                            ->where('client_policy.is_addon',  1)
+                            ->where('client_policy.policy_type_id', 3)
+                            ->where('client_policy.is_addon', 1)
                             ->where('client_policy.client_id', $this->request->getGet('client_id'))
                             ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id'))
                             ->where('client_policy.is_active', 1)
                             ->get()
                             ->getResult();
                         if ($checkGmcParentsPolicyExist) {
-                            $GmcParrentsData =  $this->getGmcParrentsPolicy($checkGmcParentsPolicyExist, $emp_code, $client_id, $client_branch_id);
+                            $GmcParrentsData = $this->getGmcParrentsPolicy($checkGmcParentsPolicyExist, $emp_code, $client_id, $client_branch_id);
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => [$array, $GmcParrentsData]], 200);
                         }
 
@@ -1342,7 +1298,6 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function getGmcParrentsPolicy($GmcParrentsPolicy, $emp_code, $client_id, $client_branch_id)
     {
 
@@ -1354,19 +1309,15 @@ class EmployeeRestController extends AdminController
         // return  $employeeData;
         foreach ($GmcParrentsPolicy as $key => $array) {
 
-
-
             // Reset employee array
             $empData = $employeeData;
 
-
             $array->Policy_Terms = json_decode($array->Policy_Terms);
 
-
-            // Retrieve slab rate and grid master data by passing the ClientPolicyId and ClientId 
+            // Retrieve slab rate and grid master data by passing the ClientPolicyId and ClientId
             $getSlabAndGridData = $this->policesModel->getPolicySlabRatesForEmpOnboard($array->ClientPolicyId, $array->ClientId);
-            $array->SlabRates = $getSlabAndGridData['slab_rates'];
-            $array->GridMaster = $getSlabAndGridData['grid_master'];
+            $array->SlabRates   = $getSlabAndGridData['slab_rates'];
+            $array->GridMaster  = $getSlabAndGridData['grid_master'];
 
             $tpaArray = $this->employeeModel->select('employees.name as name , employee_polices.tpa_id as tpa_id ,  employee_polices.rand_string as rand_string')
                 ->join('employee_polices', 'employee_polices.employee_id = employees.id')
@@ -1378,15 +1329,16 @@ class EmployeeRestController extends AdminController
 
             if (count($tpaArray)) {
 
-                if ($tpaArray[0]->tpa_id != null)
+                if ($tpaArray[0]->tpa_id != null) {
                     $array->eCardDownload = base_url('download-e-card/') . $tpaArray[0]->rand_string . '/1';
-                else
+                } else {
                     $array->eCardDownload = null;
+                }
+
             } else {
                 $array->eCardDownload = null;
             }
 
-
             $array->eCardDownload = null;
 
             // Map family floaters that already exist in the employee table
@@ -1395,30 +1347,29 @@ class EmployeeRestController extends AdminController
             // Generate Notes string based on  familyFloates terms
             $array->notes = $this->FloterNotesConvertion($familyFloates);
 
-            if ($getSlabAndGridData['slab_rates'][0]['premium_type'] == 1  || $getSlabAndGridData['slab_rates'][0]['premium_type'] == 3) {
-                $array->floter_text_heading = 'Floater Sum Insured';
+            if ($getSlabAndGridData['slab_rates'][0]['premium_type'] == 1 || $getSlabAndGridData['slab_rates'][0]['premium_type'] == 3) {
+                $array->floter_text_heading     = 'Floater Sum Insured';
                 $array->floter_text_description = 'This is a floater sum insured. A floater is a type of sum insured that provides coverage to more than one member ot a family at the same time. Simply put, its a single insurance cover for the entire family.';
             } else {
-                $array->floter_text_heading = 'Sum Insured';
+                $array->floter_text_heading     = 'Sum Insured';
                 $array->floter_text_description = '';
             }
 
-
-            // remove parent and parent-in-law from familyFloaters 
+            // remove parent and parent-in-law from familyFloaters
             if ($familyFloates->{'either-parents-pil'} != 0) {
                 unset($familyFloates->parents);
                 unset($familyFloates->parents_in_law);
             }
 
-            // Convert familyFloaters terms data to plain array 
+            // Convert familyFloaters terms data to plain array
             $floters = $this->FloterConvertion($familyFloates);
 
-            $data = [];
-            $dependent_and_si_value = 0;
+            $data                           = [];
+            $dependent_and_si_value         = 0;
             $dependent_and_si_premium_value = 0;
-            $dependent_and_si_gst_value = 0;
+            $dependent_and_si_gst_value     = 0;
             foreach ($floters as $familyFloatesValue) {
-                $dependent =   preg_replace('/\d/', '', $familyFloatesValue);
+                $dependent = preg_replace('/\d/', '', $familyFloatesValue);
 
                 if (count($empData)) {
                     foreach ($empData as $key => $value) {
@@ -1436,17 +1387,16 @@ class EmployeeRestController extends AdminController
                                 }
                             }
 
-                            $temp['is_value_exist'] = true;
+                            $temp['is_value_exist']             = true;
                             $temp['data']['family_floater_key'] = $familyFloatesValue;
-                            $temp['data']['employee_id'] = $value['id'];
-                            $temp['data']['relationship'] = $value['relationship'];
-                            $temp['data']['name'] = $value['name'];
-                            $temp['data']['dob'] = $this->convertDateFormatDMY($value['dob']);
-                            $temp['data']['client_policy_id'] = $array->ClientPolicyId;
-                            $temp['data']['form_type'] = $dependent;
-                            $temp['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
-                            $temp['data']['age_validation'] = $this->getAgeRange($array->Policy_Terms, $familyFloatesValue);
-
+                            $temp['data']['employee_id']        = $value['id'];
+                            $temp['data']['relationship']       = $value['relationship'];
+                            $temp['data']['name']               = $value['name'];
+                            $temp['data']['dob']                = $this->convertDateFormatDMY($value['dob']);
+                            $temp['data']['client_policy_id']   = $array->ClientPolicyId;
+                            $temp['data']['form_type']          = $dependent;
+                            $temp['data']['basic_cover_si']     = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
+                            $temp['data']['age_validation']     = $this->getAgeRange($array->Policy_Terms, $familyFloatesValue);
 
                             array_push($data, $temp);
                             unset($empData[$key]);
@@ -1459,7 +1409,7 @@ class EmployeeRestController extends AdminController
 
             // Remove Unwanted floter key from floters array based on either-parents-pil  term value
             if ($familyFloates->{'either-parents-pil'} == 1 && count($floters)) {
-                $count_parent = 0;
+                $count_parent        = 0;
                 $count_parent_in_law = 0;
                 foreach ($floters as $value) {
                     if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1476,7 +1426,7 @@ class EmployeeRestController extends AdminController
                     $floters = array_filter($floters, fn($value) => strpos($value, 'parent') === false || strpos($value, 'parent_in_law') !== false);
                 }
             } else if ($familyFloates->{'either-parents-pil'} == 2 && count($floters)) {
-                $count_parent = 0;
+                $count_parent        = 0;
                 $count_parent_in_law = 0;
                 foreach ($floters as $value) {
                     if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1495,32 +1445,31 @@ class EmployeeRestController extends AdminController
             if (count($floters)) {
                 foreach ($floters as $familyFloatesValue) {
 
-                    $temp2['is_value_exist'] = false;
+                    $temp2['is_value_exist']             = false;
                     $temp2['data']['family_floater_key'] = $familyFloatesValue;
-                    $temp2['data']['client_policy_id'] = $array->ClientPolicyId;
-                    $temp2['data']['button_name'] = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
-                    $temp2['data']['form_type'] = preg_replace('/\d/', '', $familyFloatesValue);
-                    $temp2['data']['age_validation'] = $this->getAgeRange($array->Policy_Terms, $familyFloatesValue);
+                    $temp2['data']['client_policy_id']   = $array->ClientPolicyId;
+                    $temp2['data']['button_name']        = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
+                    $temp2['data']['form_type']          = preg_replace('/\d/', '', $familyFloatesValue);
+                    $temp2['data']['age_validation']     = $this->getAgeRange($array->Policy_Terms, $familyFloatesValue);
                     array_push($data, $temp2);
                 }
             }
 
-            $array->mapped_family_floaters = $data;
-            $array->type = "GMC - Parents";
-            $array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
-            $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
-            $array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
+            $array->mapped_family_floaters                            = $data;
+            $array->type                                              = "GMC - Parents";
+            $array->family_floaters_of_dependent_and_si_value         = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
+            $array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
+            $array->family_floaters_of_dependent_and_gst_value        = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
 
             return $array;
         }
     }
 
-
     public function getAdditionalGPAPolicy($empData, $policy_type, $emp_code, $client_id, $client_branch_id, $login_by_hr)
     {
         $checkPolicyExist = $this->clientPolicyModel->select('client_policy.id as ClientPolicyId , client_policy.client_id as ClientId,  client_policy.policy_type_id as policy_type_id,  client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type  as inception_type , client_policy.policy_terms as Policy_Terms , client_policy.enrolment_visibility')
-            ->where('client_policy.policy_type_id',  $policy_type)
-            ->where('client_policy.is_addon',  1)
+            ->where('client_policy.policy_type_id', $policy_type)
+            ->where('client_policy.is_addon', 1)
             ->where('client_policy.client_id', $client_id)
             ->where('client_policy.client_branch_id', $client_branch_id)
             ->where('client_policy.is_active', 1)
@@ -1531,28 +1480,27 @@ class EmployeeRestController extends AdminController
 
             foreach ($checkPolicyExist as $key => $array) {
 
-                $decodedArray = json_decode($array->Policy_Terms);
+                $decodedArray        = json_decode($array->Policy_Terms);
                 $array->Policy_Terms = $decodedArray;
-                $si_value = 0;
-                $si_premium_value = 0;
-                $si_gst_value = 0;
+                $si_value            = 0;
+                $si_premium_value    = 0;
+                $si_gst_value        = 0;
 
                 // Filter employee data where the family_floater_key is 'self'
-                $selfData = array_filter($empData, fn($arr) => trim(strtolower($arr['family_floater_key'])) === 'self');
+                $selfData        = array_filter($empData, fn($arr) => trim(strtolower($arr['family_floater_key'])) === 'self');
                 $employee_policy = $this->employeePolicyModel->where('employee_id', $selfData[0]['id'])->where('client_policy_id', $array->ClientPolicyId)->where('is_active', 1)->get()->getRow();
-                $si_value = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
+                $si_value        = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
                 if (isset($employee_policy->payable_employee) && $employee_policy->payable_employee == 1) {
                     $si_premium_value = $si_premium_value + $employee_policy->rata_premimum;
-                    $si_gst_value = $si_gst_value + $employee_policy->gst;
+                    $si_gst_value     = $si_gst_value + $employee_policy->gst;
                 }
                 $policyTypeData = $this->policyTypeModel->where('id', $policy_type)->get()->getRow();
 
-                $array->type = $policyTypeData->policy_type;
-                $array->Policy_Name = $policyTypeData->long_name;
-                $array->si_value = $si_value;
+                $array->type             = $policyTypeData->policy_type;
+                $array->Policy_Name      = $policyTypeData->long_name;
+                $array->si_value         = $si_value;
                 $array->si_premium_value = $si_premium_value;
-                $array->si_gst_value = $si_gst_value;
-
+                $array->si_gst_value     = $si_gst_value;
 
                 if ($employee_policy) {
 
@@ -1562,26 +1510,27 @@ class EmployeeRestController extends AdminController
                         $array->eCardDownload = null;
                     }
 
-                    $self['is_value_exist'] = true;
+                    $self['is_value_exist']             = true;
                     $self['data']['family_floater_key'] = 'self';
-                    $self['data']['employee_id'] = $selfData[0]['id'];
-                    $self['data']['relationship'] = 'Self';
-                    $self['data']['name'] = $selfData[0]['name'];
-                    $self['data']['dob'] = $this->convertDateFormatDMY($selfData[0]['dob']);
-                    $self['data']['mobile'] = $selfData[0]['mobile'];
-                    $self['data']['client_policy_id'] = $array->ClientPolicyId;
-                    $self['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
-                    $array->mapped_family_floaters = $self;
-
+                    $self['data']['employee_id']        = $selfData[0]['id'];
+                    $self['data']['relationship']       = 'Self';
+                    $self['data']['name']               = $selfData[0]['name'];
+                    $self['data']['dob']                = $this->convertDateFormatDMY($selfData[0]['dob']);
+                    $self['data']['mobile']             = $selfData[0]['mobile'];
+                    $self['data']['client_policy_id']   = $array->ClientPolicyId;
+                    $self['data']['basic_cover_si']     = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : 0;
+                    $array->mapped_family_floaters      = $self;
 
                     if (isset($login_by_hr) && $login_by_hr == true) {
                         return $array;
                     } else {
 
-                        if ($array->enrolment_visibility == 1)
+                        if ($array->enrolment_visibility == 1) {
                             return $array;
-                        else
+                        } else {
                             return false;
+                        }
+
                     }
                 } else {
                     return false;
@@ -1590,8 +1539,6 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-
     public function FloterConvertion($array)
     {
 
@@ -1641,8 +1588,8 @@ class EmployeeRestController extends AdminController
                 } else if ($value == 2 && $key === 'either-parents-pil') {
                     $result .= ' + Any 2 of Parents and Parents in law';
                 } else if ($value != 0 && $key === 'spouse') {
-                    $string = str_replace('-', ' ', $key);
-                    $string = ucwords($string);
+                    $string  = str_replace('-', ' ', $key);
+                    $string  = ucwords($string);
                     $result .= ' + ' . $string;
                 } else if ($value != 0 && $key === 'self') {
                     $result = 'Allowed members Self ';
@@ -1654,8 +1601,8 @@ class EmployeeRestController extends AdminController
                     }
                 } else if ($value != 0 && $key === 'elders_count') {
                 } else {
-                    $string = str_replace('-', ' ', $key);
-                    $string = ucwords($string);
+                    $string  = str_replace('-', ' ', $key);
+                    $string  = ucwords($string);
                     $result .= ' + ' . $value . ' ' . $string;
                 }
             }
@@ -1679,13 +1626,13 @@ class EmployeeRestController extends AdminController
             $client_id = $this->request->getGet('client_id');
             if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
                 $client = $this->clientModel->where('MD5(id)', $client_id)->first();
-            }else{
+            } else {
                 $client = $this->clientModel->where('id', $client_id)->first();
-            } 
+            }
 
-            if (!empty($client)) {
+            if (! empty($client)) {
                 $client['client_logo'] = base_url() . 'public/uploads/logo/' . $client['client_logo'];
-                $clientPolicy = $this->clientPolicyModel->where('client_id', $client['id'])
+                $clientPolicy          = $this->clientPolicyModel->where('client_id', $client['id'])
                     ->where('client_branch_id', $this->request->getGet('client_branch_id'))->findAll();
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['client' => $client, 'client_policy' => $clientPolicy]], 200);
             } else {
@@ -1706,8 +1653,6 @@ class EmployeeRestController extends AdminController
                 ->where('client_branch_id', $this->request->getGet('client_branch_id'))
                 ->where('is_addon_value', 1)->findAll();
 
-
-
             $clientPolicy = $this->clientPolicyModel->where('client_id', $this->request->getGet('client_id'))
                 ->where('client_branch_id', $this->request->getGet('client_branch_id'))
                 ->where('policy_status', 1)
@@ -1723,47 +1668,46 @@ class EmployeeRestController extends AdminController
                     ->get()
                     ->getRow();
 
-                $band = $self->band;
+                $band       = $self->band;
                 $PolicyData = [];
                 foreach ($clientPolicy as $key => $array) {
                     $responce = [];
 
-                    $decodedArray = json_decode($array['policy_terms']);
-                    $policy_terms = $decodedArray;
+                    $decodedArray       = json_decode($array['policy_terms']);
+                    $policy_terms       = $decodedArray;
                     $getSlabAndGridData = $this->policesModel->getPolicySlabRatesForEmpOnboard($array['id'], $array['client_id']);
-                    $uniqueData = [];
-                    $siValues = [];
+                    $uniqueData         = [];
+                    $siValues           = [];
                     foreach ($getSlabAndGridData['slab_rates'] as $item) {
                         if ($getSlabAndGridData['grid_master']['emp_band'] == 1) {
                             if ($item['grade'] == $band) {
                                 $uniqueData[] = $item;
                             }
                         } else {
-                            if (!in_array($item['si'], $siValues)) {
+                            if (! in_array($item['si'], $siValues)) {
 
                                 if ($item['policy_grid_id'] == 11 && ($item['max_si'] != 0 || $item['max_si'] != null)) {
                                     $uniqueData[] = $item;
-                                    $siValues[] = $item['si'];
+                                    $siValues[]   = $item['si'];
                                 } else if ($item['policy_grid_id'] != 11) {
                                     $uniqueData[] = $item;
-                                    $siValues[] = $item['si'];
+                                    $siValues[]   = $item['si'];
                                 }
                             }
                         }
                     }
 
-
-                    $policyTypeData = $this->policyTypeModel->where('id', $array['policy_type_id'])->get()->getRow();
-                    $responce['policy_name'] =  $policyTypeData->long_name;
-                    $responce['type'] = $policyTypeData->policy_type;
-                    $responce['SlabRates'] = $uniqueData;
-                    $responce['GridMaster'] = $getSlabAndGridData['grid_master'];
-                    $responce['client_id'] = $array['client_id'];
-                    $responce['client_policy_id'] = $array['id'];
-                    $responce['is_addon'] = $array['is_addon'];
+                    $policyTypeData                = $this->policyTypeModel->where('id', $array['policy_type_id'])->get()->getRow();
+                    $responce['policy_name']       = $policyTypeData->long_name;
+                    $responce['type']              = $policyTypeData->policy_type;
+                    $responce['SlabRates']         = $uniqueData;
+                    $responce['GridMaster']        = $getSlabAndGridData['grid_master'];
+                    $responce['client_id']         = $array['client_id'];
+                    $responce['client_policy_id']  = $array['id'];
+                    $responce['is_addon']          = $array['is_addon'];
                     $responce['OpenForEnrollment'] = $array['open_for_enrollment'];
-                    $responce['policy_terms'] = $decodedArray;
-                    $responce['policy_type_id'] = $array['policy_type_id'];
+                    $responce['policy_terms']      = $decodedArray;
+                    $responce['policy_type_id']    = $array['policy_type_id'];
                     //$responce['is_member_modify_allowed'] =  $array['is_member_modify_allowed'];
                     $responce['disclaimer'] = $array['disclaimer'];
 
@@ -1775,12 +1719,13 @@ class EmployeeRestController extends AdminController
                         ->get()
                         ->getResult();
 
-
                     if (count($tpaArray)) {
-                        if ($tpaArray[0]->tpa_id != null)
+                        if ($tpaArray[0]->tpa_id != null) {
                             $responce['eCardDownload'] = base_url('download-e-card/') . $tpaArray[0]->rand_string . '/1';
-                        else
+                        } else {
                             $responce['eCardDownload'] = null;
+                        }
+
                     } else {
                         $responce['eCardDownload'] = null;
                     }
@@ -1789,11 +1734,10 @@ class EmployeeRestController extends AdminController
                         if ($getSlabAndGridData['slab_rates'][0]['premium_type'] == 1 || $getSlabAndGridData['slab_rates'][0]['premium_type'] == 3) {
                             $responce['floter_text_heading'] = 'Floater Sum Insured';
                         } else {
-                            $responce['floter_text_heading'] =  'Sum Insured';
+                            $responce['floter_text_heading'] = 'Sum Insured';
                         }
                     }
 
-
                     if ($array['is_addon'] == 3 && $array['policy_type_id'] == 3) //dependent add on policy
                     {
 
@@ -1811,7 +1755,7 @@ class EmployeeRestController extends AdminController
                                 ->get()
                                 ->getRow();
 
-                            $selfSi = $selfGMC->basic_cover_si;
+                            $selfSi            = $selfGMC->basic_cover_si;
                             $filteredSlabRates = array_filter($responce['SlabRates'], function ($rate) use ($selfSi) {
                                 return $rate['si'] === $selfSi;
                             });
@@ -1819,23 +1763,22 @@ class EmployeeRestController extends AdminController
                             $responce['SlabRates'] = array_values($filteredSlabRates);
                         }
 
-
                         // Map family floaters that already exist in the employee table
                         $familyFloates = $policy_terms->family_floaters;
-                        // remove parent and parent-in-law from familyFloaters 
+                        // remove parent and parent-in-law from familyFloaters
                         if ($familyFloates->{'either-parents-pil'} != 0) {
                             unset($familyFloates->parents);
                             unset($familyFloates->parents_in_law);
                         }
-                        // Convert familyFloaters terms data to plain array 
+                        // Convert familyFloaters terms data to plain array
                         $floters = $this->FloterConvertion($familyFloates);
 
-                        $data = [];
-                        $dependent_and_si_value = 0;
+                        $data                           = [];
+                        $dependent_and_si_value         = 0;
                         $dependent_and_si_premium_value = 0;
-                        $dependent_and_si_gst_value = 0;
+                        $dependent_and_si_gst_value     = 0;
                         foreach ($floters as $familyFloatesValue) {
-                            $dependent =   preg_replace('/\d/', '', $familyFloatesValue);
+                            $dependent = preg_replace('/\d/', '', $familyFloatesValue);
                             if (count($addOnEmployeeData)) {
                                 foreach ($addOnEmployeeData as $key => $value) {
                                     if ($value['family_floater_key'] === $dependent) {
@@ -1852,17 +1795,17 @@ class EmployeeRestController extends AdminController
                                             }
                                         }
 
-                                        $temp['is_value_exist'] = true;
+                                        $temp['is_value_exist']             = true;
                                         $temp['data']['family_floater_key'] = $familyFloatesValue;
-                                        $temp['data']['employee_id'] = $value['id'];
-                                        $temp['data']['relationship'] = $value['relationship'];
-                                        $temp['data']['name'] = $value['name'];
-                                        $temp['data']['dob'] = $this->convertDateFormatDMY($value['dob']);
-                                        $temp['data']['client_policy_id'] = $array['id'];
-                                        $temp['data']['form_type'] = $dependent;
-                                        $temp['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
-                                        $temp['data']['premium'] = isset($employee_policy->premium) ? $employee_policy->premium : null;
-                                        $temp['data']['age_validation'] = $this->getAgeRange($decodedArray, $familyFloatesValue);
+                                        $temp['data']['employee_id']        = $value['id'];
+                                        $temp['data']['relationship']       = $value['relationship'];
+                                        $temp['data']['name']               = $value['name'];
+                                        $temp['data']['dob']                = $this->convertDateFormatDMY($value['dob']);
+                                        $temp['data']['client_policy_id']   = $array['id'];
+                                        $temp['data']['form_type']          = $dependent;
+                                        $temp['data']['basic_cover_si']     = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
+                                        $temp['data']['premium']            = isset($employee_policy->premium) ? $employee_policy->premium : null;
+                                        $temp['data']['age_validation']     = $this->getAgeRange($decodedArray, $familyFloatesValue);
 
                                         array_push($data, $temp);
                                         unset($addOnEmployeeData[$key]);
@@ -1876,8 +1819,7 @@ class EmployeeRestController extends AdminController
                         //Remove Unwanted floter key from floters array based on either-parents-pil  term value
                         if ($familyFloates->{'either-parents-pil'} == 1 && count($floters)) {
 
-
-                            $count_parent = 0;
+                            $count_parent        = 0;
                             $count_parent_in_law = 0;
                             foreach ($floters as $value) {
                                 if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1894,7 +1836,7 @@ class EmployeeRestController extends AdminController
                                 $floters = array_filter($floters, fn($value) => strpos($value, 'parent') === false || strpos($value, 'parent_in_law') !== false);
                             }
                         } else if ($familyFloates->{'either-parents-pil'} == 2 && count($floters)) {
-                            $count_parent = 0;
+                            $count_parent        = 0;
                             $count_parent_in_law = 0;
                             foreach ($floters as $value) {
                                 if (preg_replace('/\d/', '', $value) == 'parent') {
@@ -1909,16 +1851,15 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-
                         // Add family floter buttons placement data for FE validation
                         if (count($floters)) {
                             foreach ($floters as $familyFloatesValue) {
 
-                                $temp2['is_value_exist'] = false;
+                                $temp2['is_value_exist']             = false;
                                 $temp2['data']['family_floater_key'] = $familyFloatesValue;
-                                $temp2['data']['client_policy_id'] = $array['id'];
-                                $temp2['data']['button_name'] = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
-                                $temp2['data']['form_type'] = preg_replace('/\d/', '', $familyFloatesValue);
+                                $temp2['data']['client_policy_id']   = $array['id'];
+                                $temp2['data']['button_name']        = 'Add ' . ucfirst(str_replace('_', ' ', preg_replace('/\d/', '', $familyFloatesValue)));
+                                $temp2['data']['form_type']          = preg_replace('/\d/', '', $familyFloatesValue);
 
                                 $temp2['data']['age_validation'] = $this->getAgeRange($decodedArray, $familyFloatesValue);
 
@@ -1926,14 +1867,10 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-                        $responce['family_floaters_of_dependent_and_si_array'] = $data;
-                        $responce['family_floaters_of_dependent_and_si_value'] = $dependent_and_si_value > 0 ?  $dependent_and_si_value : 0;
-                        $responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ?  round($dependent_and_si_premium_value) : 0;
-                        $responce['family_floaters_of_dependent_and_gst_value'] = $dependent_and_si_gst_value > 0 ?  round($dependent_and_si_gst_value) : 0;
-
-
-
-
+                        $responce['family_floaters_of_dependent_and_si_array']         = $data;
+                        $responce['family_floaters_of_dependent_and_si_value']         = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
+                        $responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
+                        $responce['family_floaters_of_dependent_and_gst_value']        = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
 
                         if ($this->request->getGet('policy') == 'GMC-DEPENDENT-ADDON') {
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['gmc_dependent_addon' => $responce]], 200);
@@ -1944,7 +1881,6 @@ class EmployeeRestController extends AdminController
                     } else if ($array['is_addon'] == 2 && $array['policy_type_id'] == 4) //Topup policy
                     {
 
-
                         $whereArray = [];
                         foreach ($decodedArray->family_floaters as $key => $value) {
                             if ($value != 0) {
@@ -1963,8 +1899,7 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-
-                        $getAddOnType = $this->clientPolicyModel->where('id', $array['base_policy'])->where('policy_status', 1)->get()->getRow();
+                        $getAddOnType        = $this->clientPolicyModel->where('id', $array['base_policy'])->where('policy_status', 1)->get()->getRow();
                         $basePolicyAddOnType = $getAddOnType->is_addon;
                         // if is_addon value is 1 it is GMC if not it is one of the Add On policy
                         if ($basePolicyAddOnType == 1) {
@@ -1972,10 +1907,10 @@ class EmployeeRestController extends AdminController
                         } else {
                             $is_addon_value = 1;
                         }
-                        $only_si_array = [];
-                        $only_si_value = 0;
-                        $only_si_premium_value = 0;
-                        $only_si_gst_value = 0;
+                        $only_si_array          = [];
+                        $only_si_value          = 0;
+                        $only_si_premium_value  = 0;
+                        $only_si_gst_value      = 0;
                         $BasePolicyEmployeeData = $this->employeeModel->where('is_active', 1)->where('emp_code', $this->request->getGet('emp_code'))->where('client_id', $this->request->getGet('client_id'))->where('is_addon_value', $is_addon_value)->whereIn('family_floater_key', $whereArray)->findAll();
                         foreach ($BasePolicyEmployeeData as $key => $value) {
 
@@ -1991,22 +1926,21 @@ class EmployeeRestController extends AdminController
                                     $only_si_gst_value = $only_si_gst_value + $employee_policy->gst;
                                 }
                             }
-                            $temp3['is_value_exist'] = true;
-                            $temp3['data']['employee_id'] = $value['id'];
-                            $temp3['data']['relationship'] = $value['relationship'];
-                            $temp3['data']['name'] = $value['name'];
-                            $temp3['data']['dob'] = $this->convertDateFormatDMY($value['dob']);
+                            $temp3['is_value_exist']           = true;
+                            $temp3['data']['employee_id']      = $value['id'];
+                            $temp3['data']['relationship']     = $value['relationship'];
+                            $temp3['data']['name']             = $value['name'];
+                            $temp3['data']['dob']              = $this->convertDateFormatDMY($value['dob']);
                             $temp3['data']['client_policy_id'] = $array['id'];
-                            $temp3['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
-                            $temp3['data']['premium'] = isset($employee_policy->premium) ? $employee_policy->premium : null;
+                            $temp3['data']['basic_cover_si']   = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
+                            $temp3['data']['premium']          = isset($employee_policy->premium) ? $employee_policy->premium : null;
                             array_push($only_si_array, $temp3);
                         }
 
-                        $responce['family_floaters_of_only_si_array'] = $only_si_array;
-                        $responce['family_floaters_of_only_si_value'] = $only_si_value;
+                        $responce['family_floaters_of_only_si_array']         = $only_si_array;
+                        $responce['family_floaters_of_only_si_value']         = $only_si_value;
                         $responce['family_floaters_of_only_si_premium_value'] = round($only_si_premium_value);
-                        $responce['family_floaters_of_only_si_gst_value'] = $only_si_gst_value;
-
+                        $responce['family_floaters_of_only_si_gst_value']     = $only_si_gst_value;
 
                         if ($this->request->getGet('policy') == 'GMC-SI-TOPUP') {
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['gmc_si_topup' => $responce]], 200);
@@ -2032,7 +1966,7 @@ class EmployeeRestController extends AdminController
                             }
                         }
 
-                        $getAddOnType = $this->clientPolicyModel->where('id', $array['base_policy'])->where('policy_status', 1)->get()->getRow();
+                        $getAddOnType        = $this->clientPolicyModel->where('id', $array['base_policy'])->where('policy_status', 1)->get()->getRow();
                         $basePolicyAddOnType = $getAddOnType->is_addon;
                         // if is_addon value is 1 it is GMC if not it is one of the Add On policy
                         if ($basePolicyAddOnType == 1) {
@@ -2040,10 +1974,10 @@ class EmployeeRestController extends AdminController
                         } else {
                             $is_addon_value = 1;
                         }
-                        $only_si_array = [];
-                        $only_si_value = 0;
-                        $only_si_premium_value = 0;
-                        $only_si_gst_value = 0;
+                        $only_si_array          = [];
+                        $only_si_value          = 0;
+                        $only_si_premium_value  = 0;
+                        $only_si_gst_value      = 0;
                         $BasePolicyEmployeeData = $this->employeeModel->where('is_active', 1)->where('emp_code', $this->request->getGet('emp_code'))->where('client_id', $this->request->getGet('client_id'))->where('is_addon_value', $is_addon_value)->whereIn('family_floater_key', $whereArray)->findAll();
                         foreach ($BasePolicyEmployeeData as $key => $value) {
 
@@ -2059,22 +1993,21 @@ class EmployeeRestController extends AdminController
                                     $only_si_gst_value = $only_si_gst_value + $employee_policy->gst;
                                 }
                             }
-                            $temp3['is_value_exist'] = true;
-                            $temp3['data']['employee_id'] = $value['id'];
-                            $temp3['data']['relationship'] = $value['relationship'];
-                            $temp3['data']['name'] = $value['name'];
-                            $temp3['data']['dob'] = $this->convertDateFormatDMY($value['dob']);
+                            $temp3['is_value_exist']           = true;
+                            $temp3['data']['employee_id']      = $value['id'];
+                            $temp3['data']['relationship']     = $value['relationship'];
+                            $temp3['data']['name']             = $value['name'];
+                            $temp3['data']['dob']              = $this->convertDateFormatDMY($value['dob']);
                             $temp3['data']['client_policy_id'] = $array['id'];
-                            $temp3['data']['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
-                            $temp3['data']['premium'] = isset($employee_policy->premium) ? $employee_policy->premium : null;
+                            $temp3['data']['basic_cover_si']   = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null;
+                            $temp3['data']['premium']          = isset($employee_policy->premium) ? $employee_policy->premium : null;
                             array_push($only_si_array, $temp3);
                         }
 
-                        $responce['family_floaters_of_only_si_array'] = $only_si_array;
-                        $responce['family_floaters_of_only_si_value'] = $only_si_value;
+                        $responce['family_floaters_of_only_si_array']         = $only_si_array;
+                        $responce['family_floaters_of_only_si_value']         = $only_si_value;
                         $responce['family_floaters_of_only_si_premium_value'] = round($only_si_premium_value);
-                        $responce['family_floaters_of_only_si_gst_value'] = round($only_si_gst_value);
-
+                        $responce['family_floaters_of_only_si_gst_value']     = round($only_si_gst_value);
 
                         if ($this->request->getGet('policy') == 'GMC-SI-PARENT-TOPUP') {
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['gmc_si_parent_topup' => $responce]], 200);
@@ -2082,7 +2015,6 @@ class EmployeeRestController extends AdminController
                     }
                 }
 
-
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
             } else {
                 return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
@@ -2100,15 +2032,15 @@ class EmployeeRestController extends AdminController
         $client_policy_id = $postData['client_policy_id'];
         sort($client_policy_id);
 
-        $emp_code = $postData['emp_code'];
+        $emp_code  = $postData['emp_code'];
         $client_id = $postData['client_id'];
 
-        $empData = $this->employeeModel->where('emp_code', $emp_code)->where('client_id', $client_id)->where('is_active', 1)->findAll();
+        $empData     = $this->employeeModel->where('emp_code', $emp_code)->where('client_id', $client_id)->where('is_active', 1)->findAll();
         $employeeIds = array_column($empData, 'id');
         //for mail common parameter
         $filteredEmpData = array_filter($empData, fn($item) => $item['relationship'] === 'Self');
 
-        if (!is_null($client_policy_id) && is_array($client_policy_id)) {
+        if (! is_null($client_policy_id) && is_array($client_policy_id)) {
             $array_list = [];
             foreach ($client_policy_id as $key => $value) {
                 $policy = $this->clientPolicyModel->where('id', $value)->where('open_for_enrollment', 1)->find();
@@ -2130,7 +2062,7 @@ class EmployeeRestController extends AdminController
                             ->where('status', 'draft')
                             ->orWhere('status', 'enrolled')
                             ->groupEnd()
-                            ->set(array('status' => 'enrolled'))
+                            ->set(['status' => 'enrolled'])
                             ->update();
                         //update Employee table
                         $this->employeeModel->where('emp_code', $emp_code)
@@ -2154,40 +2086,36 @@ class EmployeeRestController extends AdminController
                 }
             }
 
-
-
-
             $notification = $this->notificationModel->where('client_id', $client_id)->where('template_name', 'member_review_and_summary_mail')->first();
 
-
             if (isset($notification) && $notification['enabled'] == 1 && count($array_list)) {
-                $params['array_list'] = $array_list;
+                $params['array_list']       = $array_list;
                 $params['client_policy_id'] = $client_policy_id;
-                $params['emp_code'] = $emp_code;
-                $params['client_id'] = $client_id;
-                $params['notification'] = $notification;
-                $params['common'] = [
-                    'client_id' => $filteredEmpData[0]['client_id'],
-                    'client_branch_id' => $filteredEmpData[0]['client_branch_id'],
-                    'client_policy_id' => null,
+                $params['emp_code']         = $emp_code;
+                $params['client_id']        = $client_id;
+                $params['notification']     = $notification;
+                $params['common']           = [
+                    'client_id'          => $filteredEmpData[0]['client_id'],
+                    'client_branch_id'   => $filteredEmpData[0]['client_branch_id'],
+                    'client_policy_id'   => null,
                     'employee_policy_id' => null,
-                    'employee_id' => $filteredEmpData[0]['id'],
-                    'mail_type' => 'member_review_and_summary_mail',
+                    'employee_id'        => $filteredEmpData[0]['id'],
+                    'mail_type'          => 'member_review_and_summary_mail',
                 ];
 
                 // print_r($params);die;
-                $wholeData = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
-                $mail_send_return =  MailHelper::send_email($wholeData[0]);
+                $wholeData        = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
+                $mail_send_return = MailHelper::send_email($wholeData[0]);
                 $this->myLogger->logme("error", $mail_send_return);
 
                 if (isset($wholeData[0])) {
 
                     $params['common']['mail_type'] = 'account_maneger_summary_mail';
-                    $account_manager_wholeData = sendMailNotification::sendMailNotification('account_maneger_summary_mail', $params);
+                    $account_manager_wholeData     = sendMailNotification::sendMailNotification('account_maneger_summary_mail', $params);
 
                     if ($account_manager_wholeData != null && $account_manager_wholeData != '' && count($account_manager_wholeData)) {
                         foreach ($account_manager_wholeData as $key => $value) {
-                            $mail_send_return1 =  MailHelper::send_email($value);
+                            $mail_send_return1 = MailHelper::send_email($value);
                             $this->myLogger->logme("error", $mail_send_return1);
                         }
                     } else {
@@ -2195,7 +2123,7 @@ class EmployeeRestController extends AdminController
                     }
 
                     $params['common']['mail_type'] = 'client_hr_summary_mail';
-                    $client_hr_wholeData = sendMailNotification::sendMailNotification('client_hr_summary_mail', $params);
+                    $client_hr_wholeData           = sendMailNotification::sendMailNotification('client_hr_summary_mail', $params);
 
                     if ($client_hr_wholeData != null && $client_hr_wholeData != '' && count($client_hr_wholeData)) {
                         foreach ($client_hr_wholeData as $key => $value) {
@@ -2214,47 +2142,46 @@ class EmployeeRestController extends AdminController
         return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
     }
 
-    //Post method  - which receives client_policy id and empcode of the family.
-    //Pull records againest emp code and calculate premium 
-    // retun array
-    public function calculatePremium($clientPolicyId = null, $empCode = null, $default_si = null,  $client_branch_id = null) //family level
+                                                                                                                            //Post method  - which receives client_policy id and empcode of the family.
+                                                                                                                            //Pull records againest emp code and calculate premium
+                                                                                                                            // retun array
+    public function calculatePremium($clientPolicyId = null, $empCode = null, $default_si = null, $client_branch_id = null) //family level
     {
         // dd($clientPolicyId, $empCode, $default_si, $client_branch_id);
         helper('excel_util_helper');
 
         if ($this->request) { //
             $client_policy_id = $this->request->getVar('client_policy_id') ?? $clientPolicyId;
-            $emp_code = $this->request->getVar('emp_code') ?? $empCode;
-            $default_si = $this->request->getVar('si') ?? $default_si; // si amt which choosed in add on policy
+            $emp_code         = $this->request->getVar('emp_code') ?? $empCode;
+            $default_si       = $this->request->getVar('si') ?? $default_si; // si amt which choosed in add on policy
             $client_branch_id = $this->request->getVar('client_branch_id') ?? $client_branch_id;
         } else {
             //Cli and enrollment
             $client_policy_id = $clientPolicyId;
-            $emp_code = $empCode;
-            $default_si = $default_si; // si amt which choosed in add on policy
+            $emp_code         = $empCode;
+            $default_si       = $default_si; // si amt which choosed in add on policy
             $client_branch_id = $client_branch_id;
         }
         // dd($client_policy_id);
 
-
-        $client_id = ($this->clientPolicyModel->select('client_id')->find((int)$client_policy_id))['client_id'];
+        $client_id = ($this->clientPolicyModel->select('client_id')->find((int) $client_policy_id))['client_id'];
         // get policy and rack details
         $policy_terms = $this->clientPolicyModel->getPolicyDetails($client_id, $client_policy_id);
-        $policy_type = $policy_terms[0]->is_addon;
-        $base_policy = $policy_terms[0]->base_policy;
+        $policy_type  = $policy_terms[0]->is_addon;
+        $base_policy  = $policy_terms[0]->base_policy;
         $policy_terms = (array) $policy_terms[0]; // convert obj to array
 
-        //get policy slab rates 
+        //get policy slab rates
         $slab_details = $this->policesModel->getPolicySlabRatesForEmpOnboard($client_policy_id, $client_id);
         // print_r($slab_details);die();
 
         $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id, client_policy_id: $client_policy_id, emp_code: $emp_code, emp_status: ['draft', 'enrolled'], policy_status: ['draft', 'enrolled']);
 
-        if (!count($existing_famility_details) && $policy_type == 2) //top up addon only
+        if (! count($existing_famility_details) && $policy_type == 2) //top up addon only
         {
             //get basepolicy id then pull emplist from base policy if only current policy is DA addon policy and emplist is zero
             // echo 'inside';
-            $client_policy_id = $base_policy;
+            $client_policy_id          = $base_policy;
             $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id, client_policy_id: $client_policy_id, emp_code: $emp_code, emp_status: ['draft', 'enrolled'], policy_status: ['draft', 'enrolled']);
         }
 
@@ -2264,7 +2191,6 @@ class EmployeeRestController extends AdminController
         $employee_data_group_by_family = data_group_by_family($existing_famility_details, $data_source = 'db');
         // print_r(($employee_data_group_by_family));//die();
 
-
         $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $client_id, client_branch_id: $client_branch_id);
 
         foreach ($employee_data_group_by_family as $emp_id => $family) {
@@ -2283,11 +2209,9 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-
     public function getHRAccessData($hr_id = null, $request_for = 'post_enrollment')
     {
-        $hr_id = $this->request->getGet('hr_id') ?? $hr_id;
+        $hr_id       = $this->request->getGet('hr_id') ?? $hr_id;
         $request_for = $this->request->getGet('request_for') ?? $request_for;
 
         if ($request_for == 'pre_enrollment') {
@@ -2308,11 +2232,11 @@ class EmployeeRestController extends AdminController
     public function getPolicyLevelEmployeeSummaryData()
     {
 
-        $hr_id = $this->request->getGet('hr_id');
+        $hr_id        = $this->request->getGet('hr_id');
         $HRAccessData = $this->getHRAccessData($hr_id, 'post_enrollment');
 
         if (isset($HRAccessData['allowed_active_policies'])) {
-            $policyId =  json_decode($HRAccessData['allowed_active_policies'], true);
+            $policyId = json_decode($HRAccessData['allowed_active_policies'], true);
         } else {
             $policyId = [];
         }
@@ -2321,32 +2245,31 @@ class EmployeeRestController extends AdminController
             return $this->respond(['status' => 'failed', 'code' => (count($policyId) ? 200 : 404), 'data' => []], 200);
         }
 
-
-        if($this->request->getGet('policy_status') == 0){
+        if ($this->request->getGet('policy_status') == 0) {
             $emp_policy_status = 'expired';
-        }else{
+        } else {
             $emp_policy_status = 'active';
         }
 
-        $db = \Config\Database::connect();
+        $db                = \Config\Database::connect();
         $emp_policy_status = $db->escape($emp_policy_status);
 
         $ClientPolicyData = $this->clientPolicyModel
             ->select("
-                client_policy.id as client_policy_id , 
-                client_policy.client_id as client_id,  
-                client_policy.policy_type_id as policy_type_id,  
-                client_policy.is_addon as is_addon , 
-                client_policy.open_for_enrollment as OpenForEnrollment , 
-                client_policy.inception_type  as inception_type, 
-                client_policy.policy_no as policy_no, 
-                client_policy.insurer_id as insurer_id, 
+                client_policy.id as client_policy_id ,
+                client_policy.client_id as client_id,
+                client_policy.policy_type_id as policy_type_id,
+                client_policy.is_addon as is_addon ,
+                client_policy.open_for_enrollment as OpenForEnrollment ,
+                client_policy.inception_type  as inception_type,
+                client_policy.policy_no as policy_no,
+                client_policy.insurer_id as insurer_id,
                 DATE_FORMAT(client_policy.policy_start_date, '%d-%m-%Y') AS policy_start_date,
                 DATE_FORMAT(client_policy.policy_end_date, '%d-%m-%Y') AS policy_expiry_date,
                 (
-                    select COALESCE(ROUND(SUM(rata_premimum + gst)), 0) 
-                    from employee_polices 
-                    where is_active = 1 
+                    select COALESCE(ROUND(SUM(rata_premimum + gst)), 0)
+                    from employee_polices
+                    where is_active = 1
                     and status = $emp_policy_status
                     and client_policy_id = client_policy.id
                 ) as total_premium
@@ -2358,22 +2281,21 @@ class EmployeeRestController extends AdminController
             ->whereIn('client_policy.id', $policyId)
             ->findAll();
 
-
         $result = [];
         // dd( $ClientPolicyData);
         foreach ($ClientPolicyData as $key => $value) {
             $policyTypeData = $this->policyTypeModel->where('id', $value['policy_type_id'])->get()->getRow();
-            $insurerData = $this->insurerModel->where('id', $value['insurer_id'])->get()->getRow();
+            $insurerData    = $this->insurerModel->where('id', $value['insurer_id'])->get()->getRow();
 
-            $value['type'] = $policyTypeData->policy_type;
-            $value['policy_name'] = $policyTypeData->long_name;
-            $value['insurer_name'] = $insurerData->name;
+            $value['type']               = $policyTypeData->policy_type;
+            $value['policy_name']        = $policyTypeData->long_name;
+            $value['insurer_name']       = $insurerData->name;
             $value['insurer_short_name'] = $insurerData->short_name;
-            $employeeDetails = $this->employeePolicyModel->getEmployeePolicy(client_id: $value['client_id'], policy_id: $value['client_policy_id'], status: 0, branch_id: $this->request->getGet('client_branch_id'), status_type: 'inactive');
+            $employeeDetails             = $this->employeePolicyModel->getEmployeePolicy(client_id: $value['client_id'], policy_id: $value['client_policy_id'], status: 0, branch_id: $this->request->getGet('client_branch_id'), status_type: 'inactive');
             // dd($employeeDetails);
-            $activeCount = 0;
+            $activeCount   = 0;
             $inactiveCount = 0;
-            if (count($employeeDetails)) {  
+            if (count($employeeDetails)) {
                 foreach ($employeeDetails as $item) {
                     if ($item['status'] === 'active') {
                         $activeCount++;
@@ -2383,18 +2305,15 @@ class EmployeeRestController extends AdminController
                 }
             }
 
-            $value['totalMembersCount'] = count($employeeDetails);
-            $value['membersCountOfActive'] = $activeCount;
-            $value['membersCountOfInactive'] = $inactiveCount;
-            $value['is_ecard_bulk_download'] = 0;
+            $value['totalMembersCount']                   = count($employeeDetails);
+            $value['membersCountOfActive']                = $activeCount;
+            $value['membersCountOfInactive']              = $inactiveCount;
+            $value['is_ecard_bulk_download']              = 0;
             $value['is_ecard_bulk_download_for_employee'] = 0;
 
-
             array_push($result, $value);
         }
 
-
-
         if ($result) {
             return $this->respond(['status' => 'success', 'code' => (count($result) ? 200 : 404), 'data' => $result], 200);
         } else {
@@ -2402,19 +2321,18 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function cdSummaryData()
     {
 
-        $hr_id = $this->request->getGet('hr_id');
+        $hr_id        = $this->request->getGet('hr_id');
         $HRAccessData = $this->getHRAccessData($hr_id, 'post_enrollment');
         // print_rr($HRAccessData);die();
         if (isset($HRAccessData['allowed_cd'])) {
-            $allowed_cd =  json_decode($HRAccessData['allowed_cd'], true);
+            $allowed_cd = json_decode($HRAccessData['allowed_cd'], true);
         } else {
             $allowed_cd = [];
         }
-        // $allowed_cd = [125]; 
+        // $allowed_cd = [125];
         // print_r($allowed_cd);die();
         if (count($allowed_cd) == 0) {
             return $this->respond(['status' => 'failed', 'code' => (count($allowed_cd) ? 200 : 404), 'data' => []], 200);
@@ -2423,21 +2341,20 @@ class EmployeeRestController extends AdminController
         $clientId = $this->request->getGet('client_id');
 
         $clientController = new ClientController;
-        $result = $clientController->deposit($clientId, $requestFrom = 'rest', []);
+        $result           = $clientController->deposit($clientId, $requestFrom = 'rest', []);
         // print_rr($result);die();
         $data = [];
 
-
         foreach ($result['clientData'] as $key => $value) {
             if (in_array($value->cd_ac_pk, $allowed_cd)) {
-                $temp['client_id'] = $value->client_id;
-                $temp['insurer_id'] = $value->insurer_id;
-                $temp['cd_ac_pk'] = $value->cd_ac_pk;
-                $temp['insurer_name'] = $value->insurer_name;
+                $temp['client_id']            = $value->client_id;
+                $temp['insurer_id']           = $value->insurer_id;
+                $temp['cd_ac_pk']             = $value->cd_ac_pk;
+                $temp['insurer_name']         = $value->insurer_name;
                 $temp['cd_master_account_no'] = $value->cd_master_account_no;
 
                 if (isset($result['balances'][$temp['insurer_id'] . '-' . $temp['cd_ac_pk']])) {
-                    $balance = $result['balances'][$temp['insurer_id'] . '-' . $temp['cd_ac_pk']]->balance;
+                    $balance         = $result['balances'][$temp['insurer_id'] . '-' . $temp['cd_ac_pk']]->balance;
                     $temp['balance'] = $balance;
                 } else {
                     $temp['balance'] = "N/A";
@@ -2447,7 +2364,6 @@ class EmployeeRestController extends AdminController
             }
         }
 
-
         if ($data) {
             return $this->respond(['status' => 'success', 'code' => (count($data) ? 200 : 404), 'data' => $data], 200);
         } else {
@@ -2458,22 +2374,21 @@ class EmployeeRestController extends AdminController
     public function cdTransactionData()
     {
 
-        $clientId = $this->request->getGet('client_id');
-        $insurerId = $this->request->getGet('insurer_id');
+        $clientId            = $this->request->getGet('client_id');
+        $insurerId           = $this->request->getGet('insurer_id');
         $cdAccountPrimaryKey = $this->request->getGet('cd_ac_pk');
 
         $clientController = new ClientController;
-        $result = $clientController->view_Deposit($insurerId, $requestFrom = 'rest', $param = ['client_id' => $clientId, 'cd_ac_pk' => $cdAccountPrimaryKey]);
+        $result           = $clientController->view_Deposit($insurerId, $requestFrom = 'rest', $param = ['client_id' => $clientId, 'cd_ac_pk' => $cdAccountPrimaryKey]);
 
-        $data['insurer_name'] = $result['insurerName']->name;
+        $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;
-        $data['total_refund'] = $result['deposiamount']->total_refund;
-        $data['currect_balance'] = $result['deposiamount']->balance;
-        $data['deposit_data'] = $result['depositdata'];
-
+        $data['account_number']     = $result['insurerName']->cd_master_account_no;
+        $data['total_deposit']      = $result['deposiamount']->total_credit;
+        $data['total_consumed']     = $result['deposiamount']->total_withdraw;
+        $data['total_refund']       = $result['deposiamount']->total_refund;
+        $data['currect_balance']    = $result['deposiamount']->balance;
+        $data['deposit_data']       = $result['depositdata'];
 
         // dd($data);
 
@@ -2484,20 +2399,19 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function claimsSearch()
     {
 
         if ($this->request->is('get')) {
 
             $data['claim_status'] = $this->claimStatusModel
-                        ->select('id,ticket_type, display_name as claim_status')
-                        ->where('is_active', 1)
-                        ->where('display_name IS NOT NULL OR display_name <> ""')
-                        ->groupBy('display_name')
-                        ->findAll();
-           
-            $data['ticket_type'] =  [
+                ->select('id,ticket_type, display_name as claim_status')
+                ->where('is_active', 1)
+                ->where('display_name IS NOT NULL OR display_name <> ""')
+                ->groupBy('display_name')
+                ->findAll();
+
+            $data['ticket_type'] = [
                 ["ticket_type" => "1", "type_name" => "Claim-GMC"],
                 ["ticket_type" => "2", "type_name" => "Claim-GPA"],
                 ["ticket_type" => "3", "type_name" => "EDLI"],
@@ -2511,33 +2425,32 @@ 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();
+        if (isset($search_data['client_id']) && is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+            $client_data              = $this->clientModel->where('MD5(id)', $search_data['client_id'])->first();
             $search_data['client_id'] = $client_data['id'] ?? null;
-        } 
-
+        }
 
         $client_id = isset($search_data['client_id']) ? (int) $search_data['client_id'] : 0;
         unset($search_data['client_id']);
         unset($search_data['client_branch_id']);
         $policy_number = isset($search_data['policy_no']) ? $search_data['policy_no'] : null;
 
-        $from_date = isset($search_data['from_date']) ? $search_data['from_date'] : null;
-        $to_date   = isset($search_data['to_date']) ? $search_data['to_date'] : null;
-        $claim_status_id   = isset($search_data['claim_status_id']) ? $search_data['claim_status_id'] : null;
+        $from_date       = isset($search_data['from_date']) ? $search_data['from_date'] : null;
+        $to_date         = isset($search_data['to_date']) ? $search_data['to_date'] : null;
+        $claim_status_id = isset($search_data['claim_status_id']) ? $search_data['claim_status_id'] : null;
         unset($search_data['from_date'], $search_data['to_date'], $search_data['claim_status_id'], $search_data['policy_no']);
 
         $where = [];
 
         // Dynamically build WHERE conditions from non-empty parameters
         foreach ($search_data as $key => $value) {
-            if (!empty($value) && $value !== 0 && $value !== '0') {
+            if (! empty($value) && $value !== 0 && $value !== '0') {
                 $where["tm.$key"] = $value;
             }
         }
 
         $claim_status_ids = [];
-        if(!empty($claim_status_id)){
+        if (! empty($claim_status_id)) {
             $claim_status_ids = $this->getTicketClaimStatusIdBasedOnTheDisplayName($claim_status_id);
         }
 
@@ -2546,14 +2459,14 @@ class EmployeeRestController extends AdminController
             'tm.id',
             'tm.ticket_type_id',
             'tcs.claim_status AS original_status',
-            "CASE 
-                WHEN tcs.display_name IS NULL OR tcs.display_name = '' 
+            "CASE
+                WHEN tcs.display_name IS NULL OR tcs.display_name = ''
                     THEN tcs.claim_status
                 ELSE UPPER(tcs.display_name)
                 END AS status
             ",
-            "CASE 
-                WHEN tm.tpa_claim_type IS NOT NULL OR tm.tpa_claim_type != '' 
+            "CASE
+                WHEN tm.tpa_claim_type IS NOT NULL OR tm.tpa_claim_type != ''
                     THEN tm.tpa_claim_type
                 ELSE 'Reimbursement'
                 END AS cl_type
@@ -2631,21 +2544,21 @@ class EmployeeRestController extends AdminController
             $builder->where('tm.client_id', $client_id);
         }
 
-        if (!empty($from_date) && !empty($to_date)) {
+        if (! empty($from_date) && ! empty($to_date)) {
             $from_date_mysql = date('Y-m-d', strtotime($from_date));
-            $to_date_mysql = date('Y-m-d', strtotime($to_date));
+            $to_date_mysql   = date('Y-m-d', strtotime($to_date));
             $builder->where("DATE(tm.created_at) BETWEEN '$from_date_mysql' AND '$to_date_mysql'");
         }
 
-        if (!empty($where)) {
+        if (! empty($where)) {
             $builder->where($where);
         }
 
-        if (!empty($claim_status_ids)) {
+        if (! empty($claim_status_ids)) {
             $builder->whereIn('claim_status_id', $claim_status_ids);
         }
 
-        if (!empty($policy_number)) {
+        if (! empty($policy_number)) {
             $builder->where('cp.policy_no', $policy_number);
         }
 
@@ -2660,21 +2573,21 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $ticket_id = $this->request->getGet('ticket_id');
-            $ticketController = new TicketController;
-            $data['ticket_history'] =  $ticketController->ticketHistory($ticket_id);
-            $data['claims_data'] = $this->ticketMaster->getTicketDataByTicketID($ticket_id);
-            $data['ticket_data'] = $ticketController->getMoreInfo($requestFrom = 'rest', $ticket_id);
+            $ticket_id              = $this->request->getGet('ticket_id');
+            $ticketController       = new TicketController;
+            $data['ticket_history'] = $ticketController->ticketHistory($ticket_id);
+            $data['claims_data']    = $this->ticketMaster->getTicketDataByTicketID($ticket_id);
+            $data['ticket_data']    = $ticketController->getMoreInfo($requestFrom = 'rest', $ticket_id);
 
-            $required_docs = $this->ticketMaster->select('required_docs')->where('id', $ticket_id)->first();
+            $required_docs         = $this->ticketMaster->select('required_docs')->where('id', $ticket_id)->first();
             $data['required_docs'] = json_decode($required_docs['required_docs'] ?? '{}', true) ?? [];
             // $ticketData = $data['ticket_data'];
             // $ticketHistory = $data['ticket_history'];
             // print_r($ticketHistory); die;
 
             $currentClaimStatus = $this->claimStatusModel->select("claim_status")->where('id', $data['claims_data']['claim_status_id'])->where('is_active', 1)->first();
-            $ticketClaimStatus = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('ticket_type', $data['claims_data']['ticket_type_id'])->where('is_active', 1)->findAll();
-            $status_list = array_column($ticketClaimStatus, 'display_name', 'claim_status');
+            $ticketClaimStatus  = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('ticket_type', $data['claims_data']['ticket_type_id'])->where('is_active', 1)->findAll();
+            $status_list        = array_column($ticketClaimStatus, 'display_name', 'claim_status');
             // print_r($currentClaimStatus); die;
 
             $data['ticket_data'] = array_fill_keys(array_keys($data['ticket_data']), []);
@@ -2703,15 +2616,15 @@ class EmployeeRestController extends AdminController
             foreach ($data['ticket_data'] as $oldKey => $value) {
 
                 // Only process if key exists in status_list
-                if (!isset($status_list[$oldKey])) {
-                    continue;   // skip and do NOT add to new array
+                if (! isset($status_list[$oldKey])) {
+                    continue; // skip and do NOT add to new array
                 }
 
                 // Get new key based on mapping
                 $newKey = $status_list[$oldKey];
 
                 // Avoid duplicates
-                if (!isset($new_ticket_data[$newKey])) {
+                if (! isset($new_ticket_data[$newKey])) {
                     $new_ticket_data[$newKey] = $value;
                 }
             }
@@ -2719,14 +2632,13 @@ class EmployeeRestController extends AdminController
             uasort($new_ticket_data, function ($a, $b) {
                 $timeA = \DateTime::createFromFormat('d-m-Y h:i A', $a['modified_at']);
                 $timeB = \DateTime::createFromFormat('d-m-Y h:i A', $b['modified_at']);
-                return $timeA <=> $timeB;   // Ascending
+                return $timeA <=> $timeB; // Ascending
             });
 
             $data['ticket_data'] = $new_ticket_data;
 
-
             $ticketMesssageModel = new TicketMessageModel();
-            $ticket_message = $ticketMesssageModel
+            $ticket_message      = $ticketMesssageModel
                 ->where('is_active', 1)
                 ->where('sender', "user")
                 ->where('ticket_id', $ticket_id)
@@ -2737,7 +2649,7 @@ class EmployeeRestController extends AdminController
 
             if (isset($ticket_message['id'])) {
 
-                $claimFiles = new ClaimFilesModel();
+                $claimFiles       = new ClaimFilesModel();
                 $claim_files_data = $claimFiles
                     ->select('id as claim_file_id, doc_name as claim_file_name')
                     ->where('is_active', 1)
@@ -2747,7 +2659,7 @@ class EmployeeRestController extends AdminController
                     ->findAll();
 
                 foreach ($claim_files_data as &$value) {
-                    $value['url'] = base_url('downloadClaimFile/') . $value['claim_file_id'];
+                    $value['url']      = base_url('downloadClaimFile/') . $value['claim_file_id'];
                     $claim_file_urls[] = $value;
                 }
                 unset($value);
@@ -2755,25 +2667,24 @@ class EmployeeRestController extends AdminController
 
             $data['claim_files'] = $claim_file_urls;
 
-            return $this->respond(['status' => (count($data) ? 'success' : 'failed'), 'code' => (count($data) ? 200 : 404), 'data' => $data,], 200);
+            return $this->respond(['status' => (count($data) ? 'success' : 'failed'), 'code' => (count($data) ? 200 : 404), 'data' => $data], 200);
 
         } catch (\Throwable $th) {
-            $this->myLogger->logme("error", 'claim_view' .($th->getMessage() . ' --- ' . $th->getLine() . '----' . $th->getTraceAsString()));
+            $this->myLogger->logme("error", 'claim_view' . ($th->getMessage() . ' --- ' . $th->getLine() . '----' . $th->getTraceAsString()));
             $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
+                '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,
+                'function'    => $th->getTrace()[0]['function'] ?? null,
+                'class'       => $th->getTrace()[0]['class'] ?? null,
             ];
-            return $this->respond(['status' => 'failed', 'code' => 500, 'data' => "", 'error_data' =>  $errorData], 500);
+            return $this->respond(['status' => 'failed', 'code' => 500, 'data' => "", 'error_data' => $errorData], 500);
         }
     }
 
-
     public function exportCashDepositData()
     {
 
@@ -2784,13 +2695,13 @@ class EmployeeRestController extends AdminController
         if (count($CashDepositData)) {
             // Define headers and map database fields to Excel fields
             $headers = [
-                'Date' => 'created_at',
-                'Type' => 'transaction_type',
-                'Amount' => 'amount',
-                'Balance' => 'balance',
-                'Description' => 'description',
+                'Date'         => 'created_at',
+                'Type'         => 'transaction_type',
+                'Amount'       => 'amount',
+                'Balance'      => 'balance',
+                'Description'  => 'description',
                 'Insurer Name' => 'insurer_name',
-                'Client Name' => 'clientname'
+                'Client Name'  => 'clientname',
             ];
 
             // Create a new Spreadsheet object
@@ -2817,9 +2728,8 @@ class EmployeeRestController extends AdminController
                 $row++;
             }
 
-
             // Set the header for download
-            $filename =  $CashDepositData[0]->insurer_name . '-CashDeposit.xlsx';
+            $filename = $CashDepositData[0]->insurer_name . '-CashDeposit.xlsx';
             header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
             header('Content-Disposition: attachment;filename="' . $filename . '"');
             header('Cache-Control: max-age=0');
@@ -2836,7 +2746,6 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function removeEmpAndEmpPolicyData()
     {
         try {
@@ -2846,7 +2755,6 @@ class EmployeeRestController extends AdminController
 
             if (count($clientPolicy)) {
 
-
                 if ($clientPolicy[0]['is_addon'] == 2) //Topup
                 {
 
@@ -2867,7 +2775,7 @@ class EmployeeRestController extends AdminController
 
                             $this->employeePolicyModel->where('client_policy_id', $this->request->getGet('client_policy_id'))
                                 ->where('employee_id', $value['id'])
-                                ->set(array('is_active' => 0))
+                                ->set(['is_active' => 0])
                                 ->update();
                         }
                     }
@@ -2880,19 +2788,17 @@ class EmployeeRestController extends AdminController
 
                             $this->employeePolicyModel->where('client_policy_id', $this->request->getGet('client_policy_id'))
                                 ->where('employee_id', $value['id'])
-                                ->set(array('is_active' => 0))
+                                ->set(['is_active' => 0])
                                 ->update();
                         }
 
                         $this->employeeModel->where('emp_code', $this->request->getGet('emp_code'))
                             ->where('is_active', 1)->where('is_addon_value', 1)
-                            ->set(array('is_active' => 0))
+                            ->set(['is_active' => 0])
                             ->update();
                     }
                 }
 
-
-
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
             } else {
                 return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
@@ -2902,42 +2808,41 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-    function getEmployeeActiveOrInactivePolicy()
-    {   
+    public function getEmployeeActiveOrInactivePolicy()
+    {
 
         // for retail user policy only
         $receviedPayload = $this->request->getGet();
 
-        if(
-            empty($receviedPayload['client_id']) && 
-            empty($receviedPayload['client_branch_id']) && 
+        if (
+            empty($receviedPayload['client_id']) &&
+            empty($receviedPayload['client_branch_id']) &&
             empty($receviedPayload['emp_code'])
-        ){
-            
-            if(!empty($receviedPayload['mobile_no']) || !empty($receviedPayload['email_id'])){
-                
+        ) {
+
+            if (! empty($receviedPayload['mobile_no']) || ! empty($receviedPayload['email_id'])) {
+
                 $retailUserData = (object) [
-                    'id'        => null,
-                    'mobile'    => $receviedPayload['mobile_no'],
-                    'email_id'  => $receviedPayload['email_id']
+                    'id'       => null,
+                    'mobile'   => $receviedPayload['mobile_no'],
+                    'email_id' => $receviedPayload['email_id'],
                 ];
 
                 $emp_reatail_policy_data = $this->getEmpRetailPolicy($retailUserData);
-                $wellness_data = ['status' => 'failed','message' => 'Coming soon........!'];
+                $wellness_data           = ['status' => 'failed', 'message' => 'Coming soon........!'];
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => [], 'emp_name' => $emp_reatail_policy_data[0]['insurerd_name'] ?? "", 'pre_policy_count' => 0, 'emp_not_enrolled_count' => 0, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $wellness_data], 200);
             }
         }
 
         if ($this->request->getGet('type') == 'Active') {
-            $policy_status = 1;
+            $policy_status     = 1;
             $policy_status_key = "Active";
         } else {
-            $policy_status = 0;
+            $policy_status     = 0;
             $policy_status_key = "InActive";
         }
-        $dayInterval = 10;
-        $ClientPolicyData =  $this->clientPolicyModel->select("client_policy.* , policy_type.policy_type as policy_type,insurers.name as insurer_name,tpa.name as tpa_name,tpa.network_hospitals as network_hospitals_url,  policy_type.long_name as policy_long_name, DATE_ADD(client_policy.policy_end_date, INTERVAL {$dayInterval} DAY) as claims_grace_date")
+        $dayInterval      = 10;
+        $ClientPolicyData = $this->clientPolicyModel->select("client_policy.* , policy_type.policy_type as policy_type,insurers.name as insurer_name,tpa.name as tpa_name,tpa.network_hospitals as network_hospitals_url,  policy_type.long_name as policy_long_name, DATE_ADD(client_policy.policy_end_date, INTERVAL {$dayInterval} DAY) as claims_grace_date")
             ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
             ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
@@ -2961,21 +2866,20 @@ class EmployeeRestController extends AdminController
             ->where('family_floater_key', 'self')->where('is_active', 1)
             ->get()->getRow();
 
-        $employeeName =  $employeeSelfData->name ?? "";
-
+        $employeeName = $employeeSelfData->name ?? "";
 
         //for get the pre enrollment policy count
         $empMobileNo = $this->request->getGet('mobile_no');
-        $clientId = $this->request->getGet('client_id');
+        $clientId    = $this->request->getGet('client_id');
 
-        if (!empty($employeeSelfData) && isset($employeeSelfData->email_corporate)) {
-            $prePolicyCountData = $this->getPreEmployeePolicyCount($empMobileNo, $clientId, $employeeSelfData->email_corporate);
-            $prePolicyCount =  $prePolicyCountData['pre_policy_count'] ?? 0;
-            $empNotEnrolledCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
+        if (! empty($employeeSelfData) && isset($employeeSelfData->email_corporate)) {
+            $prePolicyCountData  = $this->getPreEmployeePolicyCount($empMobileNo, $clientId, $employeeSelfData->email_corporate);
+            $prePolicyCount      = $prePolicyCountData['pre_policy_count'] ?? 0;
+            $empNotEnrolledCount = $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
         } else {
-            $prePolicyCountData = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
-            $prePolicyCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
-            $empNotEnrolledCount =  $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
+            $prePolicyCountData  = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
+            $prePolicyCount      = $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
+            $empNotEnrolledCount = $prePolicyCountData['emp_not_enrolled_count'] ?? 0;
         }
 
         $whereArrayForId = [];
@@ -2992,55 +2896,54 @@ class EmployeeRestController extends AdminController
                 }
 
                 if ($ClientPolicyValue['policy_type_id'] == 1) {
-                    $policyGroup = 'gpa';
-                    $data['ticket_type_id'] = 2;
+                    $policyGroup                      = 'gpa';
+                    $data['ticket_type_id']           = 2;
                     $data['ticket_settled_status_id'] = 24;
-                    $data['claim_subject'] = "Claim GPA";
-                    $data['sum_insured_label'] = "Sum Assured";
+                    $data['claim_subject']            = "Claim GPA";
+                    $data['sum_insured_label']        = "Sum Assured";
                 } else if ($ClientPolicyValue['policy_type_id'] == 6) {
-                    $policyGroup = 'other';
-                    $data['ticket_type_id'] = 3;
+                    $policyGroup                      = 'other';
+                    $data['ticket_type_id']           = 3;
                     $data['ticket_settled_status_id'] = 34;
-                    $data['claim_subject'] = "Claim EDLI";
-                    $data['sum_insured_label'] = "Sum Assured";
+                    $data['claim_subject']            = "Claim EDLI";
+                    $data['sum_insured_label']        = "Sum Assured";
                 } else if ($ClientPolicyValue['policy_type_id'] == 7) {
-                    $policyGroup = 'other';
-                    $data['ticket_type_id'] = 4;
+                    $policyGroup                      = 'other';
+                    $data['ticket_type_id']           = 4;
                     $data['ticket_settled_status_id'] = 44;
-                    $data['claim_subject'] = "Claim GTLI";
-                    $data['sum_insured_label'] = "Sum Assured";
-                } else if ($ClientPolicyValue['policy_type_id'] == 72){
-                    $policyGroup = 'other';
-                    $data['ticket_type_id'] = 72;
+                    $data['claim_subject']            = "Claim GTLI";
+                    $data['sum_insured_label']        = "Sum Assured";
+                } else if ($ClientPolicyValue['policy_type_id'] == 72) {
+                    $policyGroup                      = 'other';
+                    $data['ticket_type_id']           = 72;
                     $data['ticket_settled_status_id'] = 76;
-                    $data['claim_subject'] = "Claim OPD";
-                    $data['sum_insured_label'] = "Sum Insured";
+                    $data['claim_subject']            = "Claim OPD";
+                    $data['sum_insured_label']        = "Sum Insured";
                 } else {
-                    $policyGroup = 'gmc';
-                    $data['ticket_type_id'] = 1;
+                    $policyGroup                      = 'gmc';
+                    $data['ticket_type_id']           = 1;
                     $data['ticket_settled_status_id'] = 11;
-                    $data['claim_subject'] = "Claim GMC";
-                    $data['sum_insured_label'] = "Sum Insured";
+                    $data['claim_subject']            = "Claim GMC";
+                    $data['sum_insured_label']        = "Sum Insured";
                 }
 
-                $terms = json_decode($ClientPolicyValue['policy_terms'], true);
-                $data['policy_terms'] = isset($terms['enrollment_display_key']) && !empty($terms['enrollment_display_key']) ? $terms['enrollment_display_key'] : $this->policyTermsFiter($terms, $policyGroup);
+                $terms                = json_decode($ClientPolicyValue['policy_terms'], true);
+                $data['policy_terms'] = isset($terms['enrollment_display_key']) && ! empty($terms['enrollment_display_key']) ? $terms['enrollment_display_key'] : $this->policyTermsFiter($terms, $policyGroup);
 
-
-                $data['client_id'] = $ClientPolicyValue['client_id'];
-                $data['client_policy_id'] = $ClientPolicyValue['id'];
-                $data['policy_name'] = $ClientPolicyValue['policy_type'];
-                $data['policy_type'] = $ClientPolicyValue['policy_type'];
-                $data['policy_no'] = $ClientPolicyValue['policy_no'];
-                $data['insurer_name'] = $ClientPolicyValue['insurer_name'];
-                $data['tpa_name'] = $ClientPolicyValue['tpa_name'];
-                $data['network_hospitals_url'] = $ClientPolicyValue['network_hospitals_url'];
-                $data['policy_start_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['policy_start_date']);
-                $data['policy_end_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['policy_end_date']);
-                $data['heading'] = $ClientPolicyValue['policy_long_name'];
-                $data['claims_grace_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['claims_grace_date']);
-                $data['policy_status'] = $policy_status_key;
-                $data['pre_policy_count'] = $prePolicyCount;
+                $data['client_id']              = $ClientPolicyValue['client_id'];
+                $data['client_policy_id']       = $ClientPolicyValue['id'];
+                $data['policy_name']            = $ClientPolicyValue['policy_type'];
+                $data['policy_type']            = $ClientPolicyValue['policy_type'];
+                $data['policy_no']              = $ClientPolicyValue['policy_no'];
+                $data['insurer_name']           = $ClientPolicyValue['insurer_name'];
+                $data['tpa_name']               = $ClientPolicyValue['tpa_name'];
+                $data['network_hospitals_url']  = $ClientPolicyValue['network_hospitals_url'];
+                $data['policy_start_date']      = $this->convertDateFormatDisplay($ClientPolicyValue['policy_start_date']);
+                $data['policy_end_date']        = $this->convertDateFormatDisplay($ClientPolicyValue['policy_end_date']);
+                $data['heading']                = $ClientPolicyValue['policy_long_name'];
+                $data['claims_grace_date']      = $this->convertDateFormatDisplay($ClientPolicyValue['claims_grace_date']);
+                $data['policy_status']          = $policy_status_key;
+                $data['pre_policy_count']       = $prePolicyCount;
                 $data['emp_not_enrolled_count'] = $empNotEnrolledCount;
                 // $data['policy_terms'] = $terms;
 
@@ -3068,9 +2971,9 @@ class EmployeeRestController extends AdminController
                     ->where('employee_polices.client_policy_id', $ClientPolicyValue['id'])
                     ->where('employee_polices.is_active', 1)->findAll();
                 if (count($employee_policy) > 0) {
-                    $si_value = 0;
+                    $si_value         = 0;
                     $si_premium_value = 0;
-                    $si_gst_value = 0;
+                    $si_gst_value     = 0;
 
                     foreach ($employee_policy as $key => $value) {
                         if (isset($value['basic_cover_si'])) {
@@ -3084,30 +2987,28 @@ class EmployeeRestController extends AdminController
                         }
                     }
 
-
-                    if ($employee_policy[0]['tpa_id'] != null)
+                    if ($employee_policy[0]['tpa_id'] != null) {
                         $data['eCardDownload'] = base_url('download-e-card/') . $employee_policy[0]['rand_string'] . '/1';
-                    else
+                    } else {
                         $data['eCardDownload'] = null;
+                    }
 
-
-
-                    $data['si_value'] = $si_value;
-                    $data['si_premium_value'] = ($ClientPolicyValue['policy_type_id'] == 1 ||  $ClientPolicyValue['policy_type_id'] == 2) ? 0 : round($si_premium_value);
-                    $data['si_gst_value'] = ($ClientPolicyValue['policy_type_id'] == 1 || $ClientPolicyValue['policy_type_id'] == 2) ? 0 : round($si_gst_value);
+                    $data['si_value']         = $si_value;
+                    $data['si_premium_value'] = ($ClientPolicyValue['policy_type_id'] == 1 || $ClientPolicyValue['policy_type_id'] == 2) ? 0 : round($si_premium_value);
+                    $data['si_gst_value']     = ($ClientPolicyValue['policy_type_id'] == 1 || $ClientPolicyValue['policy_type_id'] == 2) ? 0 : round($si_gst_value);
 
                     $data['EmployeePolicy'] = $employee_policy;
 
                     //fetch claims data
-                   $approvedClaimsAmount = $this->ticketMaster
-                                                ->select('SUM(approved_amount) AS total_settled_amount')
-                                                ->where('emp_code', $employee_policy[0]['emp_code'])
-                                                ->where('client_policy_id', $data['client_policy_id'])
-                                                ->where('claim_status_id', $data['ticket_settled_status_id'])
-                                                ->groupBy('emp_code')
-                                                ->groupBy('client_policy_id')
-                                                ->groupBy('claim_status_id')
-                                                ->get()->getRow();
+                    $approvedClaimsAmount = $this->ticketMaster
+                        ->select('SUM(approved_amount) AS total_settled_amount')
+                        ->where('emp_code', $employee_policy[0]['emp_code'])
+                        ->where('client_policy_id', $data['client_policy_id'])
+                        ->where('claim_status_id', $data['ticket_settled_status_id'])
+                        ->groupBy('emp_code')
+                        ->groupBy('client_policy_id')
+                        ->groupBy('claim_status_id')
+                        ->get()->getRow();
                     $data['total_settled_amount'] = $approvedClaimsAmount ? ($approvedClaimsAmount->total_settled_amount ?? 0) : 0;
                     array_push($result, $data);
                 }
@@ -3115,8 +3016,8 @@ class EmployeeRestController extends AdminController
             }
 
             $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
-            $apiServiceController = new ApiServiceController;
-            $emp_wellness_data =  $apiServiceController->getWellnessUrl($employeeSelfData->id ?? null);
+            $apiServiceController    = new ApiServiceController;
+            $emp_wellness_data       = $apiServiceController->getWellnessUrl($employeeSelfData->id ?? null);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'emp_not_enrolled_count' => $empNotEnrolledCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);
         } else {
@@ -3124,60 +3025,59 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-    function policyTermsFiter($terms, $type)
+    public function policyTermsFiter($terms, $type)
     {
         if (empty($terms)) {
             return [];
         }
 
         $gpa = [
-            "sumInsured2" => "Sum Insured",
-            "totalSumInsured" => "Total Sum Assured",
-            "self" => "Self",
-            "self_min_age" => "Min Age",
-            "self_max_age" => "Max Age",
-            "accidentalDeathBenefit" => "Accidental Death Benefit",
-            "permanentTotalDisablement" => "Permanent Total Disablement",
-            "permanentPartialDisablement" => "Permanent Partial Disablement",
-            "temporaryTotalDisablementBenefit" => "Temporary Total Disablement benefit",
+            "sumInsured2"                       => "Sum Insured",
+            "totalSumInsured"                   => "Total Sum Assured",
+            "self"                              => "Self",
+            "self_min_age"                      => "Min Age",
+            "self_max_age"                      => "Max Age",
+            "accidentalDeathBenefit"            => "Accidental Death Benefit",
+            "permanentTotalDisablement"         => "Permanent Total Disablement",
+            "permanentPartialDisablement"       => "Permanent Partial Disablement",
+            "temporaryTotalDisablementBenefit"  => "Temporary Total Disablement benefit",
             "accidentalHospitalizationExpenses" => "Accidental Hospitalization Expenses",
-            "childrenEducationWelfareFund" => "Children Education Welfare Fund",
-            "compassionateVisitExpenses" => "Compassionate Visit Expenses",
-            "compassionateVisitExpensesData" => "Compassionate Visit Expenses Data",
-            "brokenBoneExpenses" => "Broken Bone Expenses",
-            "brokenBoneExpensesData" => "Broken Bone Expenses Data",
-            "ambulanceCharges" => "Ambulance charges",
-            "ambulanceChargesData" => "Ambulance charges Data",
-            "burnExpenses" => "Burn Expenses",
-            "burnExpensesData" => "Burn Expenses Data",
-            "carriageOfDeadBody" => "Carriage of Dead Body",
-            "carriageOfDeadBodyData" => "Carriage of Dead Body Data",
-            "animalSnakeInsectBite" => "Animal/Snake/Insect bite",
-            "terrorism" => "Terrorism",
-            "worldwideCover" => "Worldwide Cover"
+            "childrenEducationWelfareFund"      => "Children Education Welfare Fund",
+            "compassionateVisitExpenses"        => "Compassionate Visit Expenses",
+            "compassionateVisitExpensesData"    => "Compassionate Visit Expenses Data",
+            "brokenBoneExpenses"                => "Broken Bone Expenses",
+            "brokenBoneExpensesData"            => "Broken Bone Expenses Data",
+            "ambulanceCharges"                  => "Ambulance charges",
+            "ambulanceChargesData"              => "Ambulance charges Data",
+            "burnExpenses"                      => "Burn Expenses",
+            "burnExpensesData"                  => "Burn Expenses Data",
+            "carriageOfDeadBody"                => "Carriage of Dead Body",
+            "carriageOfDeadBodyData"            => "Carriage of Dead Body Data",
+            "animalSnakeInsectBite"             => "Animal/Snake/Insect bite",
+            "terrorism"                         => "Terrorism",
+            "worldwideCover"                    => "Worldwide Cover",
         ];
 
         $gmc = [
 
-            "waiverofpreexistingdiseases" => "Waiver of Pre-existing Diseases",
+            "waiverofpreexistingdiseases"     => "Waiver of Pre-existing Diseases",
             "waiverof1,2,3&4thyearexclusions" => "Waiver of 1, 2, 3 & 4th year Exclusions",
-            "waiverof30dayswaitingperiod" => "Waiver of 30 days waiting period",
-            "9monthwaitingperiodwaived" => "9-month waiting Period waived",
-            "twindelivery" => "Twin Delivery",
-            "maternitycoverage" => "Maternity Coverage",
-            "preandpostnatal" => "Pre and Post natal",
-            "prehospitalizationcover" => "Pre Hospitalization Cover",
-            "posthospitalizationcover" => "Post Hospitalization Cover ",
-            "congenitaldiseasesinternal" => "Congenital Diseases - Internal ",
-            "congenitaldiseasesexternal" => "Congenital Diseases - External ",
-            "roomrentlimit" => "Room Rent Limit",
-            "proportionatedeductionclause" => "Proportionate Deduction Clause",
-            "ayudhtreatmentcover" => "AYUSH treatment covered",
-            "lasiksurgery" => "Lasik Surgery",
-            "cataract" => "Cataract",
-            "ailmentcapping" => "Ailment capping",
-            "moderntreatmentsasperirdai" => "Modern Treatment "
+            "waiverof30dayswaitingperiod"     => "Waiver of 30 days waiting period",
+            "9monthwaitingperiodwaived"       => "9-month waiting Period waived",
+            "twindelivery"                    => "Twin Delivery",
+            "maternitycoverage"               => "Maternity Coverage",
+            "preandpostnatal"                 => "Pre and Post natal",
+            "prehospitalizationcover"         => "Pre Hospitalization Cover",
+            "posthospitalizationcover"        => "Post Hospitalization Cover ",
+            "congenitaldiseasesinternal"      => "Congenital Diseases - Internal ",
+            "congenitaldiseasesexternal"      => "Congenital Diseases - External ",
+            "roomrentlimit"                   => "Room Rent Limit",
+            "proportionatedeductionclause"    => "Proportionate Deduction Clause",
+            "ayudhtreatmentcover"             => "AYUSH treatment covered",
+            "lasiksurgery"                    => "Lasik Surgery",
+            "cataract"                        => "Cataract",
+            "ailmentcapping"                  => "Ailment capping",
+            "moderntreatmentsasperirdai"      => "Modern Treatment ",
         ];
 
         $finalarray = [];
@@ -3202,7 +3102,7 @@ class EmployeeRestController extends AdminController
         } else if ($type == 'other') {
             foreach ($terms as $key => $value) {
                 if ($key != "multiple_sum_insured" && $value != "") {
-                    $result = ucwords(str_replace('_', ' ', $key));
+                    $result              = ucwords(str_replace('_', ' ', $key));
                     $finalarray[$result] = $value;
                 }
             }
@@ -3234,7 +3134,6 @@ class EmployeeRestController extends AdminController
         return $finalarray;
     }
 
-
     private function convertDateFormatDisplay($dateString)
     {
         // Attempt to create a DateTime object from the provided date string
@@ -3251,7 +3150,7 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $feContentData =  $this->feContentModel->where('is_active',1)->findAll();
+            $feContentData = $this->feContentModel->where('is_active', 1)->findAll();
             if (count($feContentData) > 0) {
 
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => $feContentData], 200);
@@ -3306,7 +3205,7 @@ class EmployeeRestController extends AdminController
             }
 
             // prepare URLs
-            $data = array_map(function($img){ return base_url('public/uploads/add_image_upload/' . $img['name']); }, $images);
+            $data = array_map(function ($img) {return base_url('public/uploads/add_image_upload/' . $img['name']);}, $images);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 
@@ -3321,41 +3220,40 @@ class EmployeeRestController extends AdminController
         try {
 
             $firebase_token = isset($this->request->getJSON()->firebase_token) ? $this->request->getJSON()->firebase_token : null;
-            $mobile = isset($this->request->getJSON()->mobile) ? $this->request->getJSON()->mobile : null;
-            $email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
+            $mobile         = isset($this->request->getJSON()->mobile) ? $this->request->getJSON()->mobile : null;
+            $email_id       = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
 
             // Ensure the mobile number is provided
             if (empty($mobile)) {
                 return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Mobile number is required'], 400);
             }
 
-            // Fetch employee 
+            // Fetch employee
             if (isset($mobile)) {
                 $employee = $this->employeeModel->where('mobile', $mobile)->where('relationship', 'self')->where('is_active', 1)->first();
             } else {
                 $employee = $this->employeeModel->where('email_corporate', $email_id)->where('relationship', 'self')->where('is_active', 1)->first();
             }
 
-
             if ($employee) {
                 // Check if firebase_token is provided
-                if (!empty($firebase_token)) {
+                if (! empty($firebase_token)) {
 
                     // Check if the current firebase_token is different from the new one
                     if ($employee['firebase_token'] !== $firebase_token) {
                         // Update the employee's firebase_token
                         $data['firebase_token'] = $firebase_token;
-                        $id = $employee['id'];
+                        $id                     = $employee['id'];
                         // return json_encode($data);
                         // Direct database update query for testing
-                        $db = \Config\Database::connect();
-                        $builder = $db->table('employees');
+                        $db         = \Config\Database::connect();
+                        $builder    = $db->table('employees');
                         $update_emp = $builder->update($data, ['id' => $id]);
 
                         // Check if the update was successful
                         if ($db->affectedRows() > 0) {
                             // Fetch the updated employee data
-                            $updated_employee = $this->employeeModel->find((int)$id);
+                            $updated_employee = $this->employeeModel->find((int) $id);
                             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $updated_employee], 200);
                         } else {
                             log_message('error', 'Update failed. No rows affected.');
@@ -3376,10 +3274,6 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-
-
-
     // public function sendPushNotification()
     // {
     //     $deviceToken = 'cMVKESh8QzqIl8nh_yqbcl:APA91bHKm87Sh1goVJNKZtctV4etgLMQboI0eyDVn3MH1yf9cO-2RtQRlFnKLdataOxosoxm7a4JvATKjfI1_Bids46mGw5m8zesp90mR4odCbD_cJtGmBeMYt4hssSY0YtAht1emK_H';
@@ -3404,26 +3298,24 @@ class EmployeeRestController extends AdminController
     //     }
     // }
 
-
     public function getBackToEnrolledDetails()
     {
         // Get query parameters
-        $empCode = $this->request->getGet('emp_code');
-        $clientId = $this->request->getGet('client_id');
+        $empCode        = $this->request->getGet('emp_code');
+        $clientId       = $this->request->getGet('client_id');
         $clientBranchId = $this->request->getGet('client_branch_id');
 
-
-        if (!$empCode || !$clientId || !$clientBranchId) {
+        if (! $empCode || ! $clientId || ! $clientBranchId) {
             return $this->fail("emp_code, client_id, and client_branch_id are required parameters.");
         }
 
         //Fetch active employee  details
         $employees = $this->employeeModel->select('id,emp_code,name,relationship,dob,emp_status,is_addon_value,created_at,updated_at')
             ->where([
-                'emp_code' => $empCode,
-                'client_id' => $clientId,
+                'emp_code'         => $empCode,
+                'client_id'        => $clientId,
                 'client_branch_id' => $clientBranchId,
-                'is_active' => 1
+                'is_active'        => 1,
             ])
             ->findAll();
 
@@ -3431,20 +3323,18 @@ class EmployeeRestController extends AdminController
         $selfEmployee = array_filter($employees, function ($employee) {
             return $employee['relationship'] === 'Self';
         });
-        $data['self_status'] = !empty($selfEmployee) ? array_values($selfEmployee)[0]['emp_status'] : null;
-        $data['self_enrolled_time'] = !empty($selfEmployee) ? array_values($selfEmployee)[0]['updated_at'] : null;
-        $data['self_employee_id'] = !empty($selfEmployee) ? array_values($selfEmployee)[0]['id'] : null;
-
+        $data['self_status']        = ! empty($selfEmployee) ? array_values($selfEmployee)[0]['emp_status'] : null;
+        $data['self_enrolled_time'] = ! empty($selfEmployee) ? array_values($selfEmployee)[0]['updated_at'] : null;
+        $data['self_employee_id']   = ! empty($selfEmployee) ? array_values($selfEmployee)[0]['id'] : null;
 
         //Fetch employee policy details
         $employeeIds = array_column($employees, 'id');
-        $policies = $this->employeePolicyModel->whereIn('employee_id', $employeeIds)->where('is_active', 1)->findAll();
-
+        $policies    = $this->employeePolicyModel->whereIn('employee_id', $employeeIds)->where('is_active', 1)->findAll();
 
         //Find the stage of enrolment process
-        $employeeStatuses = array_column($employees, 'emp_status');
+        $employeeStatuses       = array_column($employees, 'emp_status');
         $employeePolicyStatuses = array_column($policies, 'status');
-        $uniqueStatuses = array_unique(array_merge($employeeStatuses, $employeePolicyStatuses));
+        $uniqueStatuses         = array_unique(array_merge($employeeStatuses, $employeePolicyStatuses));
 
         if (count($uniqueStatuses) > 1) {
             $enrolmentStagekey = 1;
@@ -3456,53 +3346,55 @@ class EmployeeRestController extends AdminController
             }
         }
 
-        $enrolmentStage =  ['Draft Only', 'Intermittent Enrollment', 'Successful Enrollment'];
+        $enrolmentStage          = ['Draft Only', 'Intermittent Enrollment', 'Successful Enrollment'];
         $data['enrolment_stage'] = $enrolmentStage[$enrolmentStagekey];
 
-
-
-        $data['revert_employee_data'] = [];
+        $data['revert_employee_data']        = [];
         $data['revert_employee_policy_data'] = [];
         if ($enrolmentStagekey == 1) {
             //Find active employee history
             $empIdsWithoutSelf = $employeeIds;
-            $key = array_search($data['self_employee_id'], $empIdsWithoutSelf);
+            $key               = array_search($data['self_employee_id'], $empIdsWithoutSelf);
             unset($empIdsWithoutSelf[$key]);
             foreach ($empIdsWithoutSelf as $key => $pk) {
                 $retrivedData = $this->retriveOldData($data['self_enrolled_time'], 'employees', $pk);
-                if ($retrivedData != false)
+                if ($retrivedData != false) {
                     array_push($data['revert_employee_data'], $retrivedData);
+                }
+
             }
 
             //Find inactive employee history
             $inActiveEmployees = $this->employeeModel->select('id,emp_code,name,relationship,dob,emp_status,is_addon_value,created_at,updated_at')
                 ->where([
-                    'emp_code' => $empCode,
-                    'client_id' => $clientId,
+                    'emp_code'         => $empCode,
+                    'client_id'        => $clientId,
                     'client_branch_id' => $clientBranchId,
-                    'is_active' => 0
+                    'is_active'        => 0,
                 ])
                 ->findAll();
             $inActiveEmployeeIds = array_column($inActiveEmployees, 'id');
             foreach ($inActiveEmployeeIds as $key => $pk) {
                 $retrivedData = $this->retriveOldData($data['self_enrolled_time'], 'employees', $pk);
-                if ($retrivedData != false)
+                if ($retrivedData != false) {
                     array_push($data['revert_employee_data'], $retrivedData);
+                }
+
             }
 
-
             //Merged active and inactive employees , employee_polict history
-            $mergedEmpIds = array_merge($employeeIds, $inActiveEmployeeIds);
-            $empPolicyData = $this->employeePolicyModel->whereIn('employee_id', $mergedEmpIds)->findAll();
+            $mergedEmpIds      = array_merge($employeeIds, $inActiveEmployeeIds);
+            $empPolicyData     = $this->employeePolicyModel->whereIn('employee_id', $mergedEmpIds)->findAll();
             $employeePolicyIds = array_column($empPolicyData, 'id');
             foreach ($employeePolicyIds as $key => $pk) {
                 $retrivedData = $this->retriveOldData($data['self_enrolled_time'], 'employee_polices', $pk);
-                if ($retrivedData != false)
+                if ($retrivedData != false) {
                     array_push($data['revert_employee_policy_data'], $retrivedData);
+                }
+
             }
         }
 
-
         if ($this->request->getGet('revert_data') == 1) {
             //update data back to employee
             if (count($data['revert_employee_data'])) {
@@ -3518,43 +3410,39 @@ class EmployeeRestController extends AdminController
             }
             //update enrolled status for self
             if (count($data['revert_employee_data']) || count($data['revert_employee_policy_data'])) {
-                $this->employeeModel->where('id', $data['self_employee_id'])->set(array('emp_status' => 'enrolled'))->update();
+                $this->employeeModel->where('id', $data['self_employee_id'])->set(['emp_status' => 'enrolled'])->update();
                 $data['retrieve_status'] = 'Data revert successfully';
             } else {
                 $data['retrieve_status'] = 'There is no data to revert';
             }
         }
 
-
-
-
-
         // Fetch all policies related to these employees who currently active
         $current_employee_data = $this->employeeModel->select('id,emp_code,name,relationship,dob,emp_status,is_addon_value,created_at,updated_at')
             ->where([
-                'emp_code' => $empCode,
-                'client_id' => $clientId,
+                'emp_code'         => $empCode,
+                'client_id'        => $clientId,
                 'client_branch_id' => $clientBranchId,
-                'is_active' => 1
+                'is_active'        => 1,
             ])
             ->findAll();
-        $Ids = array_column($current_employee_data, 'id');
+        $Ids      = array_column($current_employee_data, 'id');
         $policies = $this->employeePolicyModel->whereIn('employee_id', $Ids)->where('is_active', 1)->findAll();
         // Group policies by policy_id
         $groupedPolicies = [];
         foreach ($policies as $policy) {
             $policyId = $policy['client_policy_id'];
 
-            if (!isset($groupedPolicies[$policyId])) {
+            if (! isset($groupedPolicies[$policyId])) {
                 $groupedPolicies[$policyId] = [
-                    'policy_id' => $policy['id'],
+                    'policy_id'        => $policy['id'],
                     'client_policy_id' => $policy['client_policy_id'],
-                    'uhid' => $policy['uhid'],
-                    'status' => $policy['status'],
-                    'basic_cover_si' => $policy['basic_cover_si'],
-                    'date_coverage' => $policy['date_coverage'],
-                    'policy_end_date' => $policy['policy_end_date'],
-                    'members' => []
+                    'uhid'             => $policy['uhid'],
+                    'status'           => $policy['status'],
+                    'basic_cover_si'   => $policy['basic_cover_si'],
+                    'date_coverage'    => $policy['date_coverage'],
+                    'policy_end_date'  => $policy['policy_end_date'],
+                    'members'          => [],
                 ];
             }
 
@@ -3562,13 +3450,13 @@ class EmployeeRestController extends AdminController
             foreach ($current_employee_data as $employee) {
                 if ($employee['id'] === $policy['employee_id']) {
                     $groupedPolicies[$policyId]['members'][] = [
-                        'id' => $employee['id'],
-                        'emp_code' => $employee['emp_code'],
-                        'name' => $employee['name'],
-                        'relationship' => $employee['relationship'],
-                        'dob' => $employee['dob'],
-                        'emp_status' => $employee['emp_status'],
-                        'is_addon_value' => $employee['is_addon_value']
+                        'id'             => $employee['id'],
+                        'emp_code'       => $employee['emp_code'],
+                        'name'           => $employee['name'],
+                        'relationship'   => $employee['relationship'],
+                        'dob'            => $employee['dob'],
+                        'emp_status'     => $employee['emp_status'],
+                        'is_addon_value' => $employee['is_addon_value'],
                     ];
                 }
             }
@@ -3586,7 +3474,7 @@ class EmployeeRestController extends AdminController
         $historyData = $this->auditHistoryModel->where('pk', $pk)->where('table_name', $table)->findAll();
 
         $beforeEnrolled = [];
-        $afterEnrolled = [];
+        $afterEnrolled  = [];
         // Split the array
         foreach ($historyData as $val) {
             if ($val['created_at'] <= $self_enrolled_time) {
@@ -3599,46 +3487,47 @@ class EmployeeRestController extends AdminController
         if (count($beforeEnrolled) && count($afterEnrolled)) { //After enrolment edited some of the data
 
             $temp['table'] = $table;
-            $temp['id'] = $pk;
+            $temp['id']    = $pk;
             // Extract earliest `old_value` for each `field_name`
             $originalValues = [];
             foreach ($afterEnrolled as $entry) {
                 $field = $entry['field_name'];
                 // If the field is not already in originalValues , update it
-                if (!isset($originalValues[$field])) {
+                if (! isset($originalValues[$field])) {
                     $originalValues[$field] = $entry['old_value'];
                 }
             }
             $temp['data'] = $originalValues;
             return $temp;
-        } else if (!count($beforeEnrolled) && !count($afterEnrolled)) { //After enrolment created new data
+        } else if (! count($beforeEnrolled) && ! count($afterEnrolled)) { //After enrolment created new data
 
             $temp['table'] = $table;
-            $temp['id'] = $pk;
-            $temp['data'] = ['is_active' => 0];
+            $temp['id']    = $pk;
+            $temp['data']  = ['is_active' => 0];
             return $temp;
-        } else if (!count($beforeEnrolled) && count($afterEnrolled)) { //After enrolment created new data and edited some of the data
+        } else if (! count($beforeEnrolled) && count($afterEnrolled)) { //After enrolment created new data and edited some of the data
 
             $temp['table'] = $table;
-            $temp['id'] = $pk;
-            $temp['data'] = ['is_active' => 0];
+            $temp['id']    = $pk;
+            $temp['data']  = ['is_active' => 0];
             return $temp;
-        } else if (count($beforeEnrolled) && !count($afterEnrolled)) { //After enrolment nothing changes from the data
+        } else if (count($beforeEnrolled) && ! count($afterEnrolled)) { //After enrolment nothing changes from the data
 
             return false;
         }
     }
 
-
     public function findThePolicyIsOpenForEnrollment($plicy_id)
     {
 
         $policy = $this->clientPolicyModel->where('id', $plicy_id)->where('open_for_enrollment', 1)->find();
 
-        if ($policy)
+        if ($policy) {
             return true;
-        else
+        } else {
             return false;
+        }
+
     }
 
     // ---------------- TICKET API's ---------------------------------------------------------------------------------------------------
@@ -3649,54 +3538,52 @@ class EmployeeRestController extends AdminController
 
         $received_data = $this->request->getPost();
         $this->myLogger->logme('error', 'API claim initiate Recevied Params :' . json_encode($received_data ?? []));
-        $get_file_data = $this->request->getFiles('claim_docs') ?? null;
-        $get_docs_name = $this->request->getPost('claim_doc_names') ?? [];
+        $get_file_data         = $this->request->getFiles('claim_docs') ?? null;
+        $get_docs_name         = $this->request->getPost('claim_doc_names') ?? [];
         $policy_transaction_id = $this->request->getPost('policy_transaction_id') ?? null;
 
-
         if (is_string($received_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $received_data['client_id'])) {
-            $client_data = $this->clientModel->where('MD5(id)', $received_data['client_id'])->first();
+            $client_data                = $this->clientModel->where('MD5(id)', $received_data['client_id'])->first();
             $received_data['client_id'] = $client_data['id'] ?? null;
-        } 
+        }
 
         $client_policy_data = $this->clientPolicyModel->where('id', $received_data['client_policy_id'] ?? null)->first();
 
         $isduplicate = checkDuplicateClaim([
-            'doa' => change_date_format($received_data['doa'] ?? '') ?? null, 
-            'emp_code' => $received_data['emp_code'] ?? null, 
-            'claim_amount' => $received_data['claim_amount'] ?? null, 
-            'policy_no' => $client_policy_data['policy_no'] ?? null
+            'doa'          => change_date_format($received_data['doa'] ?? '') ?? null,
+            'emp_code'     => $received_data['emp_code'] ?? null,
+            'claim_amount' => $received_data['claim_amount'] ?? null,
+            'policy_no'    => $client_policy_data['policy_no'] ?? null,
         ]);
 
-        if($isduplicate){
+        if ($isduplicate) {
             $response = ['status' => false, 'code' => 404, 'message' => 'Claim already exist'];
             return $this->respond($response, 200);
         }
 
-        if(!empty($policy_transaction_id)){
-           $response = $this->retailClaimInitiate($received_data);
+        if (! empty($policy_transaction_id)) {
+            $response = $this->retailClaimInitiate($received_data);
             return $this->respond($response, 200);
         }
 
         if (is_string($get_docs_name)) {
-            $decoded = json_decode($get_docs_name, true);
+            $decoded       = json_decode($get_docs_name, true);
             $get_docs_name = json_last_error() === JSON_ERROR_NONE ? $decoded : [];
-        } elseif (!is_array($get_docs_name)) {
+        } elseif (! is_array($get_docs_name)) {
             $get_docs_name = [];
         }
 
         // print_r($get_file_data); die;
-        $employee_id = $received_data['emp_id'];
+        $employee_id      = $received_data['emp_id'];
         $client_policy_id = $received_data['client_policy_id'];
-        $insured_emp_id = $received_data['insured_emp_id'];
+        $insured_emp_id   = $received_data['insured_emp_id'];
 
         $file_data = [];
-        if (isset($get_file_data) && !empty($get_file_data)) {
-            $file_path =   WRITEPATH . 'uploads/claim_files/';
-            $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name);
+        if (isset($get_file_data) && ! empty($get_file_data)) {
+            $file_path = WRITEPATH . 'uploads/claim_files/';
+            $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name, UPLOAD_EXT_CLAIM_DOCS);
         }
 
-
         if (empty($received_data['doa'])) {
             $received_data['doa'] = null;
         } else {
@@ -3710,7 +3597,7 @@ class EmployeeRestController extends AdminController
         }
 
         $sql = "
-            select 
+            select
                 cp.policy_type_id,
                 cl_rm.user_id as acm_id,
                 cp.insurer_id as insurer_id,
@@ -3726,30 +3613,30 @@ class EmployeeRestController extends AdminController
                 empl.id as insured_emp_id,
                 empl.name as insured_name,
                 empl.relationship,
-                
-                CASE 
+
+                CASE
                     WHEN cp.policy_type_id IN (2, 3, 4, 5) THEN 1
                     WHEN cp.policy_type_id = 1 THEN 2
                     WHEN cp.policy_type_id = 6 THEN 3
                     WHEN cp.policy_type_id = 7 THEN 4
-                    ELSE cp.policy_type_id 
+                    ELSE cp.policy_type_id
                 END AS ticket_type_id
 
-            from employees emp 
+            from employees emp
 
             left join employees empl on empl.id = :insured_emp_id: and empl.is_active = 1 and empl.emp_status = 'active'
-            left join employee_polices emp_pol on empl.id = emp_pol.employee_id and emp_pol.client_policy_id = :client_policy_id: and emp_pol.is_active = 1 
+            left join employee_polices emp_pol on empl.id = emp_pol.employee_id and emp_pol.client_policy_id = :client_policy_id: and emp_pol.is_active = 1
             left join client_policy cp on cp.id = emp_pol.client_policy_id and cp.is_active = 1
-            left join client_rm cl_rm on cl_rm.client_id = empl.client_id and cl_rm.is_active = 1 and cl_rm.level = 3 
+            left join client_rm cl_rm on cl_rm.client_id = empl.client_id and cl_rm.is_active = 1 and cl_rm.level = 3
 
         where emp.id = :employee_id: and emp.is_active = 1 and emp.emp_status = 'active'
         limit 1 ";
 
-        $binds = ['insured_emp_id'=>$insured_emp_id,'client_policy_id'=>(int)$client_policy_id,'employee_id'=>$employee_id ];
-        $emp_ticket_data = $this->employeeModel->query($sql,$binds)->getResultArray();
+        $binds           = ['insured_emp_id' => $insured_emp_id, 'client_policy_id' => (int) $client_policy_id, 'employee_id' => $employee_id];
+        $emp_ticket_data = $this->employeeModel->query($sql, $binds)->getResultArray();
         // print_r(db_connect()->getLastQuery()); die;
 
-        if (!empty($emp_ticket_data)) {
+        if (! empty($emp_ticket_data)) {
 
             unset($received_data['relationship']);
             $fetchData = $emp_ticket_data[0];
@@ -3759,21 +3646,20 @@ class EmployeeRestController extends AdminController
                 ->where('ticket_type', $fetchData['ticket_type_id'])
                 ->orderBy('id', 'asc');
 
-            if ($fetchData['ticket_type_id'] == 1 && !empty($fetchData['tpa_no'])) {
-                $results = $claimStatusQuery->findAll(2);
+            if ($fetchData['ticket_type_id'] == 1 && ! empty($fetchData['tpa_no'])) {
+                $results                      = $claimStatusQuery->findAll(2);
                 $fetchData['claim_status_id'] = $results[1]['id'] ?? $results[0]['id'];
-            } else if ($fetchData['ticket_type_id'] == 72 && !empty($fetchData['tpa_no'])) {
-                $results = $claimStatusQuery->findAll(2);
+            } else if ($fetchData['ticket_type_id'] == 72 && ! empty($fetchData['tpa_no'])) {
+                $results                      = $claimStatusQuery->findAll(2);
                 $fetchData['claim_status_id'] = $results[1]['id'] ?? $results[0]['id'];
             } else {
                 $fetchData['claim_status_id'] = $claimStatusQuery->first()['id'];
             }
 
-
-            $fetchData['priority'] = 1;
+            $fetchData['priority']           = 1;
             $fetchData['mode_of_intimation'] = 3;
-            
-            if(!isset($received_data['claim_type']) || (isset($received_data['claim_type']) && empty($received_data['claim_type']))) {
+
+            if (! isset($received_data['claim_type']) || (isset($received_data['claim_type']) && empty($received_data['claim_type']))) {
                 $received_data['claim_type'] = 1;
             }
 
@@ -3784,26 +3670,26 @@ class EmployeeRestController extends AdminController
 
             // print_r($fetchData); die;
             $insert_status = $this->ticketMaster->insert($fetchData);
-            $ticket_id = $this->ticketMaster->insertID();
+            $ticket_id     = $this->ticketMaster->insertID();
 
-            if ($insert_status && !empty($ticket_id)) {
+            if ($insert_status && ! empty($ticket_id)) {
 
                 //insert first history
                 $this->ticketController->putHistoryAfterInsert($fetchData, $ticket_id);
 
                 $messagesData = [
-                    'ticket_id' => $ticket_id ?? null,
-                    'sender' => 'user',
+                    'ticket_id'    => $ticket_id ?? null,
+                    'sender'       => 'user',
                     'claim_status' => $fetchData['claim_status_id'] ?? null,
-                    'emp_mail' => $fetchData['emp_mail'] ?? null,
+                    'emp_mail'     => $fetchData['emp_mail'] ?? null,
                     'mail_subject' => $fetchData['subject'] ?? "New Claim",
                     'mail_content' => $fetchData['message'] ?? "New Claim",
                 ];
 
                 $ticket_message_id = null;
-                if (!empty($messagesData['ticket_id'])) {
+                if (! empty($messagesData['ticket_id'])) {
                     $TicketMessageModel = new TicketMessageModel();
-                    $ticket_message_id = $TicketMessageModel->insert($messagesData);
+                    $ticket_message_id  = $TicketMessageModel->insert($messagesData);
                 }
 
                 $this->handleCliamFiles($file_data, $ticket_id, $ticket_message_id);
@@ -3843,40 +3729,40 @@ class EmployeeRestController extends AdminController
     }
 
     public function retailClaimInitiate($data)
-    {   
-        if(isset($data['policy_transaction_id'])){
+    {
+        if (isset($data['policy_transaction_id'])) {
 
             $policy_transaction_model = new PolicyTransactionModel();
 
             $policy = $policy_transaction_model
-                            ->select('policy_transaction.*, clients.client_name, clients.phone as client_mobile, clients.email as client_email')
-                            ->join('clients', 'policy_transaction.client_id = clients.id')
-                            ->where('policy_transaction.is_active',1)
-                            ->where('clients.is_active',1)
-                            ->where('policy_transaction.id', $data['policy_transaction_id'])
-                            ->first();
+                ->select('policy_transaction.*, clients.client_name, clients.phone as client_mobile, clients.email as client_email')
+                ->join('clients', 'policy_transaction.client_id = clients.id')
+                ->where('policy_transaction.is_active', 1)
+                ->where('clients.is_active', 1)
+                ->where('policy_transaction.id', $data['policy_transaction_id'])
+                ->first();
 
-            if(!empty($policy)){
+            if (! empty($policy)) {
 
                 $claimData = [
-                    'ticket_type_id'   => $data['policy_type_id'],
-                    'policy_transaction_id'   => $data['policy_transaction_id'],
-                    'claim_status_id'  => 62,
-                    'policy_no'        => $policy['policy_no'],
-                    'client_policy_id' => $policy['client_policy_id'],
-                    'insurer_id'       => $policy['insurer_id'],
-                    'client_id'        => $policy['client_id'] ?? null,
-                    'agent_id'         => $policy['agent_id'] ?? null,
-                    'manager_id'       => $policy['manager_id'] ?? null,
-                    'vehicle_id'       => $policy['vehicle_id'] ?? null,
-                    'insured_name'     => $policy['client_name'] ?? null,
-                    'emp_name'         => $policy['client_name'] ?? null,
-                    'emp_mobile'       => $policy['client_mobile'] ?? null,
-                    'emp_mail'         => $policy['client_email'] ?? null,
-                    'emp_personal_mail'=> $policy['client_email'] ?? null,
-                    'claim_type'       => $data['claim_type'],
-                    'claim_description'=> $data['claim_description'],
-                    'created_by'       => $policy['client_id'] ?? null,
+                    'ticket_type_id'        => $data['policy_type_id'],
+                    'policy_transaction_id' => $data['policy_transaction_id'],
+                    'claim_status_id'       => 62,
+                    'policy_no'             => $policy['policy_no'],
+                    'client_policy_id'      => $policy['client_policy_id'],
+                    'insurer_id'            => $policy['insurer_id'],
+                    'client_id'             => $policy['client_id'] ?? null,
+                    'agent_id'              => $policy['agent_id'] ?? null,
+                    'manager_id'            => $policy['manager_id'] ?? null,
+                    'vehicle_id'            => $policy['vehicle_id'] ?? null,
+                    'insured_name'          => $policy['client_name'] ?? null,
+                    'emp_name'              => $policy['client_name'] ?? null,
+                    'emp_mobile'            => $policy['client_mobile'] ?? null,
+                    'emp_mail'              => $policy['client_email'] ?? null,
+                    'emp_personal_mail'     => $policy['client_email'] ?? null,
+                    'claim_type'            => $data['claim_type'],
+                    'claim_description'     => $data['claim_description'],
+                    'created_by'            => $policy['client_id'] ?? null,
                 ];
 
                 $ticket_id = $this->ticketMaster->insert($claimData);
@@ -3903,15 +3789,15 @@ class EmployeeRestController extends AdminController
 
                     $message = 'Claim Initiated Successfully';
                     return ['status' => true, 'code' => 200, 'data' => $ticket_id, 'message' => $message];
-                }else{
+                } else {
                     $message = 'Claim Initiation failed';
                     return ['status' => false, 'code' => 404, 'message' => $message];
                 }
-            }else{
+            } else {
                 $message = 'Claim Initiation failed. Policy data not found';
                 return ['status' => false, 'code' => 404, 'message' => $message];
             }
-        }else{
+        } else {
             $message = 'Claim Initiation failed';
             return ['status' => false, 'code' => 404, 'message' => $message];
         }
@@ -3919,23 +3805,23 @@ class EmployeeRestController extends AdminController
 
     public function handleCliamFiles($data, $ticket_id, $ticket_message_id = null, $tpa_claim_push = true, $ir_docs = false)
     {
-        if (!empty($data) && !empty($ticket_id)) {
-            $insert_ids = [];
+        if (! empty($data) && ! empty($ticket_id)) {
+            $insert_ids            = [];
             $pdf_exist_in_the_file = false;
-            $claim_file = new ClaimFilesModel();
+            $claim_file            = new ClaimFilesModel();
             foreach ($data as $key => $value) {
 
                 $data = [
-                    'ticket_id' => $ticket_id,
-                    'doc_name' => $value['doc_name'],
-                    'file_name' => $value['file_name'],
-                    'url' => $value['file_path'],
-                    'file_type' => 2,
+                    'ticket_id'         => $ticket_id,
+                    'doc_name'          => $value['doc_name'],
+                    'file_name'         => $value['file_name'],
+                    'url'               => $value['file_path'],
+                    'file_type'         => 2,
                     'ticket_message_id' => $ticket_message_id,
-                    'mime_type' => getMimeTypeByFileName($value['file_name']),
+                    'mime_type'         => getMimeTypeByFileName($value['file_name']),
                 ];
 
-                if($ir_docs == true){
+                if ($ir_docs == true) {
                     $data['docs_for_ir'] = 1;
                 }
 
@@ -3959,11 +3845,11 @@ class EmployeeRestController extends AdminController
                     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){
+                if ($tpa_claim_push == false) {
                     log_message('error', 'Skip the TPA claim push for IR DOCUMENTS');
-                } else if($count == 0){
+                } else if ($count == 0) {
                     log_message('error', 'TPA claim push skipped as the claim reference number is already generated.');
-                }else{
+                } else {
                     log_message('error', "Failed to call the pushClaims function in EmployeeRestController for Ticket ID: {$ticket_id}, because the .pdf file does not exist.");
                 }
             }
@@ -4000,7 +3886,7 @@ class EmployeeRestController extends AdminController
                 // ])->setStatusCode(400);
 
                 $ticket_type = $this->ticketController->ticketType;
-                $claim_type = $this->ticketController->claimType;
+                $claim_type  = $this->ticketController->claimType;
                 unset($claim_type[1][2]);
                 unset($claim_type[1][4]);
 
@@ -4022,32 +3908,32 @@ class EmployeeRestController extends AdminController
                 ->groupBy('employee_polices.client_policy_id')
                 ->findAll();
 
-            if (!$policy_type_ids) {
+            if (! $policy_type_ids) {
                 $this->myLogger->logme('error', "No policy types found for client_id={$client_id}, emp_code={$emp_code}");
                 return $this->response->setJSON([
                     'status'  => false,
                     'code'    => 404,
-                    'message' => 'No policy types found'
+                    'message' => 'No policy types found',
                 ])->setStatusCode(200);
             }
 
             $this->myLogger->logme('error', "Policy type IDs fetched: " . json_encode($policy_type_ids));
 
             $ticket_type = $this->ticketController->ticketType;
-            $claim_type = $this->ticketController->claimType;
+            $claim_type  = $this->ticketController->claimType;
             unset($claim_type[1][2]);
             unset($claim_type[1][4]);
 
-            $filtered    = [];
+            $filtered = [];
 
             $mapping = [
-                2 => 1,
-                3 => 1,
-                4 => 1,
-                5 => 1,
-                1 => 2,
-                6 => 3,
-                7 => 4,
+                2  => 1,
+                3  => 1,
+                4  => 1,
+                5  => 1,
+                1  => 2,
+                6  => 3,
+                7  => 4,
                 72 => 72,
             ];
 
@@ -4061,7 +3947,7 @@ class EmployeeRestController extends AdminController
                     // Use mappedId as key to avoid duplicates
                     $filtered[$mappedId] = [
                         'id'   => $mappedId,
-                        'name' => $mappedName
+                        'name' => $mappedName,
                     ];
 
                     $this->myLogger->logme('error', "Ticket type resolved: ID={$ticketTypeId}, Name={$mappedName}");
@@ -4077,30 +3963,28 @@ class EmployeeRestController extends AdminController
             return $this->response->setJSON([
                 'status'  => false,
                 'code'    => 500,
-                'message' => 'Internal Server Error'
+                'message' => 'Internal Server Error',
             ])->setStatusCode(500);
         }
     }
 
-
     //ticket data
     public function get_ticket_data()
     {
-        $priorityType = $this->ticketController->priorityType;
-        $modeOFIntimate = $this->ticketController->modeOFIntimate;
-        $claimType = $this->ticketController->claimType;
+        $priorityType     = $this->ticketController->priorityType;
+        $modeOFIntimate   = $this->ticketController->modeOFIntimate;
+        $claimType        = $this->ticketController->claimType;
         $relationshipType = $this->ticketController->relationshipType;
-        $ticketTypeArray = $this->ticketController->ticketType;
+        $ticketTypeArray  = $this->ticketController->ticketType;
 
-
-        $emp_id = $this->request->getGet('emp_id');
-        $ticket_type = $this->request->getGet('ticket_type') ?? null;
-        $ticket_id = $this->request->getGet('ticket_id') ?? null;
+        $emp_id        = $this->request->getGet('emp_id');
+        $ticket_type   = $this->request->getGet('ticket_type') ?? null;
+        $ticket_id     = $this->request->getGet('ticket_id') ?? null;
         $mobile_number = $this->request->getGet('mobile_number') ?? null;
-        $email_id = $this->request->getGet('email_id') ?? null;
-        $request = \Config\Services::request();
-        $uri = $request->uri->getPath();
-        $returnType = "";
+        $email_id      = $this->request->getGet('email_id') ?? null;
+        $request       = \Config\Services::request();
+        $uri           = $request->uri->getPath();
+        $returnType    = "";
         // $returnType = (strpos($uri, 'api') !== false) ? 'api' : 'web';
         // dd($emp_id);
 
@@ -4109,14 +3993,14 @@ class EmployeeRestController extends AdminController
         }
 
         $retail_ticket_data = [];
-        if(!empty($mobile_number) || !empty($email_id)){
+        if (! empty($mobile_number) || ! empty($email_id)) {
             $retail_ticket_data = $this->getRetailPolicyClaimData($this->request->getGet());
         }
 
         $TicketMasterModel = new TicketMasterModel();
-        $ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id);
+        $ticket_data       = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id);
 
-        if (!empty($ticket_data)) {
+        if (! empty($ticket_data)) {
 
             // $client_claim_status = [
             //     'Received' => [1, 2, 3, 4, 15, 16, 17, 18, 25, 26, 27, 28, 35, 36, 37, 38],
@@ -4138,7 +4022,7 @@ class EmployeeRestController extends AdminController
             //     'Denial Review Awaited' => [66],
             //     'Rejected' => [8, 49, 55, 60],
             // ];
-            
+
             // construct the claim status
             $client_claim_status = $this->getClaimStatusGrouped();
 
@@ -4147,26 +4031,26 @@ class EmployeeRestController extends AdminController
                 foreach ($client_claim_status as $claim_key => $claim_value) {
                     if (in_array($value['claim_status_id'], $claim_value)) { // Corrected argument order
                         $ticket_data[$key]['claim_status'] = $claim_key ?? null; // Assign back to the main array
-                    }else if(in_array($value['old_status_id'], $claim_value)){
+                    } else if (in_array($value['old_status_id'], $claim_value)) {
                         $ticket_data[$key]['claim_status'] = $claim_key ?? null; // Assign back to the main array
                     }
                 }
 
-                $ticket_data[$key]['priority_type'] = $priorityType[$value['priority']] ?? null;
+                $ticket_data[$key]['priority_type']         = $priorityType[$value['priority']] ?? null;
                 $ticket_data[$key]['mode_of_intimate_type'] = $modeOFIntimate[$value['mode_of_intimation']] ?? null;
-                $ticket_data[$key]['relationship_type'] = ucfirst($value['relationship']) ?? null;
-                $claimPrimaryTypey = "1";
+                $ticket_data[$key]['relationship_type']     = ucfirst($value['relationship']) ?? null;
+                $claimPrimaryTypey                          = "1";
                 if (in_array($value['claim_type'], [2, 3, 4])) {
                     $claimPrimaryTypey = "2";
                 }
-                $ticket_data[$key]['claim_type_value'] = $claimType[$claimPrimaryTypey][$value['claim_type']] ?? null;
+                $ticket_data[$key]['claim_type_value']   = $claimType[$claimPrimaryTypey][$value['claim_type']] ?? null;
                 $ticket_data[$key]['ticket_policy_type'] = $ticketTypeArray[$value['ticket_type_id']] ?? null;
 
                 $claim_file_urls = [];
 
                 if (isset($value['ticket_message_id'])) {
 
-                    $claimFiles = new ClaimFilesModel();
+                    $claimFiles       = new ClaimFilesModel();
                     $claim_files_data = $claimFiles
                         ->select('id as claim_file_id, doc_name as claim_file_name')
                         ->where('is_active', 1)
@@ -4176,7 +4060,7 @@ class EmployeeRestController extends AdminController
                         ->findAll();
 
                     foreach ($claim_files_data as &$value) {
-                        $value['url'] = base_url('downloadClaimFile/') . $value['claim_file_id'];
+                        $value['url']      = base_url('downloadClaimFile/') . $value['claim_file_id'];
                         $claim_file_urls[] = $value;
                     }
                     unset($value);
@@ -4193,13 +4077,13 @@ class EmployeeRestController extends AdminController
     }
 
     public function getRetailPolicyClaimData($receviedPayload)
-    {   
+    {
         try {
             // Create minimal retail user object
             $retailUserData = (object) [
-                'id'        => null,
-                'mobile'    => $receviedPayload['mobile_number'] ?? null,
-                'email_id'  => $receviedPayload['email_id'] ?? null
+                'id'       => null,
+                'mobile'   => $receviedPayload['mobile_number'] ?? null,
+                'email_id' => $receviedPayload['email_id'] ?? null,
             ];
 
             // Get retail policies of user
@@ -4236,7 +4120,7 @@ class EmployeeRestController extends AdminController
                     ->where('ticket_master.policy_transaction_id', $policy['policy_transaction_id'])
                     ->findAll();
 
-                if (!empty($tickets)) {
+                if (! empty($tickets)) {
                     $retail_ticket_data = array_merge($retail_ticket_data, $tickets);
                 }
             }
@@ -4245,9 +4129,9 @@ class EmployeeRestController extends AdminController
                 return [];
             }
 
-            // Fetch grouped claim statuses
+                                                                   // Fetch grouped claim statuses
             $client_claim_status = $this->getClaimStatusGrouped(); // Format expected: [status => [ids]]
-            $claim_type = $this->getClaimTypeMaster('internal');
+            $claim_type          = $this->getClaimTypeMaster('internal');
 
             // Convert claim type for quick access
             $typeMap = array_column($claim_type, 'claim_type', 'id');
@@ -4257,7 +4141,7 @@ class EmployeeRestController extends AdminController
                 $ticket['claim_status'] = null; // Default
 
                 $ticket['claim_type_name'] = $typeMap[$ticket['claim_type']] ?? null;
-                if($ticket['ticket_type_id'] == 8){
+                if ($ticket['ticket_type_id'] == 8) {
                     $ticket['ticket_policy_type'] = 'Motor';
                 }
                 foreach ($client_claim_status as $status_name => $status_list) {
@@ -4275,17 +4159,17 @@ class EmployeeRestController extends AdminController
 
             return $retail_ticket_data;
 
-        }catch (\Throwable $th) {
+        } catch (\Throwable $th) {
 
             $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
+                '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,
+                'function'    => $th->getTrace()[0]['function'] ?? null,
+                'class'       => $th->getTrace()[0]['class'] ?? null,
             ];
 
             $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getRetailPolicyClaimData: Exception: " . json_encode($errorData ?? []));
@@ -4309,7 +4193,7 @@ class EmployeeRestController extends AdminController
             $name = $row['display_name'];
             $id   = $row['id'];
 
-            if (!isset($result[$name])) {
+            if (! isset($result[$name])) {
                 $result[$name] = [];
             }
 
@@ -4320,27 +4204,26 @@ class EmployeeRestController extends AdminController
     }
 
     // not in use did for testing
-    function encrypt_for_sso(): string
+    public function encrypt_for_sso(): string
     {
 
-
         $key = "32D1D5535157AF3D4667ADAB0CC795D77D022BB281AD3272EB134C72BD0B185E";
 
         $userParams = [
-            "name" => "John Doe 3",
-            "email" => "john.doe3@email.com",
-            "memberId" => "TEST-REL-01",
-            "gender" => "Male",
-            "dob" => "1997-01-01",
-            "policyName" => "Nhance DEMO",
-            "phone" => "6676126763",
-            "employeeId" => "EMP-NHANCE-TEST-03",
-            "policyNumber" => "EMP-NHANCE-TEST-03",
+            "name"            => "John Doe 3",
+            "email"           => "john.doe3@email.com",
+            "memberId"        => "TEST-REL-01",
+            "gender"          => "Male",
+            "dob"             => "1997-01-01",
+            "policyName"      => "Nhance DEMO",
+            "phone"           => "6676126763",
+            "employeeId"      => "EMP-NHANCE-TEST-03",
+            "policyNumber"    => "EMP-NHANCE-TEST-03",
             "policyStartDate" => "2025-09-08",
-            "policyEndDate" => "2026-09-08",
-            "moduleName" => "home",
-            "relation" => "self",
-            "planId" => "NHANCE-PLAN-1"
+            "policyEndDate"   => "2026-09-08",
+            "moduleName"      => "home",
+            "relation"        => "self",
+            "planId"          => "NHANCE-PLAN-1",
         ];
 
         $algorithm = "aes-256-cbc";
@@ -4358,7 +4241,6 @@ class EmployeeRestController extends AdminController
         }
         $plainText = ltrim($plainText, '&');
 
-
         // echo ($plainText); die;
 
         // Encrypt
@@ -4367,22 +4249,15 @@ class EmployeeRestController extends AdminController
         // Base64URL encode (same as Node.js output)
         $output = rtrim(strtr(base64_encode($encrypted), '+/', '-_'), '=');
 
-        // return $output;    
+        // return $output;
 
-
-        $baseURL = 'https://web.getvisitapp.net';
+        $baseURL  = 'https://web.getvisitapp.net';
         $clientId = 'nhance-gt-2tx7';
         $finalUrl = $baseURL . '/sso?userParams=' . $output . '&clientId=' . $clientId;
 
         return $finalUrl;
     }
 
-
-
-
-
-
-
     public function getEmployeePolicyCount()
     {
         $db2 = \Config\Database::connect('preDB');
@@ -4402,9 +4277,9 @@ class EmployeeRestController extends AdminController
         $count = $query->getNumRows(); // count grouped rows manually
 
         return $this->respond([
-            'status' => 'success',
-            'code' => 200,
-            'policy_count' => $count
+            'status'       => 'success',
+            'code'         => 200,
+            'policy_count' => $count,
         ], 200);
     }
 
@@ -4438,7 +4313,6 @@ class EmployeeRestController extends AdminController
 
     //     return $response['data'] ?? 0 ;
 
-
     //     try {
     //         log_message('error', 'Attempting to connect to preDB...');
     //         $db2 = \Config\Database::connect('preDB');
@@ -4493,7 +4367,7 @@ class EmployeeRestController extends AdminController
 
         $client_short_name = null;
 
-        if (!empty($clientId)) {
+        if (! empty($clientId)) {
 
             log_message('error', 'STEP 3: Fetching client short name for client ID: ' . $clientId);
             $client_data = $this->clientModel->where('is_active', 1)->where('id', $clientId)->first();
@@ -4508,20 +4382,18 @@ class EmployeeRestController extends AdminController
             log_message('error', 'STEP 3: No clientId provided. Skipping client lookup.');
         }
 
-        if (!empty($email)) {
+        if (! empty($email)) {
             $post_data = [
-                'email_id'     => $email,
-                'client_short_name' => $client_short_name
+                'email_id'          => $email,
+                'client_short_name' => $client_short_name,
             ];
         } else {
             $post_data = [
                 'mobile_number'     => $mobile_no,
-                'client_short_name' => $client_short_name
+                'client_short_name' => $client_short_name,
             ];
         }
 
-
-
         log_message('error', 'STEP 5: Calling third-party API with payload: ' . json_encode($post_data));
 
         try {
@@ -4542,16 +4414,14 @@ class EmployeeRestController extends AdminController
 
     private function callThirdPartyAPI($postData, $endPoint)
     {
-        $client = \Config\Services::curlrequest();
-        $url = env('PRE_ENROLLMENT_BASEURL') . $endPoint;
-         $headers = [ 'App-Signature' => getenv('APP_SIGNATURE') ];
-        $response = $client->post($url, ['json' => $postData,'headers' => $headers,'http_errors' => false]);
+        $client   = \Config\Services::curlrequest();
+        $url      = env('PRE_ENROLLMENT_BASEURL') . $endPoint;
+        $headers  = ['App-Signature' => getenv('APP_SIGNATURE')];
+        $response = $client->post($url, ['json' => $postData, 'headers' => $headers, 'http_errors' => false]);
         // return json_decode($response->getBody(), true);
         return $response->getBody();
     }
 
-
-
     //--------------------------------------------------------------------------------------------
     public function hrFileUpload()
     {
@@ -4568,34 +4438,34 @@ class EmployeeRestController extends AdminController
             ];
             // print_r($post_data); die;
 
-            if(empty($post_data['client_id'])){
+            if (empty($post_data['client_id'])) {
                 return $this->respondCreated(['status' => false, 'message' => 'Client is required', 'data' => []]);
             }
 
-             // Handle raw client_id vs MD5
+            // Handle raw client_id vs MD5
             if (is_string($post_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $post_data['client_id'])) {
-                $client_data = $this->clientModel->where('MD5(id)',  $post_data['client_id'])->first();
+                $client_data            = $this->clientModel->where('MD5(id)', $post_data['client_id'])->first();
                 $post_data['client_id'] = $client_data['id'];
             } else {
-                $client_data = $this->clientModel->where('id',  $post_data['client_id'])->first();
+                $client_data = $this->clientModel->where('id', $post_data['client_id'])->first();
             }
 
-            if(empty($client_data)){
+            if (empty($client_data)) {
                 return $this->respondCreated(['status' => false, 'message' => 'Invalid Client Id', 'data' => []]);
             }
 
             // print_r($client_data); die;
 
-            if($client_data['hr_file_processed_by'] == 1){
+            if ($client_data['hr_file_processed_by'] == 1) {
                 $responce = $this->fileUploadInFilesTable($post_data);
-            }else{
+            } else {
                 $responce = $this->fileUploadInHrFileUploadTable($post_data);
             }
 
             return $this->respondCreated($responce);
 
         } catch (\Exception $e) {
-           // return $this->failServerError($e->getMessage());
+            // return $this->failServerError($e->getMessage());
             return $this->respondCreated(['status' => false, 'message' => $e->getMessage(), 'data' => []]);
         }
     }
@@ -4605,11 +4475,19 @@ class EmployeeRestController extends AdminController
         // Check file
         $file = $post_data['file_name'];
 
-        if (!$file) {
+        if (!$file || !$file->isValid()) {
             return [
-                'status' => false,
+                'status'  => false,
                 'message' => "Invalid file or file not uploaded.",
-                'data'    => []
+                'data'    => [],
+            ];
+        }
+
+        if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+            return [
+                'status'  => false,
+                'message' => "Only Excel files (xls, xlsx, ods, csv) are allowed.",
+                'data'    => [],
             ];
         }
 
@@ -4617,8 +4495,8 @@ class EmployeeRestController extends AdminController
         $uploadPath = WRITEPATH . 'uploads/hr_files/';
 
         // If directory not exists, create it
-        if (!is_dir($uploadPath)) {
-            mkdir($uploadPath, 0777, true);
+        if (! is_dir($uploadPath)) {
+            mkdir($uploadPath, 0755, true);
         }
 
         // New file name with timestamp
@@ -4648,7 +4526,7 @@ class EmployeeRestController extends AdminController
             $response = [
                 'status'  => true,
                 'message' => 'File uploaded successfully',
-                'data'    => $data
+                'data'    => $data,
             ];
             return $response;
         }
@@ -4657,7 +4535,7 @@ class EmployeeRestController extends AdminController
     public function fileUploadInFilesTable($post_data)
     {
         $employeeController = new EmployeeController();
-        $responce = $employeeController->employeesUplodWithEvents($post_data);
+        $responce           = $employeeController->employeesUplodWithEvents($post_data);
         // print_r($responce); die;
 
         return $responce;
@@ -4695,18 +4573,17 @@ class EmployeeRestController extends AdminController
         $mailTemplate['mail_content'] = str_replace('%client_name%', $client_name ?? '', $mailTemplate['mail_content']);
         $mailTemplate['mail_content'] = str_replace('%policy_no%', $data['policy_no'] ?? '', $mailTemplate['mail_content']);
 
-        $mailTemplate['subject']      = str_replace('%subject%', $data['file_action'] ?? '', $mailTemplate['subject']);
-        $mailTemplate['subject']      = str_replace('%client_name%', $client_name ?? '', $mailTemplate['subject']);
-
-        $from_mail      =  "";
-        $to_mail        =  $account_manager_email;
-        $subject        =  $mailTemplate['subject'];
-        $message        =  $mailTemplate['mail_content'];
-        $cc_string      =  "";
-        $attachments    =  "";
-        $reply_to       =  "";
-        $bcc_string     =  "";
+        $mailTemplate['subject'] = str_replace('%subject%', $data['file_action'] ?? '', $mailTemplate['subject']);
+        $mailTemplate['subject'] = str_replace('%client_name%', $client_name ?? '', $mailTemplate['subject']);
 
+        $from_mail   = "";
+        $to_mail     = $account_manager_email;
+        $subject     = $mailTemplate['subject'];
+        $message     = $mailTemplate['mail_content'];
+        $cc_string   = "";
+        $attachments = "";
+        $reply_to    = "";
+        $bcc_string  = "";
 
         MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail, 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
     }
@@ -4716,7 +4593,7 @@ class EmployeeRestController extends AdminController
         try {
             $id = $this->request->getPost('id');
 
-            if (!$id) {
+            if (! $id) {
                 return $this->failValidationErrors('ID is required for update.');
             }
 
@@ -4732,8 +4609,8 @@ class EmployeeRestController extends AdminController
             ];
 
             // Check if record exists
-            $record = $this->hrFileUploadModel->find((int)$id);
-            if (!$record) {
+            $record = $this->hrFileUploadModel->find((int) $id);
+            if (! $record) {
                 return $this->failNotFound("Record with ID {$id} not found.");
             }
 
@@ -4743,46 +4620,45 @@ class EmployeeRestController extends AdminController
             return $this->respond([
                 'status'  => true,
                 'message' => 'File record updated successfully',
-                'data'    => $data
+                'data'    => $data,
             ], 200);
         } catch (\Exception $e) {
             return $this->failServerError($e->getMessage());
         }
     }
 
-
     public function hrFileDownload($id = null)
     {
         try {
 
-            $file_id = $this->request->getGet('id') ?? $id;
+            $file_id   = $this->request->getGet('id') ?? $id;
             $client_id = $this->request->getGet('cliend_id') ?? null;
 
             $client_data = [];
-            if(!empty($client_id)){
+            if (! empty($client_id)) {
                 if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
-                    $client_data = $this->clientModel->where('MD5(id)',  $client_id)->first();
+                    $client_data = $this->clientModel->where('MD5(id)', $client_id)->first();
                 } else {
-                    $client_data = $this->clientModel->where('id',  $client_id)->first();
+                    $client_data = $this->clientModel->where('id', $client_id)->first();
                 }
             }
 
             // Find record
-            if($client_data && $client_data['hr_file_processed_by'] == 1){
-                $record = $this->fileModel->where('id', (int)$file_id)->find();
+            if ($client_data && $client_data['hr_file_processed_by'] == 1) {
+                $record     = $this->fileModel->where('id', (int) $file_id)->find();
                 $uploadPath = WRITEPATH . 'uploads/excel/';
-            }else{
-                $record = $this->hrFileUploadModel->where('id', (int)$file_id)->find();
+            } else {
+                $record     = $this->hrFileUploadModel->where('id', (int) $file_id)->find();
                 $uploadPath = WRITEPATH . 'uploads/hr_files/';
             }
 
-            if (!$record) {
+            if (! $record) {
                 return $this->failNotFound("File record not found");
             }
 
             $filePath = $uploadPath . $record[0]['file_name'];
 
-            if (!file_exists($filePath)) {
+            if (! file_exists($filePath)) {
                 return $this->failNotFound("File not found on server");
             }
 
@@ -4840,27 +4716,27 @@ class EmployeeRestController extends AdminController
     {
         try {
 
-            $request = service('request');
+            $request     = service('request');
             $search_data = $request->getGetPost() ?? []; // supports both GET and POST
-            $table = "";
+            $table       = "";
 
-            if(isset($search_data['hr_file_type']) && $search_data['hr_file_type'] == "CRM"){
-                $data = $this->getDataFromHrFileUploadTable($search_data);
+            if (isset($search_data['hr_file_type']) && $search_data['hr_file_type'] == "CRM") {
+                $data  = $this->getDataFromHrFileUploadTable($search_data);
                 $table = "hr_file_upload";
-            }else{
+            } else {
 
                 if (is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
-                    $client_data = $this->clientModel->where('MD5(id)',  $search_data['client_id'])->first();
+                    $client_data              = $this->clientModel->where('MD5(id)', $search_data['client_id'])->first();
                     $search_data['client_id'] = $client_data['id'];
                 } else {
-                    $client_data = $this->clientModel->where('id',  $search_data['client_id'])->first();
+                    $client_data = $this->clientModel->where('id', $search_data['client_id'])->first();
                 }
 
-                if($client_data['hr_file_processed_by'] == 1){
-                    $data = $this->getDataFromHrFilesTable($search_data);
+                if ($client_data['hr_file_processed_by'] == 1) {
+                    $data  = $this->getDataFromHrFilesTable($search_data);
                     $table = "files";
-                }else{
-                    $data = $this->getDataFromHrFileUploadTable($search_data);
+                } else {
+                    $data  = $this->getDataFromHrFileUploadTable($search_data);
                     $table = "hr_file_upload 2";
 
                 }
@@ -4870,20 +4746,20 @@ class EmployeeRestController extends AdminController
                 'status'  => "success",
                 'message' => 'File list fetched successfully',
                 'data'    => $data,
-                'table'   => $table
+                'table'   => $table,
             ]);
 
         } catch (\Exception $th) {
 
             $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
+                '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,
+                'function'    => $th->getTrace()[0]['function'] ?? null,
+                'class'       => $th->getTrace()[0]['class'] ?? null,
             ];
 
             return $this->failServerError($th->getMessage());
@@ -4901,24 +4777,24 @@ class EmployeeRestController extends AdminController
 
         $builder = $this->hrFileUploadModel
             ->select("
-                    hr_file_upload.id, 
-                    hr_file_upload.client_id, 
-                    hr_file_upload.client_branch_id, 
-                    hr_file_upload.policy_id, 
-                    hr_file_upload.policy_no, 
-                    hr_file_upload.file_name, 
-                    hr_file_upload.file_action, 
-                    hr_file_upload.created_at, 
-                    hr_file_upload.created_by, 
-                    hr_file_upload.updated_at, 
+                    hr_file_upload.id,
+                    hr_file_upload.client_id,
+                    hr_file_upload.client_branch_id,
+                    hr_file_upload.policy_id,
+                    hr_file_upload.policy_no,
+                    hr_file_upload.file_name,
+                    hr_file_upload.file_action,
+                    hr_file_upload.created_at,
+                    hr_file_upload.created_by,
+                    hr_file_upload.updated_at,
                     hr_file_upload.updated_by,
-                    c.short_name, 
-                    cb.branch_name, 
+                    c.short_name,
+                    cb.branch_name,
                     lc.name as first_name,
-                    CASE 
-                        WHEN f.status IS NULL 
-                        THEN hr_file_upload.status 
-                        ELSE CONCAT(UCASE(LEFT(f.status, 1)), LCASE(SUBSTRING(f.status, 2))) 
+                    CASE
+                        WHEN f.status IS NULL
+                        THEN hr_file_upload.status
+                        ELSE CONCAT(UCASE(LEFT(f.status, 1)), LCASE(SUBSTRING(f.status, 2)))
                     END AS status,
                     '0' as file_error_status,
                     '' as file_error_status
@@ -4927,10 +4803,10 @@ class EmployeeRestController extends AdminController
             ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
             ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left')
             ->join(
-                '(SELECT f1.* 
-                    FROM files f1 
-                    WHERE f1.is_active = 1 
-                    ORDER BY f1.id DESC 
+                '(SELECT f1.*
+                    FROM files f1
+                    WHERE f1.is_active = 1
+                    ORDER BY f1.id DESC
                     LIMIT 1) f',
                 'f.hr_file_id = hr_file_upload.id',
                 'left'
@@ -4944,13 +4820,13 @@ class EmployeeRestController extends AdminController
             'policy_no',
             'file_action',
             'status',
-            'created_by'
+            'created_by',
         ];
 
         // Apply filters dynamically
         foreach ($filters as $key) {
             $value = $search_data[$key] ?? null; // supports both GET and POST
-            if (!empty($value)) {
+            if (! empty($value)) {
                 $builder->where("hr_file_upload.$key", $value);
             }
         }
@@ -4959,7 +4835,7 @@ class EmployeeRestController extends AdminController
         $builder->orderBy('hr_file_upload.id', 'DESC');
         $data = $builder->get()->getResultArray();
 
-        if(!empty($data)){
+        if (! empty($data)) {
             return $data;
         }
 
@@ -4967,28 +4843,28 @@ class EmployeeRestController extends AdminController
     }
 
     public function getDataFromHrFilesTable($search_data)
-    {   
+    {
         $file_download_base = base_url('downloadFileTableFile/');
-        $builder = $this->fileModel
+        $builder            = $this->fileModel
             ->select("
-                    files.id, 
-                    files.client_id, 
-                    files.client_branch_id, 
-                    files.policy_id, 
-                    cp.policy_no, 
-                    files.file_name, 
-                    files.action as file_action, 
-                    files.created_at, 
-                    files.created_by, 
-                    files.updated_at, 
+                    files.id,
+                    files.client_id,
+                    files.client_branch_id,
+                    files.policy_id,
+                    cp.policy_no,
+                    files.file_name,
+                    files.action as file_action,
+                    files.created_at,
+                    files.created_by,
+                    files.updated_at,
                     files.updated_by,
-                    c.short_name, 
-                    cb.branch_name, 
+                    c.short_name,
+                    cb.branch_name,
                     lc.name as first_name,
                     CONCAT(UCASE(LEFT(files.status, 1)), LCASE(SUBSTRING(files.status, 2))) as status,
-                    CASE 
-                        WHEN status = 'failed' THEN 1 
-                        ELSE 0 
+                    CASE
+                        WHEN status = 'failed' THEN 1
+                        ELSE 0
                     END AS file_error_status,
                     CONCAT('{$file_download_base}', files.id, '/api') AS file_download_link
                 ", false)
@@ -4997,20 +4873,19 @@ class EmployeeRestController extends AdminController
             ->join('client_policy cp', 'files.policy_id = cp.id AND cp.is_active = 1', 'left')
             ->join('level_contacts lc', 'files.hr_id = lc.id AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
 
-
-        if (isset($search_data['policy_id']) && !empty($search_data['policy_id'])) {
+        if (isset($search_data['policy_id']) && ! empty($search_data['policy_id'])) {
             $builder->where("files.policy_id", $search_data['policy_id']);
         }
 
-        if (isset($search_data['created_by']) && !empty($search_data['created_by'])) {
+        if (isset($search_data['created_by']) && ! empty($search_data['created_by'])) {
             $builder->where("files.hr_id", $search_data['created_by']);
         }
 
-        if (isset($search_data['policy_no']) && !empty($search_data['policy_no'])) {
+        if (isset($search_data['policy_no']) && ! empty($search_data['policy_no'])) {
             $builder->where("cp.policy_no", $search_data['policy_no']);
         }
 
-        if (isset($search_data['client_id']) && !empty($search_data['client_id'])) {
+        if (isset($search_data['client_id']) && ! empty($search_data['client_id'])) {
             if (is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
                 $builder->where("MD5(files.client_id)", $search_data['client_id']);
             } else {
@@ -5018,16 +4893,15 @@ class EmployeeRestController extends AdminController
             }
         }
 
-        if (isset($search_data['file_id']) && !empty($search_data['file_id'])) {
+        if (isset($search_data['file_id']) && ! empty($search_data['file_id'])) {
             $builder->where("files.id", $search_data['file_id']);
         }
 
-
         // Execute query
         $builder->orderBy('files.id', 'DESC');
         $data = $builder->get()->getResultArray();
 
-        if (!empty($data)) {
+        if (! empty($data)) {
             return $data;
         }
 
@@ -5038,12 +4912,12 @@ class EmployeeRestController extends AdminController
     {
         try {
             //for inception upload
-            $data['actions'] = ['addition' => 'Addition (Employee + Dependents)',  'missed_inception' => 'Missed Inception (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
+            $data['actions'] = ['addition' => 'Addition (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
 
             return $this->respond([
                 'status'  => true,
                 'message' => 'File inception upload masters',
-                'data'    => $data
+                'data'    => $data,
             ]);
         } catch (\Exception $e) {
             return $this->failServerError($e->getMessage());
@@ -5103,13 +4977,13 @@ class EmployeeRestController extends AdminController
             // Step 5: Check if API service is enabled
             log_message('error', "Checking TPA API service for TPA ID={$tpa_id} and API name={$api_name}");
             $tpaApiServiceModel = new TpaApiSeviceModel();
-            $api_data = $tpaApiServiceModel
+            $api_data           = $tpaApiServiceModel
                 ->where('is_active', 1)
                 ->where('api_name', $api_name)
                 ->where('tpa_id', $tpa_id)
                 ->first();
 
-            if (!empty($api_data)) {
+            if (! empty($api_data)) {
                 log_message('error', "API '{$api_name}' is enabled for TPA ID={$tpa_id}");
                 if ($return_type == 'api') {
                     return $this->respond(['status' => true, 'code' => 200, 'message' => 'API services enabled']);
@@ -5133,16 +5007,14 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
-
     public function getEcardURL()
     {
         try {
 
-            $id = $this->request->getGet('id');
-            $emp_code = $this->request->getGet('emp_code');
+            $id               = $this->request->getGet('id');
+            $emp_code         = $this->request->getGet('emp_code');
             $client_policy_id = $this->request->getGet('client_policy_id');
-            $policy_no = $this->request->getGet('policy_no');
+            $policy_no        = $this->request->getGet('policy_no');
 
             $employee_policy = $this->employeePolicyModel
                 ->select('employees.*, employee_polices.tpa_id , employee_polices.rand_string , employee_polices.uhid as uhid , client_policy.tpa_id as tpa_primary_id ')
@@ -5152,13 +5024,11 @@ class EmployeeRestController extends AdminController
                 ->where('employee_polices.client_policy_id', $client_policy_id)
                 ->where('employee_polices.is_active', 1)->findAll();
 
-
-
             if (count($employee_policy) > 0) {
                 if ($employee_policy[0]['tpa_id'] != null) {
                     if ($employee_policy[0]['tpa_primary_id'] == 2) //Medi assist
                     {
-                        $mediAssistController = new MediAssistApiController();
+                        $mediAssistController  = new MediAssistApiController();
                         $data['eCardDownload'] = $mediAssistController->EcardRequest($emp_code, $policy_no);
                     } else {
                         $data['eCardDownload'] = base_url('download-e-card/') . $employee_policy[0]['rand_string'] . '/1';
@@ -5170,8 +5040,7 @@ class EmployeeRestController extends AdminController
                 $data['eCardDownload'] = null;
             }
 
-
-            return $this->respond(['status'  => true, 'message' => '', 'data'    => $data]);
+            return $this->respond(['status' => true, 'message' => '', 'data' => $data]);
         } catch (\Exception $e) {
         }
     }
@@ -5183,32 +5052,32 @@ class EmployeeRestController extends AdminController
         try {
 
             $payload = $this->request->getJSON(true);
-            $pk = $payload['retail_policy_id'] ?? null;
-            $emp_id = $payload['emp_id'] ?? null;
+            $pk      = $payload['retail_policy_id'] ?? null;
+            $emp_id  = $payload['emp_id'] ?? null;
 
             if (empty($emp_id)) {
                 $this->myLogger->logme("error", "addEmpRetailPolicy: emp_id is missing");
-                return $this->respond(['status'  => 'failed','code' => 400,'message' => 'emp_id is required' ], 200);
+                return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'emp_id is required'], 200);
             }
 
-            if(isset($payload['policy_end_date']) && !empty($payload['policy_end_date'])){
+            if (isset($payload['policy_end_date']) && ! empty($payload['policy_end_date'])) {
                 $payload['policy_end_date'] = change_date_format($payload['policy_end_date'], 'd M Y', 'Y-m-d');
-            }else{
-                 $payload['policy_end_date'] = null;
+            } else {
+                $payload['policy_end_date'] = null;
             }
 
-            if(isset($payload['policy_start_date']) && !empty($payload['policy_start_date'])){
+            if (isset($payload['policy_start_date']) && ! empty($payload['policy_start_date'])) {
                 $payload['policy_start_date'] = change_date_format($payload['policy_start_date'], 'd M Y', 'Y-m-d');
-            }else{
-                 $payload['policy_start_date'] = null;
+            } else {
+                $payload['policy_start_date'] = null;
             }
 
-            if(empty($pk)){
+            if (empty($pk)) {
                 $payload['created_by'] = $emp_id;
-                $emp_retail_policy_id = $this->employeeRetailPolicy->insert($payload);
-            }else{
+                $emp_retail_policy_id  = $this->employeeRetailPolicy->insert($payload);
+            } else {
                 $payload['updated_by'] = $emp_id;
-                $emp_retail_policy_id = $this->employeeRetailPolicy->where('id', $pk)->set($payload)->update();
+                $emp_retail_policy_id  = $this->employeeRetailPolicy->where('id', $pk)->set($payload)->update();
             }
 
             if ($emp_retail_policy_id) {
@@ -5220,44 +5089,44 @@ class EmployeeRestController extends AdminController
                     'code'    => 200,
                     'message' => 'Employee Retail Policy created successfully',
                     'data'    => [
-                        'emp_retail_policy_id' => $emp_retail_policy_id
-                    ]
+                        'emp_retail_policy_id' => $emp_retail_policy_id,
+                    ],
                 ], 200);
             } else {
-                $this->myLogger->logme( "error", "addEmpRetailPolicy: Failed to create Employee Retail Policy. Insert returned false" );
-                return $this->respond(['status'  => 'failed','code' => 500,'message' => 'Failed to create Employee Retail Policy'], 500);
+                $this->myLogger->logme("error", "addEmpRetailPolicy: Failed to create Employee Retail Policy. Insert returned false");
+                return $this->respond(['status' => 'failed', 'code' => 500, 'message' => 'Failed to create Employee Retail Policy'], 500);
             }
 
         } catch (\Throwable $th) {
 
             $this->myLogger->logme("error", "addEmpRetailPolicy: Exception occurred - " . $th->getMessage());
-            return $this->respond(['status'  => 'failed','code'    => 500,'message' => 'Internal server error: ' . $th->getMessage()], 500);
+            return $this->respond(['status' => 'failed', 'code' => 500, 'message' => 'Internal server error: ' . $th->getMessage()], 500);
         }
     }
 
     public function getEmpRetailPolicy($employeeData)
-    {   
+    {
         $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getEmpRetailPolicy: Given params: " . json_encode($employeeData ?? []));
 
         try {
 
-            $emp_id = $employeeData->id ?? null;
+            $emp_id        = $employeeData->id ?? null;
             $mobile_number = $employeeData->mobile ?? null;
-            $email_id = $employeeData->email_id ?? null;
+            $email_id      = $employeeData->email_id ?? null;
 
             $emp_retail_policy_data = [];
             if ($emp_id != null) {
 
                 $emp_retail_policy_data = $this->employeeRetailPolicy
                     ->select("
-                        employee_retail_policies.emp_id, 
-                        employee_retail_policies.insurer_id, 
-                        employee_retail_policies.policy_type_id, 
-                        employee_retail_policies.policy_no, 
+                        employee_retail_policies.emp_id,
+                        employee_retail_policies.insurer_id,
+                        employee_retail_policies.policy_type_id,
+                        employee_retail_policies.policy_no,
                         DATE_FORMAT(employee_retail_policies.policy_start_date, '%d-%b-%Y') as policy_start_date,
                         DATE_FORMAT(employee_retail_policies.policy_end_date, '%d-%b-%Y') as policy_end_date,
-                        policy_type.policy_type, 
-                        policy_type.long_name as policy_type_long_name, 
+                        policy_type.policy_type,
+                        policy_type.long_name as policy_type_long_name,
                         insurers.name as insurer_name,
                         insurers.short_name as insurer_short_name
                     ")
@@ -5271,7 +5140,7 @@ class EmployeeRestController extends AdminController
 
             $emp_retail_client_data = [];
 
-            if (!empty($mobile_number)) {
+            if (! empty($mobile_number)) {
                 $emp_retail_client_data = $this->clientModel
                     ->select("
                         '{$emp_id}' AS emp_id,
@@ -5288,8 +5157,8 @@ class EmployeeRestController extends AdminController
                         vehicle.vehicle_no,
                         DATE_FORMAT(policy_transaction.policy_start_date, '%d-%b-%Y') as policy_start_date,
                         DATE_FORMAT(policy_transaction.policy_end_date, '%d-%b-%Y') as policy_end_date,
-                        policy_type.policy_type, 
-                        policy_type.long_name as policy_type_long_name, 
+                        policy_type.policy_type,
+                        policy_type.long_name as policy_type_long_name,
                         insurers.name as insurer_name,
                         insurers.short_name as insurer_short_name
                     ")
@@ -5304,7 +5173,7 @@ class EmployeeRestController extends AdminController
                     ->where('clients.phone IS NOT NULL')
                     ->where('clients.phone', $mobile_number)
                     ->findAll();
-            }else {
+            } else {
                 $emp_retail_client_data = $this->clientModel
                     ->select("
                         '{$emp_id}' AS emp_id,
@@ -5321,8 +5190,8 @@ class EmployeeRestController extends AdminController
                         vehicle.vehicle_no,
                         DATE_FORMAT(policy_transaction.policy_start_date, '%d-%b-%Y') as policy_start_date,
                         DATE_FORMAT(policy_transaction.policy_end_date, '%d-%b-%Y') as policy_end_date,
-                        policy_type.policy_type, 
-                        policy_type.long_name as policy_type_long_name, 
+                        policy_type.policy_type,
+                        policy_type.long_name as policy_type_long_name,
                         insurers.name as insurer_name,
                         insurers.short_name as insurer_short_name
                     ")
@@ -5353,14 +5222,14 @@ class EmployeeRestController extends AdminController
         } catch (\Throwable $th) {
 
             $errorData = [
-                'message' => $th->getMessage(),
-                'file'    => $th->getFile(),
-                'line'    => $th->getLine(),
-                'code'    => $th->getCode(),
-                'trace'   => $th->getTraceAsString(),
+                '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,
+                'function'    => $th->getTrace()[0]['function'] ?? null,
+                'class'       => $th->getTrace()[0]['class'] ?? null,
             ];
 
             $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getEmpRetailPolicy: Exception: " . json_encode($errorData ?? []));
@@ -5369,19 +5238,17 @@ class EmployeeRestController extends AdminController
         }
     }
 
-    
-
     public function getPolicyTypeAndInsurer()
     {
         $policy_type_ids = [8, 37, 38, 39, 62];
-        $policy_type = $this->policyTypeModel
+        $policy_type     = $this->policyTypeModel
             ->select('id as policy_type_id, policy_type, long_name as policy_type_long_name')
             ->where('is_active', 1)
             ->whereIn('id', $policy_type_ids)
             ->findAll();
 
         $insurer_category = ['general'];
-        $insurers = $this->insurerModel
+        $insurers         = $this->insurerModel
             ->select('id as insurer_id, name as insurer_name, short_name as insurer_short_name')
             ->where('is_active', 1)
             ->where('category', $insurer_category)
@@ -5392,58 +5259,58 @@ class EmployeeRestController extends AdminController
             'code'   => 200,
             'data'   => [
                 'insurer'     => $insurers,
-                'policy_type' => $policy_type
-            ]
+                'policy_type' => $policy_type,
+            ],
         ], 200);
     }
 
     public function getClaimTypeMaster($return_type = 'api')
     {
-        $data = db_connect()->table('partner_claim_type_master')->select('id,claim_type')->where('is_active',1)->get()->getResultArray();
+        $data = db_connect()->table('partner_claim_type_master')->select('id,claim_type')->where('is_active', 1)->get()->getResultArray();
 
-        if (!$data) {
+        if (! $data) {
             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
         }
 
-        if($return_type == 'api'){
-            return $this->respond(['status' => 'success', 'code' => 200,  'data' => $data]);
-        }else{
+        if ($return_type == 'api') {
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data]);
+        } else {
             return $data;
         }
     }
 
     public function uploadIRDocs()
-    {   
-        $ticket_id = $this->request->getPost('ticket_id') ?? null;
+    {
+        $ticket_id     = $this->request->getPost('ticket_id') ?? null;
         $get_file_data = $this->request->getFiles('claim_docs') ?? null;
         $get_docs_name = $this->request->getPost('claim_doc_names') ?? [];
         $required_docs = $this->request->getPost('required_docs') ?? [];
 
         if (is_string($get_docs_name)) {
-            $decoded = json_decode($get_docs_name, true);
+            $decoded       = json_decode($get_docs_name, true);
             $get_docs_name = json_last_error() === JSON_ERROR_NONE ? $decoded : [];
-        } elseif (!is_array($get_docs_name)) {
+        } elseif (! is_array($get_docs_name)) {
             $get_docs_name = [];
         }
 
         $file_data = [];
-        if (isset($get_file_data) && !empty($get_file_data)) {
-            $file_path =   WRITEPATH . 'uploads/claim_files/';
-            $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name);
+        if (isset($get_file_data) && ! empty($get_file_data)) {
+            $file_path = WRITEPATH . 'uploads/claim_files/';
+            $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name, UPLOAD_EXT_CLAIM_DOCS);
         }
 
         $result = $this->handleCliamFiles($file_data, $ticket_id, null, false, true);
 
-        if(!empty($result)){
+        if (! empty($result)) {
             // $this->ticketMaster->where('id', $ticket_id)->set(['required_docs', $required_docs])->update();
-             db_connect()->query(
+            db_connect()->query(
                 "UPDATE ticket_master SET required_docs = ? WHERE id = ?",
                 [$required_docs, $ticket_id]
             );
-            $apiServiceController = new ApiServiceController();
+            $apiServiceController  = new ApiServiceController();
             $tpaIrFilePushResponce = $apiServiceController->pushClaimFiles($ticket_id);
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files uploaded successfully', 'tpaIrFilePushResponce' => $tpaIrFilePushResponce], 200);
-        }else{
+        } else {
             return $this->respond(['status' => false, 'code' => 400, 'message' => 'Failed to upload the file'], 200);
         }
     }
@@ -5451,11 +5318,11 @@ class EmployeeRestController extends AdminController
     public function getTicketClaimStatusIdBasedOnTheDisplayName($claim_status_id)
     {
         $claim_status_data_display_name = $this->claimStatusModel->where('is_active', 1)->where('id', $claim_status_id)->first();
-        $claim_status_data_id = $this->claimStatusModel
-                    ->select('id')
-                    ->where('is_active', 1)
-                    ->where('display_name', $claim_status_data_display_name['display_name'])
-                    ->findAll();
+        $claim_status_data_id           = $this->claimStatusModel
+            ->select('id')
+            ->where('is_active', 1)
+            ->where('display_name', $claim_status_data_display_name['display_name'])
+            ->findAll();
 
         $claim_status_data_id = array_column($claim_status_data_id, 'id');
         return $claim_status_data_id;
@@ -5468,8 +5335,8 @@ class EmployeeRestController extends AdminController
             $file_id = $this->request->getGet('id');
 
             // Find record
-            $record =  $this->batchFileModel->where('MD5(id)', $file_id)->first();
-            if (!$record) {
+            $record = $this->batchFileModel->where('MD5(id)', $file_id)->first();
+            if (! $record) {
                 $data['message'] = 'File record not found';
                 return view('errors/404', $data);
             }
@@ -5477,7 +5344,7 @@ class EmployeeRestController extends AdminController
             $uploadPath = WRITEPATH . 'uploads/import_excel/';
             $filePath   = $uploadPath . $record['file_name'];
 
-            if (!file_exists($filePath)) {
+            if (! file_exists($filePath)) {
                 // return $this->failNotFound("File not found on server");
                 $data['message'] = 'The Physical File Not Found';
                 return view('errors/404', $data);
@@ -5491,14 +5358,13 @@ class EmployeeRestController extends AdminController
         }
     }
 
-
     public function getHrDashboad()
     {
         // $dashboard_id = $this->request->getGet('dashboard_id') ?? null;
-        $client_id = $this->request->getPost('client_id') ?? null;
+        $client_id        = $this->request->getPost('client_id') ?? null;
         $client_policy_id = $this->request->getPost('client_policy_id') ?? null;
-        $received_data = $this->request->getJSON(true) ?? null;
-         // 🔐 Move this to .env in real projects
+        $received_data    = $this->request->getJSON(true) ?? null;
+        // 🔐 Move this to .env in real projects
         $METABASE_SECRET_KEY = getenv('METABASE_SECRET_KEY');
 
         $is_tpa_dashboard_enable = $this->clientPolicyModel
@@ -5507,13 +5373,13 @@ class EmployeeRestController extends AdminController
             ->where('client_policy.id', $received_data['client_policy_id'])
             ->where('tpa.dashboard_id IS NOT NULL')
             ->first();
-            
+
         $payload = [
             'resource' => [
-                'dashboard' => 2
+                'dashboard' => 2,
             ],
-            'params' => (object)['client_policy' => $received_data['client_policy_id']],   // MUST be object for Metabase
-            'exp'    => time() + (10 * 60) // 10 minutes
+            'params'   => (object) ['client_policy' => $received_data['client_policy_id']], // MUST be object for Metabase
+            'exp'      => time() + (10 * 60),                                               // 10 minutes
         ];
 
         $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
@@ -5525,18 +5391,18 @@ class EmployeeRestController extends AdminController
         // ]);
         // if($this->request->getGet('api') == 1)
         // {
-             return $this->respond([
-                'status' => 'success',
-                'message' => 'Form data received successfully!',
-                'data' => [
-                    'metabaseToken' => $token,
-                    'metabaseUrl'   => 'https://nsights.nhanceindia.in'
-                ],
-                'is_tpa_dashboard_enable' => !empty($is_tpa_dashboard_enable ?? []),
-            ]);
+        return $this->respond([
+            'status'                  => 'success',
+            'message'                 => 'Form data received successfully!',
+            'data'                    => [
+                'metabaseToken' => $token,
+                'metabaseUrl'   => 'https://nsights.nhanceindia.in',
+            ],
+            'is_tpa_dashboard_enable' => ! empty($is_tpa_dashboard_enable ?? []),
+        ]);
         // }
 
-       return view('meta_dashboard_demo_one', [
+        return view('meta_dashboard_demo_one', [
             'metabaseToken' => $token,
             'metabaseUrl'   => 'https://nsights.nhanceindia.in',
         ]);
@@ -5549,7 +5415,7 @@ class EmployeeRestController extends AdminController
         if ($return_type === 'api') {
 
             $received_data = $this->request->getJSON(true) ?? [];
-            $policy_id = $received_data['client_policy_id'] ?? null;
+            $policy_id     = $received_data['client_policy_id'] ?? null;
 
         } else {
             // Internal call
@@ -5560,7 +5426,7 @@ class EmployeeRestController extends AdminController
             return $this->respond([
                 'status'  => 'failed',
                 'message' => 'Client Policy ID is required.',
-                'data'    => []
+                'data'    => [],
             ]);
         }
 
@@ -5576,16 +5442,16 @@ class EmployeeRestController extends AdminController
             return $this->respond([
                 'status'  => 'failed',
                 'message' => 'There is no dashboard for this TPA.',
-                'data'    => []
+                'data'    => [],
             ]);
         }
 
         $payload = [
             'resource' => [
-                'dashboard' => $database_id
+                'dashboard' => $database_id,
             ],
-            'exp'    => time() + (10 * 60),
-            'params' => (object)[]
+            'exp'      => time() + (10 * 60),
+            'params'   => (object) [],
         ];
 
         $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
@@ -5595,7 +5461,7 @@ class EmployeeRestController extends AdminController
             // Return raw data for internal usage
             return [
                 'metabaseToken' => $token,
-                'metabaseUrl'   => 'https://nsights.nhanceindia.in'
+                'metabaseUrl'   => 'https://nsights.nhanceindia.in',
             ];
         }
 
@@ -5604,11 +5470,10 @@ class EmployeeRestController extends AdminController
             'message' => 'Dashboard fetched successfully.',
             'data'    => [
                 'metabaseToken' => $token,
-                'metabaseUrl'   => 'https://nsights.nhanceindia.in'
-            ]
+                'metabaseUrl'   => 'https://nsights.nhanceindia.in',
+            ],
         ]);
     }
-          
 
     // get policy files
     public function getPolicyAndEndorsementFiles()
@@ -5617,79 +5482,77 @@ class EmployeeRestController extends AdminController
 
         $cdModel = new ClientDepositModel();
         $cd_data = $cdModel->where('id', $cd_ac_pk)
-                            ->where('is_active', 1)
-                            ->where('client_policy_id IS NOT NULL')
-                            ->first();
+            ->where('is_active', 1)
+            ->where('client_policy_id IS NOT NULL')
+            ->first();
 
-        if(empty($cd_data)){
+        if (empty($cd_data)) {
             $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Client Deposit data found for cd_ac_pk=' . $cd_ac_pk);
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
         }
 
         $client_policy_data = $this->clientPolicyModel
-                                    ->where('id', $cd_data['client_policy_id'])
-                                    ->where('is_active', 1)
-                                    ->first();
+            ->where('id', $cd_data['client_policy_id'])
+            ->where('is_active', 1)
+            ->first();
 
-        if(empty($client_policy_data)){
+        if (empty($client_policy_data)) {
             $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Client Policy data found for client_policy_id=' . $cd_data['client_policy_id']);
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
         }
 
-        $policyTransactionModel = new PolicyTransactionModel();        
-        $builder = $policyTransactionModel
+        $policyTransactionModel = new PolicyTransactionModel();
+        $builder                = $policyTransactionModel
             ->where('is_active', 1)
             ->where('policy_no', $client_policy_data['policy_no'])
             ->where('action_type', $cd_data['event_name']);
 
-        if (!empty($cd_data['endorsement_no']) && $cd_data['event_name'] != 'inception') {
+        if (! empty($cd_data['endorsement_no']) && $cd_data['event_name'] != 'inception') {
             $builder->where('endorsement_no', $cd_data['endorsement_no']);
         }
 
         $policy_transaction_data = $builder->findAll();
 
-        if(empty($policy_transaction_data)){
+        if (empty($policy_transaction_data)) {
             $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No Policy Transaction data found for policy_no=' . $client_policy_data['policy_no']);
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
         }
 
         $policy_transaction_ids = array_column($policy_transaction_data, 'id');
 
-
-        $ptFilesModel = new PTFileModel();
+        $ptFilesModel  = new PTFileModel();
         $pt_files_data = $ptFilesModel->where('is_active', 1)->whereIn('pt_id', $policy_transaction_ids)->findAll();
 
-        if(empty($pt_files_data)){
+        if (empty($pt_files_data)) {
             $this->myLogger->logme('error', 'getPolicyAndEndorsementFiles: No PT Files data found for pt_ids=' . implode(',', $policy_transaction_ids));
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'No file found', 'data' => []], 200);
         }
 
-                   
         return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files found', 'data' => $pt_files_data], 200);
- 
+
     }
 
     // download policy file
     public function downloadPolicyFiles()
-    {   
+    {
         $pt_file_id = $this->request->getGet('file_id') ?? null;
 
-        if(empty($pt_file_id)){
+        if (empty($pt_file_id)) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'File ID is required'], 200);
         }
 
         $uploadFilePath = WRITEPATH . 'uploads/client_kyc_documents';
 
-        $ptFilesModel = new PTFileModel();
+        $ptFilesModel  = new PTFileModel();
         $pt_files_data = $ptFilesModel->where('is_active', 1)->where('id', $pt_file_id)->first();
 
-        if(empty($pt_files_data)){
+        if (empty($pt_files_data)) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'The Physical File Not Found in server'], 200);
         }
 
         $filePath = $uploadFilePath . '/' . $pt_files_data['file_name'];
 
-        if (!file_exists($filePath)) {
+        if (! file_exists($filePath)) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'The Physical File Not Found in server'], 200);
         }
 
@@ -5702,29 +5565,29 @@ class EmployeeRestController extends AdminController
         $received_data = $this->request->getJSON(true) ?? null;
         $this->myLogger->logme('error', 'bulkEcardDownloadAsZip: Received payload = ' . json_encode($received_data ?? []));
 
-        if(empty($received_data['client_policy_id']) && empty($received_data['emp_policy_ids'])){
+        if (empty($received_data['client_policy_id']) && empty($received_data['emp_policy_ids'])) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'client_policy_id or employee_policy_ids is required'], 200);
         }
 
-        if(empty($received_data['hr_id'])){
+        if (empty($received_data['hr_id'])) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'hr_id is required'], 200);
         }
 
         $employee_data = $this->employeePolicyModel->getEmployeeDataWithPolicyUsingClientPolicyIdOrEmployeePolicyIds($received_data);
 
-        if(empty($employee_data)){
+        if (empty($employee_data)) {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'No employee data found for the policy'], 200);
         }
-        
+
         $received_data['folder_name'] = 'bulk_ecards_' . $employee_data[0]['policy_no'] . '_' . date('Y-m-d_H-i-s');
 
         // Dispatch background job to process the bulk e-card download
-        $r = Jobs::addJob(['job_name' => 'bulkEcardDownloadAsZipFromS3', 'payload'  => $received_data]);
+        $r = Jobs::addJob(['job_name' => 'bulkEcardDownloadAsZipFromS3', 'payload' => $received_data]);
         $this->myLogger->logme('error', 'bulkEcardDownloadAsZip: Job dispatched with result = ' . json_encode($r ?? []));
-        
+
         return $this->respond(['status' => true, 'code' => 200, 'message' => 'Bulk E-card download process started. Link share your mail'], 200);
 
-    }        
+    }
 
     public function bulkEcardDownloadAsZipNew()
     {
@@ -5754,8 +5617,8 @@ class EmployeeRestController extends AdminController
             'misc_data' => json_encode([
                 'folder_name' => $folderName,
                 'status'      => 'pending',
-                's3_key'      => null
-            ])
+                's3_key'      => null,
+            ]),
         ];
 
         $zip_id = $this->UserActivityHistoryModel->insert($insert_data);
@@ -5765,7 +5628,7 @@ class EmployeeRestController extends AdminController
             'folder_name' => $folderName,
             'batch_no'    => 1,
             'last_id'     => 0,
-            'limit'       => 100 
+            'limit'       => 100,
         ]);
 
         // Dispatch job
@@ -5773,7 +5636,7 @@ class EmployeeRestController extends AdminController
 
         return $this->respond([
             'status'  => true,
-            'message' => 'Process started. You will receive an email with the download link shortly.'
+            'message' => 'Process started. You will receive an email with the download link shortly.',
         ], 200);
     }
 
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 2c2d9bcf..a712688f 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -1035,7 +1035,7 @@ class LeadsController extends BaseController
 
         $multi_file_data = [];
         foreach ($files as $index => $value) {
-            $file_name = file_Upload_for_lead($value, $uploadFilePath);
+            $file_name = file_Upload_for_lead($value, $uploadFilePath, UPLOAD_EXT_LEAD_FILES);
             $multi_file_data[] = [
                 'file_name' => $file_name,
                 'docs_name' => $docs_names[$index],
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index c03b7069..4087b301 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -367,7 +367,7 @@ class MasterController extends AdminController
         }
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
+        $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
         $data   = $this->request->getPost();
         $sanitized_post_data = sanitizeInputArrayAdvanced($data);
 
@@ -593,7 +593,7 @@ class MasterController extends AdminController
         }
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name      = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
+        $file_name      = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
         $data           = $this->request->getPost();
         $sanitized_post_data = sanitizeInputArrayAdvanced($data);
         $id                  = $sanitized_post_data['PrimaryKey'];
@@ -974,11 +974,11 @@ class MasterController extends AdminController
 
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath);
+        $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
 
         $template_bg_path = ROOTPATH . 'public/uploads/template_bg';
-        $front_card_file_name = file_Upload($this->request->getFile('fc'), $template_bg_path);
-        $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path);
+        $front_card_file_name = file_Upload($this->request->getFile('fc'), $template_bg_path, UPLOAD_EXT_IMAGES);
+        $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path, UPLOAD_EXT_IMAGES);
 
 
         $eCardTemplate = $sanitized_post_data['ecard_content'];
@@ -1264,11 +1264,11 @@ class MasterController extends AdminController
 
 
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
-        $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath);
+        $file_name = file_Upload($this->request->getFile('tpa_logo'), $uploadFilePath, UPLOAD_EXT_IMAGES);
 
         $template_bg_path = ROOTPATH . 'public/uploads/template_bg';
-        $front_card_file_name = file_Upload($this->request->getFile('fc'), $template_bg_path);
-        $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path);
+        $front_card_file_name = file_Upload($this->request->getFile('fc'), $template_bg_path, UPLOAD_EXT_IMAGES);
+        $back_card_file_name = file_Upload($this->request->getFile('bc'), $template_bg_path, UPLOAD_EXT_IMAGES);
 
         $id                 = $sanitized_post_data['PrimaryKey'] ?? null;
         
diff --git a/app/Controllers/NotificationController.php b/app/Controllers/NotificationController.php
index 8014f0c5..4b743cc3 100755
--- a/app/Controllers/NotificationController.php
+++ b/app/Controllers/NotificationController.php
@@ -364,7 +364,7 @@ class NotificationController extends AdminController
         // Define upload path and attempt file upload
         $uploadFilePath = WRITEPATH . 'uploads/attachments';
         $uploadedFile = $this->request->getFile('file');
-        $fileName = file_Upload_for_lead($uploadedFile, $uploadFilePath); // Assume file_Upload handles file saving
+        $fileName = file_Upload_for_lead($uploadedFile, $uploadFilePath, UPLOAD_EXT_MAIL_ATTACHMENTS);
     
         if ($fileName) {
             // Prepare data for insertion
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index c6b47973..59c115fe 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -3411,7 +3411,7 @@ class PolicyTransactionController extends BaseController
             if (!empty($docName) && $file->isValid() && !$file->hasMoved()) {
 
                 // Upload the file
-                $uploadedFileName = file_Upload_for_lead($file, $uploadFilePath);
+                $uploadedFileName = file_Upload_for_lead($file, $uploadFilePath, UPLOAD_EXT_POLICY_DOCS);
 
                 if ($uploadedFileName) {
                     // Prepare data for each document upload
diff --git a/app/Controllers/RuleImportController.php b/app/Controllers/RuleImportController.php
index e624fbad..3a6c53e4 100644
--- a/app/Controllers/RuleImportController.php
+++ b/app/Controllers/RuleImportController.php
@@ -104,6 +104,10 @@ class RuleImportController extends AdminController
                 return $this->response->setJSON(['status'=>false,'message'=>'No file uploaded or upload error']);
             }
 
+            if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+                return $this->response->setJSON(['status'=>false,'message'=>'Only Excel/CSV files (xls, xlsx, ods, csv) are allowed.']);
+            }
+
             // Move uploaded file to writable temp location
             $tmpPath = WRITEPATH . 'uploads/' . $file->getRandomName();
             $file->move(WRITEPATH . 'uploads', $file->getName()); // keep original name inside uploads
@@ -140,6 +144,10 @@ class RuleImportController extends AdminController
                 return $this->respond(['status'  => false, 'code' => 404, 'message' => 'No file uploaded or upload error.'], 200);
             }
 
+            if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+                return $this->respond(['status'  => false, 'code' => 400, 'message' => 'Only Excel/CSV files (xls, xlsx, ods, csv) are allowed.'], 200);
+            }
+
             // ---------------------------------------------------------
             // 2. Read POST fields
             // ---------------------------------------------------------
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 56842b57..01109672 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -3237,7 +3237,7 @@ class TicketController extends BaseController
             $file_data = [];
             if(isset($get_file_data) && !empty($get_file_data)){
                 $file_path =   WRITEPATH . 'uploads/claim_files/';
-                $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name);
+                $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name, UPLOAD_EXT_CLAIM_DOCS);
             }
 
             if(!empty($file_data)){
@@ -3932,7 +3932,7 @@ class TicketController extends BaseController
                 
                     if ($is_moved) {
                         $file_path = WRITEPATH.'uploads/claims_mis';
-                        $filename = file_Upload_for_lead($file, $file_path);
+                        $filename = file_Upload_for_lead($file, $file_path, UPLOAD_EXT_EXCEL);
                         $fileSize = $file->getSize(); // File size in bytes
                         $fileSize = $fileSize / (1024 * 1024); // Convert to MB
 
@@ -3983,7 +3983,7 @@ class TicketController extends BaseController
         }
 
         $file_path = WRITEPATH.'uploads/claims_mis';
-        $file_name = file_Upload_for_lead($file, $file_path);
+        $file_name = file_Upload_for_lead($file, $file_path, UPLOAD_EXT_EXCEL);
 
         if(!empty($file_name)){
             $data['file_name'] = $file_name;
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 97ed35bd..e2947d7d 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -1009,8 +1009,15 @@ class UserController extends AdminController
                 $fileId = $this->request->getPost('id');
 
                 if ($file && $file->isValid() && !$file->hasMoved()) {
-                    
-                        $originalName = $file->getClientName(); 
+
+                        if (!validate_upload_extension($file, UPLOAD_EXT_EXCEL)) {
+                            return $this->response->setJSON([
+                                'status'  => 'error',
+                                'message' => 'Only Excel files (xls, xlsx, ods, csv) are allowed.',
+                            ])->setStatusCode(400);
+                        }
+
+                        $originalName = sanitize_upload_filename($file->getClientName());
                         $extension    = $file->getExtension();  
 
                         $fileName = pathinfo($originalName, PATHINFO_FILENAME) . '_' . date('Ymd_His') . '.' . $extension;
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index efc2842e..c5237bc5 100755
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -1,21 +1,19 @@
 <?php
-use App\Models\ClientModel;
-use App\Models\UserTeamsModel;
-use App\Models\FileModel;
-use App\Models\BatchFileModelFileModel;
+use App\Controllers\ApiServiceController;
 use App\Controllers\GoogleDriveController;
 use App\Models\BatchFileModel;
-use App\Controllers\ApiServiceController;
+use App\Models\FileModel;
 use App\Models\TicketMasterModel;
+use App\Models\UserTeamsModel;
 
 // File: app/Helpers/Uuid_helper.php
 
-if (!function_exists('generate_uuid')) {
+if (! function_exists('generate_uuid')) {
     function generate_uuid($version = 4, $format = 'hex')
     {
         $data = random_bytes(16);
         // echo $data.'<br>';
-            // Set version to 0100
+        // Set version to 0100
         $data[6] = chr(ord($data[6]) & 0x0f | 0x40);
         // Set bits 6-7 to 10
         $data[8] = chr(ord($data[8]) & 0x3f | 0x80);
@@ -26,8 +24,8 @@ if (!function_exists('generate_uuid')) {
     }
 }
 
-if (!function_exists('change_date_format2')) {
-    
+if (! function_exists('change_date_format2')) {
+
     function change_date_format2($data, $source_format, $output_format)
     {
         $data = trim($data);
@@ -53,13 +51,47 @@ if (!function_exists('change_date_format2')) {
     }
 }
 
-if (!function_exists('file_Upload')) {
-    function file_Upload($fileToUpload, $filepath)
+if (! function_exists('sanitize_upload_filename')) {
+    function sanitize_upload_filename(string $fileName): string
     {
-        if ($fileToUpload !== null && $fileToUpload->isValid() && !$fileToUpload->hasMoved()) {
-            $fileToUpload->move($filepath);
-            $fileName = $fileToUpload->getName();
-            $fileName = preg_replace('/[\s\x{00A0}\x{200B}-\x{200D}\x{FEFF}]/u', '', $fileName);
+        $fileName = preg_replace('/[\x00-\x1F\x7F]/u', '', $fileName);
+        $fileName = preg_replace('/[\x{00A0}\x{200B}-\x{200D}\x{FEFF}\x{00AD}\x{2060}\x{180E}\x{2028}\x{2029}]/u', '', $fileName);
+        $fileName = preg_replace('/[\/\\\\:*?"<>|;`${}()\'&!#]/', '', $fileName);
+        $fileName = preg_replace('/\.{2,}/', '.', $fileName);
+        $fileName = trim($fileName, ". \t\n\r");
+
+        if ($fileName === '' || strlen($fileName) > 200) {
+            $fileName = time() . '_' . bin2hex(random_bytes(8));
+        }
+
+        return $fileName;
+    }
+}
+
+if (! function_exists('validate_upload_extension')) {
+    function validate_upload_extension($file, array $allowedExtensions = UPLOAD_ALLOWED_EXTENSIONS): bool
+    {
+        $ext = strtolower($file->getClientExtension());
+        if (! in_array($ext, $allowedExtensions, true)) {
+            log_message('critical', '[UPLOAD_HELPER] Blocked extension: {ext} | File: {name}', [
+                'ext'  => $ext,
+                'name' => $file->getClientName(),
+            ]);
+            return false;
+        }
+        return true;
+    }
+}
+
+if (! function_exists('file_Upload')) {
+    function file_Upload($fileToUpload, $filepath, array $allowedExtensions = UPLOAD_ALLOWED_EXTENSIONS)
+    {
+        if ($fileToUpload !== null && $fileToUpload->isValid() && ! $fileToUpload->hasMoved()) {
+            if (! validate_upload_extension($fileToUpload, $allowedExtensions)) {
+                return "";
+            }
+            $fileName = sanitize_upload_filename($fileToUpload->getName());
+            $fileToUpload->move($filepath, $fileName);
             return $fileName;
         } else {
             return "";
@@ -67,12 +99,15 @@ if (!function_exists('file_Upload')) {
     }
 }
 
-if (!function_exists('file_Upload_for_lead')) {
-    function file_Upload_for_lead($fileToUpload, $filepath)
+if (! function_exists('file_Upload_for_lead')) {
+    function file_Upload_for_lead($fileToUpload, $filepath, array $allowedExtensions = UPLOAD_ALLOWED_EXTENSIONS)
     {
-        if ($fileToUpload !== null && $fileToUpload->isValid() && !$fileToUpload->hasMoved()) {
-            $fileToUpload->move($filepath);
-            $fileName = $fileToUpload->getName();
+        if ($fileToUpload !== null && $fileToUpload->isValid() && ! $fileToUpload->hasMoved()) {
+            if (! validate_upload_extension($fileToUpload, $allowedExtensions)) {
+                return "";
+            }
+            $fileName = sanitize_upload_filename($fileToUpload->getName());
+            $fileToUpload->move($filepath, $fileName);
             return $fileName;
         } else {
             return "";
@@ -97,7 +132,7 @@ if (!function_exists('file_Upload_for_lead')) {
 //                     ];
 //                 }
 //             }
-//         } 
+//         }
 //         // Handle single file
 //         else {
 //             if ($fileToUpload !== null && $fileToUpload->isValid() && !$fileToUpload->hasMoved()) {
@@ -115,8 +150,8 @@ if (!function_exists('file_Upload_for_lead')) {
 // }
 
 // function for only using in the Flutter Claim File Upload
-if (!function_exists('multi_file_Upload')) {
-    function multi_file_Upload($fileToUpload, $filepath,  $docs_name = [])
+if (! function_exists('multi_file_Upload')) {
+    function multi_file_Upload($fileToUpload, $filepath, $docs_name = [], array $allowedExtensions = UPLOAD_ALLOWED_EXTENSIONS)
     {
         $uploadedFiles = [];
 
@@ -127,26 +162,32 @@ if (!function_exists('multi_file_Upload')) {
             // If file is itself an array (multiple under same input name)
             if (is_array($file)) {
                 foreach ($file as $index => $f) {
-                    if ($f !== null && $f->isValid() && !$f->hasMoved()) {
-                        $fileRandomName = $f->getRandomName(); // safer unique name
-                        $fileName = $f->getName();
+                    if ($f !== null && $f->isValid() && ! $f->hasMoved()) {
+                        if (! validate_upload_extension($f, $allowedExtensions)) {
+                            continue;
+                        }
+                        $fileRandomName = $f->getRandomName();
+                        $fileName       = sanitize_upload_filename($f->getName());
                         $f->move($filepath, $fileRandomName);
                         $uploadedFiles[] = [
                             'file_name' => $fileName,
-                            'doc_name' => $docs_name[$index] ?? $fileName,
-                            // 'file_path' => $filepath . $fileRandomName
-                            'file_path' => $fileRandomName
+                            'doc_name'  => $docs_name[$index] ?? $fileName,
+                            'file_path' => $fileRandomName,
                         ];
                     }
                 }
             } else {
                 // Single file
-                if ($file !== null && $file->isValid() && !$file->hasMoved()) {
-                    $fileName = $file->getRandomName();
-                    $file->move($filepath, $fileName);
+                if ($file !== null && $file->isValid() && ! $file->hasMoved()) {
+                    if (! validate_upload_extension($file, $allowedExtensions)) {
+                        continue;
+                    }
+                    $fileName = sanitize_upload_filename($file->getName());
+                    $diskName = $file->getRandomName();
+                    $file->move($filepath, $diskName);
                     $uploadedFiles[] = [
                         'file_name' => $fileName,
-                        'file_path' => $filepath . $fileName
+                        'file_path' => $filepath . $diskName,
                     ];
                 }
             }
@@ -156,8 +197,7 @@ if (!function_exists('multi_file_Upload')) {
     }
 }
 
-
-if (!function_exists('file_unlink')) {
+if (! function_exists('file_unlink')) {
     function file_unlink($filepath)
     {
         if (is_file($filepath) && file_exists($filepath)) {
@@ -166,7 +206,7 @@ if (!function_exists('file_unlink')) {
     }
 }
 
-if (!function_exists('compressImage')) {
+if (! function_exists('compressImage')) {
     function compressImage($file, $destinationPath, $newWidth = 100, $newHeight = 100)
     {
         // Load the image manipulation library
@@ -174,23 +214,24 @@ if (!function_exists('compressImage')) {
 
         // Resize and compress the image
         $image->withFile($file)
-              ->fit($newWidth, $newHeight, 'center')
-              ->save($destinationPath);
+            ->fit($newWidth, $newHeight, 'center')
+            ->save($destinationPath);
 
         return true;
     }
 }
 
-if (!function_exists('fancy_date_time_format')) {
-    function fancy_date_time_format($datetime,$return_type = 'fancy') {
+if (! function_exists('fancy_date_time_format')) {
+    function fancy_date_time_format($datetime, $return_type = 'fancy')
+    {
         date_default_timezone_set('Asia/Kolkata');
 
         $currentDateTime = new DateTime();
-        $passedDateTime = new DateTime($datetime);
-    
+        $passedDateTime  = new DateTime($datetime);
+
         // Calculate the interval between the current time and the passed datetime
         $interval = $currentDateTime->diff($passedDateTime);
-    
+
         // If the interval is more than 1 month or the year is different, return the original datetime
         if ($interval->m > 1 || $interval->y != 0) {
             if ($return_type == 'fancy') {
@@ -215,7 +256,7 @@ if (!function_exists('fancy_date_time_format')) {
 
 }
 
-if(!function_exists('check_string_date')){
+if (! function_exists('check_string_date')) {
     function check_string_date($str)
     {
         if (DateTime::createFromFormat('Y-m-d H:i:s', $str) !== false) {
@@ -225,10 +266,11 @@ if(!function_exists('check_string_date')){
     }
 }
 
-if (!function_exists('generate_download_link')) {
+if (! function_exists('generate_download_link')) {
+
+    function generate_download_link($rand_string)
+    {
 
-    function generate_download_link($rand_string) {
-       
         // Generate the link using provided emp_code and client_policy_id
         $link = htmlspecialchars(base_url('download-e-card/' . $rand_string));
 
@@ -238,8 +280,9 @@ if (!function_exists('generate_download_link')) {
     }
 }
 
-if (!function_exists('generate_random_alphanumeric')) {
-    function generate_random_alphanumeric($length = 12) {
+if (! function_exists('generate_random_alphanumeric')) {
+    function generate_random_alphanumeric($length = 12)
+    {
         $random_string = '';
         for ($i = 0; $i < $length; $i++) {
             $random_ascii = rand(0, 61);
@@ -256,7 +299,7 @@ if (!function_exists('generate_random_alphanumeric')) {
     }
 }
 
-if (!function_exists('get_base64_image')) {
+if (! function_exists('get_base64_image')) {
 
     function get_base64_image($path)
     {
@@ -273,49 +316,51 @@ if (!function_exists('get_base64_image')) {
     }
 }
 
-if (!function_exists('format_indian_number')) {
-    function format_indian_number($number) {
-         // Round the number to two decimal places
-    $number = isset($number) ? $number : 0;
-    $number = round($number, 2);
+if (! function_exists('format_indian_number')) {
+    function format_indian_number($number)
+    {
+        // Round the number to two decimal places
+        $number = isset($number) ? $number : 0;
+        $number = round($number, 2);
 
-    // Split the number into integer and decimal parts
-    $numberParts = explode('.', number_format($number, 2, '.', ''));
-    $integerPart = $numberParts[0];
-    $decimalPart = isset($numberParts[1]) ? $numberParts[1] : '00';
+        // Split the number into integer and decimal parts
+        $numberParts = explode('.', number_format($number, 2, '.', ''));
+        $integerPart = $numberParts[0];
+        $decimalPart = isset($numberParts[1]) ? $numberParts[1] : '00';
 
-    // Format the integer part with commas
-    $length = strlen($integerPart);
-    $formattedStr = '';
-    $counter = 0;
+        // Format the integer part with commas
+        $length       = strlen($integerPart);
+        $formattedStr = '';
+        $counter      = 0;
 
-    for ($i = $length - 1; $i >= 0; $i--) {
-        $formattedStr = $integerPart[$i] . $formattedStr;
-        $counter++;
-        if ($counter == 3 && $i != 0) {
-            $formattedStr = ',' . $formattedStr;
-            $counter = 0;
-        } elseif ($counter == 2 && $i != 0 && $length - $i > 3) {
-            $formattedStr = ',' . $formattedStr;
-            $counter = 0;
+        for ($i = $length - 1; $i >= 0; $i--) {
+            $formattedStr = $integerPart[$i] . $formattedStr;
+            $counter++;
+            if ($counter == 3 && $i != 0) {
+                $formattedStr = ',' . $formattedStr;
+                $counter      = 0;
+            } elseif ($counter == 2 && $i != 0 && $length - $i > 3) {
+                $formattedStr = ',' . $formattedStr;
+                $counter      = 0;
+            }
         }
-    }
 
-    // Combine the integer and decimal parts
-    return $formattedStr . '.' . $decimalPart;
+        // Combine the integer and decimal parts
+        return $formattedStr . '.' . $decimalPart;
     }
 }
 
-if (!function_exists('get_username')) {
-    function get_username($user_id) {
+if (! function_exists('get_username')) {
+    function get_username($user_id)
+    {
         // Connect to the database
         $db = \Config\Database::connect();
 
         // Query the database
         $query = $db->table('user_profiles')
-                    ->select('first_name')
-                    ->where('id', $user_id)
-                    ->get();
+            ->select('first_name')
+            ->where('id', $user_id)
+            ->get();
 
         // Get the result
         $result = $query->getRow();
@@ -325,21 +370,23 @@ if (!function_exists('get_username')) {
     }
 }
 
-if (!function_exists('get_role_id')) {
-    function get_role_id() {
+if (! function_exists('get_role_id')) {
+    function get_role_id()
+    {
 
         $role_id = isset(get_session_userdata()->role) ? get_session_userdata()->role : null;
         return $role_id;
     }
 }
 
-if (!function_exists('teams')) {
-    function teams() {
+if (! function_exists('teams')) {
+    function teams()
+    {
         // Load the UserTeamsModel
         $teamModel = new \App\Models\UserTeamsModel();
         // Get the user ID from the session
         $user_id = get_session_userid();
-        
+
         // Fetch the team IDs associated with the user
         $user_teams = $teamModel->select('team_id')->where('user_id', $user_id)->findAll();
 
@@ -348,7 +395,7 @@ if (!function_exists('teams')) {
         // log_message('info', 'User Teams: ' . json_encode($user_teams)); // Optionally log it
 
         // Check if the result is not empty
-        if (!empty($user_teams)) {
+        if (! empty($user_teams)) {
             // Extract only the 'team_id' values
             $team_ids = array_column($user_teams, 'team_id');
             return $team_ids; // Return array of team IDs
@@ -358,15 +405,14 @@ if (!function_exists('teams')) {
     }
 }
 
-
-
-if (!function_exists('generate_client_code')) {
-    function generate_client_code($string = 'GC') {
+if (! function_exists('generate_client_code')) {
+    function generate_client_code($string = 'GC')
+    {
 
         $clientModel = new \App\Models\ClientModel();
-        
+
         $latestClient = $clientModel->select('id')->orderBy('id', 'DESC')->first();
-        $id = $latestClient ? $latestClient['id'] : 0;
+        $id           = $latestClient ? $latestClient['id'] : 0;
 
         $year = date('y');
 
@@ -378,21 +424,22 @@ if (!function_exists('generate_client_code')) {
     }
 }
 
-if (!function_exists('generate_tsi_code')) {
-    function generate_tsi_code($type) {
+if (! function_exists('generate_tsi_code')) {
+    function generate_tsi_code($type)
+    {
 
         $PolicyTransactionModel = new \App\Models\PolicyTransactionModel();
-        
-        $latestClient = $PolicyTransactionModel->select('id')->orderBy('id', 'DESC')->first();
-        $id = $latestClient ? $latestClient['id'] : 0;
 
-        $year = date('y');
-        $month = date('m');
+        $latestClient = $PolicyTransactionModel->select('id')->orderBy('id', 'DESC')->first();
+        $id           = $latestClient ? $latestClient['id'] : 0;
+
+        $year   = date('y');
+        $month  = date('m');
         $string = 'P';
 
-        if($type == 2){
+        if ($type == 2) {
             $string2 = 'R';
-        }else{
+        } else {
             $string2 = 'F';
         }
 
@@ -404,35 +451,37 @@ if (!function_exists('generate_tsi_code')) {
     }
 }
 
-if (!function_exists('generateRandomCode')) {
-    function generateRandomCode($prefix = 'RTL-', $length = 6) {
+if (! function_exists('generateRandomCode')) {
+    function generateRandomCode($prefix = 'RTL-', $length = 6)
+    {
         // Generate a random number with the specified length
-        $randomNumber = str_pad(mt_rand(0, pow(10, $length)-1), $length, '0', STR_PAD_LEFT);
-        
+        $randomNumber = str_pad(mt_rand(0, pow(10, $length) - 1), $length, '0', STR_PAD_LEFT);
+
         // Return the code with the prefix
         return $prefix . $randomNumber;
     }
 }
 
-if (!function_exists('excelFileGDriveUpload')) {
+if (! function_exists('excelFileGDriveUpload')) {
 
-    function excelFileGDriveUpload($file_id, $table_name) {
-        $doc_type = "UPLOADS";
+    function excelFileGDriveUpload($file_id, $table_name)
+    {
+        $doc_type       = "UPLOADS";
         $uploadFilePath = WRITEPATH . 'uploads/' . ($table_name == 'batch_file' ? 'import_excel' : 'excel');
 
         $models = [
             'batch_file' => [
-                'model' => new BatchFileModel(),
-                'select' => "client_id, client_policy_id, file_name"
+                'model'  => new BatchFileModel(),
+                'select' => "client_id, client_policy_id, file_name",
             ],
-            'files' => [
-                'model' => new FileModel(),
-                'select' => "client_id, policy_id as client_policy_id, file_name"
+            'files'      => [
+                'model'  => new FileModel(),
+                'select' => "client_id, policy_id as client_policy_id, file_name",
             ],
         ];
 
-        if (!array_key_exists($table_name, $models)) {
-            return; 
+        if (! array_key_exists($table_name, $models)) {
+            return;
         }
 
         // Retrieve data
@@ -442,54 +491,53 @@ if (!function_exists('excelFileGDriveUpload')) {
             ->where('is_active', 1)
             ->first();
 
-
-
         if ($data) {
             $uploadFilePath .= '/' . $data['file_name'];
             // dd($data, $uploadFilePath);
 
             $GoogleDriveController = new GoogleDriveController();
-            $result = $GoogleDriveController->uploadFiletoGdrive(
+            $result                = $GoogleDriveController->uploadFiletoGdrive(
                 // client_id       : $data['client_id'],
                 client_policy_id: $data['client_policy_id'],
-                doc_type        : $doc_type,
-                file_path       : $uploadFilePath,
-                file_name       : $data['file_name']
+                doc_type: $doc_type,
+                file_path: $uploadFilePath,
+                file_name: $data['file_name']
             );
 
             // dd($result);
 
             return true;
 
-        }else{
+        } else {
 
             return false;
         }
     }
 }
 
-if(!function_exists('checkFamilyFloaters')){
+if (! function_exists('checkFamilyFloaters')) {
 
-    function checkFamilyFloaters($policy_premium_data, $client_policy_data, $emp_data){
+    function checkFamilyFloaters($policy_premium_data, $client_policy_data, $emp_data)
+    {
 
-        if($policy_premium_data['premium_type'] == 1){
+        if ($policy_premium_data['premium_type'] == 1) {
 
             //only family floater
             if ($emp_data['relationship'] == 'Self') {
                 return true;
             }
 
-            if($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3){
-                if($emp_data['rata_premimum'] > 0){
+            if ($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3) {
+                if ($emp_data['rata_premimum'] > 0) {
                     return true;
-                }else{
+                } else {
                     return false;
                 }
             }
 
             return false;
 
-        }else{
+        } else {
             //individual
             return true;
         }
@@ -497,20 +545,20 @@ if(!function_exists('checkFamilyFloaters')){
     }
 }
 
-if (!function_exists('numberToWords')) {
+if (! function_exists('numberToWords')) {
     function numberToWords($number)
     {
-        $words = array(
-            '0' => 'Zero',
-            '1' => 'One',
-            '2' => 'Two',
-            '3' => 'Three',
-            '4' => 'Four',
-            '5' => 'Five',
-            '6' => 'Six',
-            '7' => 'Seven',
-            '8' => 'Eight',
-            '9' => 'Nine',
+        $words = [
+            '0'  => 'Zero',
+            '1'  => 'One',
+            '2'  => 'Two',
+            '3'  => 'Three',
+            '4'  => 'Four',
+            '5'  => 'Five',
+            '6'  => 'Six',
+            '7'  => 'Seven',
+            '8'  => 'Eight',
+            '9'  => 'Nine',
             '10' => 'Ten',
             '11' => 'Eleven',
             '12' => 'Twelve',
@@ -528,30 +576,30 @@ if (!function_exists('numberToWords')) {
             '60' => 'Sixty',
             '70' => 'Seventy',
             '80' => 'Eighty',
-            '90' => 'Ninety'
-        );
+            '90' => 'Ninety',
+        ];
 
         if ($number < 21) {
             return $words[$number];
         }
 
         if ($number < 100) {
-            $tens = (int)($number / 10) * 10;
+            $tens  = (int) ($number / 10) * 10;
             $units = $number % 10;
             return $words[$tens] . ($units ? ' ' . $words[$units] : '');
         }
 
         if ($number < 1000) {
-            $hundreds = (int)($number / 100);
+            $hundreds  = (int) ($number / 100);
             $remainder = $number % 100;
             return $words[$hundreds] . ' Hundred' . ($remainder ? ' and ' . numberToWords($remainder) : '');
         }
 
-        $levels = array('', ' Thousand', ' Million', ' Billion', ' Trillion', ' Quadrillion', ' Quintillion');
+        $levels = ['', ' Thousand', ' Million', ' Billion', ' Trillion', ' Quadrillion', ' Quintillion'];
 
         for ($i = 0, $unit = 1; $i < count($levels); $i++, $unit *= 1000) {
             if ($number < $unit * 1000) {
-                $current = (int)($number / $unit);
+                $current   = (int) ($number / $unit);
                 $remainder = $number % $unit;
                 return numberToWords($current) . $levels[$i] . ($remainder ? ' ' . numberToWords($remainder) : '');
             }
@@ -561,7 +609,7 @@ if (!function_exists('numberToWords')) {
     }
 }
 
-if (!function_exists('print_rr')) {
+if (! function_exists('print_rr')) {
     function print_rr($data)
     {
         echo "<pre>";
@@ -570,7 +618,7 @@ if (!function_exists('print_rr')) {
     }
 }
 
-if (!function_exists('get_server_details')) {
+if (! function_exists('get_server_details')) {
     /**
      * Get the hostname and server name.
      *
@@ -578,70 +626,72 @@ if (!function_exists('get_server_details')) {
      */
     function get_server_details(): array
     {
-        $hostname = gethostname(); // Get the hostname of the server
+        $hostname   = gethostname();                        // Get the hostname of the server
         $serverName = $_SERVER['SERVER_NAME'] ?? 'Unknown'; // Get the server name
 
         return [
-            'hostname' => $hostname,
+            'hostname'    => $hostname,
             'server_name' => $serverName,
         ];
     }
 }
 
-if (!function_exists('isJsonString')) {
+if (! function_exists('isJsonString')) {
 
     function isJsonString($input)
     {
-        json_decode($input); // Decode the string
+        json_decode($input);                            // Decode the string
         return (json_last_error() === JSON_ERROR_NONE); // Check if the last JSON error is "no error"
     }
 }
 
-if (!function_exists('isValidDate')) {
-    function isValidDate($date, $format) {
+if (! function_exists('isValidDate')) {
+    function isValidDate($date, $format)
+    {
         $parsed_date = DateTime::createFromFormat($format, $date);
         return $parsed_date && $parsed_date->format($format) === $date;
     }
 }
 
-if (!function_exists('change_date_format')) {
+if (! function_exists('change_date_format')) {
 
-    function change_date_format($date_str, $source_format = null, $output_format = 'Y-m-d') {
+    function change_date_format($date_str, $source_format = null, $output_format = 'Y-m-d')
+    {
 
         $date_str = trim($date_str);
         // Allowed date formats
         $allowed_formats = [
-            // Day Month Year (clear unambiguous formats)
-            'd M Y',     // 01 Dec 2024
-            'd-M-Y',     // 01-Dec-2024
-            'd/M/Y',     // 01/Dec/2024
-            'd.M.Y',     // 01.Dec.2024
-            'd,M,Y',     // 01,Dec,2024
+                     // Day Month Year (clear unambiguous formats)
+            'd M Y', // 01 Dec 2024
+            'd-M-Y', // 01-Dec-2024
+            'd/M/Y', // 01/Dec/2024
+            'd.M.Y', // 01.Dec.2024
+            'd,M,Y', // 01,Dec,2024
 
-            // Month Day Year (clear unambiguous formats)
-            'M d Y',     // Dec 01 2024
-            'M-d-Y',     // Dec-01-2024
-            'M/d/Y',     // Dec/01/2024
-            'M.d.Y',     // Dec.01.2024
-            'M,d,Y',     // Dec,01,2024
+                     // Month Day Year (clear unambiguous formats)
+            'M d Y', // Dec 01 2024
+            'M-d-Y', // Dec-01-2024
+            'M/d/Y', // Dec/01/2024
+            'M.d.Y', // Dec.01.2024
+            'M,d,Y', // Dec,01,2024
 
-            // Year Month Day (clear unambiguous formats)
-            'Y M d',     // 2024 Dec 01
-            'Y-M-d',     // 2024-Dec-01
-            'Y/M/d',     // 2024/Dec/01
-            'Y.M.d',     // 2024.Dec.01
-            'Y,M,d',     // 2024,Dec,01
+                     // Year Month Day (clear unambiguous formats)
+            'Y M d', // 2024 Dec 01
+            'Y-M-d', // 2024-Dec-01
+            'Y/M/d', // 2024/Dec/01
+            'Y.M.d', // 2024.Dec.01
+            'Y,M,d', // 2024,Dec,01
 
-            // Year Numeric Month Numeric Day
-            'Y-m-d',     // 2024-12-01
-            'Y/m/d',     // 2024/12/01
-            'Y.m.d',     // 2024.12.01
-            'Y,m,d',     // 2024,12,01
+                     // Year Numeric Month Numeric Day
+            'Y-m-d', // 2024-12-01
+            'Y/m/d', // 2024/12/01
+            'Y.m.d', // 2024.12.01
+            'Y,m,d', // 2024,12,01
 
-            'd/m/Y',     // 01/01/2025
-            'd-m-Y',     // 01-01-2025
-            'm/d/Y h:i:s A',     // 01-01-2025
-            'm/d/Y',     // 25-05-2025
+            'd/m/Y',         // 01/01/2025
+            'd-m-Y',         // 01-01-2025
+            'm/d/Y h:i:s A', // 01-01-2025
+            'm/d/Y',         // 25-05-2025
 
         ];
 
@@ -649,7 +699,7 @@ if (!function_exists('change_date_format')) {
             // Case 1: Source and Output formats are provided
             if ($source_format !== null && $output_format !== null) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
-                if (!$date) {
+                if (! $date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
                     // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
@@ -660,7 +710,7 @@ if (!function_exists('change_date_format')) {
             // Case 2: Source format is provided, Output format is null
             if ($source_format !== null && $output_format === null) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
-                if (!$date) {
+                if (! $date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
                     // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
@@ -695,7 +745,7 @@ if (!function_exists('change_date_format')) {
     }
 }
 
-// if (!function_exists('check_pay_by_employee_or_company')) 
+// if (!function_exists('check_pay_by_employee_or_company'))
 // {
 
 //     function check_pay_by_employee_or_company($is_payable_employee = null, $relationship = null) {
@@ -711,7 +761,7 @@ if (!function_exists('change_date_format')) {
 //         }else if($relationship == 'spouse'){
 
 //             $result = $is_payable_employee['spouse'] == 1 ? 1 : 0;
-            
+
 //         }else if(in_array($relationship, ['son', 'daughter'])){
 
 //             $result = $is_payable_employee['childern'] == 1 ? 1 : 0;
@@ -726,55 +776,55 @@ if (!function_exists('change_date_format')) {
 //     }
 // }
 
-if (!function_exists('check_pay_by_employee_or_company')) {
+if (! function_exists('check_pay_by_employee_or_company')) {
 
     function check_pay_by_employee_or_company($policy_terms = null, $relationship = null)
     {
-       
+
         // dd($policy_terms, $relationship);
 
-        if (!$policy_terms || !($policy_terms = json_decode($policy_terms, true))) {
+        if (! $policy_terms || ! ($policy_terms = json_decode($policy_terms, true))) {
             return 0;
         }
 
         // dd($policy_terms, $relationship);
-    
-        if (!isset($policy_terms['is_payable_employee'])) {
-            return 0; 
+
+        if (! isset($policy_terms['is_payable_employee'])) {
+            return 0;
         }
-    
+
         $is_payable_employee = $policy_terms['is_payable_employee'];
-    
+
         $relationship = strtolower(str_replace(" ", "_", $relationship));
 
         // dd($is_payable_employee, $relationship);
-    
+
         $relationshipMap = [
-            'self' => 'self',
-            'spouse' => 'spouse',
-            'son' => 'childern',
-            'daughter' => 'childern',
-            'father' => 'elders',
-            'mother' => 'elders',
+            'self'          => 'self',
+            'spouse'        => 'spouse',
+            'son'           => 'childern',
+            'daughter'      => 'childern',
+            'father'        => 'elders',
+            'mother'        => 'elders',
             'father_in_law' => 'elders',
-            'mother_in_law' => 'elders'
+            'mother_in_law' => 'elders',
         ];
-    
+
         if (array_key_exists($relationship, $relationshipMap)) {
             $key = $relationshipMap[$relationship];
-    
+
             return isset($is_payable_employee[$key]) && $is_payable_employee[$key] == 1 ? 1 : 0;
         }
-    
+
         return 0;
     }
-    
+
 }
 
-if (!function_exists('is_json_string')) {
+if (! function_exists('is_json_string')) {
     function is_json_string($string)
     {
-        if (!is_string($string)) {
+        if (! is_string($string)) {
             return false;
         }
 
@@ -783,16 +833,16 @@ if (!function_exists('is_json_string')) {
     }
 }
 
-if (!function_exists('check_cd_entry_exist')) {
+if (! function_exists('check_cd_entry_exist')) {
     function check_cd_entry_exist($params)
     {
         $db = db_connect();
 
-        $client_id = $params['client_id'];
+        $client_id        = $params['client_id'];
         $client_policy_id = $params['client_policy_id'];
-        $insurer_id = $params['insurer_id'];
-        $cd_ac_pk = $params['cd_ac_pk'];
-        $event_name = $params['event_name'];
+        $insurer_id       = $params['insurer_id'];
+        $cd_ac_pk         = $params['cd_ac_pk'];
+        $event_name       = $params['event_name'];
 
         // Check if truncated entry (sub_type = 8) exists
         $has_truncated = $db->table('cash_deposit')
@@ -823,7 +873,7 @@ if (!function_exists('check_cd_entry_exist')) {
             if (count($entries) > 1) {
                 // Only one entry found (truncated)
                 return true;
-            }else{
+            } else {
                 return false;
             }
         } else {
@@ -838,7 +888,7 @@ if (!function_exists('check_cd_entry_exist')) {
                 ->get()
                 ->getRowArray();
 
-            if (!empty($entry)) {
+            if (! empty($entry)) {
                 return true;
             }
         }
@@ -847,24 +897,23 @@ if (!function_exists('check_cd_entry_exist')) {
     }
 }
 
-if (!function_exists('expected_amount_calc')) {
+if (! function_exists('expected_amount_calc')) {
     function expected_amount_calc($data, $index)
     {
-        $agreed_amount      = (float) ($data['agreed_amount'][$index] ?? 0);
-        $agreed_bp_per      = (float) ($data['agreed_bp'][$index] ?? 0);
-        $agreed_tp_per      = (float) ($data['agreed_tp'][$index] ?? 0);
-        $agreed_tep_per     = (float) ($data['agreed_ter'][$index] ?? 0);
+        $agreed_amount  = (float) ($data['agreed_amount'][$index] ?? 0);
+        $agreed_bp_per  = (float) ($data['agreed_bp'][$index] ?? 0);
+        $agreed_tp_per  = (float) ($data['agreed_tp'][$index] ?? 0);
+        $agreed_tep_per = (float) ($data['agreed_ter'][$index] ?? 0);
 
-        $standard_bp_per    = (float) ($data['standard_bp'][$index] ?? 0);
-        $standard_tp_per    = (float) ($data['standard_tp'][$index] ?? 0);
-        $standard_tep_per   = (float) ($data['standard_ter'][$index] ?? 0);
+        $standard_bp_per  = (float) ($data['standard_bp'][$index] ?? 0);
+        $standard_tp_per  = (float) ($data['standard_tp'][$index] ?? 0);
+        $standard_tep_per = (float) ($data['standard_ter'][$index] ?? 0);
 
-
-        if($data['bro_payable_by'] == 0){
+        if ($data['bro_payable_by'] == 0) {
             $base_premium       = (float) ($data['co_premium'][$index] ?? 0);
             $third_part_premium = (float) ($data['co_tp_premium'][$index] ?? 0);
             $terrisom_premium   = (float) ($data['co_ter_premium'][$index] ?? 0);
-        }else{
+        } else {
             $base_premium       = (float) ($data['base_premium'][$index] ?? 0);
             $third_part_premium = (float) ($data['tp_premium'][$index] ?? 0);
             $terrisom_premium   = (float) ($data['ter_premium'][$index] ?? 0);
@@ -892,24 +941,24 @@ if (!function_exists('expected_amount_calc')) {
     }
 }
 
-if (!function_exists('getFileIfExists')) {
+if (! function_exists('getFileIfExists')) {
     function getFileIfExists($path)
-    {   
+    {
         return file_exists(FCPATH . $path) ? base_url($path) : '';
     }
 }
 
-if (!function_exists('removeNumberFormatting')) {
+if (! function_exists('removeNumberFormatting')) {
     function removeNumberFormatting($number)
     {
         return (float) str_replace(',', '', trim($number));
     }
 }
 
-if (!function_exists('formatKey')) {
+if (! function_exists('formatKey')) {
     function formatKey($key, $len = 3)
     {
-        $words = explode('_', $key);
+        $words     = explode('_', $key);
         $formatted = array_map(function ($word) use ($len) {
             return strlen($word) < $len ? strtoupper($word) : ucfirst(strtolower($word));
         }, $words);
@@ -917,7 +966,7 @@ if (!function_exists('formatKey')) {
     }
 }
 
-if (!function_exists('getMimeTypeByFileName')) {
+if (! function_exists('getMimeTypeByFileName')) {
     function getMimeTypeByFileName($file_name)
     {
         $ext = strtolower(pathinfo($file_name, PATHINFO_EXTENSION));
@@ -943,7 +992,7 @@ if (!function_exists('getMimeTypeByFileName')) {
     }
 }
 
-if (!function_exists('validateExcelFile')) {
+if (! function_exists('validateExcelFile')) {
 
     function validateExcelFile($file)
     {
@@ -963,13 +1012,13 @@ if (!function_exists('validateExcelFile')) {
             'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'application/vnd.oasis.opendocument.spreadsheet',
             'application/zip',
-            'application/octet-stream'
+            'application/octet-stream',
         ];
 
         $allowedExtensions = ['xls', 'xlsx', 'ods', 'xlsm'];
 
         // Get the actual values using CI4 methods
-        $mime = $file->getClientMimeType();
+        $mime      = $file->getClientMimeType();
         $extension = $file->getExtension(); // This is the CI4 method
 
         // 4. Validate
@@ -981,23 +1030,24 @@ if (!function_exists('validateExcelFile')) {
     }
 }
 
-if (!function_exists('generate_ecard_download_link_based_on_tpa')) {
+if (! function_exists('generate_ecard_download_link_based_on_tpa')) {
+
+    function generate_ecard_download_link_based_on_tpa($params)
+    {
 
-    function generate_ecard_download_link_based_on_tpa($params) {
-       
         $apiServiceController = new ApiServiceController();
-        $data = $apiServiceController->ecardRequest($params, $return_type = 'internal');
+        $data                 = $apiServiceController->ecardRequest($params, $return_type = 'internal');
         log_message('error', 'E-card request call from the helper for mail send');
 
-        if(isset($data['eCardDownload']) && !empty($data['eCardDownload'])){
+        if (isset($data['eCardDownload']) && ! empty($data['eCardDownload'])) {
             return $data['eCardDownload'];
-        }else{
+        } else {
             return $data['message'];
         }
     }
 }
 
-if (!function_exists('canSendOtp')) {
+if (! function_exists('canSendOtp')) {
     function canSendOtp(array $row, int $limitSeconds = 60): array
     {
         // If OTP does not exist → allow
@@ -1014,8 +1064,8 @@ if (!function_exists('canSendOtp')) {
         // If still within limit → block
         if ($currentTime < $allowedAfter) {
             return [
-                'allowed' => false,
-                'retry_after' => $allowedAfter - $currentTime
+                'allowed'     => false,
+                'retry_after' => $allowedAfter - $currentTime,
             ];
         }
 
@@ -1023,14 +1073,14 @@ if (!function_exists('canSendOtp')) {
     }
 }
 
-if (!function_exists('checkDuplicateClaim')) {
+if (! function_exists('checkDuplicateClaim')) {
 
-   function checkDuplicateClaim(array $params): bool
-    {   
+    function checkDuplicateClaim(array $params): bool
+    {
         $ticketMaster = new TicketMasterModel();
-        $query = $ticketMaster->where('is_active', 1);
+        $query        = $ticketMaster->where('is_active', 1);
 
-        if(empty($params['doa']) && empty($params['claim_amount'])){
+        if (empty($params['doa']) && empty($params['claim_amount'])) {
             return false;
         }
 
@@ -1043,26 +1093,25 @@ if (!function_exists('checkDuplicateClaim')) {
             }
         }
 
-        if (!$hasValidCondition) {
+        if (! $hasValidCondition) {
             return false;
         }
 
         $result = $query->countAllResults();
         // print_r($ticketMaster->getLastQuery()->getQuery());  die;
-        if($result > 0){ return true; }else{ return false; }
+        if ($result > 0) {return true;} else {return false;}
     }
 }
 
-
 function getRealClientIP()
 {
     $request = service('request');
 
-    if (!empty($_SERVER['HTTP_CF_CONNECTING_IP'])) {
+    if (! empty($_SERVER['HTTP_CF_CONNECTING_IP'])) {
         return $_SERVER['HTTP_CF_CONNECTING_IP'];
     }
 
-    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+    if (! empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         return explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])[0];
     }
 
@@ -1089,7 +1138,7 @@ function generateFingerprint(bool $exclude_ua = false): string
     // IPv6 handling
     elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
         // Use first 4 blocks of IPv6 (rough /64 grouping)
-        $blocks = explode(':', $ip);
+        $blocks  = explode(':', $ip);
         $ipGroup = implode(':', array_slice($blocks, 0, 4));
     }
     // Fallback
@@ -1097,16 +1146,13 @@ function generateFingerprint(bool $exclude_ua = false): string
         $ipGroup = 'unknown';
     }
 
-    if($exclude_ua){
+    if ($exclude_ua) {
         return hash('sha256', $ipGroup);
     }
     return hash('sha256', $ua . '|' . $ipGroup);
 }
 
-
-
-
-if (!function_exists('convertGoogleDriveToDownloadLink')) {
+if (! function_exists('convertGoogleDriveToDownloadLink')) {
     function convertGoogleDriveToDownloadLink(?string $url): ?string
     {
         if (empty($url)) {
@@ -1120,7 +1166,7 @@ if (!function_exists('convertGoogleDriveToDownloadLink')) {
         $patterns = [
             '#https?://drive\.google\.com/file/d/([^/]+)/?#',
             '#https?://drive\.google\.com/open\?id=([^&]+)#',
-            '#https?://drive\.google\.com/uc\?id=([^&]+)#'
+            '#https?://drive\.google\.com/uc\?id=([^&]+)#',
         ];
 
         foreach ($patterns as $pattern) {
@@ -1137,21 +1183,21 @@ if (!function_exists('convertGoogleDriveToDownloadLink')) {
     }
 }
 
-if (!function_exists('get_cd_balance')) {
+if (! function_exists('get_cd_balance')) {
     function get_cd_balance(): array
     {
         $session = session();
 
         return [
             'has_cd_balance'  => $session->has('cd_balance'),
-            'cd_balance'  => $session->get('cd_balance') ?? null,
+            'cd_balance'      => $session->get('cd_balance') ?? null,
             'hr_data'         => $session->get('hr_data') ?? [],
             'cd_balance_info' => $session->get('cd_balance_info') ?? [],
         ];
     }
 }
 
-if (!function_exists('clear_cd_balance_session')) {
+if (! function_exists('clear_cd_balance_session')) {
     function clear_cd_balance_session(): void
     {
         $session = session();
@@ -1164,16 +1210,25 @@ if (!function_exists('clear_cd_balance_session')) {
     }
 }
 
-if (!function_exists('format_gender_v2')) {
-    function format_gender_v2($gender) {
-        if (empty($gender)) return null;
+if (! function_exists('format_gender_v2')) {
+    function format_gender_v2($gender)
+    {
+        if (empty($gender)) {
+            return null;
+        }
 
         $g = strtoupper(trim($gender));
 
         // Direct-ah check pannuvom
-        if (str_starts_with($g, 'M')) return 'M'; // Male, M
-        if (str_starts_with($g, 'F')) return 'F'; // Female, F
-        
+        if (str_starts_with($g, 'M')) {
+            return 'M';
+        }
+        // Male, M
+        if (str_starts_with($g, 'F')) {
+            return 'F';
+        }
+        // Female, F
+
         // Others, Transgender, O - ivatrai 'O' ena return seiyum
         if (str_starts_with($g, 'O') || str_starts_with($g, 'T')) {
             return 'O';
@@ -1183,20 +1238,22 @@ if (!function_exists('format_gender_v2')) {
     }
 }
 
-if (!function_exists('map_relationship')) {
+if (! function_exists('map_relationship')) {
     /**
      * Employee -> self, WIFE -> spouse ena maatri return seiyum.
      */
-    function map_relationship($relation) {
-        if (empty($relation)) return '';
+    function map_relationship($relation)
+    {
+        if (empty($relation)) {
+            return '';
+        }
 
         // Case prechanai varaamal irukka lowercase-kku maatri check seivom
         $r = strtolower(trim($relation));
 
         if ($r == 'employee') {
             return 'self';
-        } 
-        else if ($r == 'wife') {
+        } else if ($r == 'wife') {
             return 'spouse';
         }
 
@@ -1205,135 +1262,123 @@ if (!function_exists('map_relationship')) {
     }
 }
 
-
 /**
-     * Extract identity from POST body or GET params.
-     * Looks for 'email' or 'mobile_number'.
-     */
-    function resolveIdentity($request): ?string
-    {
-        // Try POST body first
-        $email  = $request->getPost('email');
-        // print_r($email);die;
-        $mobile = $request->getPost('mobile_number');
+ * Extract identity from POST body or GET params.
+ * Looks for 'email' or 'mobile_number'.
+ */
+function resolveIdentity($request): ?string
+{
+    // Try POST body first
+    $email = $request->getPost('email');
+    // print_r($email);die;
+    $mobile = $request->getPost('mobile_number');
 
-        // Fallback to GET params
-        if (! $email && ! $mobile) {
-            $email  = $request->getGet('email');
-            $mobile = $request->getGet('mobile_number');
-        }
-        // Fallback to JSON params
-        if (! $email && ! $mobile) {
-         $req_data = $request->getJSON();
-         // print_r( $req_data);
-         
-         $mobile = $req_data->mobile_number ?? null;
-         // return trim($mobile_number);
+    // Fallback to GET params
+    if (! $email && ! $mobile) {
+        $email  = $request->getGet('email');
+        $mobile = $request->getGet('mobile_number');
+    }
+    // Fallback to JSON params
+    if (! $email && ! $mobile) {
+        $req_data = $request->getJSON();
+        // print_r( $req_data);
 
-         $email = $req_data->email ?? null;
-          
-          if (!$email)
-          {
+        $mobile = $req_data->mobile_number ?? null;
+        // return trim($mobile_number);
+
+        $email = $req_data->email ?? null;
+
+        if (! $email) {
             $email = $req_data->email_id ?? null;
-          }
-         // return trim($email);
         }
-
-        if ($email) {
-            return strtolower(trim($email));
-        }
-
-        if ($mobile) {
-            return trim($mobile);
-        }
-
-        return null;
+        // return trim($email);
     }
 
+    if ($email) {
+        return strtolower(trim($email));
+    }
 
-    function recordRateLimitFailure(string $context = 'authApi'): void
+    if ($mobile) {
+        return trim($mobile);
+    }
+
+    return null;
+}
+
+function recordRateLimitFailure(string $context = 'authApi'): void
+{
+    /** @var IncomingRequest $request */
+    $request = \Config\Services::request();
+
+    $limiter = \Config\Services::limiter(); // or your custom limiter service
+
+    $fingerprint = $request->getVar('rateLimitFingerprint') ?? generateFingerprint(exclude_ua: true);
+
+    $identity = $request->getVar('rateLimitIdentity') ?? resolveIdentity($request);
+
+    // Record IP-level failure
+    $limiter->recordIpFailure($fingerprint);
+
+    // Record user-level failure
+    if (! empty($identity)) {
+        $limiter->recordUserFailure($identity, $context);
+    }
+}
+
+if (! function_exists('getCurrentFinancialYear')) {
+    function getCurrentFinancialYear()
     {
-        /** @var IncomingRequest $request */
-        $request = \Config\Services::request();
+        // Get current year and month
+        $date         = new DateTime();
+        $currentYear  = (int) $date->format('Y');
+        $currentMonth = (int) $date->format('m');
 
-        $limiter = \Config\Services::limiter(); // or your custom limiter service
+        // If month is Jan, Feb, or March, we are still in the previous year's FY
+        if ($currentMonth < 4) {
+            $startYear = $currentYear - 1;
+            $endYear   = $currentYear;
+        } else {
+            $startYear = $currentYear;
+            $endYear   = $currentYear + 1;
+        }
 
-        $fingerprint = $request->getVar('rateLimitFingerprint')
-            ?? generateFingerprint(exclude_ua: true);
+        return $startYear . '-' . $endYear;
+    }
+}
 
-        
+if (! function_exists('format_financial_year')) {
+    function format_financial_year(string $financialYear): string
+    {
+        if (empty($financialYear) || ! str_contains($financialYear, '-')) {
+            return $financialYear;
+        }
 
-        $identity = $request->getVar('rateLimitIdentity')
-            ?? resolveIdentity($request);
+        $years = explode('-', $financialYear);
 
-        // Record IP-level failure
-        $limiter->recordIpFailure($fingerprint);
+        // Ensure we have both parts
+        $startYear = $years[0] ?? '';
+        $endYear   = $years[1] ?? '';
 
-        // Record user-level failure
-        if (!empty($identity)) {
-            $limiter->recordUserFailure($identity, $context);
+        return "APR " . $startYear . " - MAR " . $endYear;
+    }
+}
+
+if (! function_exists('add_google_calender_event')) {
+    function add_google_calender_event($data)
+    {
+
+        $calendar = new \App\Libraries\GoogleCalendarService();
+
+        // Check if user is authenticated without passing tokens manually
+        if (! $calendar->isReady()) {
+            return ['status' => 'failed', 'code' => '404', 'message' => 'Google Access Token Expired'];
+        }
+
+        try {
+            $response = $calendar->createEvent($data);
+            return ['status' => 'success', 'code' => '200', 'message' => 'Follow-up Saved', 'response' => $response];
+        } catch (\Exception $e) {
+            return ['status' => 'failed', 'code' => '500', 'message' => 'Error: ' . $e->getMessage()];
         }
     }
-
-
-    if (!function_exists('getCurrentFinancialYear')) {
-        function getCurrentFinancialYear() 
-        {
-            // Get current year and month
-            $date = new DateTime();
-            $currentYear = (int)$date->format('Y');
-            $currentMonth = (int)$date->format('m');
-
-            // If month is Jan, Feb, or March, we are still in the previous year's FY
-            if ($currentMonth < 4) {
-                $startYear = $currentYear - 1;
-                $endYear = $currentYear;
-            } else {
-                $startYear = $currentYear;
-                $endYear = $currentYear + 1;
-            }
-
-            return $startYear . '-' . $endYear;
-        }
-    }
-
-
-    if (!function_exists('format_financial_year')) {
-        function format_financial_year(string $financialYear): string
-        {
-            if (empty($financialYear) || !str_contains($financialYear, '-')) {
-                return $financialYear;
-            }
-
-            $years = explode('-', $financialYear);
-            
-            // Ensure we have both parts
-            $startYear = $years[0] ?? '';
-            $endYear   = $years[1] ?? '';
-
-            return "APR " . $startYear . " - MAR " . $endYear;
-        }
-    }
-
-
-    if(!function_exists('add_google_calender_event')){
-        function add_google_calender_event($data){
-            
-            $calendar = new \App\Libraries\GoogleCalendarService();
-
-            // Check if user is authenticated without passing tokens manually
-            if (!$calendar->isReady()) {
-                return ['status' => 'failed', 'code' => '404' , 'message' => 'Google Access Token Expired'];
-            }
-
-            try {
-                $response = $calendar->createEvent($data);
-                return ['status' => 'success', 'code' => '200' , 'message' => 'Follow-up Saved', 'response' => $response];
-            } catch (\Exception $e) {
-                return ['status' => 'failed', 'code' => '500' , 'message' => 'Error: ' . $e->getMessage()];
-            }
-        }
-    }
-
-
-
+}

From 997aae68ef92f1bd051d481b04efce46cb8d72b3 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Thu, 26 Feb 2026 17:03:57 +0530
Subject: [PATCH 12/12] FIX_SalesTracker4

---
 app/Controllers/LeadsController.php              |  1 +
 app/Controllers/SalesController.php              |  3 ++-
 app/Views/layout/header.php                      |  2 +-
 app/Views/sales/branch_level_dashboard_view.php  | 16 ++++++++++------
 .../sales/sales_manager_level_dashboard.php      |  8 ++++----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 2c506aed..dfd99a43 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -825,6 +825,7 @@ class LeadsController extends BaseController
             $last_3_years_claims = $data['finyear'];
 
             $processedData[] = [
+                'actual_lead_id'         => $data['actual_lead_id'] ?? null,
                 'lead_type'              => $data['lead_type'],
                 'issuer'                 => $data['issuer'],
                 'client_type'            => $data['client_type'],
diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index a830542e..c3f870c5 100644
--- a/app/Controllers/SalesController.php
+++ b/app/Controllers/SalesController.php
@@ -863,9 +863,10 @@ class SalesController extends BaseController
             
             // 5. Team Performance
             $teamPerformance = $db->table('user_profiles as u')
-                ->select('u.first_name, u.last_name, u.profile as role, 
+                ->select('u.first_name, u.last_name, r.role, 
                         (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id) as total_acts,
                         (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id AND status = "completed") as done_acts')
+                ->join('roles r', 'r.id = u.role')
                 ->where('u.nhance_branch_id', $branchId)
                 ->whereIn('u.id', $sales_manager_ids)
                 ->where('u.is_active', 1)
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index f5109843..b7271a2c 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -2077,7 +2077,7 @@
                             </a>
                         </li>
                     <?php } ?>
-                    <?php if (in_array(get_role_id(), [1, 2, 3, 4]) || in_array(SALES_TEAM_ID, user_team())) { ?>
+                    <?php if (in_array(get_role_id(), [1, 5]) || (get_role_id() == 4 && in_array(SALES_TEAM_ID, user_team()))) { ?>
                         <li class="li-seperate" id="app-sales-tracker-li">
                             <a id="app_sales_tracker" href="#sidebarSalesTrackermenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
                                 <img
diff --git a/app/Views/sales/branch_level_dashboard_view.php b/app/Views/sales/branch_level_dashboard_view.php
index 7f3789f4..fe1f6dba 100644
--- a/app/Views/sales/branch_level_dashboard_view.php
+++ b/app/Views/sales/branch_level_dashboard_view.php
@@ -238,15 +238,17 @@
                             </div>
                         <?php endforeach; ?>
                     <?php else: ?>
-                        <div class="empty-state">No activities found</div>
+                        <div class="empty-state">
+                                    <div class="empty-icon">✓</div> No activities found
+                        </div>
                     <?php endif; ?>
             </div>
         </div>
     </div>
 
-    <div class="card">
+    <div class="card" style="grid-column: 1 / -1; width: 100%; box-sizing: border-box;">
         <div class="table-header">
-            <h3 style="font-size: 16px; font-weight: 700;">All Leads Overview</h3>
+            <h3 style="font-size: 16px; font-weight: 700;">All Leads Overview <?php echo !empty($leads_overview) ? "<i>(".count($leads_overview).")</i>" : ""; ?></h3>
             <!-- <span style="color: #718096; font-size: 12px; font-weight: 600;">Click a lead to see details</span> -->
              <a href="<?= base_url('sales') ?>" 
                 style="color: #718096; font-size: 12px; font-weight: 600; text-decoration: none; padding: 4px 8px; transition: color 0.2s ease; display: inline-block; cursor: pointer;"
@@ -261,8 +263,8 @@
                     <th>Company</th>
                     <th>Status</th>
                     <th>Assigned To</th>
-                    <th>Activities</th>
-                    <th>Opportunities</th>
+                    <th style="text-align: center !important;">Activities</th>
+                    <th style="text-align: center !important;">Opportunities</th>
                 </tr>
             </thead>
             <tbody>
@@ -280,7 +282,9 @@
                 <?php else: ?>
                     <tr>
                         <td colspan="5">
-                            <div class="empty-state">No leads found</div>
+                            <div class="empty-state">
+                                    <div class="empty-icon">👤</div> No leads found
+                            </div>
                         </td>
                     </tr>
                 <?php endif; ?>
diff --git a/app/Views/sales/sales_manager_level_dashboard.php b/app/Views/sales/sales_manager_level_dashboard.php
index b9cbbf41..c14a0052 100644
--- a/app/Views/sales/sales_manager_level_dashboard.php
+++ b/app/Views/sales/sales_manager_level_dashboard.php
@@ -54,14 +54,14 @@
 }
 
 /* Fix for inputs inside modal rows */
-input, select, textarea { 
-    width: 100%; /* Change from 400px to 100% */
-    box-sizing: border-box; /* Ensures padding doesn't add to width */
+/* input, select, textarea { 
+    width: 100%; * Change from 400px to 100% *
+    box-sizing: border-box; * Ensures padding doesn't add to width *
     padding: 10px 15px; 
     border: 1px solid #e0e0e0; 
     border-radius: 8px; 
     font-size: 14px; 
-}
+} */