diff --git a/.env.sample b/.env.sample
index 4faec3e2..5c3f1bf8 100755
--- a/.env.sample
+++ b/.env.sample
@@ -131,5 +131,10 @@ HEALTH_INDIA_PASSWORD =
 
 HEALTH_INDIA_PRIMARY_KEY_CONSTANT =
 
+#For sending mail for leads RFQ/QCR
 LEAD_INSURER_FROM_MAIL_ID = 
-LEAD_CLIENT_FROM_MAIL_ID = 
\ No newline at end of file
+LEAD_CLIENT_FROM_MAIL_ID = 
+
+# BDS Daily Report Emails Configuration
+bds.dailyReportEmails = 
+
diff --git a/app/Config/Acl.php b/app/Config/Acl.php
index 2960595f..b4d85eac 100644
--- a/app/Config/Acl.php
+++ b/app/Config/Acl.php
@@ -32,6 +32,8 @@ class Acl
         '#^/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]],
+        '#^/expense#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, STAFF_ROLE_ID]],
+
 
 
 
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 4996d7f7..09d117f3 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -444,11 +444,17 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('proceedExcelFileDataValidation', 'EmployeeController::proceedExcelFileDataValidation');
     $routes->get('checkTpaApiEnable', 'EmployeeRestController::checkTpaApiEnable');
     $routes->get('generateDemographyDataTable', 'LeadsController::generateDemographyDataTable');
-    $routes->post('insufficientCdBalanceHrMailSend', 'EmployeeController::insufficientCdBalanceHrMailSend');
+    $routes->post('insufficientCdBalanceHrMailSend', 'EmployeeController::insufficientCdBalanceHrMailSend'); 
+    $routes->get('getTpaClaimDumpErrorData/(:any)', 'TicketServiceController::getTpaClaimDumpErrorData/$1'); 
+    $routes->get('croneDailyActivityReport', 'DashboardController::croneDailyActivityReport');
 });
 
 $routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
 $routes->cli("cli/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
+$routes->cli("cli/cronDailyBDSReport", "PolicyTransactionController::cronDailyBDSReport");
+$routes->cli('cli/croneDailyActivityReport', 'DashboardController::croneDailyActivityReport');
+
+
 
 $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
 
@@ -496,6 +502,7 @@ $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
         //$routes->post('failedStatement',"PolicyTransactionController::failedStatementList");
     });
 
+    $routes->get("cronDailyBDSReport", "PolicyTransactionController::cronDailyBDSReport");
 });
 
 $routes->group("leads", ["filter" => "authMVC"], function ($routes) {
@@ -551,9 +558,18 @@ $routes->cli("cli/sendCroneRemainderMail", "DashboardController::sendCroneRemain
 $routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
 $routes->cli('cli/insurerRFQRemainder', 'LeadsController::remainderForQcr');
 $routes->cli('cli/sendMailWithAutoQuery','TicketController::sendMailWithAutoQuery');
+
+// Claim Status Update every 2 hours
 $routes->cli('cli/MediAssit-ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate');
 $routes->cli('cli/Vidal-ClaimStatusUpdate','VidalApiController::ClaimStatusUpdate');
+$routes->cli('cli/Fhpl-ClaimStatusUpdate','FhplApiController::ClaimStatusUpdate');
+$routes->cli('cli/HealthIndia-ClaimStatusUpdate','HealthIndiaApiController::ClaimStatusUpdate');
+
+// Sync TPA Claims to Nhance
 $routes->cli('cli/MediAssit-syncTpaClaimToNhance','MediAssistApiController::syncTpaClaimToNhance');
+$routes->cli('cli/Fhpl-syncTpaClaimToNhance','FhplApiController::syncFhplClaimsToNhance');
+$routes->cli('cli/HealthIndia-syncTpaClaimToNhance','HealthIndiaApiController::syncHealthIndiaClaimsToNhance');
+
 $routes->cli('cli/thzReminderCrone','ThzController::getOpenTicketsOlderThan24HoursAndAssignNextLevel');
 
 
@@ -770,6 +786,7 @@ $routes->group("/ticket", ["filter" => "authMVC"], function ($routes) {
    $routes->get('fetchVehiclePolicy/(:any)','TicketController::fetchVehiclePolicy/$1');
    $routes->post('saveIRDocsJson',"TicketController::saveIRDocsJson");
    $routes->get('getTpaClaimStatus',"ApiServiceController::getClaimStatus");
+   $routes->post('manualTpaClaimPush',"ApiServiceController::manualTpaClaimPush");
 });
 
 $routes->group("/claim_mis", ["filter" => "authMVC"], function ($routes) {
@@ -920,7 +937,7 @@ $routes->group('sales', function($routes) {
     $routes->get('/', 'SalesController::index');
     
     $routes->get('loadactivities', 'SalesController::loadactivities');
-    
+
     $routes->get('loadtargets', 'SalesController::loadtargets');
 
     $routes->get('page/(:segment)', 'SalesController::noPage/$1');
@@ -1003,6 +1020,13 @@ $routes->group('sales', function($routes) {
     // Delete note
     $routes->delete('notes/(:num)', 'SalesController::deleteNote/$1');
 
+    // ==================== TARGETS ROUTES ====================
+    $routes->get('targets',              'SalesController::getTargets');
+    $routes->get('targets/user/(:num)', 'SalesController::getTargetByUser/$1');
+    $routes->get('targets/fy/(:segment)','SalesController::getTargetByFY/$1');
+    $routes->post('targets',             'SalesController::createTarget');
+    $routes->put('targets/(:num)',       'SalesController::updateTarget/$1');
+    $routes->delete('targets/(:num)',    'SalesController::deleteTarget/$1');
 
     //Dashboard
     $routes->get('dashboard', 'SalesController::dashboard');
@@ -1010,4 +1034,13 @@ $routes->group('sales', function($routes) {
     $routes->get('salesManagerLevelDashboard', 'SalesController::salesManagerLevelDashboard');
 });
 
+// Expence Module Route Group
+$routes->group('expense', ["filter" => "authMVC", 'namespace' => 'App\Controllers'], static function($routes) {
+    $routes->get('/', 'ExpenseController::index');
+    $routes->post('save', 'ExpenseController::save');
+    $routes->get('get/(:num)', 'ExpenseController::getExpense/$1');
+    $routes->post('delete/(:num)', 'ExpenseController::delete/$1');
+    $routes->get('client-policies', 'ExpenseController::clientPolicies');
+});
+
 
diff --git a/app/Controllers/ApiServiceController.php b/app/Controllers/ApiServiceController.php
index 28b2aec6..16a650a0 100644
--- a/app/Controllers/ApiServiceController.php
+++ b/app/Controllers/ApiServiceController.php
@@ -476,6 +476,35 @@ class ApiServiceController extends BaseController
         }
     }
 
+        /**
+     * Manual TPA Claim Push - accepts claim_id via POST and delegates to pushClaims().
+     * Returns the response from pushClaims() as the API response.
+     */
+    public function manualTpaClaimPush()
+    {
+        $claimId = $this->request->getPost('claim_id');
+
+        if (empty($claimId)) {
+            return $this->response->setJSON([
+                'status' => false,
+                'message' => 'claim_id is required'
+            ]);
+        }
+
+        $result = $this->pushClaims($claimId);
+
+        if ($result !== null && is_array($result)) {
+            return $this->response->setJSON([
+                'status' => $result['status'] ?? false,
+                'message' => $result['message'] ?? ($result['status'] ? 'Claim pushed successfully' : 'Claim push failed')
+            ]);
+        }
+
+        return $this->response->setJSON([
+            'status' => false,
+            'message' => 'Claim push failed or TPA has no API service enabled for this ticket.'
+        ]);
+    }
 
 
     // public function getWellnessUrl()
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 24c0f2ec..ee3a8098 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -6969,16 +6969,23 @@ class ClientController extends AdminController
         // $response = $ticketServiceController->getClaimExcelErrorData(["file_id" => 41]);
         // $response = $ticketServiceController->claimDumpOnBoardProcess(["file_id" => 17]);
         // $response = $ticketServiceController->extractExcelData("claims_dump_form_client.xlsx");
+        
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 51]); //abhi
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 50]); //fhpl
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 53]); //icici
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 54]); //mediassist
         // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 52]); //reliance
-        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 48]); //vidal
-        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 48]); //vidal
-        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 54]); //mediassist
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 48]); //vidal`
+        // $response = $ticketServiceController->tpaClaimDumpImporter(["file_id" => 57]); //mediassist
 
-        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 4]); //abhi
+
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 51]); //abhi
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 50]); //fhpl
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 53]); //icici
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 54]); //mediassist
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 52]); //reliance
+        // $response = $ticketServiceController->tpaClaimDumpToTicketMasterImporters(["file_id" => 48]); //vidal
+        // $response = $ticketServiceController->getTpaClaimDumpErrorData(["file_id" => 48]);
         // dd($response);
 
         // ---------- TICKET CONTROLLER --------------------------------------------------------------------------------
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 1dab325b..b4d224fe 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -7,6 +7,7 @@ use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
 use App\Helpers\sendMailNotification;
+use App\Helpers\MailHelper;
 
 use CodeIgniter\API\ResponseTrait;
 
@@ -24,6 +25,11 @@ use App\Controllers\EmpDataServiceController;
 use App\Models\TicketMasterModel;
 use App\Models\LeadsModel;
 use App\Models\TicketClaimStatusModel;
+use App\Models\FileModel;
+use App\Models\BatchFileModel;
+use App\Models\SalesActivityModel;
+use App\Models\SalesActualLeadModel;
+
 
 
 class DashboardController extends AdminController
@@ -43,6 +49,13 @@ class DashboardController extends AdminController
     protected $policyStatus;
     protected $colorShades;
     protected $claimDashLimit;
+    protected $filesModel;
+    protected $batchFilesModel;
+    protected $leadsModel;
+    protected $ticketMasterModel;
+    protected $ticketClaimStatusModel;
+    protected $salesActivityModel;
+    protected $salesActualModel;
 
     protected $myLogger;
 
@@ -59,6 +72,13 @@ class DashboardController extends AdminController
         $this->ticketModel = new TicketMasterModel();
         $this->leadModel = new LeadsModel();
         $this->ticketStatusModel = new TicketClaimStatusModel();
+        $this->filesModel = new FileModel();
+        $this->batchFilesModel = new BatchFileModel();
+        $this->leadsModel = new LeadsModel();
+        $this->ticketMasterModel = new TicketMasterModel();
+        $this->ticketClaimStatusModel = new TicketClaimStatusModel();
+        $this->salesActivityModel = new SalesActivityModel();
+        $this->salesActualModel = new SalesActualLeadModel();
 
         $this->myLogger = \Config\Services::mylogger();
 
@@ -787,4 +807,298 @@ class DashboardController extends AdminController
         $data['ticket_type_id'] = $ticketTypeId;
         return $this->respond(['status' => "success", "data" => $data], 200);
     }
+
+    public function croneDailyActivityReport()
+    {
+
+        // $today = date('Y-m-d');
+        $today = date('Y-m-d', strtotime('-1 day'));
+
+        // Inception & endorsement counts (file uploads)
+        $total_inception_count = $this->filesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('action', 'inception')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        $total_endorsement_count = $this->filesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('action !=', 'inception')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        // TPA & Insurer batch file counts
+        $total_tpa_incetion_count = $this->batchFilesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('event_type', 'inception')
+            ->where('insurer_or_tpa', 'tpa')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        $total_tpa_endorsement_count = $this->batchFilesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('event_type !=', 'inception')
+            ->where('insurer_or_tpa', 'tpa')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        $total_insurer_incetion_count = $this->batchFilesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('event_type', 'inception')
+            ->where('insurer_or_tpa', 'insurer')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        $total_insurer_endorsement_count = $this->batchFilesModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('event_type !=', 'inception')
+            ->where('insurer_or_tpa', 'insurer')
+            ->where('status', 'success')
+            ->countAllResults();
+
+        // Claim counts
+        $total_claim_count = $this->ticketMasterModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->countAllResults();
+
+        $total_gmc_status_wise_claim_count = $this->ticketMasterModel
+            ->select('tcs.claim_status, count(*) as count')
+            ->join('ticket_claim_status tcs', 'tcs.id = ticket_master.claim_status_id', 'left')
+            ->where('ticket_master.is_active', 1)
+            ->where('ticket_master.ticket_type_id', 1)
+            // ->where('DATE(ticket_master.created_at)', $today)
+            ->where('tcs.is_active', 1)
+            ->groupBy('tcs.claim_status')
+            ->findAll();
+
+        $total_gpa_status_wise_claim_count = $this->ticketMasterModel
+            ->select('tcs.claim_status, count(*) as count')
+            ->join('ticket_claim_status tcs', 'tcs.id = ticket_master.claim_status_id', 'left')
+            ->where('ticket_master.is_active', 1)
+            ->where('ticket_master.ticket_type_id', 2)
+            // ->where('DATE(ticket_master.created_at)', $today)
+            ->where('tcs.is_active', 1)
+            ->groupBy('tcs.claim_status')
+            ->findAll();
+
+        $total_edli_status_wise_claim_count = $this->ticketMasterModel
+            ->select('tcs.claim_status, count(*) as count')
+            ->join('ticket_claim_status tcs', 'tcs.id = ticket_master.claim_status_id', 'left')
+            ->where('ticket_master.is_active', 1)
+            ->where('ticket_master.ticket_type_id', 3)
+            // ->where('DATE(ticket_master.created_at)', $today)
+            ->where('tcs.is_active', 1)
+            ->groupBy('tcs.claim_status')
+            ->findAll();
+
+        $total_gtli_status_wise_claim_count = $this->ticketMasterModel
+            ->select('tcs.claim_status, count(*) as count')
+            ->join('ticket_claim_status tcs', 'tcs.id = ticket_master.claim_status_id', 'left')
+            ->where('ticket_master.is_active', 1)
+            ->where('ticket_master.ticket_type_id', 4)
+            // ->where('DATE(ticket_master.created_at)', $today)
+            ->where('tcs.is_active', 1)
+            ->groupBy('tcs.claim_status')
+            ->findAll();
+
+        // Sales / lead counts
+        $total_opportunity_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->countAllResults();
+
+        $total_rfq_created_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('status', 'rfq_created')
+            ->countAllResults();
+
+        $total_rfq_insurer_send_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('status', 'rfq_sent')
+            ->countAllResults();
+
+        $total_qcr_created_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('status', 'qcr_created')
+            ->countAllResults();
+
+        $total_qcr_client_send_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('status', 'qcr_sent')
+            ->countAllResults();
+
+        $total_placement_count = $this->leadsModel
+            ->where('is_active', 1)
+            ->where('DATE(created_at)', $today)
+            ->where('status', 'won')
+            ->countAllResults();
+
+        $total_activity_count = $this->salesActivityModel
+            ->where('DATE(created_at)', $today)
+            ->countAllResults();
+
+        $total_lead_count = $this->salesActualModel
+            ->where('DATE(created_at)', $today)
+            ->countAllResults();
+
+        $total_bds_count = $this->policyTransactionModel
+            ->select('pt_co_share_details.*')
+            ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id')
+            ->where('DATE(policy_transaction.created_at)', $today)
+            ->where('pt_co_share_details.is_active', 1)
+            ->where('policy_transaction.is_active', 1)
+            ->countAllResults();
+
+        $total_bds_policy_wise_count = $this->policyTransactionModel
+            ->select('pt_co_share_details.*')
+            ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id')
+            ->where('DATE(policy_transaction.created_at)', $today)
+            ->where('pt_co_share_details.is_active', 1)
+            ->where('policy_transaction.action_type', 'inception')
+            ->where('policy_transaction.is_active', 1)
+            ->countAllResults();
+
+
+        $total_bds_endorsement_wise_count = $this->policyTransactionModel
+            ->select('pt_co_share_details.*')
+            ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id')
+            ->where('DATE(policy_transaction.created_at)', $today)
+            ->where('pt_co_share_details.is_active', 1)
+            ->where('policy_transaction.action_type !=', 'inception')
+            ->where('policy_transaction.is_active', 1)
+            ->countAllResults();
+
+        $total_bds_policy_type_wise_count = $this->policyTransactionModel
+            ->select('policy_type.policy_type, count(*) as count')
+            ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id')
+            ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id')
+            ->where('DATE(policy_transaction.created_at)', $today)
+            ->where('pt_co_share_details.is_active', 1)
+            ->where('policy_transaction.is_active', 1)
+            ->groupBy('policy_transaction.policy_type_id')
+            ->findAll();
+
+        // Connect Pre DB for Employee Enrollment Count
+
+        $db2 = \Config\Database::connect('preDB');
+
+        $builder = $db2->table('employees');
+        $total_employee_draft_count = $builder->join('employee_polices', 'employees.id = employee_polices.employee_id')
+            ->select('employee_polices.status, count(*) as count')
+            ->where('DATE(employee_polices.created_at)', $today)
+            ->where('employee_polices.is_active', 1)
+            ->where('employees.is_active', 1)
+            ->whereIn('employee_polices.status', ['draft'])
+            ->groupBy('employee_polices.status')
+            ->countAllResults();
+
+
+        $builder1 = $db2->table('employees');
+        $total_employee_enrolled_count = $builder1->join('employee_polices', 'employees.id = employee_polices.employee_id')
+            ->select('employee_polices.status, count(*) as count')
+            ->where('DATE(employee_polices.created_at)', $today)
+            ->where('employee_polices.is_active', 1)
+            ->where('employees.is_active', 1)
+            ->whereIn('employee_polices.status', ['enrolled'])
+            ->groupBy('employee_polices.status')
+            ->countAllResults();
+                
+        $builder2 = $db2->table('files');
+        $total_open_for_enrollemnt_policy_count = $builder2
+            ->select('COUNT(*) as count')
+            ->where('enrollment_open_date <=', $today)
+            ->where('enrollment_close_date >=', $today)
+            ->where('is_active', 1)
+            ->where('status', 'success')
+            ->countAllResults();
+
+        $data = [
+            'total_inception_count' => $total_inception_count,
+            'total_endorsement_count' => $total_endorsement_count,
+            'total_tpa_incetion_count' => $total_tpa_incetion_count,
+            'total_tpa_endorsement_count' => $total_tpa_endorsement_count,
+            'total_insurer_incetion_count' => $total_insurer_incetion_count,
+            'total_insurer_endorsement_count' => $total_insurer_endorsement_count,
+            'total_claim_count' => $total_claim_count,
+            'total_gmc_status_wise_claim_count' => $total_gmc_status_wise_claim_count,
+            'total_gpa_status_wise_claim_count' => $total_gpa_status_wise_claim_count,
+            'total_edli_status_wise_claim_count' => $total_edli_status_wise_claim_count,
+            'total_gtli_status_wise_claim_count' => $total_gtli_status_wise_claim_count,
+            'total_opportunity_count' => $total_opportunity_count,
+            'total_rfq_created_count' => $total_rfq_created_count,
+            'total_rfq_insurer_send_count' => $total_rfq_insurer_send_count,
+            'total_qcr_created_count' => $total_qcr_created_count,
+            'total_qcr_client_send_count' => $total_qcr_client_send_count,
+            'total_placement_count' => $total_placement_count,
+            'total_activity_count' => $total_activity_count,
+            'total_lead_count' => $total_lead_count,
+            'total_bds_count' => $total_bds_count,
+            'total_bds_policy_wise_count' => $total_bds_policy_wise_count,
+            'total_bds_endorsement_wise_count' => $total_bds_endorsement_wise_count,
+            'total_bds_policy_type_wise_count' => $total_bds_policy_type_wise_count,
+            'total_employee_draft_count' => $total_employee_draft_count,
+            'total_employee_enrolled_count' => $total_employee_enrolled_count,
+            'total_open_for_enrollemnt_policy_count' => $total_open_for_enrollemnt_policy_count,
+        ];
+
+        // dd($data);
+
+        $today = date('d-m-Y', strtotime($today));
+        $data['today'] = $today;
+
+        // Render the HTML email using the dedicated view
+        $message = view('daily_report_email_template', $data);
+        // return $message;
+
+        // Recipients: prefer dedicated env, fallback to BDS report emails if not set
+        $emailList = getenv('activity.dailyReportEmails') ?: getenv('bds.dailyReportEmails') ?: '';
+        $recipientEmails = array_filter(array_map('trim', explode(',', $emailList)));
+
+        if (empty($recipientEmails)) {
+            $this->myLogger->logme('error', 'croneDailyActivityReport: No recipients configured (set activity.dailyReportEmails in .env).');
+            return $this->respond([
+                'status' => 'success',
+                'message' => 'Daily activity data prepared but no recipients configured.',
+                'data' => $data,
+            ], 200);
+        }
+
+        $subject = "Daily Activity Report - {$today}";
+
+        $res = MailHelper::send_email([
+            'mail' => $recipientEmails,
+            'subject' => $subject,
+            'message' => $message,
+        ]);
+
+        $resDecoded = is_string($res) ? json_decode($res, true) : $res;
+
+        if (isset($resDecoded['status']) && $resDecoded['status'] === 'success') {
+            $this->myLogger->logme('error', 'croneDailyActivityReport: Report email sent to ' . count($recipientEmails) . ' recipients');
+            return $this->respond([
+                'status' => true,
+                'message' => 'Daily activity report emailed successfully.',
+                'recipients' => count($recipientEmails),
+            ], 200);
+        }
+
+        $this->myLogger->logme('error', 'croneDailyActivityReport: Email send failed - ' . json_encode($resDecoded));
+        return $this->respond([
+            'status' => false,
+            'message' => 'Daily activity data prepared but email send failed.',
+            'data' => $data,
+        ], 500);
+    }
+
 }
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 3a0bea5b..df5dcfab 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2418,6 +2418,11 @@ class EmployeeRestController extends AdminController
                 ["ticket_type" => "4", "type_name" => "GTLI"],
             ];
 
+            $claim_type  = $this->ticketController->claimType;
+            unset($claim_type[1][2]);
+            unset($claim_type[1][4]);
+            $data['claim_type'] = $claim_type;
+
             return $this->respond(['status' => (count($data) ? 'success' : 'failed'), 'code' => (count($data) ? 200 : 404), 'data' => $data], 200);
         }
 
@@ -2581,61 +2586,90 @@ class EmployeeRestController extends AdminController
 
             $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;
+            // print_rr($data['ticket_history']); die;
+
+            $filteredArray = array_filter($data['ticket_history'], function($item) {
+                return $item['field_name'] == 'claim_status_id';
+            });
+            
+            $filteredArray = array_reverse(array_values($filteredArray));
 
             $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');
-            // print_r($currentClaimStatus); die;
+            // dd($filteredArray, $status_list); die;
 
-            $data['ticket_data'] = array_fill_keys(array_keys($data['ticket_data']), []);
+            $filtered_history = [];
+            $counter = 0;
+            
+            foreach ($filteredArray as $key => $value) {
+                foreach ($status_list as $status => $display_name) {
+                    if ($value['new_value'] == $status) {
 
-            // Loop through ticket_data
-            foreach ($data['ticket_data'] as $status => &$fields) {
-                // Search ticket_history for matching old_status_value
-                foreach ($data['ticket_history'] as $history) {
+                        if($display_name == 'Under Process'){
+                            $unique_key = $display_name . str_repeat("\u{200B}", $counter++);
+                        }else{
+                            $unique_key = $display_name;
+                        }
 
-                    if ($history['old_status_value'] === $status) {
-                        // Attach modified_by and created_at
-                        // $fields['modified_by'] = $history['modified_by'];
-                        $fields['modified_by'] = "";
-                        $fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at']));
-                        // Break after first match (assuming latest entry is enough)
-                        break;
+                        $filtered_history[$unique_key] = [
+                            'modified_by' => "",
+                            'modified_at' => date('d-m-Y h:i A', strtotime($value['created_at'])),
+                        ];
                     }
                 }
             }
+            // dd($filteredArray, $status_list, $filtered_history); die;
 
-            $data['ticket_data'][$currentClaimStatus['claim_status']]['modified_by'] = "";
-            $data['ticket_data'][$currentClaimStatus['claim_status']]['modified_at'] = $formatted = date('d-m-Y h:i A', strtotime($data['claims_data']['updated_at']));
 
-            $new_ticket_data = [];
 
-            foreach ($data['ticket_data'] as $oldKey => $value) {
+            // $data['ticket_data'] = array_fill_keys(array_keys($data['ticket_data']), []);
 
-                // Only process if key exists in status_list
-                if (! isset($status_list[$oldKey])) {
-                    continue; // skip and do NOT add to new array
-                }
+            // // Loop through ticket_data
+            // foreach ($data['ticket_data'] as $status => &$fields) {
+            //     // Search ticket_history for matching old_status_value
+            //     foreach ($data['ticket_history'] as $history) {
 
-                // Get new key based on mapping
-                $newKey = $status_list[$oldKey];
+            //         if ($history['old_status_value'] === $status) {
+            //             // Attach modified_by and created_at
+            //             // $fields['modified_by'] = $history['modified_by'];
+            //             $fields['modified_by'] = "";
+            //             $fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at']));
+            //             // Break after first match (assuming latest entry is enough)
+            //             break;
+            //         }
+            //     }
+            // }
 
-                // Avoid duplicates
-                if (! isset($new_ticket_data[$newKey])) {
-                    $new_ticket_data[$newKey] = $value;
-                }
-            }
+            // $data['ticket_data'][$currentClaimStatus['claim_status']]['modified_by'] = "";
+            // $data['ticket_data'][$currentClaimStatus['claim_status']]['modified_at'] = $formatted = date('d-m-Y h:i A', strtotime($data['claims_data']['updated_at']));
 
-            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
-            });
+            // $new_ticket_data = [];
 
-            $data['ticket_data'] = $new_ticket_data;
+            // 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
+            //     }
+
+            //     // Get new key based on mapping
+            //     $newKey = $status_list[$oldKey];
+
+            //     // Avoid duplicates
+            //     if (! isset($new_ticket_data[$newKey])) {
+            //         $new_ticket_data[$newKey] = $value;
+            //     }
+            // }
+
+            // 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
+            // });
+
+            // $data['ticket_data'] = $new_ticket_data;
+            $data['ticket_data'] = $filtered_history;
 
             $ticketMesssageModel = new TicketMessageModel();
             $ticket_message      = $ticketMesssageModel
@@ -5451,7 +5485,7 @@ class EmployeeRestController extends AdminController
                 'dashboard' => $database_id,
             ],
             'exp'      => time() + (10 * 60),
-            'params'   => (object) [],
+            'params'   => (object) ['client_policy' => $policy_id ], // MUST be object for Metabase
         ];
 
         $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
diff --git a/app/Controllers/ExpenseController.php b/app/Controllers/ExpenseController.php
new file mode 100644
index 00000000..c734284d
--- /dev/null
+++ b/app/Controllers/ExpenseController.php
@@ -0,0 +1,412 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Models\ExpenseModel;
+use App\Models\ClientModel;
+use App\Models\ClientPolicyModel;
+use CodeIgniter\API\ResponseTrait;
+
+class ExpenseController extends AdminController
+{
+    use ResponseTrait;
+
+    protected $myLogger;
+    protected $expenseModel;
+    protected $clientModel;
+    protected $clientPolicyModel;
+
+    public function __construct()
+    {
+        set_session_context('Expense');
+
+        $this->myLogger         = \Config\Services::mylogger();
+        $this->expenseModel     = new ExpenseModel();
+        $this->clientModel      = new ClientModel();
+        $this->clientPolicyModel = new ClientPolicyModel();
+    }
+
+    /**
+     * Web list + form view
+     */
+    public function index()
+    {
+        try {
+            $data['tab_name']  = 'Expense';
+            $data['page_name'] = 'Expense';
+            $descriptionPattern = '/^[a-zA-Z0-9\s\.\,\-\(\)\/\&\+]+$/u';
+
+            // Raw GET filters
+            $rawFilters = $this->request->getGet() ?? [];
+            $rawFilters = is_array($rawFilters) ? $rawFilters : [];
+
+            // Sanitize input array using existing helper
+            $sanitized = sanitizeInputArrayAdvanced($rawFilters);
+
+            $filters = [
+                'client_id'        => trim($sanitized['client_id'] ?? ''),
+                'client_policy_id' => trim($sanitized['client_policy_id'] ?? ''),
+                'approved_by'      => trim($sanitized['approved_by'] ?? ''),
+                'description'      => trim($sanitized['description'] ?? ''),
+                'amount'           => trim($sanitized['amount'] ?? ''),
+                'expense_date'     => trim($sanitized['expense_date'] ?? ''),
+            ];
+
+            $validationErrors = [];
+
+            // Basic type / format validation for filters
+            if ($filters['client_id'] !== '' && ! ctype_digit($filters['client_id'])) {
+                $validationErrors[]   = 'Invalid client selected for search.';
+                $filters['client_id'] = '';
+            }
+
+            if ($filters['client_policy_id'] !== '' && ! ctype_digit($filters['client_policy_id'])) {
+                $validationErrors[]         = 'Invalid policy selected for search.';
+                $filters['client_policy_id'] = '';
+            }
+
+            if ($filters['approved_by'] !== '' && ! ctype_digit($filters['approved_by'])) {
+                $validationErrors[]    = 'Invalid approver selected for search.';
+                $filters['approved_by'] = '';
+            }
+
+            if ($filters['description'] !== '' && ! preg_match($descriptionPattern, $filters['description'])) {
+                $validationErrors[]     = 'Description filter contains invalid characters.';
+                $filters['description'] = '';
+            }
+
+            if ($filters['amount'] !== '') {
+                if (! is_numeric($filters['amount']) || (float) $filters['amount'] < 0) {
+                    $validationErrors[] = 'Amount filter must be a non-negative number.';
+                    $filters['amount']  = '';
+                }
+            }
+
+            if ($filters['expense_date'] !== '') {
+                $dt = \DateTime::createFromFormat('d-m-Y', $filters['expense_date']);
+                $errors = $dt ? \DateTime::getLastErrors() : ['warning_count' => 1, 'error_count' => 1];
+                if (! $dt || ! empty($errors['warning_count']) || ! empty($errors['error_count'])) {
+                    $validationErrors[]      = 'Expense Date filter must be in DD-MM-YYYY format.';
+                    $filters['expense_date'] = '';
+                }
+            }
+
+            $data['filters']           = $filters;
+            $data['validation_errors'] = $validationErrors;
+
+            // Clients for dropdown
+            $data['clients'] = $this->clientModel
+                ->select('id, client_name, short_name')
+                ->where('is_active', 1)
+                ->orderBy('client_name', 'ASC')
+                ->findAll();
+
+            // Approved by (users) dropdown
+            $db = db_connect();
+            $data['approved_users'] = $db->table('user_profiles')
+                ->select('id, first_name')
+                ->where('is_active', 1)
+                ->whereIn('id', [7, 8])
+                ->orderBy('first_name', 'ASC')
+                ->get()
+                ->getResultArray();
+
+            // Policies for filter dropdown (when client filter is selected)
+            $data['policies_for_filter'] = [];
+            if ($filters['client_id'] !== '') {
+                $data['policies_for_filter'] = $this->clientPolicyModel
+                    ->select('id, policy_no')
+                    ->where('client_id', (int) $filters['client_id'])
+                    ->where('is_active', 1)
+                    ->orderBy('id', 'ASC')
+                    ->findAll();
+            }
+
+            // Existing expenses with optional filters
+            $builder = $this->expenseModel
+                ->select('
+                    expenses.*,
+                    clients.client_name,
+                    clients.short_name,
+                    client_policy.policy_no,
+                    user_profiles.first_name AS approved_by_name
+                ')
+                ->join('clients', 'clients.id = expenses.client_id')
+                ->join('client_policy', 'client_policy.id = expenses.client_policy_id', 'left')
+                ->join('user_profiles', 'user_profiles.id = expenses.approved_by', 'left')
+                ->where('expenses.is_active', 1);
+
+            if ($filters['client_id'] !== '') {
+                $builder->where('expenses.client_id', (int) $filters['client_id']);
+            }
+
+            if ($filters['client_policy_id'] !== '') {
+                $builder->where('expenses.client_policy_id', (int) $filters['client_policy_id']);
+            }
+
+            if ($filters['approved_by'] !== '') {
+                $builder->where('expenses.approved_by', (int) $filters['approved_by']);
+            }
+
+            if ($filters['description'] !== '') {
+                $builder->like('expenses.description', (string) $filters['description']);
+            }
+
+            if ($filters['amount'] !== '') {
+                $builder->where('expenses.amount', (float) $filters['amount']);
+            }
+
+            if ($filters['expense_date'] !== '') {
+                $dt = \DateTime::createFromFormat('d-m-Y', $filters['expense_date']);
+                if ($dt) {
+                    $builder->where('expenses.expense_date', $dt->format('Y-m-d'));
+                }
+            }
+
+            $data['expenses'] = $builder
+                ->orderBy('expenses.id', 'DESC')
+                ->findAll();
+
+            return $this->loadLayout('expense_list', $data);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    /**
+     * Create / update expense (AJAX)
+     */
+    public function save()
+    {
+        try {
+            if ($this->request->getMethod() !== 'post') {
+                return $this->response
+                    ->setStatusCode(405)
+                    ->setJSON([
+                        'status'  => false,
+                        'message' => 'Invalid request method',
+                    ]);
+            }
+
+            $rawData = $this->request->getPost();
+            $data    = sanitizeInputArrayAdvanced($rawData);
+
+            $id = isset($data['id']) && $data['id'] !== '' ? (int) $data['id'] : null;
+
+            $rules = [
+                'client_id' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Client is required',
+                    ],
+                ],
+                'client_policy_id' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Policy is required',
+                    ],
+                ],
+                'description' => [
+                    'rules'  => 'required|string|min_length[1]|max_length[2000]|regex_match[/^[a-zA-Z0-9\s\.\,\-\(\)\/\&\+]+$/]',
+                    'errors' => [
+                        'required'    => 'Description is required',
+                        'min_length'  => 'Description cannot be empty',
+                        'regex_match' => 'Description contains invalid characters.',
+                    ],
+                ],
+                'expense_date' => [
+                    'rules'  => 'required|valid_date[d-m-Y]',
+                    'errors' => [
+                        'required'   => 'Expense Date is required',
+                        'valid_date' => 'Expense Date must be in DD-MM-YYYY format',
+                    ],
+                ],
+                'approved_by' => [
+                    'rules'  => 'required|is_natural_no_zero',
+                    'errors' => [
+                        'required' => 'Approved By is required',
+                    ],
+                ],
+                'amount' => [
+                    'rules'  => 'required|numeric|greater_than_equal_to[0]',
+                    'errors' => [
+                        'required'               => 'Amount is required',
+                        'numeric'                => 'Amount must be numeric',
+                        'greater_than_equal_to'  => 'Amount cannot be negative',
+                    ],
+                ],
+            ];
+
+            if (! $this->validate($rules)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Input validation failed',
+                    'errors'  => $this->validator->getErrors(),
+                ]);
+            }
+
+            $payload = [
+                'client_id'        => (int) ($data['client_id'] ?? 0),
+                'client_policy_id' => (int) ($data['client_policy_id'] ?? 0),
+                'description'      => $data['description'] ?? null,
+                'approved_by'      => (int) ($data['approved_by'] ?? 0),
+                'amount'           => $data['amount'] ?? null,
+                'is_active'        => 1,
+            ];
+
+            $expenseDate = $data['expense_date'] ?? null;
+            if (! empty($expenseDate)) {
+                $dt = \DateTime::createFromFormat('d-m-Y', $expenseDate);
+                $payload['expense_date'] = $dt ? $dt->format('Y-m-d') : null;
+            } else {
+                $payload['expense_date'] = null;
+            }
+
+            if ($id === null) {
+                $insertId = $this->expenseModel->insert($payload, true);
+                $success  = ! empty($insertId);
+                $id       = $insertId;
+                $message  = $success
+                    ? 'Expense created successfully'
+                    : 'Unable to create expense. Please try again.';
+            } else {
+                $success = $this->expenseModel->update($id, $payload);
+                $message = $success
+                    ? 'Expense updated successfully'
+                    : 'Unable to update expense. Please try again.';
+            }
+
+            return $this->response
+                ->setStatusCode($success ? 200 : 400)
+                ->setJSON([
+                    'status'  => (bool) $success,
+                    'message' => $message,
+                    'id'      => $id,
+                ]);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    /**
+     * Get single expense (AJAX)
+     */
+    public function getExpense($id = null)
+    {
+        try {
+            $id = (int) $id;
+
+            if (empty($id)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Invalid expense id',
+                ]);
+            }
+
+            $expense = $this->expenseModel
+                ->select('
+                    expenses.*,
+                    clients.client_name,
+                    clients.short_name,
+                    client_policy.policy_no,
+                    user_profiles.first_name AS approved_by_name
+                ')
+                ->join('clients', 'clients.id = expenses.client_id', 'left')
+                ->join('client_policy', 'client_policy.id = expenses.client_policy_id', 'left')
+                ->join('user_profiles', 'user_profiles.id = expenses.approved_by', 'left')
+                ->where('expenses.id', $id)
+                ->where('expenses.is_active', 1)
+                ->first();
+
+            if (empty($expense)) {
+                return $this->response->setStatusCode(404)->setJSON([
+                    'status'  => false,
+                    'message' => 'Expense not found',
+                ]);
+            }
+
+            return $this->response->setStatusCode(200)->setJSON([
+                'status' => true,
+                'data'   => $expense,
+            ]);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    /**
+     * Soft delete expense (AJAX)
+     */
+    public function delete($id = null)
+    {
+        try {
+            if ($this->request->getMethod() !== 'post') {
+                return $this->response
+                    ->setStatusCode(405)
+                    ->setJSON([
+                        'status'  => false,
+                        'message' => 'Invalid request method',
+                    ]);
+            }
+
+            $id = (int) $id;
+
+            if (empty($id)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Invalid expense id',
+                ]);
+            }
+
+            $payload = [
+                'is_active' => 0,
+            ];
+
+            $success = $this->expenseModel->update($id, $payload);
+
+            return $this->response
+                ->setStatusCode($success ? 200 : 400)
+                ->setJSON([
+                    'status'  => (bool) $success,
+                    'message' => $success
+                        ? 'Expense deleted successfully'
+                        : 'Unable to delete expense. Please try again.',
+                ]);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    /**
+     * Get policies by client for dropdown (AJAX)
+     */
+    public function clientPolicies()
+    {
+        try {
+            $clientId = (int) ($this->request->getGet('client_id') ?? 0);
+
+            if (empty($clientId)) {
+                return $this->response->setStatusCode(400)->setJSON([
+                    'status'  => false,
+                    'message' => 'Client is required',
+                ]);
+            }
+
+            $policies = $this->clientPolicyModel
+                ->select('client_policy.id, client_policy.policy_no, policy_type.policy_type')
+                ->join('policy_type', 'policy_type.id = client_policy.policy_type_id AND policy_type.is_active = 1')
+                ->where('client_policy.client_id', $clientId)
+                ->where('client_policy.is_active', 1)
+                ->orderBy('client_policy.id', 'ASC')
+                ->findAll();
+
+            return $this->response->setStatusCode(200)->setJSON([
+                'status' => true,
+                'data'   => $policies,
+            ]);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+}
+
diff --git a/app/Controllers/FhplApiController.php b/app/Controllers/FhplApiController.php
index 734bb438..8c3e76e1 100644
--- a/app/Controllers/FhplApiController.php
+++ b/app/Controllers/FhplApiController.php
@@ -99,7 +99,7 @@ class FhplApiController extends BaseController
 
         if (count($data) && $data['filePath'] == null) {
             log_message('error', "FHPL - Claim Push FAILED  | claimId: '.$claimId.' - Claim or File Missing");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | Claim or File Missing'];
         }
 
         // Build absolute file path
@@ -108,7 +108,7 @@ class FhplApiController extends BaseController
 
         if (!file_exists($pdfPath)) {
             log_message('error', "FHPL - Claim Push FAILED  | claimId: '.$claimId.' - PDF not found on server");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | PDF not found on server'];
         }
 
         // Convert PDF to Base64
@@ -118,7 +118,7 @@ class FhplApiController extends BaseController
         $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
         if (empty($tokenResponse['data']['access_token'])) {
             log_message('error', "FHPL - Claim Push FAILED  | claimId: '.$claimId.' - FHPL Token generation failed");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | FHPL Token generation failed'];
         }
         $token = $tokenResponse['data']['access_token'];
 
@@ -163,7 +163,7 @@ class FhplApiController extends BaseController
             $this->db->table('ticket_master')
             ->where('id',$claimId)
             ->update([ 'tpa_push_response' => json_encode($response) ]);
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | API call failed'];
         }
 
 
@@ -185,14 +185,14 @@ class FhplApiController extends BaseController
                     ]);
                     
                 log_message('error', 'FHPL - Claim Push SUCCESS  | claimId: '.$claimId.' | claimNO: '.$fhplClaimNo);
-                
+                return ['status' => true, 'message' => 'Claim Push SUCCESS', 'response' => $response];
             }else {
                 log_message('error', 'FHPL - Claim Push API SUCCESS BUT  claimsInfo EMPTY  | response: '.json_encode($response));
-                return;
+                return ['status' => false, 'message' => 'Claim Push API SUCCESS BUT  claimsInfo EMPTY'];
             }
         }
 
-        return;
+        return ['status' => false, 'message' => 'Claim Push API SUCCESS BUT  claimsInfo EMPTY'];
         // return $this->response->setJSON($response);
     }
 
@@ -288,7 +288,10 @@ class FhplApiController extends BaseController
         $tickets = $this->db->table('ticket_master tm')
             ->select("tm.id,tm.tpa_claim_id,cp.policy_no")
             ->join('client_policy cp','tm.client_policy_id=cp.id')
-            ->where('tm.tpa_claim_id IS NOT NULL')
+            ->where('tm.tpa_claim_push_reference_no IS NOT NULL')
+            ->whereNotIn('tm.claim_status_id', [8, 11, 12, 13, 66, 22, 24, 47, 49, 32, 34, 53, 55, 42, 44, 58, 60])
+            ->where('tm.is_active', 1)
+            ->where('cp.tpa_id', $this->fhplTpaId)
             ->get()->getResultArray();
 
         $count=0;
@@ -714,7 +717,7 @@ class FhplApiController extends BaseController
     //     ];
     // }
 
-    public function syncFhplClaimsToNhance()
+    public function syncFhplClaimsToNhanceOld()
     {
         helper('api');
 
@@ -790,6 +793,201 @@ class FhplApiController extends BaseController
         return ['status'=>true,'total'=>count($finalResult)];
     }
 
+    public function syncFhplClaimsToNhance()
+    {
+        helper('api');
+
+        try {
+        
+            // Generate FHPL Token
+            $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+            if (empty($tokenResponse['data']['access_token'])) {
+                return $this->response->setJSON(['status' => false,'message' => 'FHPL Token generation failed']);
+            }
+
+            $token = $tokenResponse['data']['access_token'];
+
+            $url = getenv('FHPL_BASE_URL')."/api/GetTPA_ClaimsDetails";
+
+            $headers = [
+                "Authorization: Bearer ".$token,
+                "Content-Type: application/json"
+            ];
+
+            $policies = $this->db->table('client_policy')
+                ->where('tpa_id',$this->fhplTpaId)
+                ->get()->getResultArray();
+
+            $finalResult=[];
+            foreach($policies as $policy){
+
+                $body = [
+                    "UserName"     => getenv('FHPL_USER_NAME'),
+                    "Password"     => getenv('FHPL_PASSWORD'),
+                    "PolicyNumber" => $policy['policy_no'],
+                    "Fromdate"     => $policy['policy_start_date'],
+                    "Todate"       => $policy['policy_end_date']
+                ];
+
+                $response = call_third_party_api($url,'POST',$headers,$body);
+
+                if(!empty($response['data'])){
+                    log_message('error', 'FHPL - Sync TPA Claims | Exception thrown while calling GetTPA_ClaimsDetails API: ' . json_encode($response));
+                    $finalResult = array_merge($finalResult,$response['data']);
+                }
+            }
+
+            $insertedCount = 0;
+
+            // Insert into ticket_master with mandatory columns (reference: MediAssist syncTpaClaimToNhance)
+            foreach($finalResult as $row){
+
+                $status = $row['CLAIM_STATUS'] ?? null;
+
+                $map = [
+                    "Under Process"=>5,
+                    "Paid"=>11,
+                    "Rejected"=>8,
+                    "Approved"=>8
+                ];
+
+                $claimStatus = $map[$status] ?? 61;
+
+                // Derive relationship (default to self)
+                $relationship = map_relationship(trim($row['RELATION'] ?? 'self'));
+                
+                // Fetch client policy details
+                $clientpolicy = $this->db->table('client_policy cp')
+                    ->select("
+                        cp.id as client_policy_id,
+                        cp.client_id ,
+                        cp.insurer_id ,
+                        cp.tpa_id ,
+                        client_rm.id as acm_id
+                    ")
+                    ->join('client_rm', 'client_rm.client_id = cp.client_id AND client_rm.level = 3', 'left')
+                    ->where('cp.policy_no', $row['POLICY_NO'] ?? null)
+                    ->orderBy('client_rm.id','DESC')
+                    ->get()
+                    ->getRowArray();
+
+                if (!$clientpolicy) {
+                    log_message(
+                        'error',
+                        'FHPL - Sync TPA Claims | Client policy not found for policy_no: ' . ($row['POLICY_NO'] ?? 'N/A')
+                    );
+                    continue;
+                }
+
+                // Fetch employee / insured details
+                $employee = $this->db->table('employees e')
+                    ->select("
+                        e.id as emp_id,
+                        e.emp_code ,
+                        e.name as emp_name,
+                        e2.id as insured_emp_id,
+                        e2.name as insured_emp_name,
+                        ep.tpa_id as tpa_no
+                    ")
+                    ->join(
+                        'employees e2',
+                        "e2.emp_code = e.emp_code AND e2.relationship = ".$this->db->escape($relationship),
+                        'left'
+                    )
+                    ->join( 'employee_polices ep',  "ep.employee_id = e2.id ",  'left' )
+                    ->where('e.emp_code', $row['EMPLOYEE_NO'] ?? null)
+                    ->where('e.client_id', $clientpolicy['client_id'] ?? null)
+                    ->where('e.relationship', 'self')
+                    ->where('e.is_active', 1)
+                    ->where('e2.is_active', 1)
+                    ->where('ep.is_active', 1)
+                    ->get()
+                    ->getRowArray();
+
+                if (!$employee) {
+                    log_message(
+                        'error',
+                        'FHPL - Sync TPA Claims | Employee data not found for emp_code: ' . ($row['EMPLOYEE_NO'] ?? 'N/A') .
+                        ' | policy_no: ' . ($row['POLICY_NO'] ?? 'N/A') .
+                        ' | relationship: ' . $relationship
+                    );
+                    continue;
+                }
+
+                $claimData = [
+                    // Core
+                    'ticket_type_id'   => 1,
+                    'claim_status_id'  => $claimStatus,
+                    'policy_no'        => $row['POLICY_NO'] ?? null,
+                    'claim_number'     => $row['CLAIM_ID'] ?? null,
+                    'tpa_claim_id'     => $row['CLAIM_ID'] ?? null,
+
+                    // local primary ids
+                    'tpa_id'           => $clientpolicy['tpa_id'] ?? $this->fhplTpaId,
+                    'insurer_id'       => $clientpolicy['insurer_id'] ?? null,
+                    'client_policy_id' => $clientpolicy['client_policy_id'] ?? null,
+                    'client_id'        => $clientpolicy['client_id'] ?? null,
+                    'acm_id'           => $clientpolicy['acm_id'] ?? null,
+
+                    // Employee / Insured
+                    'emp_id'           => $employee['emp_id'] ?? null,
+                    'insured_emp_id'   => $employee['insured_emp_id'] ?? null,
+                    'tpa_no'           => $employee['tpa_no'] ?? null,
+                    'emp_code'         => $row['EMPLOYEE_NO'] ?? null,
+                    'emp_name'         => $employee['emp_name'] ?? null,
+                    'insured_name'     => $row['insured_emp_name'] ?? null,
+                    'relationship'     => $relationship,
+
+                    // Claim info
+                    'claim_type'         => 1,
+                    'mode_of_intimation' => 5,
+                    'claim_amount'       => $row['CLAIM_AMOUNT'] ?? null,
+
+                    // Dates
+                    'doa'              => change_date_format($row['DATE_OF_ADMISSION'] ?? '', null, 'Y-m-d') ?? null,
+                    'dod'              => change_date_format($row['DATE_OF_DISCHARGE'] ?? '', null, 'Y-m-d') ?? null,
+
+                    // Hospital
+                    'hospital_name'    => $row['HOSPITAL_NAME'] ?? null,
+                    'hospital_state'   => $row['HOSPITAL_STATE'] ?? null,
+                    'hospital_city'    => $row['HOSPITAL_CITY'] ?? null,
+                    'hospital_address'    => $row['Hospital Address'] ?? null,
+                    'hospital_pincode'    => $row['Hospital Pincode'] ?? null,
+
+                    'registration_date'    => $row['CLAIM_REGISTERED_DATE'] ?? null,
+
+                    // Others
+                    'tpa_claim_type'   => $row['CLAIM_TYPE'] ?? null,
+                    'tpa_ailments'     => $row['AILMENT'] ?? null,
+
+                    'created_at'       => date('Y-m-d H:i:s'),
+                ];
+
+                $this->db->table('ticket_master')->insert($claimData);
+
+                $insertedCount++;
+            }
+
+            log_message('error', 'FHPL - Sync TPA Claims | Fetched Data | Inserted Data: ' . count($finalResult) . ' | Inserted: ' . $insertedCount);
+            return ['status'=>true,'total'=>count($finalResult), 'inserted'=>$insertedCount];
+
+        } catch (\Throwable $th) {
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+            log_message('error', 'FHPL - Sync TPA Claims | Exception thrown: ' . json_encode($errorData));
+            return ['status'=>false,'message'=>$th->getMessage()];
+        }
+    }
+
     public function saveFhplAPIData($array)
     {
         $file_id = $array['file_id'];
diff --git a/app/Controllers/HealthIndiaApiController.php b/app/Controllers/HealthIndiaApiController.php
index 13bc10c3..66e6d543 100644
--- a/app/Controllers/HealthIndiaApiController.php
+++ b/app/Controllers/HealthIndiaApiController.php
@@ -123,12 +123,12 @@ class HealthIndiaApiController extends BaseController
 
         if (!$data) {
             log_message('error', "HEALTH_INDIA - Claim Push FAILED  | claimId: {$claimId} - Claim not found");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | Claim not found'];
         }
 
         if ($data['filePath'] == null) {
             log_message('error', "HEALTH_INDIA - Claim Push FAILED | claimId: {$claimId} - File Missing");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | File Missing'];
         }
 
         // Build absolute file path
@@ -137,7 +137,7 @@ class HealthIndiaApiController extends BaseController
 
         if (!file_exists($pdfPath)) {
             log_message('error', "HEALTH_INDIA - Claim Push FAILED | claimId: {$claimId} - PDF not found on server at path: {$pdfPath}");
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | PDF not found on server'];
         }
 
         // Convert PDF to Base64
@@ -217,7 +217,7 @@ class HealthIndiaApiController extends BaseController
             $this->db->table('ticket_master')
                 ->where('id', $claimId)
                 ->update(['tpa_push_response' => json_encode($response)]);
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | API call failed'];
         }
 
         if ($response['status'] === true && !empty($response['data']['result'][0]['ccn'])) {
@@ -234,12 +234,13 @@ class HealthIndiaApiController extends BaseController
                 ]);
 
             log_message('error', 'HEALTH_INDIA - Claim Push SUCCESS | claimId: ' . $claimId . ' | CCN: ' . $ccn . ' | CCN_EXT: ' . $ccnExt);
+            return ['status' => true, 'message' => 'Claim Push SUCCESS', 'response' => $response];
         } else {
             log_message('error', 'HEALTH_INDIA - Claim Push API SUCCESS BUT CCN EMPTY | claimId: ' . $claimId . ' | response: ' . json_encode($response));
-            return;
+            return ['status' => false, 'message' => 'Claim Push API SUCCESS BUT CCN EMPTY'];
         }
 
-        return;
+        return ['status' => false, 'message' => 'Claim Push API SUCCESS BUT CCN EMPTY'];
     }
 
     public function ClaimDetail($claimId = null)
@@ -355,7 +356,9 @@ class HealthIndiaApiController extends BaseController
         $tickets = $this->db->table('ticket_master tm')
             ->select("tm.id, tm.tpa_claim_id, cp.policy_no")
             ->join('client_policy cp', 'tm.client_policy_id=cp.id')
-            ->where('tm.tpa_claim_id IS NOT NULL')
+            ->where('tm.tpa_claim_push_reference_no IS NOT NULL')
+            ->whereNotIn('tm.claim_status_id', [8, 11, 12, 13, 66, 22, 24, 47, 49, 32, 34, 53, 55, 42, 44, 58, 60])
+            ->where('tm.is_active', 1)
             ->where('cp.tpa_id', $this->healthIndiaTpaId)
             ->get()->getResultArray();
 
@@ -722,7 +725,7 @@ class HealthIndiaApiController extends BaseController
         }
     }
 
-    public function syncHealthIndiaClaimsToNhance()
+    public function syncHealthIndiaClaimsToNhanceOld()
     {
         helper('api');
 
@@ -820,6 +823,217 @@ class HealthIndiaApiController extends BaseController
         ]);
     }
 
+    public function syncHealthIndiaClaimsToNhance()
+    {
+        helper('api');
+
+        log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Started');
+
+        // Generate Health India Token
+        $tokenResponse = json_decode($this->generateAuthToken()->getBody(), true);
+
+        if (empty($tokenResponse['data']['result'][0]['access_token'])) {
+            log_message('error', 'HEALTH_INDIA - Sync TPA Claims FAILED  | Token generation failed');
+            return $this->response->setJSON(['status' => false, 'message' => 'Token generation failed']);
+        }
+
+        $token = $tokenResponse['data']['result'][0]['access_token'];
+
+        $url = getenv('HEALTH_INDIA_BASE_URL') . "/ClaimsMIS/GetClaimsMIS";
+
+        $headers = [
+            "Authorization: Bearer " . $token,
+            "Content-Type: application/json"
+        ];
+
+        $policies = $this->db->table('client_policy')
+            ->where('tpa_id', $this->healthIndiaTpaId)
+            ->get()->getResultArray();
+
+        $finalResult = [];
+
+        foreach ($policies as $policy) {
+            $body = [
+                "policY_NUMBER" => $policy['policy_no']
+            ];
+
+            log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Fetching for policy: ' . $policy['policy_no']);
+
+            $response = call_third_party_api($url, 'POST', $headers, $body);
+
+            if (!empty($response['data']['result'])) {
+                $finalResult = array_merge($finalResult, $response['data']['result']);
+                log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Fetched ' . count($response['data']['result']) . ' claims for policy: ' . $policy['policy_no']);
+            }
+        }
+
+        log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Total claims fetched: ' . count($finalResult));
+
+        $insertedCount = 0;
+
+        foreach ($finalResult as $row) {
+            $status = $row['Claim_Status'] ?? 'Under Process';
+
+            $map = [
+                "Under Process"          => 5,
+                "Pending for Bill Entry" => 5,
+                "Paid"                   => 11,
+                "Rejected"               => 8,
+                "Approved"               => 8,
+                "Outstanding"            => 5,
+            ];
+
+            $claimStatus = $map[$status] ?? 1;
+
+            // Check if claim already exists
+            $existing = $this->db->table('ticket_master')
+                ->where('tpa_claim_id', $row['CLAIM_NUMBER'])
+                ->get()->getRowArray();
+
+            if ($existing) {
+                log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Skipped existing claim: ' . ($row['CLAIM_NUMBER'] ?? 'N/A'));
+                continue;
+            }
+
+            // Derive relationship (default to self)
+            $relationship = 'self';
+            $rawRelation = $row['RELATION_NAME'] ?? null;
+            if (!empty($rawRelation)) {
+                if ($rawRelation === 'Employee') {
+                    $relationship = 'self';
+                } elseif (strtoupper($rawRelation) === 'WIFE') {
+                    $relationship = 'spouse';
+                } else {
+                    $relationship = strtolower($rawRelation);
+                }
+            }
+
+            // Fetch client policy details
+            $clientpolicy = $this->db->table('client_policy cp')
+                ->select("
+                    cp.id as client_policy_id,
+                    cp.client_id,
+                    cp.insurer_id,
+                    cp.tpa_id,
+                    client_rm.id as acm_id
+                ")
+                ->join('client_rm', 'client_rm.client_id = cp.client_id AND client_rm.level = 3', 'left')
+                ->where('cp.policy_no', $row['Policy_No'] ?? null)
+                ->orderBy('client_rm.id', 'DESC')
+                ->get()
+                ->getRowArray();
+
+            if (!$clientpolicy) {
+                log_message(
+                    'error',
+                    'HEALTH_INDIA - Sync TPA Claims | Client policy not found for policy_no: ' . ($row['Policy_No'] ?? 'N/A')
+                );
+                continue;
+            }
+
+            // Fetch employee / insured details
+            $employee = $this->db->table('employees e')
+                ->select("
+                    e.id as emp_id,
+                    e.emp_code,
+                    e.name as emp_name,
+                    e2.id as insured_emp_id,
+                    e2.name as insured_emp_name,
+                    ep.tpa_id as tpa_no,
+                    e.mobile as emp_mobile,
+                    e.email_corporate as emp_mail
+                ")
+                ->join(
+                    'employees e2',
+                    "e2.emp_code = e.emp_code AND e2.relationship = " . $this->db->escape($relationship),
+                    'left'
+                )
+                ->join('employee_polices ep', "ep.employee_id = e2.id ", 'left')
+                ->where('e.emp_code', $row['Employee_Code'] ?? null)
+                ->where('e.client_id', $clientpolicy['client_id'] ?? null)
+                ->where('e.relationship', 'self')
+                ->where('e.is_active', 1)
+                ->where('e2.is_active', 1)
+                ->where('ep.is_active', 1)
+                ->get()
+                ->getRowArray();
+
+            if (!$employee) {
+                log_message(
+                    'error',
+                    'HEALTH_INDIA - Sync TPA Claims | Employee data not found for emp_code: ' . ($row['Employee_Code'] ?? 'N/A') .
+                    ' | policy_no: ' . ($row['Policy_No'] ?? 'N/A') .
+                    ' | relationship: ' . $relationship
+                );
+                continue;
+            }
+
+            $claimData = [
+                // Core
+                'ticket_type_id'   => 1,
+                'claim_status_id'  => $claimStatus,
+                'policy_no'        => $row['Policy_No'] ?? null,
+                'claim_number'     => $row['CLAIM_NUMBER'] ?? null,
+                'tpa_claim_id'     => $row['CLAIM_NUMBER'] ?? null,
+
+                // Local primary/foreign keys
+                'tpa_id'           => $clientpolicy['tpa_id'] ?? $this->healthIndiaTpaId,
+                'insurer_id'       => $clientpolicy['insurer_id'] ?? null,
+                'client_policy_id' => $clientpolicy['client_policy_id'] ?? null,
+                'client_id'        => $clientpolicy['client_id'] ?? null,
+                'acm_id'           => $clientpolicy['acm_id'] ?? null,
+
+                // Employee / Insured
+                'emp_id'           => $employee['emp_id'] ?? null,
+                'insured_emp_id'   => $employee['insured_emp_id'] ?? null,
+                'tpa_no'           => $employee['tpa_no'] ?? null,
+                'emp_code'         => $row['Employee_Code'] ?? null,
+                'emp_name'         => $employee['emp_name'] ?? null,
+                'insured_name'     => $employee['insured_emp_name'] ?? ($row['PATIENT_NAME'] ?? null),
+                'relationship'     => $relationship,
+                'emp_mobile'       => $employee['emp_mobile'] ?? null,
+                'emp_mail'         => $employee['emp_mail'] ?? null,
+
+                // Claim info
+                'claim_type'         => 1,
+                'mode_of_intimation' => 5,
+                'claim_amount'       => $row['INTIMATED_AMOUNT'] ?? 0,
+
+                // Dates
+                'doa'              => !empty($row['DATEOF_ADMISSION']) ? date('Y-m-d', strtotime($row['DATEOF_ADMISSION'])) : null,
+                'dod'              => !empty($row['DATEOF_DISCHARGE']) ? date('Y-m-d', strtotime($row['DATEOF_DISCHARGE'])) : null,
+
+                // Hospital
+                'hospital_name'    => $row['HOSPITAL_NAME'] ?? null,
+                'hospital_address'    => $row['Hospital_address'] ?? null,
+                'hospital_pincode'    => $row['HOSPITAL_Pincode'] ?? null,
+                'hospital_state'    => $row['HOSPITAL_STATE'] ?? null,
+                'hospital_city'    => $row['HOSPITAL_CITY'] ?? null,
+
+                // TPA extras
+                'tpa_claim_status' => $status,
+
+                'created_at'       => date('Y-m-d H:i:s'),
+            ];
+
+            $this->db->table('ticket_master')->insert($claimData);
+            $insertedCount++;
+
+            log_message(
+                'error',
+                'HEALTH_INDIA - Sync TPA Claims | Inserted claim: ' . ($row['CLAIM_NUMBER'] ?? 'N/A')
+            );
+        }
+
+        log_message('error', 'HEALTH_INDIA - Sync TPA Claims | Completed | Total: ' . count($finalResult) . ' | Inserted: ' . $insertedCount);
+
+        return $this->response->setJSON([
+            'status'   => true,
+            'total'    => count($finalResult),
+            'inserted' => $insertedCount
+        ]);
+    }
+
     public function saveHealthIndiaAPIData($array)
     {
         $file_id = $array['file_id'];
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index af699248..41739b6a 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -1,7 +1,44 @@
 <?php
 namespace App\Controllers;
 
+
 use App\Controllers\Jobs;
+
+use CodeIgniter\API\ResponseTrait;
+
+
+use Exception;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+use App\Models\UserModel;
+use App\Models\ClientModel;
+use App\Models\ClientBranchModel;
+use App\Models\ClientPolicyModel;
+use App\Models\LevelContactModel;
+use App\Models\LeadsModel;
+use App\Models\PolicyTypeModel;
+use App\Models\KYCEntityTypeModel;
+use App\Models\PolicyTransactionStatusModel;
+use App\Models\InsurerBranchModel;
+use App\Models\TPABranchModel;
+use App\Models\RFQModel;
+use App\Models\InsurerModel;
+use App\Models\OccupancyMasterModel;
+use App\Models\LeadFilesModel;
+use App\Models\LeadInstallmentPaymentDetails;
+use App\Models\GmailSentHistoryModel;
+use App\Models\SalesActualLeadModel;
+use App\Models\SalesContactPersonModel;
+
+use App\Helpers\MailHelper;
+
 use App\Helpers\ExcelMergeHelper;
 use App\Helpers\ExcelSanitizeHelper;
 use App\Helpers\MailHelper;
@@ -70,6 +107,8 @@ class LeadsController extends BaseController
     protected $buisnessType;
     protected $member_data_excel_columns;
     protected $general_relationships;
+    protected $leadModel;
+    protected $contactModel;
 
     public function __construct()
     {
@@ -92,7 +131,10 @@ class LeadsController extends BaseController
         $this->occupancyModel                = new OccupancyMasterModel();
         $this->leadFilesModel                = new LeadFilesModel();
         $this->leadInstallmentPaymentDetails = new LeadInstallmentPaymentDetails();
-        $this->gmailSentHistoryModel         = new GmailSentHistoryModel();
+        $this->gmailSentHistoryModel = new GmailSentHistoryModel();
+        $this->leadModel = new SalesActualLeadModel();
+        $this->contactModel = new SalesContactPersonModel();
+
 
         $this->issuer       = [1 => 'JIBS', 2 => 'Nhance'];
         $this->clientType   = [1 => 'Group', 2 => 'Individual'];
@@ -616,7 +658,6 @@ class LeadsController extends BaseController
 
         $request_data = $this->request->getPost();
         $data         = sanitizeInputArrayAdvanced($request_data);
-
         $data['client_type'] = 1;
         $data['pan']         = "";
 
@@ -812,28 +853,28 @@ 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'],
-                'client_name'                => $data['client_name'],
-                'client_short_name'          => $data['client_short_name'],
-                'entity_type_id'             => $data['entity_type_id'],
-                'client_code'                => $data['client_code'],
-                'pan'                        => $data['pan'],
-                'gst'                        => $data['gst'],
-                'branch_name'                => $data['branch_name'],
-                'branch_code'                => $data['branch_code'],
-                'contact_person_name'        => $data['contact_person_name'],
-                'contact_person_mobile'      => $data['contact_person_mobile'],
-                'contact_person_email'       => $data['contact_person_email'],
-                'client_id'                  => $data['client_id'] ?? 0,
-                'client_branch_id'           => $data['client_branch_id'] ?? 0,
-                'is_client_created'          => $data['is_client_created'] ?? null,
-                'source_policy_id'           => $data['source_policy_id'] ?? 0,
-                'policy_type_id'             => $value,
-                'salse_person_id'            => $data['salse_person_id'] ?? 0,
-
+                'lost_reason'            => $data['lost_reason'] ?? null,
+                'actual_lead_id'         => $data['actual_lead_id'] ?? null,
+                'lead_type'              => $data['lead_type'],
+                'issuer'                 => $data['issuer'],
+                'client_type'            => $data['client_type'],
+                'client_name'            => $data['client_name'],
+                'client_short_name'      => $data['client_short_name'],
+                'entity_type_id'         => $data['entity_type_id'],
+                'client_code'            => $data['client_code'],
+                'pan'                    => $data['pan'],
+                'gst'                    => $data['gst'],
+                'branch_name'            => $data['branch_name'],
+                'branch_code'            => $data['branch_code'],
+                'contact_person_name'    => $data['contact_person_name'],
+                'contact_person_mobile'  => $data['contact_person_mobile'],
+                'contact_person_email'   => $data['contact_person_email'],
+                'client_id'              => $data['client_id'] ?? 0,
+                'client_branch_id'       => $data['client_branch_id'] ?? 0,
+                'is_client_created'      => $data['is_client_created'] ?? null,
+                'source_policy_id'       => $data['source_policy_id'] ?? 0,
+                'policy_type_id'         => $value,
+                'salse_person_id'        => $data['salse_person_id'] ?? 0,
                 'insurer_id'                 => $insurer_id ?? 0,
                 'insurer_branch_id'          => $insurer_branch_id ?? 0,
                 'tpa_id'                     => $tpa_id ?? 0,
@@ -4607,6 +4648,28 @@ class LeadsController extends BaseController
             'actual_lead_id'     => $actual_lead_id,
         ];
 
+        if ($actual_lead_id > 0) {
+
+            // 🔹 Client Details (Single Row)
+            $data['actual_lead_client_details'] = $this->leadModel
+                ->select('company_name, email, phone, address, website, gst_number, status, assigned_to')
+                ->where('lead_id', $actual_lead_id)
+                ->first();   // first row only
+
+
+            // 🔹 Contact Person Details (First Row Only)
+            $data['actual_lead_contact_person_details'] = $this->contactModel
+                ->select('contact_id, name, mobile, designation, email, is_primary')
+                ->where('lead_id', $actual_lead_id)
+                ->where('is_primary',1)
+                ->orderBy('is_primary', 'DESC') // optional (primary first)
+                ->first();   // only first row
+        }
+        else {
+            $data['actual_lead_client_details'] = null;
+            $data['actual_lead_contact_person_details'] = null;
+        }
+
         // Fetch sales team members who are active in team 5
         $data['salse_team'] = $this->userModel
             ->select('user_profiles.*')
diff --git a/app/Controllers/MediAssistApiController.php b/app/Controllers/MediAssistApiController.php
index a59c2637..05770e6f 100644
--- a/app/Controllers/MediAssistApiController.php
+++ b/app/Controllers/MediAssistApiController.php
@@ -141,7 +141,7 @@ class MediAssistApiController extends BaseController
             $this->db->table('ticket_master')
             ->where('id',$claimId)
             ->update([ 'tpa_push_response' => json_encode($response) ]);
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED', 'response' => $response];
         }
 
         // return $this->response->setJSON($response);
@@ -156,11 +156,11 @@ class MediAssistApiController extends BaseController
             ->where('id',$claimId)
             ->update([ 'tpa_claim_push_reference_no' => $claimRef ]);
 
-            return;
+            return ['status' => true, 'message' => 'Claim Push SUCCESS', 'response' => $response];
 
         } else {
             log_message('error','MEDI_ASSIST - Claim Push API Failed | claimReferenceNo EMPTY | claimId: '.$claimId.' | response: '.json_encode($response));
-            return;
+            return ['status' => false, 'message' => 'Claim Push API Failed', 'response' => $response];
         }
 
     }
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 59c115fe..c762866e 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -317,8 +317,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'Q',
                 'col_name' => 'Base Premium',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -329,8 +329,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'R',
                 'col_name' => 'Non commission permium Amount',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -341,8 +341,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'S',
                 'col_name' => 'TP Premium',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -353,8 +353,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'T',
                 'col_name' => 'IGST',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => 'check_gst_percentage',
                 'params' => ['row']
@@ -365,8 +365,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'U',
                 'col_name' => 'CGST',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => 'check_gst_percentage',
                 'params' => ['row']
@@ -377,8 +377,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'V',
                 'col_name' => 'SGST',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => 'check_gst_percentage',
                 'params' => ['row']
@@ -390,8 +390,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'W',
                 'col_name' => 'Stamp Duty',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -414,8 +414,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'X',
                 'col_name' => 'Agreed Amount',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -426,8 +426,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'Y',
                 'col_name' => 'Agreed BP Percentage',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -438,8 +438,8 @@ class PolicyTransactionController extends BaseController
                 'col_cell_name' => 'Z',
                 'col_name' => 'Agreed TP Percentage',
                 'is_mandatory' => false,
-                'data_type' => '',
-                'format' => null,
+                'data_type' => 'positive_number',
+                'format' => 'positive_number',
                 'allowed_values' => null,
                 'custom' => null,
                 'params' => null
@@ -6098,8 +6098,189 @@ class PolicyTransactionController extends BaseController
             return array('status' => false, 'message' => 'file_id is required');
         }
 
-        $this->policyTransactionModel->select()->findAll();
+        $data['is_active'] = 0;
+        $this->policyTransactionModel->where('file_id', $file_id)->set($data)->update();
+        $this->PTCOShareDetailsModel->where('file_id', $file_id)->set($data)->update();
 
+        return $this->respond(['status' => true, 'code' => 200, 'message' => 'BDS bulk upload data truncated successfully'], 200);
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    
+    /**
+     * Cron job: Daily BDS Report
+     * Fetches today's BDS entries, generates Excel (matching report_bds.php column order), and emails to recipients from .env.
+     * Recipients: comma-separated emails in bds.reportEmails
+     * File stored temporarily in writable/tmp/ and deleted after sending.
+    */
+    public function cronDailyBDSReport()
+    {
+       
+        helper('excel_import_export_helper');
+
+        $filePath = null;
+        try {
+
+            $today = date('Y-m-d', strtotime('-1 day'));
+            $reportList = $this->policyTransactionModel->getBDSReportList($today, $today,0,0,0,'created_at',0,0,0,0,0,[]);
+            
+            if (empty($reportList)) {
+                $this->myLogger->logme('error', "cronDailyBDSReport: No BDS records for {$today}");
+                return $this->respond(['status' => 'success', 'message' => 'No BDS records for today. No report sent.'], 200);
+            }
+
+            // Column headers exactly matching report_bds.php order (including display:none columns)
+            $headers = [
+                'S. No', 'User', 'Month', 'Business Type', 'Client Type', 'Insured Name', 'Transaction Type',
+                'Policy Type', 'BAP Group', 'Vehicle Number', 'Policy No', 'Endorsement No', 'Insurer Branch',
+                'Endorsement Effective Date', 'Policy Effective Date', 'Policy Expiry Date', 'Reference', 'Remarks',
+                'BP Premium', 'TP Premium', 'Premium (without GST)', 'Total Premium', 'Agreed BP %', 'Agreed TP %',
+                'Rewards', 'Agreed Amount', 'Invoiced Amount', 'Outstanding Amount',
+                'Salse Person', 'Service Person', 'Salse Person Branch', 'Installment', 'Data Received Date', 'Renewal Date',
+                'Co-Premium', 'Remuneration Pay By Leader', 'Salse Person Manager', 'Service Person Manager',
+                'Service Person Branch', 'Rollover Date', 'Policyholder Name', 'Insured (Same as Proposer)',
+                'Follower Policy No', 'Co-Share %', 'Non Commissional Premium Amount', 'CGST', 'SGST', 'IGST',
+                'Stamp Duty', 'Standard BP %', 'Standard TP %', 'Actual BP Amount', 'Actual TP Amount',
+                'Actual BP %', 'Actual TP %', 'Actual BP Remuneration Amount', 'Actual TP Remuneration Amount',
+                'CD Account No'
+            ];
+
+            $excelData = [];
+            foreach ($reportList as $idx => $row) {
+                $totalIrda = (float)($row['total_irda_amt'] ?? 0);
+                $billedAmt = (float)($row['billed_amt'] ?? 0);
+                $unbilledAmt = $totalIrda - $billedAmt;
+                if ($totalIrda == 0) {
+                    $unbilledAmt = abs($unbilledAmt);
+                }
+                $unbilledAmt = ($unbilledAmt == 0 && $billedAmt == 0) ? $totalIrda : $unbilledAmt;
+
+                $hasIrda = ($totalIrda != 0);
+
+                $excelData[] = [
+                    $idx + 1,
+                    $row['user_name'] ?? 'N/A',
+                    $row['policy_issue_month'] ?? 'N/A',
+                    $row['revenue_type'] ?? 'N/A',
+                    $row['client_type'] ?? 'N/A',
+                    $row['client_name'] ?? 'N/A',
+                    $row['action_type'] ?? 'N/A',
+                    $row['policy_type'] ?? 'N/A',
+                    $row['bap'] ?? 'N/A',
+                    $row['vehicle_no'] ?? 'N/A',
+                    $row['policy_no'] ?? 'N/A',
+                    $row['endorsement_no'] ?? 'N/A',
+                    $row['insurer_branch_name'] ?? 'N/A',
+                    !empty($row['endorse_eff_date']) ? change_date_format($row['endorse_eff_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    !empty($row['policy_start_date']) ? change_date_format($row['policy_start_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    !empty($row['policy_end_date']) ? change_date_format($row['policy_end_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    $row['ref'] ?? 'N/A',
+                    $row['remarks'] ?? 'N/A',
+                    $hasIrda ? ($row['bp_amt'] ?? '0.00') : '0.00',
+                    $hasIrda ? ($row['tp_or_ter'] ?? '0.00') : '0.00',
+                    $hasIrda ? ($row['premium_wo_gst'] ?? '0.00') : '0.00',
+                    $hasIrda ? ($row['total_premium'] ?? '0.00') : '0.00',
+                    $hasIrda ? ($row['agreed_bp_per'] ?? '0.00') . '%' : '0.00%',
+                    $hasIrda ? ($row['agreed_tp_or_ter_per'] ?? '0.00') . '%' : '0.00%',
+                    $row['reward'] ?? '0.00',
+                    $row['total_irda_amt'] ?? '0.00',
+                    !empty($row['billed_amt']) ? $row['billed_amt'] : '0.00',
+                    number_format((float)$unbilledAmt, 2, '.', ''),
+                    $row['salse_person_name'] ?? 'N/A',
+                    $row['service_person_name'] ?? 'N/A',
+                    $row['nhance_branch'] ?? 'N/A',
+                    $row['installment'] ?? 'N/A',
+                    !empty($row['data_received_date']) ? change_date_format($row['data_received_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    !empty($row['renewal_date']) ? change_date_format($row['renewal_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    $row['co_share'] ?? 'No',
+                    $row['bro_payable_by'] ?? 'No',
+                    $row['salse_manager_name'] ?? 'N/A',
+                    $row['service_manager_name'] ?? 'N/A',
+                    $row['service_branch'] ?? 'N/A',
+                    !empty($row['rollover_date']) ? change_date_format($row['rollover_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                    $row['policy_holder_name'] ?? 'N/A',
+                    $row['same_as_proposer'] ?? 'No',
+                    $row['follower_policy_no'] ?? 'N/A',
+                    number_format((float)($row['co_share_per'] ?? 0), 2),
+                    number_format((float)($row['non_comm_per_amt'] ?? 0), 2),
+                    number_format((float)($row['bp_cgst'] ?? 0), 2),
+                    number_format((float)($row['bp_sgst'] ?? 0), 2),
+                    number_format((float)($row['bp_igst'] ?? 0), 2),
+                    number_format((float)($row['stamp_duty'] ?? 0), 2),
+                    number_format((float)($row['standerd_bp_per'] ?? 0), 2),
+                    number_format((float)($row['standerd_tp_per'] ?? 0), 2),
+                    number_format((float)($row['actual_bp_amt'] ?? 0), 2),
+                    number_format((float)($row['actual_tp_amt'] ?? 0), 2),
+                    number_format((float)($row['actual_bp_per'] ?? 0), 2),
+                    number_format((float)($row['actual_tp_per'] ?? 0), 2),
+                    number_format((float)($row['actual_tep_brokerage_amt'] ?? 0), 2),
+                    number_format((float)($row['actual_tp_brokerage_amt'] ?? 0), 2),
+                    $row['cd_ac_no'] ?? 'N/A'
+                ];
+            }
+
+            $today = date('d-m-Y', strtotime($today));
+            $fileName = 'BDS_Daily_Report_' . $today . '.xlsx';
+            $tmpDir = WRITEPATH . 'tmp' . DIRECTORY_SEPARATOR;
+            if (!is_dir($tmpDir)) {
+                mkdir($tmpDir, 0755, true);
+            }
+            $filePath = $tmpDir . $fileName;
+
+            $generated = generate_excel($headers, $excelData, $filePath);
+            if (!$generated) {
+                $this->myLogger->logme('error', 'cronDailyBDSReport: Excel generation failed');
+                return $this->respond(['status' => false, 'message' => 'Excel generation failed'], 500);
+            }
+
+            $emailList = getenv('bds.dailyReportEmails') ?: '';
+            $recipientEmails = array_filter(array_map('trim', explode(',', $emailList)));
+            if (empty($recipientEmails)) {
+                @unlink($filePath);
+                $this->myLogger->logme('error', 'cronDailyBDSReport: No recipients in bds.dailyReportEmails. Report generated but not sent.');
+                return $this->respond([
+                    'status' => 'success',
+                    'message' => 'Report generated. No recipients configured (set bds.dailyReportEmails in .env).',
+                    'file' => $fileName
+                ], 200);
+            }
+
+            $subject = "BDS Report Up to - {$today}";
+            $message = "<p>Please find attached the BDS report up to {$today}.</p>";
+            $message .= "<p>Total records: " . count($reportList) . "</p>";
+
+            $attachments = [
+                ['filePath' => $filePath, 'fileName' => $fileName]
+            ];
+
+            $res = MailHelper::send_email([
+                'mail' => $recipientEmails,
+                'subject' => $subject,
+                'message' => $message,
+                'attachments' => $attachments
+            ]);
+
+            @unlink($filePath);
+
+            $resDecoded = is_string($res) ? json_decode($res, true) : $res;
+            if (isset($resDecoded['status']) && $resDecoded['status'] === 'success') {
+                $this->myLogger->logme('error', "cronDailyBDSReport: Report sent to " . count($recipientEmails) . " recipients");
+                return $this->respond([
+                    'status' => true,
+                    'message' => 'Report generated and emailed successfully.',
+                    'recipients' => count($recipientEmails)
+                ], 200);
+            }
+
+            $this->myLogger->logme('error', 'cronDailyBDSReport: Email send failed - ' . json_encode($resDecoded));
+            return $this->respond(['status' => false, 'message' => 'Report generated but email send failed'], 500);
+        } catch (Exception $e) {
+            if ($filePath && is_file($filePath)) {
+                @unlink($filePath);
+            }
+            $this->myLogger->logme('error', 'cronDailyBDSReport Exception: ' . $e->getMessage());
+            return $this->respond(['status' => false, 'message' => $e->getMessage()], 500);
+        }
     }
 
 }
diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php
index dccd9d91..39a0f672 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\SalesTargetModel;
 use App\Models\UserModel;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\API\ResponseTrait;
@@ -20,6 +21,8 @@ class SalesController extends BaseController
     protected $activityModel;
     protected $noteModel;
     protected $userModel;
+    protected $targetModel;
+    
 
     public function __construct()
     {
@@ -28,6 +31,7 @@ class SalesController extends BaseController
         $this->activityModel = new SalesActivityModel();
         $this->noteModel = new SalesLeadNoteModel();
         $this->userModel = new UserModel();
+        $this->targetModel = new SalesTargetModel();
     }
 
     
@@ -49,68 +53,145 @@ class SalesController extends BaseController
                                          ->orderBy('lead_id', 'DESC')
                                          ->findAll();
 
-        
         return $this->loadLayout('sales/activity_view', $data);
     }
 
     public function loadtargets(){
         $data = $this->getSalesStaffData();
         
-        $data['tab_name']  = 'Team Target';
-        $data['page_name'] = 'Team Target';
+        $data['tab_name']  = 'Sales Team Targets';
+        $data['page_name'] = 'Sales Team Targets';
         
         return $this->loadLayout('sales/target_view', $data);
     }
 
-    /**
-     * HELPER: Fetches Sales Managers based on the logged-in user's role and branch
-     */
+   /**
+    * HELPER: Fetches Sales Managers based on the logged-in user's role and branch
+    * sales_manager                Current branch | Role 4 + Team 5  | Assign To dropdown
+    * sales_manager_ids            Current branch | Role 4 + Team 5  | Query filter IDs
+    * sales_manager_with_head      Current branch | Role 1,4,5       | Branch reporting dropdown
+    * sales_manager_with_head_ids  Current branch | Role 1,4,5       | Branch reporting filter
+    * sales_team                   All branches   | Role 1,4,5       | Admin/global reporting
+    */
     private function getSalesStaffData(): array
     {
-        $db = \Config\Database::connect();
+        $db             = \Config\Database::connect();
         $logged_user_id = get_session_userid();
-        $role             = get_role_id();
-        $team_id          = user_team();
+        $role           = get_role_id();
+        $team_id        = user_team();
 
+        // ── Get logged-in user's profile ────────────────────────────────
+        $row = $db->table('user_profiles')
+                ->where('is_active', 1)
+                ->where('id', $logged_user_id)
+                ->get()->getRow();
+
+        $nhance_branch_id = $row ? $row->nhance_branch_id : null;
+
+        // ── Base result structure ────────────────────────────────────────
         $data = [
-            'users' => [],
-            'sales_manager_ids' => []
+            'sales_role'                  => '',
+            'sales_manager'               => [],
+            'sales_manager_ids'           => [],
+            'sales_manager_with_head'     => [],
+            'sales_manager_with_head_ids' => [],
+            'sales_team'                  => [],
+            'nhance_branch_id'            => $nhance_branch_id,
         ];
 
-         $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;
-    
-        // Is the logged-in user a Sales Manager? (Role 4, Team 5)
-        if ($role == 4 && in_array(5, $team_id)) {    
+        // ================================================================
+        // QUERY 1: Get all MANAGERS in current branch
+        //          Role = 4  AND  Team = 5  AND  same branch
+        // ================================================================
+        $branch_managers = $db->table('user_profiles up')
+            ->select('up.id, up.first_name, up.role, up.nhance_branch_id')
+            ->join('user_teams ut', 'ut.user_id = up.id')
+            ->where('up.is_active', 1)
+            ->where('ut.is_active', 1)
+            ->where('up.role', 4)           // Sales Manager role
+            ->where('ut.team_id', 5)        // Sales team
+            ->where('up.nhance_branch_id', $nhance_branch_id) // same branch
+            ->groupBy('up.id')
+            ->get()->getResultArray();
+
+        // ================================================================
+        // QUERY 2: Get all HEADS in current branch
+        //          Role = 1 or 5  AND  same branch
+        // ================================================================
+        $branch_heads = $db->table('user_profiles')
+            ->select('id, first_name, role, nhance_branch_id')
+            ->where('is_active', 1)
+            ->whereIn('role', [1, 5])       // Sales Head roles
+            ->where('nhance_branch_id', $nhance_branch_id) // same branch
+            ->get()->getResultArray();
+
+        // Add "(Head)" label to heads so dropdown is clear
+        foreach ($branch_heads as &$head) {
+            $head['first_name'] = $head['first_name'] . ' (Head)';
+        }
+        unset($head);
+
+        // ================================================================
+        // QUERY 3: Get ALL MANAGERS across ALL branches
+        //          Role = 4  AND  Team = 5  (no branch filter)
+        // ================================================================
+        $all_managers = $db->table('user_profiles up')
+            ->select('up.id, up.first_name, up.role, up.nhance_branch_id')
+            ->join('user_teams ut', 'ut.user_id = up.id')
+            ->where('up.is_active', 1)
+            ->where('ut.is_active', 1)
+            ->where('up.role', 4)           // Sales Manager role
+            ->where('ut.team_id', 5)        // Sales team
+            ->groupBy('up.id')
+            ->get()->getResultArray();
+
+        // ================================================================
+        // QUERY 4: Get ALL HEADS across ALL branches
+        //          Role = 1 or 5  (no branch filter)
+        // ================================================================
+        $all_heads = $db->table('user_profiles')
+            ->select('id, first_name, role, nhance_branch_id')
+            ->where('is_active', 1)
+            ->whereIn('role', [1, 5])       // Sales Head roles
+            ->get()->getResultArray();
+
+        // Add "(Head)" label to all heads
+        foreach ($all_heads as &$head) {
+            $head['first_name'] = $head['first_name'] . ' (Head)';
+        }
+        unset($head);
+
+        // ================================================================
+        // BUILD: sales_manager_with_head  =  branch heads + branch managers
+        // ================================================================
+        $data['sales_manager_with_head']     = array_merge($branch_heads, $branch_managers);
+        $data['sales_manager_with_head_ids'] = array_column($data['sales_manager_with_head'], 'id');
+
+        // ================================================================
+        // BUILD: sales_team  =  all heads + all managers (every branch)
+        // ================================================================
+        $data['sales_team'] = array_merge($all_heads, $all_managers);
+
+        // ── Sales Manager (Role 4, Team 5) ──────────────────────────────
+        if ($role == 4 && in_array(5, $team_id)) {
+
+            $data['sales_role']        = 'Sales Manager';
+            $data['sales_manager']     = [[           // only himself
+                'id'               => $row->id,
+                'first_name'       => $row->first_name,
+                'role'             => $role,
+                'nhance_branch_id' => $nhance_branch_id,
+            ]];
             $data['sales_manager_ids'] = [$logged_user_id];
-            
-            $data['users'] = [
-                [
-                    'id'               => $row->id,
-                    'first_name'    => $row->first_name,
-                    'nhance_branch_id' => $nhance_branch_id
-                ]
-            ];
 
-        } 
-        // Otherwise fetch ALL sales managers in this branch
-        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')
-                                ->join('user_teams ut', 'ut.user_id = up.id')
-                                ->where('up.is_active', 1)
-                                ->where('ut.is_active', 1)
-                                ->where('up.role', 4)
-                                ->where('ut.team_id', 5)
-                                ->where('up.nhance_branch_id', $nhance_branch_id)
-                                ->get()
-                                ->getResultArray();
+        // ── Sales Head (Role 1 or 5) ─────────────────────────────────────
+        } elseif (in_array($role, [1, 5])) {
 
-            $data['sales_manager_ids'] = array_column($data['users'], 'id');
+            $data['sales_role']                  = 'Sales Head';
+            $data['sales_manager']               = $branch_managers; // reuse QUERY 1 result
+            $data['sales_manager_ids']           = array_column($branch_managers, 'id');
+            $data['sales_manager_with_head']     = array_merge($branch_heads, $branch_managers); // reuse
+            $data['sales_manager_with_head_ids'] = array_column($data['sales_manager_with_head'], 'id');
         }
 
         return $data;
@@ -136,6 +217,9 @@ class SalesController extends BaseController
             echo view('layout/footer', $data);
     }
 
+    /**
+     * GET /api/sales/activities/(:num)/complete
+     */
     public function completeActivity($id) {
         try {
             $data = $this->request->getJSON(true);
@@ -223,7 +307,8 @@ class SalesController extends BaseController
                 'data' => $result['data'],
                 'total' => $result['total'],
                 'limit' => $limit,
-                'offset' => $offset
+                'offset' => $offset,
+                'counts' => $result['counts'],
             ]);
         } catch (\Exception $e) {
             return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
@@ -385,6 +470,15 @@ class SalesController extends BaseController
             $data = $this->request->getJSON(true);
             $data['updated_by'] = $this->getUserId();
 
+            $contact = $this->contactModel->find($id);
+
+            if (isset($data['is_primary']) && $data['is_primary'] == 1) {
+                // Reset all contacts for this lead to 0 primary
+                $this->contactModel->where('lead_id', $contact['lead_id'])
+                                ->set(['is_primary' => 0])
+                                ->update();
+            }
+
             if (!$this->contactModel->update((int)$id, $data)) {
                 return $this->fail($this->contactModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
@@ -474,7 +568,8 @@ class SalesController extends BaseController
                 'data' => $result['data'],
                 'total' => $result['total'],
                 'limit' => $limit,
-                'offset' => $offset
+                'offset' => $offset,
+                'counts' => $result['counts'],
             ], 200);
 
         } catch (\Exception $e) {
@@ -552,6 +647,11 @@ class SalesController extends BaseController
             $data['created_by'] = $this->getUserId();
             $data['updated_by'] = $this->getUserId();
 
+            // FIX: Convert the array to a JSON string so it fits in the VARCHAR column
+            if (isset($data['additional_assigned_ids']) && is_array($data['additional_assigned_ids'])) {
+                $data['additional_assigned_ids'] = json_encode($data['additional_assigned_ids']);
+            }
+
             if (!$this->activityModel->insert($data)) {
                 return $this->fail($this->activityModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
@@ -562,6 +662,11 @@ class SalesController extends BaseController
             $activityId = $this->activityModel->getInsertID();
             $activity = $this->activityModel->find((int)$activityId);
 
+            // OPTIONAL: Decode it back to an array for the API response so the frontend gets a clean array
+            if (isset($activity['additional_assigned_ids'])) {
+                $activity['additional_assigned_ids'] = json_decode($activity['additional_assigned_ids'], true);
+            }
+
             return $this->respondCreated([
                 'status' => 'success',
                 'message' => 'Activity created successfully',
@@ -587,12 +692,22 @@ class SalesController extends BaseController
             $data = $this->request->getJSON(true);
             $data['updated_by'] = $this->getUserId();
 
+            // FIX: Convert the array to a JSON string for updating
+            if (isset($data['additional_assigned_ids']) && is_array($data['additional_assigned_ids'])) {
+                $data['additional_assigned_ids'] = json_encode($data['additional_assigned_ids']);
+            }
+
             if (!$this->activityModel->update($id, $data)) {
                 return $this->fail($this->activityModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
             }
 
             $activity = $this->activityModel->find((int)$id);
 
+            // OPTIONAL: Decode it back to an array for the API response
+            if (isset($activity['additional_assigned_ids'])) {
+                $activity['additional_assigned_ids'] = json_decode($activity['additional_assigned_ids'], true);
+            }
+
             return $this->respond([
                 'status' => 'success',
                 'message' => 'Activity updated successfully',
@@ -760,6 +875,138 @@ class SalesController extends BaseController
         }
     }
 
+    // ==================== SALES TARGET APIs ====================
+    /**
+     * Get all sales targets
+     * GET /api/sales/targets
+     */
+    public function getTargets()
+    {
+        try {
+            $targets = $this->targetModel->findAll();
+            return $this->respond([
+                'status' => 'success',
+                'data' => $targets
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Get sales target by user
+     * GET /api/sales/targets/user/{userId}
+     */
+    public function getTargetByUser($userId)
+    {
+        try {
+            $targets = $this->targetModel->where('user_id', $userId)->findAll();
+            return $this->respond([
+                'status' => 'success',
+                'data' => $targets
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Get sales target by FY year
+     * GET /api/sales/targets/fy/{fyYear}
+     */
+    public function getTargetByFY($fyYear)
+    {
+        try {
+            $targets = $this->targetModel->where('fy_year', $fyYear)->findAll();
+            return $this->respond([
+                'status' => 'success',
+                'data' => $targets
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Create sales target
+     * POST /api/sales/targets
+     */
+    public function createTarget()
+    {
+        try {
+            $data = $this->request->getJSON(true);
+            $data['created_by'] = $this->getUserId();
+            $data['updated_by'] = $this->getUserId();
+
+            if (!$this->targetModel->insert($data)) {
+                return $this->fail($this->targetModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
+            }
+
+            $targetId = $this->targetModel->getInsertID();
+            $target = $this->targetModel->find((int)$targetId);
+
+            return $this->respondCreated([
+                'status' => 'success',
+                'message' => 'Sales target created successfully',
+                'data' => $target
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Update sales target
+     * PUT /api/sales/targets/{id}
+     */
+    public function updateTarget($id)
+    {
+        try {
+            $target = $this->targetModel->find((int)$id);
+            if (!$target) {
+                return $this->failNotFound('Sales target not found');
+            }
+
+            $data = $this->request->getJSON(true);
+            $data['updated_by'] = $this->getUserId();
+
+            if (!$this->targetModel->update($id, $data)) {
+                return $this->fail($this->targetModel->errors(), ResponseInterface::HTTP_BAD_REQUEST);
+            }
+
+            $updatedTarget = $this->targetModel->find((int)$id);
+            return $this->respond([
+                'status' => 'success',
+                'message' => 'Sales target updated successfully',
+                'data' => $updatedTarget
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Delete sales target
+     * DELETE /api/sales/targets/{id}
+     */
+    public function deleteTarget($id)
+    {
+        try {
+            $target = $this->targetModel->find((int)$id);
+            if (!$target) {
+                return $this->failNotFound('Sales target not found');
+            }
+
+            $this->targetModel->delete((int)$id);
+            return $this->respondDeleted([
+                'status' => 'success',
+                'message' => 'Sales target deleted successfully'
+            ]);
+        } catch (\Exception $e) {
+            return $this->fail($e->getMessage(), ResponseInterface::HTTP_INTERNAL_SERVER_ERROR);
+        }
+    }
+
     // ==================== HELPER METHODS ====================
 
     /**
@@ -782,281 +1029,896 @@ class SalesController extends BaseController
 
 
     // ==================== Dashboard ====================
-    public function dashboard(){
 
-        $logged_user_id   = get_session_userid();
-        $role             = get_role_id();
-        $team_id          = user_team();
-        $payload          = $this->request->getGet();
+// ─────────────────────────────────────────────
+// HELPER: Build FY date range from fy_year string
+// e.g. "2024-2025" → ['2024-04-01 00:00:00', '2025-03-31 23:59:59']
+// ─────────────────────────────────────────────
+private function getFYDateRange(string $financialYear): array
+{
+    // Format: "2025-2026" — split on last hyphen to get start=2025, end=2026
+    $pos       = strrpos($financialYear, '-');
+    $startYear = substr($financialYear, 0, $pos);          // "2025"
+    $endYear   = substr($financialYear, $pos + 1);          // "2026"
 
-        $db = \Config\Database::connect();
+    return [
+        'start' => $startYear . '-04-01 00:00:00',   // 2025-04-01 00:00:00
+        'end'   => $endYear   . '-03-31 23:59:59',   // 2026-03-31 23:59:59
+    ];
+}
 
-        $row = $db->table('user_profiles')
-          ->select('*')
-          ->where('is_active', 1)
-          ->where('id', $logged_user_id)
-          ->get()
-          ->getRowArray();
+// ─────────────────────────────────────────────
+// HELPER: FY quarters  (Apr-Jun / Jul-Sep / Oct-Dec / Jan-Mar)
+// ─────────────────────────────────────────────
+private function getFYQuarters(string $financialYear): array
+{
+    $pos = strrpos($financialYear, '-');
+    $sy  = (int)substr($financialYear, 0, $pos);       // 2025
+    $ey  = (int)substr($financialYear, $pos + 1);       // 2026
 
-        $nhance_branch_id = $row ? $row['nhance_branch_id'] : null;
+    return [
+        ['name' => 'Q1', 'label' => "Q1 (Apr–Jun {$sy})",   'start' => "{$sy}-04-01",   'end' => "{$sy}-06-30"],
+        ['name' => 'Q2', 'label' => "Q2 (Jul–Sep {$sy})",   'start' => "{$sy}-07-01",   'end' => "{$sy}-09-30"],
+        ['name' => 'Q3', 'label' => "Q3 (Oct–Dec {$sy})",   'start' => "{$sy}-10-01",   'end' => "{$sy}-12-31"],
+        ['name' => 'Q4', 'label' => "Q4 (Jan–Mar {$ey})",   'start' => "{$ey}-01-01",   'end' => "{$ey}-03-31"],
+    ];
+}
 
-        // dd($logged_user_id, $nhance_branch_id, $role, $team_id );
+// ─────────────────────────────────────────────
+// dashboard() — entry point
+// ─────────────────────────────────────────────
+public function dashboard()
+{
+    $payload         = $this->request->getGet();
+    $base            = $this->getSalesStaffData();
+    $salesRole       = $base['sales_role'];
+    $salesManagerIds = $base['sales_manager_ids'];
+    $userId          = get_session_userid();
 
-        if (in_array($role,[1,5])) {
+    // Get branch id
+    $nhanceBranchId  = $base['sales_manager'][0]['nhance_branch_id'] ?? null;
 
-            $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);
-        }
-        
+    $current_fin_year = $payload['fy'] ?? getCurrentFinancialYear();
+
+    $db = \Config\Database::connect();
+
+    // Available FY years for dropdown
+    $fin_years_raw = $db->table('sales_target')
+        ->select('fy_year', false)   // false = no backtick escaping
+        ->distinct()
+        ->orderBy('fy_year', 'DESC')
+        ->get()
+        ->getResultArray();
+
+    $fin_years = array_column($fin_years_raw, 'fy_year');
+
+    if (empty($fin_years)) {
+        $fin_years[] = $current_fin_year;
     }
 
-    public function branchLevelDashboard($branchId,$sales_manager_ids)
-    {
-        // Hardcoded branch ID as requested
-        // $branchId = 1;
+    // Ensure current FY is available in list
+    if (!in_array($current_fin_year, $fin_years)) {
+        array_unshift($fin_years, $current_fin_year);
+    }
 
-        try {
-          $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
-                $total_leads        = 0;
-                $total_activity     = 0;
-                $total_completed_activity = 0;
-                $total_pending_activity   = 0;
-                $pending_activities = [];
-                $recent_activities      = [];
-                $teamPerformance    = [];
-                
-                $leadsOverview      = [];
-          } else {
+    // Route by role
+    if ($salesRole === 'Sales Head') {
+        $this->branchLevelDashboard($nhanceBranchId, $salesManagerIds, $current_fin_year, $fin_years);
+    } elseif ($salesRole === 'Sales Manager') {
+        $this->salesManagerLevelDashboard($userId, $current_fin_year, $fin_years);
+    }
+}
 
-            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();
+// ─────────────────────────────────────────────
+// branchLevelDashboard()
+// ─────────────────────────────────────────────
+public function branchLevelDashboard($branchId, $sales_manager_ids, $current_fin_year, $fin_years)
+{
+    try {
+        $sales_manager_ids = array_values(array_filter(array_map('intval', $sales_manager_ids)));
 
-            // 3. Completed  activity
-            $total_completed_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->where('status', 'completed')->countAllResults();
+        $db        = \Config\Database::connect();
+        $fyRange   = $this->getFYDateRange($current_fin_year);
+        $fyStart   = $fyRange['start'];
+        $fyEnd     = $fyRange['end'];
 
-            // 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, 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)
-                ->get()->getResultArray();
-
-            // 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();
-            
-            // 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')
-                                    ->whereIn('sa.assigned_to', $sales_manager_ids)
-                                    ->where('sa.status', 'pending')
-                                    ->get()->getResultArray();
-
-            // 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
-                            ')
-                            ->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();
-            
-            // 9. Activity BrakDown
-            $activityBreakdown = $db->table('sales_activities')
-                ->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();
-          }
+        if (empty($sales_manager_ids)) {
+            // ── No team members — return empty dashboard ──
             $data = [
-                '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"
+                'total_leads'        => 0,
+                'total_acts'         => 0,
+                'total_completed_acts' => 0,
+                'total_pending_acts' => 0,
+                'team'               => [],
+                'pending_acts'       => [],
+                'leads_overview'     => [],
+                'activity_breakdown' => [],
+                'team_achievement'   => [],
+                'opp_achievement'    => [],
+                'fin_years'          => $fin_years,
+                'current_fin_year'   => $current_fin_year,
+                'tab_name'           => 'Sales Dashboard',
+                'page_name'          => 'Sales Dashboard',
             ];
-
-            // dd($data);
-
             $this->loadLayout('sales/branch_level_dashboard_view', $data);
-
-            // return view('sales/dashboard_view', $data);
-
-        } catch (\Exception $e) {
-            return $this->failServerError($e->getMessage());
+            return;
         }
+
+        // 1. Lead count — FY filtered by created_at
+        $total_leads = $this->leadModel
+            ->whereIn('assigned_to', $sales_manager_ids)
+            ->where('created_at >=', $fyStart)
+            ->where('created_at <=', $fyEnd)
+            ->countAllResults();
+
+        // 2. Total activities — FY filtered by scheduled_date
+        $total_activity = $this->activityModel
+            ->whereIn('assigned_to', $sales_manager_ids)
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->countAllResults();
+
+        // 3. Completed activities — FY filtered
+        $total_completed_activity = $this->activityModel
+            ->whereIn('assigned_to', $sales_manager_ids)
+            ->where('status', 'completed')
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->countAllResults();
+
+        // 4. Pending activities — FY filtered
+        $total_pending_activity = $this->activityModel
+            ->whereIn('assigned_to', $sales_manager_ids)
+            ->where('status', 'pending')
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->countAllResults();
+
+        // 5. Team Performance — subqueries FY filtered by scheduled_date
+        $teamPerformance = $db->table('user_profiles as u')
+            ->select("u.id, u.first_name, u.last_name, r.role,
+                (SELECT COUNT(*) FROM sales_activities
+                 WHERE assigned_to = u.id
+                   AND scheduled_date >= '{$fyStart}'
+                   AND scheduled_date <= '{$fyEnd}') as total_acts,
+                (SELECT COUNT(*) FROM sales_activities
+                 WHERE assigned_to = u.id AND status = 'completed'
+                   AND scheduled_date >= '{$fyStart}'
+                   AND scheduled_date <= '{$fyEnd}') as done_acts", false)
+            ->join('roles r', 'r.id = u.role')
+            ->where('u.nhance_branch_id', $branchId)
+            ->whereIn('u.id', $sales_manager_ids)
+            ->where('u.is_active', 1)
+            ->get()
+            ->getResultArray();
+
+        // 6. Pending Activities list — FY filtered by scheduled_date
+        $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')
+            ->whereIn('sa.assigned_to', $sales_manager_ids)
+            ->where('sa.status', 'pending')
+            ->where('sa.scheduled_date >=', $fyStart)
+            ->where('sa.scheduled_date <=', $fyEnd)
+            ->orderBy('sa.scheduled_date', 'DESC')
+            ->get()
+            ->getResultArray();
+
+        // 7. All Leads Overview — FY filtered by sal.created_at
+        // Activities & opportunities also scoped to FY via CASE WHEN
+        $leadsOverview = $db->table('sales_actual_leads sal')
+            ->select("sal.lead_id, sal.company_name, sal.status,
+                      up.first_name AS assigned_to,
+                      COUNT(DISTINCT CASE WHEN sa.scheduled_date >= '{$fyStart}'
+                            AND sa.scheduled_date <= '{$fyEnd}' THEN sa.activity_id END) AS activities,
+                      COUNT(DISTINCT CASE WHEN l.updated_at >= '{$fyStart}'
+                            AND l.updated_at <= '{$fyEnd}' THEN l.id END) AS opportunities", false)
+            ->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')
+            ->whereIn('sal.assigned_to', $sales_manager_ids)
+            ->where('sal.created_at >=', $fyStart)
+            ->where('sal.created_at <=', $fyEnd)
+            ->groupBy('sal.lead_id, sal.company_name, sal.status, up.first_name')
+            ->orderBy('sal.created_at', 'DESC')
+            ->get()
+            ->getResultArray();
+
+        // Protect against division by zero in query #8
+        $total_activity_safe = $total_activity > 0 ? $total_activity : 1;
+
+        // 8. Activity Breakdown — FY filtered by scheduled_date
+        $activityBreakdown = $db->table('sales_activities')
+            ->select("activity_type,
+                      COUNT(*) AS total,
+                      ROUND(COUNT(*) * 100.0 / {$total_activity_safe}, 0) AS percentage", false)
+            ->whereIn('assigned_to', $sales_manager_ids)
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->groupBy('activity_type')
+            ->orderBy('total', 'DESC')
+            ->get()
+            ->getResultArray();
+
+        // 9. Team Achievement (for achievement list + modal)
+        $teamAchievement = $this->buildTeamAchievement(
+            $db, $sales_manager_ids, $branchId, $current_fin_year, $fyStart, $fyEnd
+        );
+
+        // 10. Opportunities Achievement per member
+        $oppAchievement = $this->buildOppAchievement(
+            $db, $sales_manager_ids, $branchId, $current_fin_year, $fyStart, $fyEnd
+        );
+
+        $data = [
+            'total_leads'          => $total_leads,
+            'total_acts'           => $total_activity,
+            'total_completed_acts' => $total_completed_activity,
+            'total_pending_acts'   => $total_pending_activity,
+            'team'                 => $teamPerformance,
+            'pending_acts'         => $pending_activities,
+            'leads_overview'       => $leadsOverview,
+            'activity_breakdown'   => $activityBreakdown,
+            'team_achievement'     => $teamAchievement,   // used by JS TEAM constant
+            'opp_achievement'      => $oppAchievement,    // used by JS OPP_DATA constant
+            'fin_years'            => $fin_years,
+            'current_fin_year'     => $current_fin_year,
+            'tab_name'             => 'Sales Dashboard',
+            'page_name'            => 'Sales Dashboard',
+        ];
+
+        $this->loadLayout('sales/branch_level_dashboard_view', $data);
+
+    } catch (\Exception $e) {
+        return $this->failServerError($e->getMessage());
+    }
+}
+
+// ─────────────────────────────────────────────
+// buildTeamAchievement()
+// Builds the TEAM array for the achievement list
+// ─────────────────────────────────────────────
+private function buildTeamAchievement($db, array $sales_manager_ids, $branchId, string $fy, string $fyStart, string $fyEnd): array
+{
+    $quarters = $this->getFYQuarters($fy);
+
+    // Gradient palette (cycles)
+    $gradients = [
+        ['grad' => 'linear-gradient(135deg,#10b981,#34d399)', 'color' => '#10b981'],
+        ['grad' => 'linear-gradient(135deg,#06b6d4,#67e8f9)', 'color' => '#06b6d4'],
+        ['grad' => 'linear-gradient(135deg,#4f46e5,#818cf8)', 'color' => '#4f46e5'],
+        ['grad' => 'linear-gradient(135deg,#ec4899,#f9a8d4)', 'color' => '#ec4899'],
+        ['grad' => 'linear-gradient(135deg,#f97316,#fbbf24)', 'color' => '#f97316'],
+    ];
+
+    $members = $db->table('user_profiles as u')
+        ->select('u.id, u.first_name, u.last_name, r.role')
+        ->join('roles r', 'r.id = u.role')
+        ->where('u.nhance_branch_id', $branchId)
+        ->whereIn('u.id', $sales_manager_ids)
+        ->where('u.is_active', 1)
+        ->get()
+        ->getResultArray();
+
+    $result = [];
+
+    foreach ($members as $idx => $m) {
+        $uid = (int)$m['id'];
+
+        // Target from sales_target
+        $targetRow = $db->table('sales_target')
+            ->where('user_id', $uid)
+            ->where('fy_year', $fy)
+            ->get()
+            ->getRowArray();
+        $targetAmt = (float)($targetRow['target_amount'] ?? 0);
+
+        // Achieved (won leads in FY)
+        $achievedAmt = (float)$this->getUserAchievedAmount($fy, $uid);
+
+        // Activities — FY filtered by scheduled_date
+        $totalActs = $db->table('sales_activities')
+            ->where('assigned_to', $uid)
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->countAllResults();
+        $doneActs  = $db->table('sales_activities')
+            ->where('assigned_to', $uid)
+            ->where('status', 'completed')
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->countAllResults();
+
+        // Activity breakdown — FY filtered
+        $actRows = $db->table('sales_activities')
+            ->select('activity_type, COUNT(*) as cnt')
+            ->where('assigned_to', $uid)
+            ->where('scheduled_date >=', $fyStart)
+            ->where('scheduled_date <=', $fyEnd)
+            ->groupBy('activity_type')
+            ->get()->getResultArray();
+        $activities = [];
+        foreach ($actRows as $ar) {
+            $activities[$ar['activity_type']] = (int)$ar['cnt'];
+        }
+
+        // Quarter splits
+        $splits = [];
+        foreach ($quarters as $q) {
+            $qStart = $q['start'] . ' 00:00:00';
+            $qEnd   = $q['end']   . ' 23:59:59';
+
+            // Achievement = SUM(exp_amt) for won policies in this quarter
+            $qAchievedRow = $db->query("
+                SELECT COALESCE(SUM(ptcs.exp_amt), 0) AS total
+                FROM policy_transaction pt
+                LEFT JOIN pt_co_share_details ptcs
+                       ON ptcs.pt_id = pt.id
+                      AND ptcs.is_active = 1
+                  WHERE pt.sales_generated_by = ?
+                  AND pt.issuer_branch      = ?
+                  AND pt.created_at        >= ?
+                  AND pt.created_at        <= ?
+            ", [$uid, $branchId, $qStart, $qEnd])->getRowArray();
+            $qAchieved = (float)($qAchievedRow['total'] ?? 0);
+
+            $qTarget = $targetAmt > 0 ? round($targetAmt / 4, 2) : 0;
+
+            $qActs = $db->table('sales_activities')
+                ->where('assigned_to', $uid)
+                ->where('scheduled_date >=', $qStart)
+                ->where('scheduled_date <=', $qEnd)
+                ->countAllResults();
+
+            $qDone = $db->table('sales_activities')
+                ->where('assigned_to', $uid)
+                ->where('status', 'completed')
+                ->where('scheduled_date >=', $qStart)
+                ->where('scheduled_date <=', $qEnd)
+                ->countAllResults();
+
+            $qLeads = $db->table('sales_actual_leads')
+                ->where('assigned_to', $uid)
+                ->where('created_at >=', $qStart)
+                ->where('created_at <=', $qEnd)
+                ->countAllResults();
+
+            $splits[] = [
+                'name'     => $q['label'],
+                'start'    => date('M Y', strtotime($q['start'])),
+                'end'      => date('M Y', strtotime($q['end'])),
+                'target'   => $qTarget,
+                'achieved' => $qAchieved,
+                'acts'     => $qActs,
+                'done'     => $qDone,
+                'leads'    => $qLeads,
+            ];
+        }
+
+        $palette = $gradients[$idx % count($gradients)];
+
+        $result[] = [
+            'id'           => $uid,
+            'first_name'   => $m['first_name'],
+            'last_name'    => $m['last_name'],
+            'role'         => $m['role'],
+            'total_acts'   => $totalActs,
+            'done_acts'    => $doneActs,
+            'target_amt'   => $targetAmt,
+            'achieved_amt' => $achievedAmt,
+            'grad'         => $palette['grad'],
+            'color'        => $palette['color'],
+            'splits'       => $splits,
+            'activities'   => $activities,
+        ];
     }
 
-    public function salesManagerLevelDashboard($userId,$sales_manager_ids, $payload = [])
-    {
-        // $userId = get_session_userid();
-        // $userId = 1;
-        $db = \Config\Database::connect();
+    return $result;
+}
 
-        try {
+// ─────────────────────────────────────────────
+// buildOppAchievement()
+// Opportunities via policy_transaction + pt_co_share_details
+// Returns per-member: totals + flat policy list (no quarterly grouping)
+// ─────────────────────────────────────────────
+private function buildOppAchievement($db, array $sales_manager_ids, $branchId, string $fy, string $fyStart, string $fyEnd): array
+{
+    $result = [];
 
-            // $payload = $this->request->getGet();
-            $current_fin_year = $payload['fy'] ?? getCurrentFinancialYear();
+    foreach ($sales_manager_ids as $uid) {
 
-            
-            $fin_years = $db->table('sales_target')
-                ->select('fy_year')
-                ->where('user_id', $userId)
-                ->orderBy('fy_year', 'desc')
-                ->get()
-                ->getResultArray();
+        // ── Target ──
+        $targetRow = $db->table('sales_target')
+            ->where('user_id', $uid)
+            ->where('fy_year', $fy)
+            ->get()
+            ->getRowArray();
+        $targetAmt = (float)($targetRow['target_amount'] ?? 0);
 
-            $fin_years = array_column($fin_years, 'fy_year');
+        // ── All policy rows for this user in FY ──
+        // policy_no, issue_date (from pt), amount (exp_amt from child), created_at
+        // If no matching pt_co_share_details row exists, exp_amt = 0
+        // Policy list for Tab 2: policy_transaction + exp_amt from pt_co_share_details
+        $policyRows = $db->query("
+            SELECT
+                pt.id,
+                pt.policy_no,
+                pt.created_at                AS issue_date,
+                COALESCE(ptcs.exp_amt, 0)    AS amount,
+                pt.created_at                AS created_at
+            FROM policy_transaction pt
+            LEFT JOIN pt_co_share_details ptcs
+                   ON ptcs.pt_id = pt.id
+                  AND ptcs.is_active = 1
+              WHERE pt.sales_generated_by = ?
+              AND pt.issuer_branch      = ?
+              AND pt.created_at        >= ?
+              AND pt.created_at        <= ?
+            ORDER BY pt.created_at DESC
+        ", [$uid, $branchId, $fyStart, $fyEnd])->getResultArray();
 
-            if(empty($fin_years)){
-                $fin_years[] = $current_fin_year;
-            }
+        // ── Totals derived from policy_transaction ──
+        $totalPolicies = count($policyRows);
+        $totalExpAmt   = array_sum(array_column($policyRows, 'amount'));
 
-            $target = $db->table('sales_target')
-                ->where('user_id', $userId)
-                ->where('fy_year', $current_fin_year)
-                ->get()
-                ->getRowArray();
-
-            $targetAmount = $target['target_amount'] ?? 0.00; 
-
-            // get achieved amount from leads table
-            $achievedAmount = $this->getUserAchievedAmount($current_fin_year, $userId);
-
-            $remainingAmount = $targetAmount - $achievedAmount;
-            // $achievementPercent = ($targetAmount > 0) ? round(($achievedAmount / $targetAmount) * 100) : 0;
-            $achievementPercent = ($targetAmount > 0) ? min(100, round(($achievedAmount / $targetAmount) * 100)) : 0;
-
-            $activitySummary = [
-                'total'     => $this->activityModel->where('assigned_to', $userId)->countAllResults(),
-                'pending'   => $this->activityModel->where(['assigned_to' => $userId, 'status' => 'pending'])->countAllResults(),
-                'completed' => $this->activityModel->where(['assigned_to' => $userId, 'status' => 'completed'])->countAllResults(),
+        // Clean policy list for JS
+        $policies = array_map(function($row) {
+            return [
+                'policy_no'  => $row['policy_no'],
+                'issue_date' => $row['issue_date'],
+                'amount'     => (float)$row['amount'],
+                'created_at' => $row['created_at'],
             ];
+        }, $policyRows);
 
-            $myLeadsCount = $this->leadModel->where('assigned_to', $userId)->countAllResults();
+        // ── Won Leads for this user in FY (Table 2 in modal) ──
+        // leads.actual_lead_id maps to sales_actual_leads.id
+        // leads.type: 1 = EB, else = Non-EB
+        $wonLeads = $db->query("
+            SELECT
+                sal.lead_id,
+                sal.company_name    AS company,
+                CASE WHEN l.lead_type = 1 THEN 'EB' ELSE 'Non-EB' END AS lead_type,
+                l.created_at        AS created_at,
+                l.status
+            FROM leads l
+            INNER JOIN sales_actual_leads sal
+                    ON sal.lead_id = l.actual_lead_id
+            WHERE l.status          = 'won'
+              AND sal.assigned_to   = ?
+              AND l.created_at     >= ?
+              AND l.created_at     <= ?
+            ORDER BY l.created_at DESC
+        ", [$uid, $fyStart, $fyEnd])->getResultArray();
 
-            $upcomingActivities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name')
-                ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id')
-                ->where(['sales_activities.assigned_to' => $userId, 'sales_activities.status' => 'pending'])
-                ->orderBy('scheduled_date', 'ASC')
-                ->limit(3)
-                ->findAll();
-
-            $recentLeads = $this->leadModel->where('assigned_to', $userId)
-                ->orderBy('created_at', 'DESC')
-                ->limit(5)
-                ->findAll();
-
-            $data = [
-                'target_amt'        => $targetAmount,
-                'achieved'      => $achievedAmount,
-                'remaining'     => $remainingAmount,
-                'percent'       => $achievementPercent,
-                'acts'          => $activitySummary,
-                'lead_count'    => $myLeadsCount,
-                'upcoming'      => $upcomingActivities,
-                'recent_leads'  => $recentLeads,
-                'fin_years'     => $fin_years,
-                'display_fin_years'     => format_financial_year($current_fin_year),
-                'user_name'     => get_session_userdata()->first_namee ?? '',
-                'tab_name'      => "Sales Dashboard",
-                'page_name'     => "Sales Dashboard"
-            ];
-
-            // dd($data);
-
-            // return view('sales/my_dashboard_view', $data);
-            $this->loadLayout('sales/sales_manager_level_dashboard', $data);
-
-        } catch (\Exception $e) {
-            return $this->failServerError($e->getMessage());
-        }
+        $result[$uid] = [
+            'total_policies' => $totalPolicies,
+            'total_exp_amt'  => $totalExpAmt,
+            'target_amt'     => $targetAmt,
+            'policies'       => $policies,
+            'won_leads'      => $wonLeads,   // for Table 2 in modal Tab 2
+        ];
     }
 
-    public function getUserAchievedAmount($financialYear, $userId)
-    {
-        // Split the string into two years
-        $years = explode('-', $financialYear);
-        $startYear = $years[0]; // 2025
-        $endYear = $years[1];   // 2026
+    return $result;
+}
 
-        // Create the timestamps
-        $startFY = $startYear . '-04-01 00:00:00';
-        $endFY = $endYear . '-03-31 23:59:59';
+// ─────────────────────────────────────────────
+// getUserAchievedAmount()
+// ─────────────────────────────────────────────
+public function getUserAchievedAmount($financialYear, $userId)
+{
+    // "2025-2026" → strrpos splits correctly into 2025 / 2026
+    $pos       = strrpos($financialYear, '-');
+    $startYear = substr($financialYear, 0, $pos);   // "2025"
+    $endYear   = substr($financialYear, $pos + 1);   // "2026"
 
-        $achievedAmountData = $this->leadModel
-            ->select('SUM(leads.premium_amount) as achieved_amount')
-            ->join('leads', 'sales_actual_leads.lead_id = leads.actual_lead_id')
-            ->where('sales_actual_leads.assigned_to', $userId)
-            ->where('leads.status', 'won')
-            ->where('leads.updated_at >=', $startFY)
-            ->where('leads.updated_at <=', $endFY)
+    $startFY = $startYear . '-04-01 00:00:00';   // 2025-04-01
+    $endFY   = $endYear   . '-03-31 23:59:59';   // 2026-03-31
+
+    // Achievement = SUM(exp_amt) from policy_transaction + pt_co_share_details
+    $db  = \Config\Database::connect();
+    $row = $db->query("
+        SELECT COALESCE(SUM(ptcs.exp_amt), 0) AS achieved_amount
+        FROM policy_transaction pt
+        LEFT JOIN pt_co_share_details ptcs
+               ON ptcs.pt_id = pt.id
+              AND ptcs.is_active = 1
+          WHERE pt.sales_generated_by = ?
+          AND pt.created_at        >= ?
+          AND pt.created_at        <= ?
+    ", [$userId, $startFY, $endFY])->getRowArray();
+
+    return (float)($row['achieved_amount'] ?? 0.00);
+}
+
+// ─────────────────────────────────────────────
+// salesManagerLevelDashboard()
+// ─────────────────────────────────────────────
+public function salesManagerLevelDashboard($userId, $current_fin_year = null, $fin_years = [])
+{
+    $db = \Config\Database::connect();
+
+    try {
+
+        // -------------------------------
+        // Financial Year Handling
+        // -------------------------------
+        if (empty($current_fin_year)) {
+            $current_fin_year = getCurrentFinancialYear();
+        }
+
+        $fyRange  = $this->getFYDateRange($current_fin_year);
+        $fyStart  = $fyRange['start'];
+        $fyEnd    = $fyRange['end'];
+
+        // -------------------------------
+        // Target (FY Based)
+        // -------------------------------
+        $target = $db->table('sales_target')
+            ->where('user_id', $userId)
+            ->where('fy_year', $current_fin_year)
+            ->get()
+            ->getRowArray();
+
+        $targetAmount = (float)($target['target_amount'] ?? 0);
+
+        // -------------------------------
+        // Achieved (FY Based)
+        // -------------------------------
+        $achievedAmount = (float)$this->getUserAchievedAmount($current_fin_year, $userId);
+
+        $remainingAmount    = $targetAmount - $achievedAmount;
+        $achievementPercent = ($targetAmount > 0)
+            ? min(100, round(($achievedAmount / $targetAmount) * 100))
+            : 0;
+
+        // -------------------------------
+        // Activity Summary (FY Based using created_at)
+        // -------------------------------
+        $activitySummary = [
+            'total' => $this->activityModel
+                ->where('assigned_to', $userId)
+                ->where('created_at >=', $fyStart)
+                ->where('created_at <=', $fyEnd)
+                ->countAllResults(),
+
+            'pending' => $this->activityModel
+                ->where([
+                    'assigned_to' => $userId,
+                    'status'      => 'pending'
+                ])
+                ->where('created_at >=', $fyStart)
+                ->where('created_at <=', $fyEnd)
+                ->countAllResults(),
+
+            'completed' => $this->activityModel
+                ->where([
+                    'assigned_to' => $userId,
+                    'status'      => 'completed'
+                ])
+                ->where('created_at >=', $fyStart)
+                ->where('created_at <=', $fyEnd)
+                ->countAllResults(),
+        ];
+
+        // -------------------------------
+        // Leads Count (FY Based)
+        // -------------------------------
+        $myLeadsCount = $this->leadModel
+            ->where('assigned_to', $userId)
+            ->where('created_at >=', $fyStart)
+            ->where('created_at <=', $fyEnd)
+            ->countAllResults();
+
+        // -------------------------------
+        // Upcoming Activities (FY Based)
+        // -------------------------------
+        $upcomingActivities = $this->activityModel
+            ->select('sales_activities.*, sales_actual_leads.company_name')
+            ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id')
+            ->where([
+                'sales_activities.assigned_to' => $userId,
+                'sales_activities.status'      => 'pending'
+            ])
+            ->where('sales_activities.created_at >=', $fyStart)
+            ->where('sales_activities.created_at <=', $fyEnd)
+            ->orderBy('scheduled_date', 'ASC')
+            ->limit(3)
             ->findAll();
 
-        return $achievedAmountData[0]['achieved_amount'] ?? 0.00;
+        // -------------------------------
+        // Recent Leads (FY Based)
+        // -------------------------------
+        $recentLeads = $this->leadModel
+            ->where('assigned_to', $userId)
+            ->where('created_at >=', $fyStart)
+            ->where('created_at <=', $fyEnd)
+            ->orderBy('created_at', 'DESC')
+            ->limit(5)
+            ->findAll();
+
+        // -------------------------------
+        // Final Data
+        // -------------------------------
+        $data = [
+            'target_amt'        => $targetAmount,
+            'achieved'          => $achievedAmount,
+            'remaining'         => $remainingAmount,
+            'percent'           => $achievementPercent,
+            'acts'              => $activitySummary,
+            'lead_count'        => $myLeadsCount,
+            'upcoming'          => $upcomingActivities,
+            'recent_leads'      => $recentLeads,
+            'fin_years'         => $fin_years,
+            'current_fin_year'  => $current_fin_year,
+            'display_fin_years' => format_financial_year($current_fin_year),
+            'user_name'         => get_session_userdata()->first_name ?? '',
+            'tab_name'          => 'Sales Dashboard',
+            'page_name'         => 'Sales Dashboard',
+        ];
+
+        return $this->loadLayout('sales/sales_manager_level_dashboard', $data);
+
+    } catch (\Exception $e) {
+        return $this->failServerError($e->getMessage());
     }
+}
+    // public function dashboard()
+    // {
+    //     $payload          = $this->request->getGet();
+    //     $base             = $this->getSalesStaffData();
+    //     $salesRole        = $base['sales_role'];
+    //     $salesManagerIds  = $base['sales_manager_ids'];
+    //     $userId           = get_session_userid();
+
+    //     // Get branch id from users array
+    //     $nhanceBranchId   = $base['users'][0]['nhance_branch_id'] ?? null;
+
+    //     if ($salesRole === 'Sales Head') {
+    //         $this->branchLevelDashboard($nhanceBranchId, $salesManagerIds);
+    //         // $this->salesManagerLevelDashboard($userId, $salesManagerIds,$payload);
+    //     } elseif ($salesRole === 'Sales Manager') {
+    //         $this->salesManagerLevelDashboard($userId, $salesManagerIds,$payload);
+    //     }
+    // }    
+
+    // public function branchLevelDashboard($branchId,$sales_manager_ids)
+    // {
+    //     // Hardcoded branch ID as requested
+    //     // $branchId = 1;
+
+    //     try {
+    //       $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
+    //             $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
+    //         }
+            
+    //         // 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, 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)
+    //             ->get()->getResultArray();
+
+    //         // 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();
+            
+    //         // 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')
+    //                                 ->whereIn('sa.assigned_to', $sales_manager_ids)
+    //                                 ->where('sa.status', 'pending')
+    //                                 ->get()->getResultArray();
+
+    //         // 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
+    //                         ')
+    //                         ->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();
+            
+    //         // 9. Activity BrakDown
+    //         $activityBreakdown = $db->table('sales_activities')
+    //             ->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();
+    //       }
+    //         $data = [
+    //             '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]
+    //             'display_fin_years'     => format_financial_year($current_fin_year),
+    //             'team'              => $teamPerformance,
+    //             'recent_acts'       => $recent_activities,
+    //             'pending_acts'      => $pending_activities,
+    //             'leads_overview'    => $leadsOverview,
+    //             'activity_breakdown'=> $activityBreakdown,
+    //             'tab_name'          => "Sales Dashboard",
+    //             'page_name'         => "Sales Dashboard"
+    //         ];
+
+    //         // dd($data);
+
+    //         $this->loadLayout('sales/branch_level_dashboard_view', $data);
+
+    //         // return view('sales/dashboard_view', $data);
+
+    //     } catch (\Exception $e) {
+    //         return $this->failServerError($e->getMessage());
+    //     }
+    // }
+
+    // public function salesManagerLevelDashboard($userId,$sales_manager_ids, $payload = [])
+    // {
+    //     // $userId = get_session_userid();
+    //     // $userId = 1;
+    //     $db = \Config\Database::connect();
+
+    //     try {
+
+    //         // $payload = $this->request->getGet();
+    //         $current_fin_year = $payload['fy'] ?? getCurrentFinancialYear();
+
+            
+    //         $fin_years = $db->table('sales_target')
+    //             ->select('fy_year')
+    //             ->where('user_id', $userId)
+    //             ->orderBy('fy_year', 'desc')
+    //             ->get()
+    //             ->getResultArray();
+
+    //         $fin_years = array_column($fin_years, 'fy_year');
+
+    //         if(empty($fin_years)){
+    //             $fin_years[] = $current_fin_year;
+    //         }
+
+    //         $target = $db->table('sales_target')
+    //             ->where('user_id', $userId)
+    //             ->where('fy_year', $current_fin_year)
+    //             ->get()
+    //             ->getRowArray();
+
+    //         $targetAmount = $target['target_amount'] ?? 0.00; 
+
+    //         // get achieved amount from leads table
+    //         $achievedAmount = $this->getUserAchievedAmount($current_fin_year, $userId);
+
+    //         $remainingAmount = $targetAmount - $achievedAmount;
+    //         // $achievementPercent = ($targetAmount > 0) ? round(($achievedAmount / $targetAmount) * 100) : 0;
+    //         $achievementPercent = ($targetAmount > 0) ? min(100, round(($achievedAmount / $targetAmount) * 100)) : 0;
+
+    //         $activitySummary = [
+    //             'total'     => $this->activityModel->where('assigned_to', $userId)->countAllResults(),
+    //             'pending'   => $this->activityModel->where(['assigned_to' => $userId, 'status' => 'pending'])->countAllResults(),
+    //             'completed' => $this->activityModel->where(['assigned_to' => $userId, 'status' => 'completed'])->countAllResults(),
+    //         ];
+
+    //         $myLeadsCount = $this->leadModel->where('assigned_to', $userId)->countAllResults();
+
+    //         $upcomingActivities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name')
+    //             ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id')
+    //             ->where(['sales_activities.assigned_to' => $userId, 'sales_activities.status' => 'pending'])
+    //             ->orderBy('scheduled_date', 'ASC')
+    //             ->limit(3)
+    //             ->findAll();
+
+    //         $recentLeads = $this->leadModel->where('assigned_to', $userId)
+    //             ->orderBy('created_at', 'DESC')
+    //             ->limit(5)
+    //             ->findAll();
+
+    //         $data = [
+    //             'target_amt'        => $targetAmount,
+    //             'achieved'      => $achievedAmount,
+    //             'remaining'     => $remainingAmount,
+    //             'percent'       => $achievementPercent,
+    //             'acts'          => $activitySummary,
+    //             'lead_count'    => $myLeadsCount,
+    //             'upcoming'      => $upcomingActivities,
+    //             'recent_leads'  => $recentLeads,
+    //             'fin_years'     => $fin_years,
+    //             'display_fin_years'     => format_financial_year($current_fin_year),
+    //             'user_name'     => get_session_userdata()->first_namee ?? '',
+    //             'tab_name'      => "Sales Dashboard",
+    //             'page_name'     => "Sales Dashboard",
+    //             'splits'        => [],
+    //             'activity_breakdown'=> [],
+    //         ];
+
+
+
+    //         // dd($data);
+
+    //         // return view('sales/my_dashboard_view', $data);
+    //         $this->loadLayout('sales/sales_manager_level_dashboard', $data);
+
+    //     } catch (\Exception $e) {
+    //         return $this->failServerError($e->getMessage());
+    //     }
+    // }
+
+    // public function getUserAchievedAmount($financialYear, $userId)
+    // {
+    //     // Split the string into two years
+    //     $years = explode('-', $financialYear);
+    //     $startYear = $years[0]; // 2025
+    //     $endYear = $years[1];   // 2026
+
+    //     // Create the timestamps
+    //     $startFY = $startYear . '-04-01 00:00:00';
+    //     $endFY = $endYear . '-03-31 23:59:59';
+
+    //     $achievedAmountData = $this->leadModel
+    //         ->select('SUM(leads.premium_amount) as achieved_amount')
+    //         ->join('leads', 'sales_actual_leads.lead_id = leads.actual_lead_id')
+    //         ->where('sales_actual_leads.assigned_to', $userId)
+    //         ->where('leads.status', 'won')
+    //         ->where('leads.updated_at >=', $startFY)
+    //         ->where('leads.updated_at <=', $endFY)
+    //         ->findAll();
+
+    //     return $achievedAmountData[0]['achieved_amount'] ?? 0.00;
+    // }
 
     public function addCalenderEvent($input)
     {
@@ -1102,9 +1964,23 @@ class SalesController extends BaseController
 
             /* ---------------- SUMMARY ---------------- */
 
-            $summary = ucfirst($input['activity_type']) . 
-                    ' with ' . 
-                    $lead_data['company_name'];
+            $activityType = ucfirst($input['activity_type']);
+
+            $prepositionMap = [
+                'Email'   => 'to',
+                'Call'    => 'with',
+                'Meeting' => 'with',
+                'Visit'   => 'to',
+                'Demo'    => 'with',
+                'Share Docs' => 'to',
+                'To Do'   => 'for'
+            ];
+
+            $preposition = $prepositionMap[$activityType] ?? 'with';
+
+            $summary = "Activity scheduled : {$activityType} {$preposition} {$lead_data['company_name']}";
+
+
 
             /* ---------------- GOOGLE PAYLOAD ---------------- */
 
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index daae4293..c83fe172 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -1097,10 +1097,12 @@ class TestingController extends BaseController
                 'dashboard' => $database_id
             ],
             'exp'    => time() + (10 * 60), // 10 minutes
-            'params' => (object)[]
+            'params'   => (object) ['client_policy' => $policy_id ], // MUST be object for Metabase
+
         ];
 
         $token = JWT::encode($payload, $METABASE_SECRET_KEY, 'HS256');
+        // dd($token);
 
         if ($this->request->getGet('api') == 1) {
             return $this->respond([
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 01109672..c3d5e86e 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -959,6 +959,8 @@ class TicketController extends BaseController
             // Redirect or show a 404 to prevent "Undefined array key" errors
             return redirect()->to(base_url('ticket/list'))->with('error', 'Ticket not found');
         }
+
+        $ticket_data['is_tpa_api_service_enabled'] = $this->ticketMasterModel->isTpaApiServiceEnabled($ticket_id);
     
         $ticket_data = $this->formatDateForClaim($ticket_data, 'd/m/Y');
 
@@ -1173,9 +1175,13 @@ class TicketController extends BaseController
                         'regex_match' => 'Policy Number can only contain letters, numbers, spaces, hyphens(-) underscores(_), and slashes(/).'
                     ]
                 ],
-                'tpa_no'    => ['label'  => 'TPA ID','rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9]+$/]','errors' => [
-                    'regex_match' => 'TPA ID can only contain letters and numbers.'
-                ]],
+                'tpa_no' => [
+                    'label'  => 'TPA ID',
+                    'rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9\/]+$/]',
+                    'errors' => [
+                        'regex_match' => 'TPA ID can only contain letters, numbers, and /.'
+                    ]
+                ],
                 'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
                     'errors' => [
                         'required' => 'Mobile number is required',
@@ -1522,9 +1528,13 @@ class TicketController extends BaseController
                         'regex_match' => 'Policy Number can only contain letters, numbers, spaces, hyphens(-) underscores(_), and slashes(/).'
                     ]
                 ],
-                'tpa_no'    => ['label'  => 'TPA ID','rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9]+$/]','errors' => [
-                    'regex_match' => 'TPA ID can only contain letters and numbers.'
-                ]],
+                'tpa_no' => [
+                    'label'  => 'TPA ID',
+                    'rules'  => 'permit_empty|regex_match[/^[a-zA-Z0-9\/]+$/]',
+                    'errors' => [
+                        'regex_match' => 'TPA ID can only contain letters, numbers, and /.'
+                    ]
+                ],
                 'emp_mobile' => ['label'  => 'Employee Mobile No','rules'  => 'required|numeric|exact_length[10]',
                     'errors' => [
                         'required' => 'Mobile number is required',
diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index f95f547d..8e96a780 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -30,8 +30,9 @@ use App\Models\TicketMasterModel;
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
 
-class TicketServiceController extends BaseController
+class TicketServiceController extends AdminController
 {
     use ResponseTrait;
 
@@ -1840,39 +1841,86 @@ class TicketServiceController extends BaseController
     {
 
     }
-
-
+    
+    
     // --------------------------------------------------------------------------------------------------------------------------------
-
-    public function tpaClaimDumpImporter($params)
+    /**
+     * Resolve and validate Claim Dump file metadata and physical file for TPA imports.
+     *
+     * @param int|null $fileId
+     * @return array{status:bool,message?:string,fileData?:array,filePath?:string}
+     */
+    private function resolveTpaClaimDumpFile(?int $fileId): array
     {
-        $file_id = $params['file_id'] ?? null; // Move outside try to ensure catch can see it
+        if (empty($fileId)) {
+            return [
+                'status'  => false,
+                'message' => 'File ID is missing',
+            ];
+        }
+
+        $fileData = $this->claimDumpFileModel->find((int) $fileId);
+        if (!$fileData) {
+            return [
+                'status'  => false,
+                'message' => 'Invalid file ID. No file data found',
+            ];
+        }
+
+        $filePath = WRITEPATH . 'uploads' . DIRECTORY_SEPARATOR . 'claim_dump_excel' . DIRECTORY_SEPARATOR . $fileData['file_name'];
+
+        if (!is_file($filePath)) {
+            return [
+                'status'  => false,
+                'message' => 'Claim dump file not found',
+            ];
+        }
+
+        return [
+            'status'   => true,
+            'fileData' => $fileData,
+            'filePath' => $filePath,
+        ];
+    }
+    
+    /**
+     * First TPA-wise job – parse Excel and push data into TPA staging table.
+     *
+     * @param array $params
+     * @return array
+     */
+    public function tpaClaimDumpImporter(array $params)
+    {
+        $file_id = isset($params['file_id']) ? (int) $params['file_id'] : null;
 
         try {
-            $file_path = WRITEPATH . 'uploads' . DIRECTORY_SEPARATOR . 'claim_dump_excel' . DIRECTORY_SEPARATOR;
+            $resolved = $this->resolveTpaClaimDumpFile($file_id);
 
-            if (!$file_id) {
-                return ['status' => false, 'message' => 'File ID is missing'];
+            if ($resolved['status'] === false) {
+                return [
+                    'status'  => false,
+                    'message' => $resolved['message'] ?? 'Unable to resolve claim dump file',
+                ];
             }
 
-            $fileData = $this->claimDumpFileModel->find((int)$file_id);
-            if (!$fileData) {
-                return ['status' => false, 'message' => 'Invalid file ID. No file data found'];
-            }
-
-            $file_full_path = $file_path . $fileData['file_name'];
-            if (!is_file($file_full_path)) {
-                return ['status' => false, 'message' => 'Claim dump file not found'];
-            }
+            $fileData = $resolved['fileData'];
+            $filePath = $resolved['filePath'];
 
             $handler = TpaClaimsImportFactory::make($fileData['tpa_id'] ?? 0);
-            $result  = $handler->runTpaClaimDumpInsert($file_full_path, $file_id);
+            $result  = $handler->runTpaClaimDumpInsert($filePath, $file_id);
 
             if (!empty($result['status']) && $result['status'] === true) {
-                Jobs::addJob(['job_name' => 'tpaClaimDumpToTicketMasterImporters', 'payload' => ['file_id' => $file_id]]);
+                Jobs::addJob([
+                    'job_name' => 'tpaClaimDumpToTicketMasterImporters',
+                    'payload'  => ['file_id' => $file_id],
+                ]);
             } else {
                 // FORCE FAIL LOGIC
-                $this->markAsFailed($file_id, $result['message'] ?? 'System error contact admin', $fileData['created_by'] ?? null);
+                $this->markAsFailed(
+                    $file_id,
+                    $result['message'] ?? 'System error contact admin',
+                    $fileData['created_by'] ?? null
+                );
             }
 
             return $result;
@@ -1884,9 +1932,9 @@ class TicketServiceController extends BaseController
             }
 
             return [
-                'status' => false,
-                'message' => 'TPA Claim dump import failed',
-                'error_data' => $th->getMessage()
+                'status'     => false,
+                'message'    => 'TPA Claim dump import failed',
+                'error_data' => $th->getMessage(),
             ];
         }
     }
@@ -1908,30 +1956,37 @@ class TicketServiceController extends BaseController
         return $this->claimDumpFileModel->update($file_id, $data);
     }
 
-    public function tpaClaimDumpToTicketMasterImporters($params)
+    /**
+     * Second TPA-wise job – move data from TPA staging into ticket_master.
+     *
+     * @param array $params
+     * @return array
+     */
+    public function tpaClaimDumpToTicketMasterImporters(array $params)
     {
-        $file_id = $params['file_id'] ?? null;
+        $file_id  = isset($params['file_id']) ? (int) $params['file_id'] : null;
         $fileData = null;
 
         try {
-            if (!$file_id) {
-                return ['status' => false, 'message' => 'File ID is missing'];
+            $resolved = $this->resolveTpaClaimDumpFile($file_id);
+
+            if ($resolved['status'] === false) {
+                return [
+                    'status'  => false,
+                    'message' => $resolved['message'] ?? 'Unable to resolve claim dump file',
+                ];
             }
 
-            $fileData = $this->claimDumpFileModel->where('id', $file_id)->first();
-
-            if (!$fileData) {
-                return ['status' => false, 'message' => 'Invalid file ID. No file data found to import'];
-            }
+            $fileData = $resolved['fileData'];
 
             $handler = TpaClaimsImportFactory::make($fileData['tpa_id'] ?? 0);
-            $result = $handler->runTicketMasterInsert($params);
+            $result  = $handler->runTicketMasterInsert($params);
 
             if (!empty($result['status']) && $result['status'] === true) {
                 // Success: Update the status to success
                 $this->claimDumpFileModel->update($file_id, [
                     'status' => 'success',
-                    'reason' => null
+                    'reason' => null,
                 ]);
             } else {
                 // Logic failure: The runTicketMasterInsert returned status false
@@ -1957,8 +2012,8 @@ class TicketServiceController extends BaseController
                 'message' => $th->getMessage(),
                 'error_data' => [
                     'line' => $th->getLine(),
-                    'file' => $th->getFile()
-                ]
+                    'file' => $th->getFile(),
+                ],
             ];
         }
     }
@@ -2011,5 +2066,176 @@ class TicketServiceController extends BaseController
         return $data;
     }
 
-   
+    public function getTpaClaimDumpErrorData($file_id)
+    {
+        $file_id = (int) $file_id;
+
+        // Ensure we always have a Response object, even if controller was instantiated manually
+        $response = $this->response ?? service('response');
+
+        if ($file_id <= 0) {
+            return $response
+                ->setStatusCode(ResponseInterface::HTTP_BAD_REQUEST)
+                ->setJSON(['status' => false, 'message' => 'Invalid file id']);
+        }
+
+        $fileData = $this->claimDumpFileModel->find($file_id);
+
+        if (!$fileData) {
+            return $response
+                ->setStatusCode(ResponseInterface::HTTP_NOT_FOUND)
+                ->setJSON(['status' => false, 'message' => 'File record not found']);
+        }
+
+        $tpaId = (int) ($fileData['tpa_id'] ?? 0);
+
+        if ($tpaId <= 0) {
+            return $response
+                ->setStatusCode(ResponseInterface::HTTP_BAD_REQUEST)
+                ->setJSON(['status' => false, 'message' => 'TPA not linked with this file']);
+        }
+
+        // Resolve TPA staging table based on configured TPA IDs
+        $tableName = match ($tpaId) {
+            (int) env('VIDAL_PRIMARY_KEY_CONSTANT')       => 'claims_dump_vidal',
+            (int) env('ABHI_PRIMARY_KEY_CONSTANT')        => 'claims_dump_abhi',
+            (int) env('MEDI_ASSIST_PRIMARY_KEY_CONSTANT') => 'claims_dump_medi_assist',
+            (int) env('FHPL_PRIMARY_KEY_CONSTANT')        => 'claims_dump_fhpl',
+            (int) env('R_CARE_PRIMARY_KEY_CONSTANT')      => 'claims_dump_reliance',
+            (int) env('ICICI_PRIMARY_KEY_CONSTANT')       => 'claims_dump_icici',
+            default                                        => null,
+        };
+
+        if ($tableName === null) {
+            return $response
+                ->setStatusCode(ResponseInterface::HTTP_BAD_REQUEST)
+                ->setJSON(['status' => false, 'message' => 'Unsupported TPA for error dump export']);
+        }
+
+        $db      = \Config\Database::connect();
+        $builder = $db->table($tableName);
+
+        // Fetch only records belonging to this file and having a rejection reason
+        $rows = $builder
+            ->where('file_id', $file_id)
+            ->where('is_active', 1)
+            ->where('master_reject_reason IS NOT NULL', null, false)
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            // No error records – return a small Excel file with just a message
+            $spreadsheet = new Spreadsheet();
+            $sheet       = $spreadsheet->getActiveSheet();
+            $sheet->setTitle('Errors');
+            $sheet->setCellValue('A1', 'Message');
+            $sheet->setCellValue('A2', 'No rejected records found for this file.');
+
+            $writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+            ob_start();
+            $writer->save('php://output');
+            $excelOutput = ob_get_clean();
+
+            $filename = 'tpa_claim_dump_errors_' . $file_id . '.xlsx';
+
+            return $response
+                ->setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+                ->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
+                ->setHeader('Cache-Control', 'max-age=0')
+                ->setBody($excelOutput);
+        }
+
+        // Columns that must NOT be included in the Excel export
+        $excludedColumns = [
+            'id',
+            'client_id',
+            'client_policy_id',
+            'ticket_id',
+            'file_id',
+            'created_at',
+            'updated_at',
+            'created_by',
+            'updated_by',
+            'is_active',
+        ];
+
+        $firstRow = $rows[0];
+
+        // Build header mapping and track the "Rejected Reason" column index
+        $dbColumnOrder        = [];
+        $displayHeaderLabels  = [];
+        $rejectedReasonColIdx = null; // 1-based index for Excel column
+
+        foreach ($firstRow as $columnName => $_) {
+            if (in_array($columnName, $excludedColumns, true)) {
+                continue;
+            }
+
+            $dbColumnOrder[] = $columnName;
+
+            if ($columnName === 'master_reject_reason' || $columnName === 'master_rejection_reason_key') {
+                $displayHeaderLabels[] = 'Rejected Reason';
+                $rejectedReasonColIdx  = count($displayHeaderLabels); // current column index (1-based)
+            } else {
+                $displayHeaderLabels[] = $columnName;
+            }
+        }
+
+        $spreadsheet = new Spreadsheet();
+        $sheet       = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Errors');
+
+        // Header row
+        $rowIndex = 1;
+        foreach ($displayHeaderLabels as $colIndex => $headerLabel) {
+            $columnLetter = Coordinate::stringFromColumnIndex($colIndex + 1);
+            $cellAddress  = $columnLetter . $rowIndex;
+            $sheet->setCellValue($cellAddress, $headerLabel);
+        }
+
+        // Data rows
+        $rowIndex = 2;
+        foreach ($rows as $row) {
+            foreach ($dbColumnOrder as $i => $columnName) {
+                $colIndex     = $i + 1;
+                $columnLetter = Coordinate::stringFromColumnIndex($colIndex);
+                $cellAddress  = $columnLetter . $rowIndex;
+                $value        = $row[$columnName] ?? null;
+
+                $sheet->setCellValue($cellAddress, $value);
+
+                // Highlight the "Rejected Reason" values
+                if ($rejectedReasonColIdx !== null && $colIndex === $rejectedReasonColIdx) {
+                    $sheet->getStyle($cellAddress)
+                        ->getFill()
+                        ->setFillType(Fill::FILL_SOLID)
+                        ->getStartColor()
+                        ->setARGB('FFFFF4B2'); // light yellow
+                }
+            }
+
+            $rowIndex++;
+        }
+
+        // Autosize columns for better readability
+        $highestColumnIndex = count($displayHeaderLabels);
+        for ($col = 1; $col <= $highestColumnIndex; $col++) {
+            $columnLetter = Coordinate::stringFromColumnIndex($col);
+            $sheet->getColumnDimension($columnLetter)->setAutoSize(true);
+        }
+
+        $writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+        ob_start();
+        $writer->save('php://output');
+        $excelOutput = ob_get_clean();
+
+        $filename = 'tpa_claim_dump_errors_' . $file_id . '.xlsx';
+
+        return $response
+            ->setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+            ->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
+            ->setHeader('Cache-Control', 'max-age=0')
+            ->setBody($excelOutput);
+    }
+
 }
diff --git a/app/Controllers/VidalApiController.php b/app/Controllers/VidalApiController.php
index 3836cb4b..d4674302 100644
--- a/app/Controllers/VidalApiController.php
+++ b/app/Controllers/VidalApiController.php
@@ -164,7 +164,7 @@ class VidalApiController extends BaseController
 
         if (count($data) && $data['filePath'] == null) {
             log_message('error', "VIDAL - Claim Push | Submit claim failed - Claim or File Missing");
-            return $this->response->setJSON(['status' => false,'message' => 'Claim or File Missing', ]);
+            return ['status' => false, 'message' => 'Claim Push FAILED | Claim or File Missing'];
         }
 
         $filePath = $data['filePath'] ?? '';
@@ -271,7 +271,7 @@ class VidalApiController extends BaseController
             $this->db->table('ticket_master')
             ->where('id',$claimId)
             ->update([ 'tpa_push_response' => json_encode($response) ]);
-            return;
+            return ['status' => false, 'message' => 'Claim Push FAILED | API call failed'];
         }
 
         // return $this->response->setJSON($response);
@@ -289,16 +289,17 @@ class VidalApiController extends BaseController
                 ->where('id',$claimId)
                 ->update([ 'tpa_claim_push_reference_no' => $claimInwardNO , 'tpa_claim_id' => $claimNO , 'claim_number' => $claimNO ]);
 
-                return;
+                return ['status' => true, 'message' => 'Claim Push SUCCESS'];
 
             } else {
                 log_message('error', 'VIDAL - Claim Push  API SUCCESS BUT claimNO,claimInwardNO EMPTY | claimId: '.$claimId.' | response: '.json_encode($response));
-                return;
+                return ['status' => false, 'message' => 'Claim Push API SUCCESS BUT claimNO,claimInwardNO EMPTY'];
             }
         }else{
             log_message('error', 'VIDAL - Claim Push  API FAILED | claimId: '.$claimId.' | response: '.json_encode($response));
-            return;
+            return ['status' => false, 'message' => 'Claim Push API FAILED'];
         }
+
     }
 
     function getWellnessSSORedirectUrl($email = 'test@getvisitapp.com')
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 5b5d6b7b..9419d6e1 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -3023,6 +3023,9 @@ if (!function_exists('validate_excel_value')) {
             case 'vehicle':
                 return validate_indian_vehicle_number($value);
 
+            case 'positive_number':
+                return validate_positive_number_value($value);
+
             default:
                 return [
                     'status' => true,
@@ -3066,6 +3069,24 @@ if (!function_exists('validate_mobile_value')) {
     }
 }
 
+if (!function_exists('validate_positive_number_value')) {
+    function validate_positive_number_value($value)
+    {   
+        if ($value === "" || $value === null) {
+            return ['status' => true, 'error' => null];
+        }
+
+        if (is_numeric($value) && $value >= 0) {
+            return ['status' => true, 'error' => null];
+        }
+
+        return [
+            'status' => false,
+            'error'  => "Value must be a positive number"
+        ];
+    }
+}
+
 if (!function_exists('validate_email_value')) {
     function validate_email_value($value)
     {
diff --git a/app/Libraries/MyGoogleDrive.php b/app/Libraries/MyGoogleDrive.php
index 566098eb..2fea0f9e 100644
--- a/app/Libraries/MyGoogleDrive.php
+++ b/app/Libraries/MyGoogleDrive.php
@@ -16,7 +16,7 @@ class MyGoogleDrive
     {
         $this->myLogger = \Config\Services::mylogger();
         $this->client = new Google_Client();
-        $this->client->setAuthConfig(ROOTPATH . 'nhance-app-google-drive.json'); // App credentials
+        $this->client->setAuthConfig(ROOTPATH . 'nhance-ee8d1-e3c5269b1ec7.json'); // App credentials
         // putenv('GOOGLE_APPLICATION_CREDENTIALS=' . ROOTPATH . 'nhance-app-google-drive.json');
         $this->client->useApplicationDefaultCredentials();
         
diff --git a/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
index ffb4b970..103989bf 100644
--- a/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/AbhiClaimImportService.php
@@ -119,6 +119,19 @@ class AbhiClaimImportService extends BaseTpaClaimImportService
         'Settled' => 11,
         'Rejected' => 8,
         'Cancelled' => 13,
+        'Approved' => 9,
+        'Closed' => 12,
+        'Query' => 4,
+        'Required Information' => 4,
+        'In-Progress' => 5,
+        'Paid' => 11,
+        'Denied' => 8,
+        'Cancelled' => 13,
+        'Processed' => 61,
+        'Information Awaited' => 4,
+        'Denied Letter Sent' => 66,
+        'Cashless Document Awaited' => 3,
+        'RI Cancelled' => 13,
     ];
 
     protected $dateColumns = [
@@ -164,14 +177,30 @@ class AbhiClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
+        $rows = $this->db->table('claims_dump_abhi cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            return true;
         }
 
-        $builder = $this->db->table('claims_dump_abhi');
-        return $builder->updateBatch($data, 'id');
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_abhi')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -329,7 +358,7 @@ class AbhiClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['claim_status_id'] = $this->checkStatusMapping($this->statusMapping, $row['claim_status']);
                 $item['file_id']    = $file_id;
                 $item['claim_dump_ref_id']    = $row['id'];
                 $item['created_by'] = $file_data['created_by'] ?? null;
diff --git a/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
index 3a6a5777..3ccbcadd 100644
--- a/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/BaseTpaClaimImportService.php
@@ -9,17 +9,30 @@ use App\Models\TicketMasterModel;
 use App\Models\EmployeeModel;
 use App\Models\ClaimDumpFileModel;
 use App\Models\ClaimsDumpFhplModel;
+use App\Models\ClientPolicyModel;
+
 use RuntimeException;
 
 abstract class BaseTpaClaimImportService
 {
     protected BaseConnection $db;
     protected $claimDumpFileModel;
+    protected $clientPolicyModel;
+    protected $policyNumberMapping;
 
     public function __construct()
     {
         $this->db = db_connect();
         $this->claimDumpFileModel = new ClaimDumpFileModel();
+        $this->clientPolicyModel = new ClientPolicyModel();
+        $this->policyNumberMapping = [
+            (int) env('VIDAL_PRIMARY_KEY_CONSTANT') => 'Insurer Policy Number',
+            (int) env('ABHI_PRIMARY_KEY_CONSTANT') => 'Policy Number',
+            (int) env('MEDI_ASSIST_PRIMARY_KEY_CONSTANT') => 'policy_no',
+            (int) env('FHPL_PRIMARY_KEY_CONSTANT') => 'Policy No',
+            (int) env('R_CARE_PRIMARY_KEY_CONSTANT') => 'Policy Number',
+            (int) env('ICICI_PRIMARY_KEY_CONSTANT') => 'POLICY_NO', 
+        ];
     }
 
     /**
@@ -33,6 +46,8 @@ abstract class BaseTpaClaimImportService
         try {
             $fileData = $this->claimDumpFileModel->where('id', $fileId)->first();
 
+            $client_policy_data = $this->clientPolicyModel->where('id', $fileData['client_policy_id'])->first();
+
             // Determine sheet name logic...
             if (env('FHPL_PRIMARY_KEY_CONSTANT') == $fileData['tpa_id']) {
                 $rows = $this->readExcelBySheetName($filePath, 'Claims&Preauth');
@@ -47,6 +62,18 @@ abstract class BaseTpaClaimImportService
                 return ['status' => false, 'message' => 'Excel file contains no data or wrong file upload'];
             }
 
+            if(isset($this->policyNumberMapping[$fileData['tpa_id']]) && !empty($this->policyNumberMapping[$fileData['tpa_id']])){
+                $policy_number_column = $this->policyNumberMapping[$fileData['tpa_id']];
+            }else{
+                $policy_number_column = 'policy_no';
+            }
+
+
+            if($client_policy_data['policy_no'] != ($rows[0][$policy_number_column] ?? '')){
+                $this->db->transRollback();
+                return ['status' => false, 'message' => 'Policy number mismatch in the file and in the system'];
+            }
+
             $tpaInsertData = $this->mapTPAData($rows, $fileId);
 
             if (empty($tpaInsertData)) {
@@ -81,7 +108,7 @@ abstract class BaseTpaClaimImportService
         $this->db->transBegin();
 
         try {
-            $file_id = $params['file_id']; 
+            $file_id = $params['file_id'];
             $ticketMasterData = $this->mapClaimMasterData($file_id);
 
             // Check if mapping failed
@@ -101,6 +128,12 @@ abstract class BaseTpaClaimImportService
                     $this->db->transRollback();
                     return ['status' => false, 'message' => 'Ticket Master Claim bulk insert failed'];
                 }
+                // Map newly created ticket IDs back to the TPA staging table
+                if (!$this->updateTicketIdInTPATable($file_id)) {
+                    $this->db->transRollback();
+                    return ['status' => false, 'message' => 'Updating ticket_id in TPA table failed'];
+                }
+
                 $message .= 'Ticket Master Claim bulk insert success. ';
                 $hasExecutedTask = true;
             }else{
@@ -328,6 +361,16 @@ abstract class BaseTpaClaimImportService
         return $employeeData ?? [];
     }
 
+    public function checkStatusMapping($statusArray, $statusString)
+    {
+        foreach ($statusArray as $key => $value) {
+            if (strtolower($statusString) == strtolower($key) || strtolower($statusString) == strtolower(trim($key))) {
+                return $value;
+            }
+        }
+        return null;
+    }
+    
     /**
      * Map Excel rows to TPA table structure
      */
@@ -349,9 +392,9 @@ abstract class BaseTpaClaimImportService
     abstract protected function importClaimMaster(array $data): bool;
 
     /**
-     * Update TPA table with ticket_master primary key
+     * Update TPA table with ticket_master primary key for a given file.
      */
-    abstract protected function updateTicketIdInTPATable(): bool;
+    abstract protected function updateTicketIdInTPATable(int $fileId): bool;
 
     /**
      * Update TPA table with ticket_master insert rejected reason
diff --git a/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
index 324fd3a7..7123230c 100644
--- a/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/FhplClaimImportService.php
@@ -181,6 +181,13 @@ class FhplClaimImportService extends BaseTpaClaimImportService
     protected $statusMapping = [
         'Settled' => 11,
         'Rejected' => 8,
+        'Paid' => 11,
+        'Approved' => 9,
+        'Closed' => 12,
+        'Under Process' => 5,
+        'Query' => 4,
+        'Required Information' => 4,
+        'In-Progress' => 5,
     ];
 
     protected $dateColumns = [
@@ -235,14 +242,31 @@ class FhplClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
+        // Join ticket_master with FHPL staging on file_id + claim_dump_ref_id -> id
+        $rows = $this->db->table('claims_dump_fhpl cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            return true;
         }
-        
-        $builder = $this->db->table('claims_dump_fhpl');
-        return $builder->updateBatch($data, 'id');
+
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_fhpl')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -400,7 +424,7 @@ class FhplClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['current_claim_status']] ?? 61;
+                $item['claim_status_id'] = $this->checkStatusMapping($this->statusMapping, $row['current_claim_status']) ?? 61;
                 $item['file_id']    = $file_id;
                 $item['claim_dump_ref_id']    = $row['id'];
                 $item['created_by'] = $file_data['created_by'] ?? null;
diff --git a/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
index 132986a2..6e055139 100644
--- a/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/IciciClaimImportService.php
@@ -106,7 +106,13 @@ class IciciClaimImportService extends BaseTpaClaimImportService
 
     protected $statusMapping = [
         'PAID' => 11,
+        'SETTLED' => 11,
         'REJECTED' => 8,
+        'APPROVED' => 9,
+        'CLOSED' => 12,
+        'QUERY' => 4,
+        'REQUIRED INFORMATION' => 4,
+        'IN-PROGRESS' => 5,
     ];
 
     protected $dateColumns = [
@@ -152,14 +158,30 @@ class IciciClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
+        $rows = $this->db->table('claims_dump_icici cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            return true;
         }
-        
-        $builder = $this->db->table('claims_dump_icici');
-        return $builder->upsertBatch($data, 'id');
+
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_icici')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -287,7 +309,7 @@ class IciciClaimImportService extends BaseTpaClaimImportService
                 $item['tpa_id']  = $client_policy_data['tpa_id'] ?? null;
                 $item['acm_id']  = $client_policy_data['acm_id'] ?? null;
                 $item['policy_no']  = $client_policy_data['policy_no'] ?? null;
-                $item['relationship']  = $this->convertRelation($row['relation_group'] ?? '');
+                $item['relationship']  = $this->convertRelation($row['relation'] ?? '');
 
                 $employee_data = $this->getEmployeeDetails($file_data['client_id'], $file_data['client_policy_id'], $row['employee_member_id'], $item['relationship']);
 
@@ -317,7 +339,7 @@ class IciciClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['updated_status']] ?? 61;
+                $item['claim_status_id'] = $this->checkStatusMapping($this->statusMapping, $row['updated_status']) ?? 61;
                 $item['claim_dump_ref_id']    = $row['id'];
                 $item['file_id']    = $file_id;
                 $item['created_by'] = $file_data['created_by'] ?? null;
diff --git a/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
index d052c9f5..4a2952fb 100644
--- a/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/MediAssistClaimImportService.php
@@ -158,12 +158,15 @@ class MediAssistClaimImportService extends BaseTpaClaimImportService
     protected $statusMapping = [
         'Settled' => 11,
         'Rejected' => 8,
+        'Paid' => 11,
         'Denied' => 8,
         'Cancelled' => 13,
         'Processed' => 61,
         'Information Awaited' => 4,
         'Denied Letter Sent' => 66,
         'Cashless Document Awaited' => 3,
+        'Approved' => 9,
+        'Closed' => 12,
     ];
 
     /**
@@ -192,16 +195,30 @@ class MediAssistClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
-        }
-        
-        $builder = $this->db->table('claims_dump_medi_assist');
-        $builder->insertBatch($data);
+        $rows = $this->db->table('claims_dump_medi_assist cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
 
-        return true;
+        if (empty($rows)) {
+            return true;
+        }
+
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_medi_assist')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -356,8 +373,8 @@ class MediAssistClaimImportService extends BaseTpaClaimImportService
 
                 // Meta fields
                 $item['claim_dump_ref_id']    = $row['id'];
-                $item['file_id']    = $file_id;
-                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['file_id']              = $file_id;
+                $item['claim_status_id']      = $this->checkStatusMapping($this->statusMapping, $row['claim_status']) ?? 61;
                 $item['created_by'] = $file_data['created_by'] ?? null;
                 $item['claim_type'] = 1;
                 $item['priority']           = 1;
diff --git a/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
index 770caadd..afe95c4f 100644
--- a/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/RcareClaimImportService.php
@@ -96,14 +96,15 @@ class RcareClaimImportService extends BaseTpaClaimImportService
     ];
 
     protected $statusMapping = [
+        'CL Paid with Settlement Letter' => 11,
         'Settled' => 11,
+        'Paid' => 11,
         'Rejected' => 8,
-        'Denied' => 8,
-        'Cancelled' => 13,
-        'Processed' => 61,
-        'Information Awaited' => 4,
-        'Denied Letter Sent' => 66,
-        'Cashless Document Awaited' => 3,
+        'Approved' => 9,
+        'Closed' => 12,
+        'CL Rejected' => 8,
+        'CL Approved' => 9,
+        'AL Closed' => 12,
     ];
 
     protected $dateColumns = [
@@ -143,14 +144,30 @@ class RcareClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
+        $rows = $this->db->table('claims_dump_reliance cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            return true;
         }
-        
-        $builder = $this->db->table('claims_dump_reliance');
-        return $builder->updateBatch($data, 'id');
+
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_reliance')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -307,7 +324,7 @@ class RcareClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['final_status']] ?? 61;
+                $item['claim_status_id'] = $this->checkStatusMapping($this->statusMapping, $row['final_status']) ?? 61;
                 $item['file_id']    = $file_id;
                 $item['created_by'] = $file_data['created_by'] ?? null;
                 $item['claim_dump_ref_id']    = $row['id'];
diff --git a/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
index c90d580b..70a1340c 100644
--- a/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
+++ b/app/Libraries/TPAClaimsImportServices/VidalClaimImportService.php
@@ -349,10 +349,17 @@ class VidalClaimImportService extends BaseTpaClaimImportService
     ];
 
     protected $statusMapping = [
-        'CL Paid with Settlement Letter' => 11,
-        'CL Rejected' => 8,
-        'CL Approved' => 9,
-        'AL Closed' => 12,
+        'Settled' => 11,
+        'Rejected' => 8,
+        'Paid' => 11,
+        'Denied' => 8,
+        'Cancelled' => 13,
+        'Processed' => 61,
+        'Information Awaited' => 4,
+        'Denied Letter Sent' => 66,
+        'Cashless Document Awaited' => 3,
+        'Approved' => 9,
+        'Closed' => 12,
     ];
 
 
@@ -382,14 +389,30 @@ class VidalClaimImportService extends BaseTpaClaimImportService
     }
 
 
-    public function updateTicketIdInTPATable(): bool
+    public function updateTicketIdInTPATable(int $fileId): bool
     {
-        if (empty($data)) {
-            return false;
+        $rows = $this->db->table('claims_dump_vidal cd')
+            ->select('cd.id, tm.id AS ticket_id')
+            ->join('ticket_master tm', 'tm.claim_dump_ref_id = cd.id AND tm.file_id = cd.file_id', 'inner')
+            ->where('cd.is_active', 1)
+            ->where('cd.file_id', $fileId)
+            ->where('cd.ticket_id IS NULL')
+            ->get()
+            ->getResultArray();
+
+        if (empty($rows)) {
+            return true;
         }
-        
-        $builder = $this->db->table('claims_dump_vidal');
-        return $builder->updateBatch($data, 'id');
+
+        $updateData = [];
+        foreach ($rows as $row) {
+            $updateData[] = [
+                'id'        => $row['id'],
+                'ticket_id' => $row['ticket_id'],
+            ];
+        }
+
+        return $this->db->table('claims_dump_vidal')->updateBatch($updateData, 'id') !== false;
     }
 
 
@@ -542,7 +565,7 @@ class VidalClaimImportService extends BaseTpaClaimImportService
                 }
 
                 // Meta fields
-                $item['claim_status_id'] = $statusMapping[$row['claim_status']] ?? 61;
+                $item['claim_status_id'] = $this->checkStatusMapping($this->statusMapping, $row['claim_status']) ?? 61;
                 $item['file_id']    = $file_id;
                 $item['claim_dump_ref_id']    = $row['id'];
                 $item['created_by'] = $file_data['created_by'] ?? null;
diff --git a/app/Models/ExpenseModel.php b/app/Models/ExpenseModel.php
new file mode 100644
index 00000000..7d4a37c1
--- /dev/null
+++ b/app/Models/ExpenseModel.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class ExpenseModel extends Model
+{
+    protected $table            = 'expenses';
+    protected $primaryKey       = 'id';
+    protected $DBGroup          = 'default';
+    protected $useAutoIncrement = true;
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+    protected $protectFields    = true;
+
+    protected $allowedFields = [
+        'id',
+        'client_id',
+        'client_policy_id',
+        'description',
+        'approved_by',
+        'amount',
+        'expense_date',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by',
+        'is_active',
+    ];
+
+    // Callbacks
+    protected $allowCallbacks = true;
+    protected $beforeInsert   = ['setCreatedBy'];
+    protected $afterInsert    = [];
+    protected $beforeUpdate   = ['setUpdatedBy'];
+    protected $afterUpdate    = [];
+    protected $beforeFind     = [];
+    protected $afterFind      = [];
+    protected $beforeDelete   = [];
+    protected $afterDelete    = [];
+
+    protected function setCreatedBy(array $data): array
+    {
+        if (empty($data['data']['created_by'])) {
+            $data['data']['created_by'] = get_session_userid();
+        }
+
+        if (empty($data['data']['created_at'])) {
+            $data['data']['created_at'] = date('Y-m-d H:i:s');
+        }
+
+        if (! isset($data['data']['is_active'])) {
+            $data['data']['is_active'] = 1;
+        }
+
+        return $data;
+    }
+
+    protected function setUpdatedBy(array $data): array
+    {
+        if (empty($data['data']['updated_by'])) {
+            $data['data']['updated_by'] = get_session_userid();
+        }
+
+        if (empty($data['data']['updated_at'])) {
+            $data['data']['updated_at'] = date('Y-m-d H:i:s');
+        }
+
+        return $data;
+    }
+}
+
diff --git a/app/Models/LeadsModel.php b/app/Models/LeadsModel.php
index 6942e3e6..507786c6 100644
--- a/app/Models/LeadsModel.php
+++ b/app/Models/LeadsModel.php
@@ -46,6 +46,7 @@ class LeadsModel extends Model
         'proposel_data',
         'status',
         'notes',
+        'lost_reason',
         'created_at',
         'created_by',
         'updated_at',
diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php
index e9656ad6..20da8dec 100644
--- a/app/Models/PolicyTransactionModel.php
+++ b/app/Models/PolicyTransactionModel.php
@@ -3098,6 +3098,8 @@
                 if ($date_type === "policy_issue_date") {
                     $conditions .= " AND pcsd.pt_policy_issue_date >= '$startDate' ";
                     $conditions .= " AND pcsd.pt_policy_issue_date <= '$endDate' ";
+                } else  if ($date_type === "created_at") {
+                    $conditions .= " AND pt.created_at <= '$endDate' ";
                 } else {
                     $conditions .= " AND pt.$date_type >= '$startDate' ";
                     $conditions .= " AND pt.$date_type <= '$endDate' ";
diff --git a/app/Models/SalesActivityModel.php b/app/Models/SalesActivityModel.php
index 8d82097f..a51713dd 100644
--- a/app/Models/SalesActivityModel.php
+++ b/app/Models/SalesActivityModel.php
@@ -25,6 +25,7 @@ class SalesActivityModel extends Model
         'completion_notes',
         'completed_date',
         'parent_activity_id',
+        'additional_assigned_ids',
         'created_by',
         'updated_by'
     ];
@@ -38,7 +39,7 @@ class SalesActivityModel extends Model
     // Validation
     protected $validationRules = [
         'lead_id'        => 'required|integer',
-        'activity_type'  => 'required|in_list[Call,Email,Meeting,Demo,Share,Todo,Visit]',
+        'activity_type' => 'required|in_list[Call,Email,Meeting,Visit,Demo,Share Docs,To Do]',
         'notes'          => 'required',
         'scheduled_date' => 'required',
         'assigned_to'    => 'required|integer',
@@ -64,8 +65,14 @@ class SalesActivityModel extends Model
      */
     public function getActivitiesByLead($leadId, $status = null)
     {
-        $builder = $this->select('sales_activities.*, user_profiles.first_name as assigned_to_name')
-            ->join('user_profiles', 'user_profiles.id = sales_activities.assigned_to', 'left')
+        // Convert the INT id to a string, then wrap it in JSON quotes to match ["5", "11"]
+        $subQuery = "(SELECT GROUP_CONCAT(up2.first_name SEPARATOR ', ')
+                        FROM user_profiles up2
+                        WHERE JSON_CONTAINS(sales_activities.additional_assigned_ids, JSON_QUOTE(CAST(up2.id AS CHAR)))
+                        ) as additional_assigned_names";
+
+        $builder = $this->select("sales_activities.*, up1.first_name as assigned_to_name, $subQuery")
+            ->join('user_profiles as up1', 'up1.id = sales_activities.assigned_to', 'left')
             ->where('sales_activities.lead_id', $leadId);
 
         if ($status) {
@@ -78,7 +85,7 @@ class SalesActivityModel extends Model
     /**
      * Get all sales_activities with filters
      */
-    public function getActivitiesWithFilters($filters = [], $limit = 10, $offset = 0)
+    public function getActivitiesWithFiltersOLD($filters = [], $limit = 10, $offset = 0)
     {
         $this->select('sales_activities.*, sales_actual_leads.company_name, user_profiles.first_name as assigned_to_name')
             ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id', 'left')
@@ -102,7 +109,7 @@ class SalesActivityModel extends Model
             $assignedToIds = is_array($assigned_to) ? $assigned_to : explode(',', $assigned_to);
             
             // Now it is guaranteed to be an array, making whereIn perfectly safe
-            $this->whereIn('sales_actual_leads.assigned_to', $assignedToIds);
+            $this->whereIn('sales_activities.assigned_to', $assignedToIds);
         }
 
 
@@ -139,6 +146,90 @@ class SalesActivityModel extends Model
         // ];
     }
 
+    public function getActivitiesWithFilters($filters = [], $limit = 10, $offset = 0)
+    {
+        // 1. Initial Selection
+        $builder = $this->select("
+                sales_activities.*, 
+                sales_actual_leads.company_name, 
+                up1.first_name as assigned_to_name, 
+                GROUP_CONCAT(DISTINCT up2.first_name SEPARATOR ', ') as additional_assigned_names
+            ")
+            ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id', 'left')
+            ->join('user_profiles as up1', 'up1.id = sales_activities.assigned_to', 'left');
+
+        // 2. The JSON Join for additional names
+        // Only attempts join if the string looks like a JSON array
+        $builder->join('user_profiles as up2', "
+            sales_activities.additional_assigned_ids IS NOT NULL 
+            AND sales_activities.additional_assigned_ids != '' 
+            AND sales_activities.additional_assigned_ids != '[]' 
+            AND JSON_VALID(sales_activities.additional_assigned_ids)
+            AND JSON_CONTAINS(sales_activities.additional_assigned_ids, JSON_QUOTE(CAST(up2.id AS CHAR)))
+        ", 'left');
+
+        // 3. Apply Filters
+        if (!empty($filters['status'])) {
+            $builder->where('sales_activities.status', $filters['status']);
+        }
+
+        if (!empty($filters['activity_type'])) {
+            $builder->where('sales_activities.activity_type', $filters['activity_type']);
+        }
+
+        if (!empty($filters['assigned_to'])) {
+            $assignedToIds = is_array($filters['assigned_to']) ? $filters['assigned_to'] : explode(',', $filters['assigned_to']);
+            $builder->whereIn('sales_activities.assigned_to', $assignedToIds);
+        }
+
+        if (!empty($filters['search'])) {
+            $builder->groupStart()
+                ->like('sales_actual_leads.company_name', $filters['search'])
+                ->orLike('up1.first_name', $filters['search'])
+                ->groupEnd();
+        }
+
+        // 4. Grouping & Ordering
+        $builder->groupBy('sales_activities.activity_id');
+        $builder->orderBy('sales_activities.created_at', 'DESC');
+
+        // 5. Calculate Counts (using a clean builder to avoid the syntax error)
+        $counts = $this->getActivityStatusCounts($filters);
+
+        // 6. Get Data and Total
+        // Use true for countAllResults to get an accurate count of grouped rows
+        $totalCountQuery = clone $builder;
+        $total = $totalCountQuery->countAllResults(false); 
+        
+        $data = $builder->findAll($limit, $offset);
+
+        return [
+            'data'   => $data,
+            'total'  => $total,
+            'counts' => $counts
+        ];
+    }
+
+    /**
+     * Helper function to get counts without breaking the main query syntax
+     */
+    private function getActivityStatusCounts($filters)
+    {
+        $validStatuses = ['pending', 'completed'];
+        $counts = ['all' => 0, 'pending' => 0, 'completed' => 0];
+
+        foreach ($validStatuses as $status) {
+            $query = $this->db->table('sales_activities')->where('status', $status);
+            if (!empty($filters['assigned_to'])) {
+                $ids = is_array($filters['assigned_to']) ? $filters['assigned_to'] : explode(',', $filters['assigned_to']);
+                $query->whereIn('assigned_to', $ids);
+            }
+            $counts[$status] = $query->countAllResults();
+        }
+        $counts['all'] = $counts['pending'] + $counts['completed'];
+        return $counts;
+    }
+
     /**
      * Complete an activity
      */
diff --git a/app/Models/SalesActualLeadModel.php b/app/Models/SalesActualLeadModel.php
index 22db6a2a..a5ca1026 100644
--- a/app/Models/SalesActualLeadModel.php
+++ b/app/Models/SalesActualLeadModel.php
@@ -123,7 +123,38 @@ class SalesActualLeadModel extends Model
 
         $data = $this->findAll($limit, $offset);
 
-        return ['data'  => $data,'total' => $total];
+        $counts = $this->getLeadStatusCounts($filters);
+
+        return ['data'  => $data,'total' => $total,'counts' => $counts];
+    }
+
+    /**
+     * Helper function to get counts without breaking the main query syntax
+     */
+    private function getLeadStatusCounts($filters)
+    {
+        
+        $validStatuses = ['New', 'Potential', 'Prospects', 'Not a Prospects'];
+        $counts = ['all' => 0, 'New' => 0, 'Potential' => 0, 'Prospects' => 0, 'Not a Prospects' => 0];
+        
+        foreach ($validStatuses as $status) {
+            $countQuery = $this->db->table('sales_actual_leads')
+                                    ->whereIn('status', $validStatuses);
+
+            // Apply assigned_to filter to counts too
+            if (!empty($filters['assigned_to'])) {
+                $assignedToIds = is_array($filters['assigned_to']) 
+                                ? $filters['assigned_to'] 
+                                : explode(',', $filters['assigned_to']);
+                $countQuery->whereIn('assigned_to', $assignedToIds);
+            }
+
+            $counts[$status] = $countQuery->where('status', $status)->countAllResults();
+        }
+
+        $counts['all'] = array_sum($counts);
+
+        return $counts;
     }
 
     /**
diff --git a/app/Models/SalesTargetModel.php b/app/Models/SalesTargetModel.php
new file mode 100644
index 00000000..f23193f6
--- /dev/null
+++ b/app/Models/SalesTargetModel.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class SalesTargetModel extends Model
+{
+    protected $table            = 'sales_target';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+
+    protected $allowedFields = [
+        'user_id',
+        'fy_year',
+        'target_amount',
+        'created_by',
+        'updated_by'
+    ];
+
+    protected $useTimestamps = true;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+
+    protected $validationRules = [
+        'user_id'       => 'required|integer',
+        'fy_year'       => 'required|max_length[9]',
+        'target_amount' => 'required|decimal',
+    ];
+
+    protected $validationMessages = [
+        'user_id'       => ['required' => 'User is required'],
+        'fy_year'       => ['required' => 'Financial year is required'],
+        'target_amount' => ['required' => 'Target amount is required', 'decimal' => 'Target amount must be a valid number'],
+    ];
+}
\ No newline at end of file
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 14101188..13682edb 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -1218,6 +1218,21 @@ class TicketMasterModel extends Model
 
     }
 
+    public function isTpaApiServiceEnabled($ticket_id)
+    {
+        $result = $this->db->table('ticket_master tm')
+                ->select('tas.*')
+                ->join('client_policy cp', 'tm.client_policy_id = cp.id')
+                ->join('tpa_api_services tas', 'cp.tpa_id = tas.tpa_id')
+                ->where('tm.id', $ticket_id)
+                ->where('tm.is_active', 1)
+                ->where('cp.is_active', 1)
+                ->where('tas.is_active', 1)
+                ->get()->getRowArray();
+
+        return count($result ?? []) > 0 ? true : false; // true if any API service is enabled, false if no API service is enabled
+    }
+
     // -----------------------------------------------------------------------------------------------------
 
 }
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index e71d67ff..0eff67a2 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -245,7 +245,7 @@
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_leads_and_bds_renewal.png" alt="Logo" height="14" 
                                 class="active_leads " style="display:none;">
                                     &nbsp;&nbsp;
-                            <span class="d-none d-sm-inline-block dash-tab dash-tab-font">Leads and BDS Renewals</span>
+                            <span class="d-none d-sm-inline-block dash-tab dash-tab-font">Opportunities and BDS Renewals</span>
                         </a>
                     </li>
              &nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 1330cded..9ba0451b 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -24,6 +24,66 @@
     .dataTables_length label {height: 21px !important;}
 
     .readonly-select { background-color: #f3f3f3 !important; cursor: not-allowed;  pointer-events: none; }
+
+.custom-tooltip {
+    position: relative;
+    display: inline-block;
+    cursor: pointer;
+}
+
+.info-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 18px;
+    height: 18px;
+    background-color: #007bff;
+    color: #fff;
+    border-radius: 50%;
+    font-size: 14px;
+    font-style: italic;
+    font-weight: bold;
+    font-family: Georgia, serif;
+    line-height: 1;
+    vertical-align: middle;
+}
+
+.tooltiptext {
+    visibility: hidden;
+    opacity: 0;
+    position: fixed;        /* fixed instead of absolute to escape modal overflow */
+    background: #333;
+    color: #fff;
+    padding: 10px 14px;
+    border-radius: 6px;
+    white-space: normal;    /* allow text wrapping */
+    width: 320px;           /* fixed width for multiline */
+    font-size: 12px;
+    font-weight: normal;
+    font-style: normal;
+    line-height: 1.6;
+    z-index: 99999;
+    transition: opacity 0.2s ease;
+    pointer-events: none;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+    top: 20px !important;
+    left: 155px !important;
+}
+
+.tooltiptext::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 20px;
+    border: 6px solid transparent;
+    border-top-color: #333;
+}
+
+.custom-tooltip:hover .tooltiptext {
+    visibility: visible;
+    opacity: 1;
+}
+
 </style>
 
 <!-- <div class="row">
@@ -117,6 +177,16 @@
                                                 class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
                                             <a target="_blank" class="dropdown-item" href="<?= base_url("util/download_claim_dump_file/") . $file['file_id']; ?>"><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+
+                                            <?php if ($file['status'] === 'failed') : ?>
+                                                <a href="javascript:void(0);"
+                                                   class="dropdown-item"
+                                                   onclick="downloadTpaErrorFile(<?= (int) $file['file_id']; ?>)">
+                                                    <i class="mdi mdi-file-excel mr-2 text-danger font-18 vertical-middle"></i>
+                                                    Download Error File
+                                                </a>
+                                            <?php endif; ?>
+
                                             <!-- <a data-id="<?php echo $file['file_id'] ?>" data-toggle="modal" data-target="#full-width-modal-emp-list" class="dropdown-item view_emp_list" href="#"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View</a> -->
                                         </div>
                                     </div>
@@ -151,7 +221,16 @@
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Claim Dump Upload</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">
+                    Claim Dump Upload 
+                    <i class="info-icon" 
+                    data-toggle="tooltip" 
+                    data-placement="right" 
+                    data-html="true"
+                    title="1. If you want to upload a TPA-wise claim dump, select the client and policy, then upload the TPA's Excel file. <br><br> 2. The second option without selecting the client and policy allows you to upload multiple claims. You can download the sample file provided below, fill it in, and upload it. This is for bulk dump upload.">
+                    i
+                    </i>
+                </h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -219,6 +298,20 @@
     let policyListByClient = null;
     let client_list = null;
 
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip();
+    });
+
+    document.querySelectorAll('.custom-tooltip').forEach(function(tooltip) {
+        tooltip.addEventListener('mouseenter', function() {
+            var icon = this.querySelector('.info-icon');
+            var tip  = this.querySelector('.tooltiptext');
+            var rect = icon.getBoundingClientRect();
+            tip.style.left = rect.left + 'px';
+            tip.style.top  = (rect.top - tip.offsetHeight - 10) + 'px';
+        });
+    });
+
     $(document).ready(function() {
 
         getClientAndBranchAndPolicy();
@@ -232,10 +325,17 @@
 
             let client_id = $('#client_id').val() ?? null;
             let client_policy_id = $('#client_policy_id').val() ?? null;
+            let tpa_id = $('#tpa_id').val() ?? null;
 
             if(client_id){
+
                 if(!client_policy_id){
-                    toastr.warning('Please select the client policy', 'Warning');
+                    toastr.warning('Please select the client policy', 'WARNING');
+                    return;
+                }
+
+                if(!tpa_id){
+                    toastr.warning('TPA is required', 'WARNING');
                     return;
                 }
             }
@@ -251,9 +351,15 @@
                 'application/vnd.oasis.opendocument.spreadsheet'
             ];
 
+            if (!fileInput.files.length) {
+                toastr.warning('Please select an Excel file', 'WARNING');
+                return false;
+            }
+
             var selectedFile = fileInput.files[0];
+
             if (!allowedTypes.includes(selectedFile.type)) {
-                alert('Please upload a valid Excel file (.xlsx, .xls, .ods)');
+                toastr.warning('Please upload a valid Excel file (.xlsx, .xls, .ods)', 'WARNING');
                 return false;
             }
 
@@ -500,6 +606,70 @@
 
     }
 
+    function downloadTpaErrorFile(file_id) {
+        if (!file_id) {
+            toastr.error('Invalid file reference for error download', 'Error');
+            return;
+        }
+
+        var url = '<?= base_url("util/getTpaClaimDumpErrorData"); ?>/' + file_id;
+
+        $.ajax({
+            url: url,
+            type: 'GET',
+            xhrFields: { responseType: 'blob' },
+            success: function (data, status, xhr) {
+                var disposition = xhr.getResponseHeader('Content-Disposition') || '';
+                var contentType = xhr.getResponseHeader('Content-Type') || '';
+
+                // If server sent JSON (error), parse it and show via Toastr
+                if (contentType.indexOf('application/json') !== -1) {
+                    var reader = new FileReader();
+                    reader.onload = function () {
+                        try {
+                            var json = JSON.parse(reader.result);
+                            var msg = json.message || 'Unable to download error file.';
+                            toastr.error(msg, 'Error');
+                        } catch (e) {
+                            toastr.error('Unable to download error file.', 'Error');
+                        }
+                    };
+                    reader.readAsText(data);
+                    return;
+                }
+
+                // Otherwise assume it is Excel and trigger a download
+                var filename = 'tpa_claim_dump_errors_' + file_id + '.xlsx';
+                var match = /filename="?([^"]+)"?/.exec(disposition);
+                if (match && match[1]) {
+                    filename = match[1];
+                }
+
+                var blob = new Blob([data], {
+                    type: contentType || 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                });
+                var link = document.createElement('a');
+                link.href = window.URL.createObjectURL(blob);
+                link.download = filename;
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+
+                toastr.success('Error file download started', 'Success');
+            },
+            error: function (xhr) {
+                var msg = 'Unable to download error file.';
+                try {
+                    var json = JSON.parse(xhr.responseText);
+                    if (json.message) {
+                        msg = json.message;
+                    }
+                } catch (e) {}
+                toastr.error(msg, 'Error');
+            }
+        });
+    }
+
     $('.close').click(function(){
         $('#modal_body').empty()
         let html = `<div class="spinner-border text-primary" role="status" style="position: relative; left: 200px;"></div>`
diff --git a/app/Views/daily_report_email_template.php b/app/Views/daily_report_email_template.php
new file mode 100644
index 00000000..0ba7c8ff
--- /dev/null
+++ b/app/Views/daily_report_email_template.php
@@ -0,0 +1,347 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style>
+        /* Base */
+        body {
+            font-family: 'Segoe UI', Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f4f7f6;
+            color: #333;
+            -webkit-text-size-adjust: 100%;
+        }
+        .container {
+            width: 100%;
+            max-width: 680px;
+            margin: 0 auto;
+            background: #ffffff;
+            border-radius: 8px;
+            overflow: hidden;
+            box-shadow: 0 4px 10px rgba(0,0,0,0.06);
+        }
+
+        /* Header */
+        .header {
+            background: linear-gradient(135deg, #1f618d, #21618c, #117a65);
+            color: #ffffff;
+            padding: 24px 16px;
+            text-align: center;
+        }
+        .header h1 {
+            margin: 0;
+            font-size: 24px;
+            letter-spacing: 0.5px;
+        }
+        .header-subtitle {
+            margin-top: 6px;
+            font-size: 13px;
+            opacity: 0.9;
+        }
+
+        /* Content */
+        .content {
+            padding: 20px;
+        }
+        .report-date {
+            color: #7f8c8d;
+            font-size: 13px;
+            margin-bottom: 16px;
+            text-align: right;
+        }
+        .section-title {
+            font-size: 17px;
+            color: #2c3e50;
+            border-bottom: 2px solid #3498db;
+            display: inline-block;
+            margin: 18px 0 12px;
+            padding-bottom: 4px;
+        }
+
+        /* Stats Grid - stacked for better email support */
+        .stats-grid {
+            margin-bottom: 18px;
+        }
+        .stat-card {
+            width: 100%;
+            display: block;
+            background: #f8f9fa;
+            padding: 12px 14px;
+            border-radius: 6px;
+            border-left: 4px solid #3498db;
+            box-sizing: border-box;
+            margin-bottom: 10px;
+        }
+        .stat-label {
+            font-size: 11px;
+            text-transform: uppercase;
+            color: #7f8c8d;
+            font-weight: 600;
+            letter-spacing: 0.5px;
+        }
+        .stat-value {
+            font-size: 18px;
+            color: #2c3e50;
+            margin-top: 4px;
+            font-weight: bold;
+        }
+        .stat-note {
+            font-size: 11px;
+            color: #95a5a6;
+            margin-top: 2px;
+        }
+
+        /* Table */
+        .table-container {
+            width: 100%;
+        }
+        .status-table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-top: 8px;
+        }
+        .status-table th {
+            background-color: #ecf0f1;
+            text-align: left;
+            padding: 10px 8px;
+            font-size: 13px;
+            border-bottom: 2px solid #bdc3c7;
+        }
+        .status-table td {
+            padding: 10px 8px;
+            border-bottom: 1px solid #eee;
+            font-size: 13px;
+        }
+
+        .badge {
+            display: inline-block;
+            padding: 2px 8px;
+            border-radius: 10px;
+            font-size: 11px;
+            background: #ecf0f1;
+            color: #2c3e50;
+        }
+
+        /* Footer */
+        .footer {
+            background: #f8f9fa;
+            padding: 14px 18px;
+            text-align: center;
+            font-size: 11px;
+            color: #95a5a6;
+        }
+
+        /* Mobile */
+        @media only screen and (max-width: 480px) {
+            .content {
+                padding: 14px;
+            }
+            .header h1 {
+                font-size: 20px;
+            }
+            .header-subtitle {
+                font-size: 12px;
+            }
+            .section-title {
+                font-size: 15px;
+            }
+            .stat-card {
+                min-width: 100%;
+            }
+            .report-date {
+                text-align: left;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container" style="width:100%;max-width:680px;margin:0 auto;background:#ffffff;border-radius:8px;overflow:hidden;box-shadow:0 4px 10px rgba(0,0,0,0.06);">
+        <div class="header" style="background:#1f618d;color:#ffffff;padding:24px 16px;text-align:center;">
+            <h1>Daily Activity Report</h1>
+            <div class="header-subtitle">
+                Key operations, sales and claim metrics for the day
+            </div>
+        </div>
+        
+        <div class="content" style="padding:20px;">
+            <div class="report-date" style="color:#7f8c8d;font-size:13px;margin-bottom:16px;text-align:right;">Date: <?= $today ?></div>
+            
+            <!-- File Operations -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">Inception &amp; Endorsement (File Upload)</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #3498db;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Total Inception</div>
+                    <div class="stat-value"><?= $total_inception_count ?></div>
+                    <div class="stat-note">Employee file uploads marked as inception</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #3498db;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Total Endorsement</div>
+                    <div class="stat-value"><?= $total_endorsement_count ?></div>
+                    <div class="stat-note">All non‑inception successful uploads</div>
+                </div>
+            </div>
+
+            <!-- Employee Enrollment (new data points as cards only) -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">Employee Enrollment</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #3498db;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Draft / Enrolled </div>
+                    <div class="stat-value"><?= $total_employee_draft_count ?? 0 ?> / <?= $total_employee_enrolled_count ?? 0 ?></div>
+                    <div class="stat-note">Employees in draft / enrolled status for the day</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #9b59b6;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Open for Enrollment Policies</div>
+                    <div class="stat-value"><?= $total_open_for_enrollemnt_policy_count ?? 0 ?></div>
+                    <div class="stat-note">Policies currently open for enrollment</div>
+                </div>
+            </div>
+
+            <!-- TPA / Insurer -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">TPA &amp; Insurer Batch Summary</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #e67e22;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">TPA (Inception / Endorsement)</div>
+                    <div class="stat-value"><?= $total_tpa_incetion_count ?> / <?= $total_tpa_endorsement_count ?></div>
+                    <div class="stat-note">Successful TPA events</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #9b59b6;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Insurer (Inception / Endorsement)</div>
+                    <div class="stat-value"><?= $total_insurer_incetion_count ?> / <?= $total_insurer_endorsement_count ?></div>
+                    <div class="stat-note">Successful insurer events</div>
+                </div>
+            </div>
+
+            <!-- Sales Funnel -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">Sales Funnel &amp; Leads</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #27ae60;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Opportunities &amp; Won</div>
+                    <div class="stat-value"><?= $total_opportunity_count ?> / <?= $total_placement_count ?></div>
+                    <div class="stat-note">Total opportunities created vs converted</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #16a085;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">RFQ (Created / Sent to Insurer)</div>
+                    <div class="stat-value"><?= $total_rfq_created_count ?> / <?= $total_rfq_insurer_send_count ?></div>
+                    <div class="stat-note">Movement from opportunity to RFQ</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #2980b9;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">QCR (Created / Sent to Client)</div>
+                    <div class="stat-value"><?= $total_qcr_created_count ?> / <?= $total_qcr_client_send_count ?></div>
+                    <div class="stat-note">Quotes prepared and shared</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #8e44ad;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Total Leads &amp; Activities</div>
+                    <div class="stat-value"><?= $total_lead_count ?> / <?= $total_activity_count ?></div>
+                    <div class="stat-note">Lead entries and logged touchpoints</div>
+                </div>
+            </div>
+
+            <!-- BDS / Policy Transactions -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">BDS Policy Transactions</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #d35400;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Total BDS Transactions</div>
+                    <div class="stat-value"><?= $total_bds_count ?></div>
+                    <div class="stat-note">All policy transactions processed</div>
+                </div>
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #c0392b;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">BDS (Policy / Endorsement)</div>
+                    <div class="stat-value"><?= $total_bds_policy_wise_count ?> / <?= $total_bds_endorsement_wise_count ?></div>
+                    <div class="stat-note">Split of inceptions vs endorsements</div>
+                </div>
+            </div>
+
+            <!-- Claims -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">Claims</h3>
+            <div class="stats-grid">
+                <div class="stat-card" style="width:100%;display:block;background:#f8f9fa;padding:12px 14px;border-radius:6px;border-left:4px solid #d35400;box-sizing:border-box;margin-bottom:10px;">
+                    <div class="stat-label">Total Claims Registered for the day</div>
+                    <div class="stat-value"><?= $total_claim_count ?></div>
+                    <div class="stat-note"></div>
+                </div>
+            </div>
+
+            <!-- BDS by Policy Type -->
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">BDS by Policy Type</h3>
+            <div class="table-container" style="width:100%;">
+                <table class="status-table" style="width:100%;border-collapse:collapse;margin-top:8px;">
+                    <thead>
+                        <tr>
+                            <th style="background-color:#ecf0f1;text-align:left;padding:10px 8px;font-size:13px;border-bottom:2px solid #bdc3c7;">Policy Type</th>
+                            <th style="background-color:#ecf0f1;text-align:right;padding:10px 8px;font-size:13px;border-bottom:2px solid #bdc3c7;">Count</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php if (!empty($total_bds_policy_type_wise_count)): ?>
+                            <?php foreach ($total_bds_policy_type_wise_count as $row): ?>
+                                <tr>
+                                    <td style="padding:10px 8px;border-bottom:1px solid #eee;font-size:13px;">
+                                        <span class="badge" style="display:inline-block;padding:2px 8px;border-radius:10px;font-size:11px;background:#ecf0f1;color:#2c3e50;"><?= esc($row['policy_type']) ?></span>
+                                    </td>
+                                    <td style="padding:10px 8px;border-bottom:1px solid #eee;font-size:13px;text-align:right;font-weight:bold;"><?= $row['count'] ?></td>
+                                </tr>
+                            <?php endforeach; ?>
+                        <?php else: ?>
+                            <tr>
+                                <td colspan="2" style="padding:10px 8px;border-bottom:1px solid #eee;font-size:12px;text-align:center;color:#7f8c8d;">
+                                    No BDS activity recorded for today.
+                                </td>
+                            </tr>
+                        <?php endif; ?>
+                    </tbody>
+                </table>
+            </div>
+
+
+            <h3 class="section-title" style="font-size:17px;color:#2c3e50;border-bottom:2px solid #3498db;display:inline-block;margin:18px 0 12px;padding-bottom:4px;">Claim Status Breakdown</h3>
+            <div style="padding:10px 8px;border:1px solid #eee;border-radius:4px;font-size:12px;text-align:center;color:#7f8c8d;margin-top:8px;">
+                The total claims received so far are listed ticket type-wise.
+            </div>
+
+            <?php
+                $claimSections = [
+                    'GMC Claims'  => $total_gmc_status_wise_claim_count ?? [],
+                    'GPA Claims'  => $total_gpa_status_wise_claim_count ?? [],
+                    'EDLI Claims' => $total_edli_status_wise_claim_count ?? [],
+                    'GTLI Claims' => $total_gtli_status_wise_claim_count ?? [],
+                ];
+                $hasAnyClaimData = false;
+            ?>
+
+            <?php foreach ($claimSections as $sectionTitle => $rows): ?>
+                <?php if (!empty($rows)): ?>
+                    <?php $hasAnyClaimData = true; ?>
+                    <h4 style="font-size:14px;color:#34495e;margin:14px 0 6px;"><?= esc($sectionTitle) ?></h4>
+                    <div class="table-container" style="width:100%;margin-bottom:10px;">
+                        <table class="status-table" style="width:100%;border-collapse:collapse;margin-top:4px;">
+                            <thead>
+                                <tr>
+                                    <th style="background-color:#ecf0f1;text-align:left;padding:10px 8px;font-size:13px;border-bottom:2px solid #bdc3c7;">Status</th>
+                                    <th style="background-color:#ecf0f1;text-align:right;padding:10px 8px;font-size:13px;border-bottom:2px solid #bdc3c7;">Count</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php foreach ($rows as $row): ?>
+                                    <tr>
+                                        <td style="padding:10px 8px;border-bottom:1px solid #eee;font-size:13px;">
+                                            <span class="badge" style="display:inline-block;padding:2px 8px;border-radius:10px;font-size:11px;background:#ecf0f1;color:#2c3e50;"><?= esc($row['claim_status']) ?></span>
+                                        </td>
+                                        <td style="padding:10px 8px;border-bottom:1px solid #eee;font-size:13px;text-align:right;font-weight:bold;"><?= $row['count'] ?></td>
+                                    </tr>
+                                <?php endforeach; ?>
+                            </tbody>
+                        </table>
+                    </div>
+                <?php endif; ?>
+            <?php endforeach; ?>
+
+        </div>
+
+        <div class="footer" style="background:#f8f9fa;padding:14px 18px;text-align:center;font-size:11px;color:#95a5a6;">
+            This is an automated system generated report. Please do not reply to this email.
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
new file mode 100644
index 00000000..2dedb059
--- /dev/null
+++ b/app/Views/expense_list.php
@@ -0,0 +1,586 @@
+<div class="row" id="expense_module">
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div class="row mb-3">
+                    <div class="col-6 d-flex align-items-center">
+                        <!-- <h4 class="mb-0">Expense</h4> -->
+                    </div>
+                    <div class="col-6 text-right">
+                        <!-- <button type="button" class="btn app-btn-secondary" id="btnResetExpense">
+                            <i class="mdi mdi-refresh mr-1"></i>Reset
+                        </button> -->
+                    </div>
+                </div>
+
+                <div class="custom-form mb-4">
+                    <form role="form" class="parsley-examples" method="get" id="expense_form">
+                        <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+                        <input type="hidden" name="id" id="expense_id" />
+
+                        <div class="form-row">
+                            <div class="form-group col-md-4">
+                                <label for="client_id">Client Name <span class="text-danger">*</span></label>
+                                <select class="form-control" id="client_id" name="client_id" required>
+                                    <option value="">Select Client</option>
+                                    <?php if (! empty($clients)) : ?>
+                                        <?php foreach ($clients as $client) : ?>
+                                            <option value="<?= $client['id']; ?>" <?= ! empty($filters['client_id']) && (int) $filters['client_id'] === (int) $client['id'] ? 'selected' : ''; ?>>
+                                                <?= esc($client['client_name']); ?>
+                                                <?= ! empty($client['short_name']) ? ' (' . esc($client['short_name']) . ')' : ''; ?>
+                                            </option>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="client_policy_id">Policy No <span class="text-danger">*</span></label>
+                                <select class="form-control" id="client_policy_id" name="client_policy_id" required>
+                                    <option value="">Select Policy</option>
+                                    <?php if (! empty($policies_for_filter)) : ?>
+                                        <?php foreach ($policies_for_filter as $policy) : ?>
+                                            <option value="<?= $policy['id']; ?>" <?= ! empty($filters['client_policy_id']) && (int) $filters['client_policy_id'] === (int) $policy['id'] ? 'selected' : ''; ?>>
+                                                <?= ! empty($policy['policy_type']) ? esc($policy['policy_type']) . ' - ' : ''; ?> <?= esc($policy['policy_no']); ?>
+                                            </option>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="approved_by">Approved By <span class="text-danger">*</span></label>
+                                <select class="form-control" id="approved_by" name="approved_by" required>
+                                    <option value="">Select User</option>
+                                    <?php if (! empty($approved_users)) : ?>
+                                        <?php foreach ($approved_users as $user) : ?>
+                                            <option value="<?= $user['id']; ?>" <?= ! empty($filters['approved_by']) && (int) $filters['approved_by'] === (int) $user['id'] ? 'selected' : ''; ?>>
+                                                <?= esc($user['first_name']); ?>
+                                            </option>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-row">
+
+                            <div class="form-group col-md-4">
+                                <label for="expense_date">Expense Date <span class="text-danger">*</span></label>
+                                <input
+                                    type="text"
+                                    class="form-control"
+                                    id="expense_date"
+                                    name="expense_date"
+                                    placeholder="DD-MM-YYYY"
+                                    value="<?= isset($filters['expense_date']) ? esc($filters['expense_date']) : ''; ?>"
+                                    required
+                                >
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="amount">Amount <span class="text-danger">*</span></label>
+                                <input type="number" step="0.01" min="0" class="form-control" id="amount" name="amount" placeholder="Enter amount" value="<?= isset($filters['amount']) ? esc($filters['amount']) : ''; ?>" required>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="description">Description <span class="text-danger">*</span></label>
+                                <textarea class="form-control" id="description" name="description" rows="3" placeholder="Enter description" required><?= isset($filters['description']) ? esc($filters['description']) : ''; ?></textarea>
+                            </div>
+                        </div>
+
+                        <div class="form-group text-right m-b-0">
+                            <!-- <button type="button" class="btn app-btn-secondary waves-effect waves-light mr-1" id="btnSearchExpense">
+                                Search
+                            </button> -->
+                            <button type="submit" class="btn app-btn-secondary waves-effect waves-light mr-1" id="btnSubmitExpense">
+                                Save
+                            </button>
+                            <button type="button" class="btn btn-secondary waves-effect" id="btnCancelExpense">
+                                Reset
+                            </button>
+                        </div>
+                    </form>
+                </div>
+
+                <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="expense-table">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="font-weight-medium">S.No</th>
+                            <th class="font-weight-medium">Client</th>
+                            <th class="font-weight-medium">Policy No</th>
+                            <th class="font-weight-medium">Description</th>
+                            <th class="font-weight-medium">Approved By</th>
+                            <th class="font-weight-medium">Amount</th>
+                            <th class="font-weight-medium">Expense Date</th>
+                            <th class="font-weight-medium">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php if (! empty($expenses)) : ?>
+                            <?php foreach ($expenses as $index => $row) : ?>
+                                <tr>
+                                    <td class="text-center"><?= $index + 1; ?></td>
+                                    <td>
+                                        <?= esc($row['client_name'] ?? ''); ?>
+                                        <?= ! empty($row['short_name']) ? ' (' . esc($row['short_name']) . ')' : ''; ?>
+                                    </td>
+                                    <td><?= esc($row['policy_no'] ?? ''); ?></td>
+                                    <td><?= esc($row['description'] ?? ''); ?></td>
+                                    <td><?= esc($row['approved_by_name'] ?? ''); ?></td>
+                                    <td><?= number_format((float) ($row['amount'] ?? 0), 2); ?></td>
+                                    <td>
+                                        <?php if (! empty($row['expense_date'])): ?>
+                                            <?= date('d-m-Y', strtotime($row['expense_date'])); ?>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td>
+                                        <div class="btn-group dropdown">
+                                            <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false">
+                                                <i class="mdi mdi-dots-horizontal"></i>
+                                            </a>
+                                            <div class="dropdown-menu dropdown-menu-right">
+                                                <a class="dropdown-item" href="javascript:void(0);" onclick="editExpense(<?= (int) $row['id']; ?>)">
+                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                </a>
+                                                <a class="dropdown-item" href="javascript:void(0);" onclick="deleteExpense(<?= (int) $row['id']; ?>)">
+                                                    <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                        <?php endif; ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const expenseValidationErrors = <?= ! empty($validation_errors) ? json_encode(array_values($validation_errors)) : '[]'; ?>;
+    let expensePoliciesCache = {};
+
+    function resetExpenseForm() {
+        $('#client_id').val('').trigger('change');
+        $('#client_policy_id').empty().append('<option value="">Select Policy</option>').trigger('change');
+        $('#approved_by').val('').trigger('change');
+        $('#description').val('');
+        $('#amount').val('');
+        $('#expense_date').val('');
+        $('#btnSubmitExpense').text('Save');
+        window.location.href = '<?= base_url("expense"); ?>';
+    }
+
+    function validateExpenseSave() {
+        const errors = [];
+        const clientId   = $('#client_id').val();
+        const policyId   = $('#client_policy_id').val();
+        const approvedBy = $('#approved_by').val();
+        const desc       = ($('#description').val() || '').trim();
+        const amount     = ($('#amount').val() || '').trim();
+        const expenseDate= ($('#expense_date').val() || '').trim();
+
+        const idPattern   = /^[0-9]+$/;
+        const descPattern = /^[a-zA-Z0-9\s\.\,\-\(\)\/\&\+]+$/;
+        const datePattern = /^[0-9]{2}-[0-9]{2}-[0-9]{4}$/;
+
+        if (!clientId) {
+            errors.push('Client is required.');
+        } else if (!idPattern.test(clientId)) {
+            errors.push('Invalid client selected.');
+        }
+
+        if (!policyId) {
+            errors.push('Policy is required.');
+        } else if (!idPattern.test(policyId)) {
+            errors.push('Invalid policy selected.');
+        }
+
+        if (!approvedBy) {
+            errors.push('Approved By is required.');
+        } else if (!idPattern.test(approvedBy)) {
+            errors.push('Invalid approver selected.');
+        }
+
+        if (!desc) {
+            errors.push('Description is required.');
+        } else if (!descPattern.test(desc)) {
+            errors.push('Description contains invalid characters.');
+        }
+
+        if (!amount) {
+            errors.push('Amount is required.');
+        } else if (isNaN(amount) || Number(amount) < 0) {
+            errors.push('Amount must be a non-negative number.');
+        }
+
+        if (!expenseDate) {
+            errors.push('Expense Date is required.');
+        } else if (!datePattern.test(expenseDate)) {
+            errors.push('Expense Date must be in DD-MM-YYYY format.');
+        }
+
+        if (errors.length) {
+            toastr.warning(errors.join('<br>'), 'Validation');
+            return false;
+        }
+
+        return true;
+    }
+
+    function validateExpenseSearchFilters() {
+        const errors = [];
+        const clientId   = $('#client_id').val();
+        const policyId   = $('#client_policy_id').val();
+        const approvedBy = $('#approved_by').val();
+        const desc       = ($('#description').val() || '').trim();
+        const amount     = ($('#amount').val() || '').trim();
+        const expenseDate= ($('#expense_date').val() || '').trim();
+
+        const idPattern   = /^[0-9]+$/;
+        const descPattern = /^[a-zA-Z0-9\s\.\,\-\(\)\/\&\+]+$/;
+        const datePattern = /^[0-9]{2}-[0-9]{2}-[0-9]{4}$/;
+
+        if (clientId && !idPattern.test(clientId)) {
+            errors.push('Invalid client selected for search.');
+        }
+
+        if (policyId && !idPattern.test(policyId)) {
+            errors.push('Invalid policy selected for search.');
+        }
+
+        if (approvedBy && !idPattern.test(approvedBy)) {
+            errors.push('Invalid approver selected for search.');
+        }
+
+        if (desc && !descPattern.test(desc)) {
+            errors.push('Description filter contains invalid characters.');
+        }
+
+        if (amount) {
+            if (isNaN(amount) || Number(amount) < 0) {
+                errors.push('Amount filter must be a non-negative number.');
+            }
+        }
+
+        if (expenseDate && !datePattern.test(expenseDate)) {
+            errors.push('Expense Date filter must be in DD-MM-YYYY format.');
+        }
+
+        if (errors.length) {
+            toastr.warning(errors.join('<br>'), 'Validation');
+            return false;
+        }
+
+        return true;
+    }
+
+    function populatePolicies(clientId, selectedPolicyId = null) {
+        if (!clientId) {
+            $('#client_policy_id').empty().append('<option value="">Select Policy</option>').trigger('change');
+            return;
+        }
+
+        if (expensePoliciesCache[clientId]) {
+            const policies = expensePoliciesCache[clientId];
+            let optionsHtml = '<option value=\"\">Select Policy</option>';
+
+            policies.forEach(function (p) {
+                optionsHtml += `<option value=\"${p.id}\">${p.policy_no}</option>`;
+            });
+
+            $('#client_policy_id').html(optionsHtml);
+
+            if (selectedPolicyId) {
+                $('#client_policy_id').val(selectedPolicyId).trigger('change');
+            }
+
+            return;
+        }
+
+        $.ajax({
+            url: '<?= base_url("expense/client-policies"); ?>',
+            type: 'GET',
+            dataType: 'json',
+            data: {client_id: clientId},
+            success: function (res) {
+                if (res.status) {
+                    expensePoliciesCache[clientId] = res.data || [];
+
+                    let optionsHtml = '<option value=\"\">Select Policy</option>';
+                    (res.data || []).forEach(function (p) {
+                        optionsHtml += `<option value=\"${p.id}\">${p.policy_no}</option>`;
+                    });
+
+                    $('#client_policy_id').html(optionsHtml);
+
+                    if (selectedPolicyId) {
+                        $('#client_policy_id').val(selectedPolicyId).trigger('change');
+                    }
+                } else {
+                    toastr.warning(res.message || 'Unable to load policies', 'WARNING');
+                }
+            },
+            error: function () {
+                toastr.error('Unexpected error while loading policies', 'ERROR');
+            }
+        });
+    }
+
+    function editExpense(id) {
+        if (!id) {
+            return;
+        }
+
+        $.ajax({
+            url: '<?= base_url("expense/get"); ?>/' + id,
+            type: 'GET',
+            dataType: 'json',
+            success: function (res) {
+                if (res.status && res.data) {
+                    const data = res.data;
+
+                    $('#expense_id').val(data.id);
+                    $('#description').val(data.description || '');
+                    $('#amount').val(data.amount || '');
+                    if (data.expense_date) {
+                        const parts = (data.expense_date || '').split('-'); // Y-m-d
+                        if (parts.length === 3) {
+                            const formatted = parts[2] + '-' + parts[1] + '-' + parts[0];
+                            $('#expense_date').val(formatted);
+                            if (window.expenseDatePicker) {
+                                window.expenseDatePicker.setDate(formatted, true, 'd-m-Y');
+                            }
+                        }
+                    }
+
+                    if (data.approved_by) {
+                        $('#approved_by').val(data.approved_by).trigger('change');
+                    }
+
+                    if (data.client_id) {
+                        $('#client_id').val(data.client_id).trigger('change');
+                        populatePolicies(data.client_id, data.client_policy_id || null);
+                    }
+
+                    $('#btnSubmitExpense').text('Update');
+                    $('html, body').animate({
+                        scrollTop: $('#expense_form').offset().top - 100
+                    }, 400);
+                } else {
+                    toastr.warning(res.message || 'Expense not found', 'WARNING');
+                }
+            },
+            error: function () {
+                toastr.error('Unable to fetch expense details', 'ERROR');
+            }
+        });
+    }
+
+    function deleteExpense(id) {
+        if (!id) {
+            return;
+        }
+
+        Swal.fire({
+            title: "Are you sure?",
+            text: "You want to delete this expense",
+            icon: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#d33",
+            confirmButtonText: "Yes",
+        }).then((result) => {
+            if (!result.isConfirmed) {
+                return;
+            }
+
+            const postData = {};
+            postData['<?= csrf_token() ?>'] = '<?= csrf_hash() ?>';
+
+            $.ajax({
+                url: '<?= base_url("expense/delete"); ?>/' + id,
+                type: 'POST',
+                dataType: 'json',
+                data: postData,
+                success: function (res) {
+                    if (res.status) {
+                        toastr.success(res.message || 'Expense deleted successfully', 'SUCCESS');
+                        setTimeout(function () {
+                            location.reload();
+                        }, 800);
+                    } else {
+                        toastr.warning(res.message || 'Unable to delete expense', 'WARNING');
+                    }
+                },
+                error: function () {
+                    toastr.error('Unable to delete expense', 'ERROR');
+                }
+            });
+        });
+    }
+
+    $(document).ready(function () {
+        $('#client_id').select2();
+        $('#client_policy_id').select2();
+        $('#approved_by').select2();
+
+        window.expenseDatePicker = flatpickr('#expense_date', {
+            dateFormat: 'd-m-Y',
+            allowInput: true
+        });
+
+        $('#expense-table').DataTable({
+            dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+            lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
+            buttons: [
+                {
+                    extend: 'collection',
+                    text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary ',
+                    buttons: [
+                        {
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited"></i><span class="btn-custom"> CSV </span>',
+                            title: 'Expense List',
+                            className: 'app-btn-primary ',
+                            exportOptions: {
+                                columns: ':not(:last-child)'
+                            }
+                        },
+                        {
+                            extend: 'excel',
+                            title: 'Expense-List',
+                            sheetName: 'Expense-List',
+                            text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
+                            className: 'app-btn-primary ',
+                            exportOptions: {
+                                orthogonal: 'sort',
+                                columns: ':not(:last-child)'
+                            }
+                        },
+                        {
+                            extend: 'pdf',
+                            text: '<i class="mdi mdi-file-pdf"></i><span class="btn-custom"> PDF </span>',
+                            title: 'Expense List',
+                            className: 'app-btn-primary ',
+                            exportOptions: {
+                                columns: ':not(:last-child)'
+                            }
+                        }
+                    ]
+                }
+            ],
+            language: {
+                search: `
+                    <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon" 
+                           style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"></i>
+                        <i class="mdi mdi-close-circle datatable-clear-icon" 
+                           style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;"></i>
+                    </div>`,
+                searchPlaceholder: "Search",
+                emptyTable: '<div class="text-center text-muted">No Data found</div>'
+            }
+        });
+
+        $('.dataTables_length label').css('height', '21px');
+
+        // Show any backend validation errors from search
+        if (Array.isArray(expenseValidationErrors) && expenseValidationErrors.length) {
+            expenseValidationErrors.forEach(function (msg) {
+                toastr.warning(msg, 'Validation');
+            });
+        }
+
+        $('#client_id').on('change', function () {
+            const clientId = $(this).val();
+            populatePolicies(clientId);
+        });
+
+        $('#btnSearchExpense').on('click', function () {
+            if (!validateExpenseSearchFilters()) {
+                return;
+            }
+
+            const params = {};
+            const clientId = $('#client_id').val();
+            const policyId = $('#client_policy_id').val();
+            const approvedBy = $('#approved_by').val();
+            const desc = $('#description').val();
+            const amount = $('#amount').val();
+            const expenseDate = $('#expense_date').val();
+
+            if (clientId) {
+                params.client_id = clientId;
+            }
+            if (policyId) {
+                params.client_policy_id = policyId;
+            }
+            if (approvedBy) {
+                params.approved_by = approvedBy;
+            }
+            if (desc) {
+                params.description = desc;
+            }
+            if (amount) {
+                params.amount = amount;
+            }
+            if (expenseDate) {
+                params.expense_date = expenseDate;
+            }
+
+            const query = $.param(params);
+            const baseUrl = '<?= base_url("expense"); ?>';
+            window.location.href = query ? baseUrl + '?' + query : baseUrl;
+        });
+
+        $('#btnSubmitExpense').on('click', function (e) {
+            e.preventDefault();
+
+            if (!validateExpenseSave()) {
+                return;
+            }
+
+            const formData = $('#expense_form').serialize();
+
+            $.ajax({
+                url: '<?= base_url("expense/save"); ?>',
+                type: 'POST',
+                dataType: 'json',
+                data: formData,
+                success: function (res) {
+                    if (res.status) {
+                        toastr.success(res.message || 'Expense saved successfully', 'SUCCESS');
+                        setTimeout(function () {
+                            location.reload();
+                        }, 800);
+                    } else {
+                        const errors = res.errors || {};
+                        let errorMsg = res.message || 'Unable to save expense';
+
+                        if (Object.keys(errors).length) {
+                            errorMsg = Object.values(errors).join('<br>');
+                        }
+
+                        toastr.warning(errorMsg, 'WARNING');
+                    }
+                },
+                error: function () {
+                    toastr.error('Unexpected error while saving expense', 'ERROR');
+                }
+            });
+        });
+
+        $('#btnResetExpense, #btnCancelExpense').on('click', function () {
+            resetExpenseForm();
+        });
+    });
+</script>
+
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 224a7bd8..0086c4f5 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -1876,6 +1876,17 @@
                         </li>
                     <?php } ?>
 
+                    <!-- Expence -->
+                    <?php if (in_array(get_role_id(), [1, 5])) { ?>
+                        <li class="li-seperate" id="clients-li">
+                            <a href="<?= base_url('expense') ?>" class="img-inactive">
+                                <img style="border-radius: 5px;"
+                                    src="<?= base_url() . "public"; ?>/assets/images/expense_icon.png" alt="Logo" height="24">
+                                <span> Expense </span>
+                            </a>
+                        </li>
+                    <?php } ?>
+
                     <!-- BDS -->
                     <?php if ((get_role_id() == 1 || get_role_id() == 5 || get_role_id() == 4) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
                         <li class="li-seperate" id="policy-transactions-li">
@@ -2106,7 +2117,7 @@
                                     </li> -->
                                     <?php if (in_array(get_role_id(), [1, 5])){ ?>
                                     <li>
-                                        <a href="<?= base_url('sales/loadtargets') ?>"><i class="ri-group-2-fill"></i> Team Targets </a>
+                                        <a href="<?= base_url('sales/loadtargets') ?>"><i class="ri-group-2-fill"></i>Sales Team Targets </a>
                                     </li>
                                     <?php } ?>
                                 </ul>
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index 0833c740..7fb07fb6 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -347,7 +347,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
         if (type == 1 && leadType != null && leadType == 1) {
             $('.leadStatusTitle_1').show();
-            $('#main_tile').text(" Leads");
+            $('#main_tile').text("Opportunities");
 
         }
         if (type == 1 && leadType != null && leadType == 2) {
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index eeef3d1b..089bff40 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -401,6 +401,12 @@
                                     </div>
 
                                 </div>
+                                <div class="form-row" id="lost_reason_div" style="display: none;">
+                                    <div class="form-group col-md-12">
+                                        <label for="lost_reason">Lost Reason <span class="text-danger">*</span></label>
+                                        <textarea class="form-control" id="lost_reason" name="lost_reason" rows="4" placeholder="Please specify why this opportunity was lost"></textarea>
+                                    </div>
+                                </div>
                                 <div class="form-row">
                                     <div class="form-group col-md-12">
                                         <label for="notes">Remarks</label>
@@ -778,7 +784,8 @@
                     $('#client_name').val(res.data.client_name);
                     $('#client_short_name').val(res.data.client_short_name);
                     $('#entity_type_id').val(res.data.entity_type_id);
-                    $('#lead_status').val(res.data.status);
+                    $('#lead_status').val(res.data.status).trigger('change');
+                    $('#lost_reason').val(res.data.lost_reason || '');
                     $('#notes').val(res.data.notes);
 
                     setTimeout(function() {
@@ -2431,5 +2438,66 @@
     });
 
 
+    $(document).ready(function() {
+
+        var actual_lead_client_details = <?= json_encode($actual_lead_client_details ?? null) ?>;
+        var actual_lead_contact_person_details = <?= json_encode($actual_lead_contact_person_details ?? null) ?>;
+
+        // -------------------------------
+        // CLIENT DETAILS AUTO FILL
+        // -------------------------------
+        if (actual_lead_client_details) {
+
+            $('#client_name').val(actual_lead_client_details.company_name || '');
+
+            $('#gst').val(actual_lead_client_details.gst_number || '');
+
+            // 🔥 Important:
+            // Only auto-generate short name IF empty (avoid overwrite in edit)
+            if (!$('#client_short_name').val()) {
+                $('#client_name').trigger('input');
+            } else {
+                // Run duplicate validation once
+                validateInput($('#client_short_name')[0], "clients", "short_name");
+            }
+        }
+
+        // -------------------------------
+        // CONTACT PERSON AUTO FILL
+        // -------------------------------
+        if (actual_lead_contact_person_details) {
+
+            $('#contact_person_name').val(actual_lead_contact_person_details.name || '');
+
+            $('#contact_person_mobile').val(actual_lead_contact_person_details.mobile || '');
+
+            $('#contact_person_email').val(actual_lead_contact_person_details.email || '');
+        }
+        
+
+        $('#lead_status').change(function() {
+            if ($(this).val() === 'lost') {
+                $('#lost_reason_div').show();
+                $('#lost_reason').attr('required', 'required');
+            } else {
+                $('#lost_reason_div').hide();
+                $('#lost_reason').val("");
+                $('#lost_reason').removeAttr('required');
+            }
+        });
+
+        // Check on page load
+        if ($('#lead_status').val() === 'lost') {
+            $('#lost_reason_div').show();
+            $('#lost_reason').attr('required', 'required');
+        } else {
+            // Ensure it's hidden and not required if the initial value is not 'lost'
+            $('#lost_reason_div').hide();
+            $('#lost_reason').val("");
+            $('#lost_reason').removeAttr('required');
+        }
+    });
+
+
     //-----------------------------------------------------------------------------------------------------------
 </script>
\ No newline at end of file
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index c6749816..c4caca5f 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -410,6 +410,12 @@
 
                             </div>
 
+                            <div class="form-row" id="lost_reason_div" style="display: none;">
+                                <div class="form-group col-md-12">
+                                    <label for="lost_reason">Lost Reason <span class="text-danger">*</span></label>
+                                    <textarea class="form-control" id="lost_reason" name="lost_reason" rows="4" placeholder="Please specify why this opportunity was lost"></textarea>
+                                </div>
+                            </div>
                             <div class="form-row">
                                 <div class="form-group col-md-12">
                                     <label for="notes">Remarks</label>
@@ -1258,4 +1264,63 @@
         }
     });
 
+    $(document).ready(function() {
+
+        var actual_lead_client_details = <?= json_encode($actual_lead_client_details ?? null) ?>;
+        var actual_lead_contact_person_details = <?= json_encode($actual_lead_contact_person_details ?? null) ?>;
+
+        // -------------------------------
+        // CLIENT DETAILS AUTO FILL
+        // -------------------------------
+        if (actual_lead_client_details) {
+
+            $('#client_name').val(actual_lead_client_details.company_name || '');
+
+            $('#gst').val(actual_lead_client_details.gst_number || '');
+
+            // 🔥 Important:
+            // Only auto-generate short name IF empty (avoid overwrite in edit)
+            if (!$('#client_short_name').val()) {
+                $('#client_name').trigger('input');
+            } else {
+                // Run duplicate validation once
+                validateInput($('#client_short_name')[0], "clients", "short_name");
+            }
+        }
+
+        // -------------------------------
+        // CONTACT PERSON AUTO FILL
+        // -------------------------------
+        if (actual_lead_contact_person_details) {
+
+            $('#contact_person_name').val(actual_lead_contact_person_details.name || '');
+
+            $('#contact_person_mobile').val(actual_lead_contact_person_details.mobile || '');
+
+            $('#contact_person_email').val(actual_lead_contact_person_details.email || '');
+        }
+        
+
+        $('#lead_status').change(function() {
+            if ($(this).val() === 'lost') {
+                $('#lost_reason_div').show();
+                $('#lost_reason').attr('required', 'required');
+            } else {
+                $('#lost_reason_div').hide();
+                $('#lost_reason').val("");
+                $('#lost_reason').removeAttr('required');
+            }
+        });
+
+        // Check on page load
+        if ($('#lead_status').val() === 'lost') {
+            $('#lost_reason_div').show();
+            $('#lost_reason').attr('required', 'required');
+        } else {
+            // Ensure it's hidden and not required if the initial value is not 'lost'
+            $('#lost_reason_div').hide();
+            $('#lost_reason').val("");
+            $('#lost_reason').removeAttr('required');
+        }
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/sales/activity_view.php b/app/Views/sales/activity_view.php
index 0f82bc8f..da457b03 100644
--- a/app/Views/sales/activity_view.php
+++ b/app/Views/sales/activity_view.php
@@ -10,6 +10,8 @@
     .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); }
+    .btn-close { background: none; border: none; font-size: 22px; cursor: pointer; color: #888; width: 32px; height: 32px; border-radius: 6px; display: flex; align-items: center; justify-content: center; transition: background .2s; }
+    .btn-close:hover { background: #f0f0f0; color: #333; }
 
     /* Filter Tabs */
     .filter-tabs { display: flex; gap: 10px; padding: 20px 30px; }
@@ -68,6 +70,7 @@
     .activity-meta { display: flex; gap: 20px; font-size: 13px; color: #999; margin-top: 10px;}
 
     .lead-status { display: inline-block; padding: 4px 10px; border-radius: 12px; font-size: 11px; font-weight: 500; margin-top: 5px; }
+    .opportunity-status-badge { padding: 4px 10px; border-radius: 12px; font-size: 11px; font-weight: 500;}
     
     .status-new { background: #e3f2fd; color: #1976d2; }
     .status-potential { background: #fff3e0; color: #f57c00; }
@@ -76,6 +79,10 @@
     .status-pending { background: #fff3e0; color: #f57c00; }
     .status-completed { background: #e8f5e9; color: #388e3c; }
     .status-unknown { background: #000; color: #fff; }
+    .status-text-unknown { color: #000; font-weight: bold; }
+    .status-text-lost    { color: #d32f2f; font-weight: bold; }
+    .status-text-won    { color: #388e3c; font-weight: bold; }
+
 
     /* 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; }
@@ -124,6 +131,9 @@
     .opportunity-details {  display: grid;  grid-template-columns: repeat(2, 1fr);  gap: 10px;  margin-top: 15px;}
     .opportunity-detail-item {  font-size: 13px;  color: #666;}
     .opportunity-footer {  margin-top: 15px; padding-top: 15px; border-top: 1px solid #f0f0f0; font-size: 13px; color: #666; }
+    .lost-reason { margin-bottom: 8px; color: #c0392b; /* soft red for lost */ }
+    .footer-divider {     border-top: 1px dashed #ddd; margin: 8px 0; }
+    .notes { color: #555; }
 
     /* Base style for both tabs */
     .tab-item { cursor: pointer; padding-bottom: 10px; margin: 0; font-size: 16px; color: #999; /* Default grey for unselected */ border-bottom: 2px solid transparent; transition: all 0.2s ease; }
@@ -142,6 +152,21 @@
     outline: none;
 }
 
+.select2-container--default 
+.select2-selection--multiple 
+.select2-selection__choice {
+    background-color: #02a8b5 !important;
+    border: none !important;
+    border-color: #fff !important;
+    color: #fff !important;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #fff !important;
+}
+.modal .select2-container--default .select2-selection--multiple {
+  background-color: #fff !important;
+}
+
     
 </style>
 
@@ -159,7 +184,7 @@
             <!-- RIGHT SIDE -->
             <div class="lead-actions">
                 <input type="text" class="search-input" id="mainSearch"
-                    placeholder="Search activities..." onkeyup="fetchActivities(false)">
+                    placeholder="Search activities..." onkeyup="fetchActivities(false)" style="width: 300px !important;">
                 <button class="btn-primary" onclick="openMainActivityModal()">
                     + Add Activity
                 </button>
@@ -191,7 +216,7 @@
                 <h2 id="det_company">Lead Detail</h2>
                 <span id="det_status_badge" class="lead-status" style="margin-top: unset;"></span>
             </div>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('leadDetailModal')">&times;</button>
+            <button class="btn-close" title="Close" onclick="closeModal('leadDetailModal')">×</button>
         </div>
         <hr class="my-0">
         <div class="modal-body">
@@ -233,7 +258,7 @@
     <div class="modal-content" style="max-width: 600px;">
         <div class="modal-header">
             <h2>Add Activity</h2>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('activityModal')">&times;</button>
+            <button class="btn-close" title="Close" onclick="closeModal('activityModal')">×</button>
         </div>
         <form class="parsley-examples" id="activityForm" enctype="multipart/form-data"> 
          <hr class="my-0">
@@ -256,8 +281,8 @@
                     <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>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="Share Docs" onclick="selectType('Share Docs', this)">📄 Share Docs</button>
+                    <button type="button" class="activity-type-btn d_activity_type" data-type="To Do" onclick="selectType('To Do', this)">✓ To Do</button>
                 </div>
             </div>
             <div class="form-group">
@@ -276,11 +301,19 @@
                 <div class="form-group">
                     <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 foreach($sales_manager_with_head as $sm): ?>
+                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
                         <?php endforeach; ?>
                     </select>
                 </div>
+                <div class="form-group">
+                <label class="form-label">Additional Assigner</label>
+                <select id="act_multiple_owner" class="search-input searchable multi-searchable" style="width:100%;" multiple>
+                    <?php foreach($sales_team as $sm): ?>
+                        <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
             </div>
          </div>
          <div class="modal-footer">
@@ -297,7 +330,7 @@
     <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>
+            <button class="btn-close" title="Close" onclick="closeModal('completeModal')">×</button>
         </div>
         <form class="parsley-examples" id="completeForm" enctype="multipart/form-data"> 
          <hr class="my-0">
@@ -326,8 +359,8 @@
                     <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('Share', this)">📄 Share Docs</button>
-                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Todo', this)">✓ To Do</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Share Docs', this)">📄 Share Docs</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('To Do', this)">✓ To Do</button>
                     
 
                 </div>
@@ -346,11 +379,19 @@
                     <div class="form-group">
                         <label class="form-label">Assigned To <span class="text-danger">*</span></label>
                         <select id="f_assigned_to" class="search-input searchable" style="width:100%">
-                            <?php foreach($users as $user): ?>
-                                <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?></option>
+                            <?php foreach($sales_manager_with_head as $sm): ?>
+                                <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
+                    <div class="form-group">
+                    <label class="form-label">Additional Assigner <span class="text-danger">*</span></label>
+                    <select id="f_multiple_owner" class="search-input searchable multi-searchable" style="width:100%" multiple>
+                        <?php foreach($sales_team as $sm): ?>
+                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
                 </div>
             </div>
          </div>
@@ -368,7 +409,7 @@
     <div class="modal-content" style="max-width: 600px;">
         <div class="modal-header">
             <h2>Select Opportunity Type</h2>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('opportunityModal')">&times;</button>
+            <button class="btn-close" title="Close" onclick="closeModal('opportunityModal')">×</button>
         </div>
          <hr class="my-0">
          <div class="modal-body p-4">
@@ -401,18 +442,45 @@
 </div>
 
 <script>
-$(document).ready(function() {
+document.addEventListener('DOMContentLoaded', function () {
     resetFlatpicker();
-    $('.searchable').each(function() {
-        let parentModal = $(this).closest('.modal');
-        $(this).select2({
+
+    // Single selects
+    document.querySelectorAll('.searchable:not(.multi-searchable)').forEach(function(el) {
+        let parentModal = el.closest('.modal');
+        $(el).select2({
             placeholder: "Select..",
-            dropdownParent: parentModal.length ? parentModal : $(document.body)
+            allowClear: false,
+            minimumResultsForSearch: 0,
+            dropdownParent: parentModal ? $(parentModal) : $(document.body)
         });
     });
 
+    // Multi selects
+    document.querySelectorAll('.multi-searchable').forEach(function(el) {
+        let parentModal = el.closest('.modal');
+        $(el).select2({
+            placeholder: "Search and select members...",
+            allowClear: false,
+            closeOnSelect: false,
+            minimumResultsForSearch: 0,
+            dropdownParent: parentModal ? $(parentModal) : $(document.body),
+            width: '100%'
+        });
+    });
 });
 
+// $(document).ready(function() {
+//     resetFlatpicker();
+//     $('.searchable').each(function() {
+//         let parentModal = $(this).closest('.modal');
+//         $(this).select2({
+//             placeholder: "Select..",
+//             dropdownParent: parentModal.length ? parentModal : $(document.body)
+//         });
+//     });
+// });
+
 function resetFlatpicker(){
     document.querySelectorAll(".forschedule").forEach(el => {
         if (el._flatpickr) {
@@ -429,8 +497,16 @@ function resetFlatpicker(){
     });
 }
 
-const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🖥️", Share: "📄", Todo: "✓" };
-const salesManagerIds = <?= json_encode($sales_manager_ids ?? []) ?>;
+const activityIcons = {
+    "Call": "📞",
+    "Email": "✉️",
+    "Meeting": "📅",
+    "Visit": "🚗",
+    "Demo": "🖥️",
+    "Share Docs": "📄",
+    "To Do": "✓"
+};
+const salesManagerWithHeadIds = <?= json_encode($sales_manager_with_head_ids ?? []) ?>;
 
 const API = '<?= base_url('sales') ?>';
 let filter = 'all';
@@ -441,6 +517,7 @@ let selectedFollowUpActivityType = '';
 let currentPage = 1;
 let limit = 10;
 let currentOffset = 0;
+const department = '<?= $sales_role ?>';
 
 
 function openModal(id) { document.getElementById(id).classList.add('active'); resetFlatpicker(); }
@@ -526,10 +603,10 @@ async function fetchActivities(isLoadMore = false) {
     </div>`;
 
     console.log("function here");
-    console.log(salesManagerIds);
+    console.log(salesManagerWithHeadIds);
     // return;
     // 2. 🛑 SHORT-CIRCUIT: If no sales manager IDs exist, show empty state and stop!
-    if (typeof salesManagerIds === 'undefined' || salesManagerIds.length === 0) {
+    if (typeof salesManagerWithHeadIds === 'undefined' || salesManagerWithHeadIds.length === 0) {
         console.log("No Sales Manager IDs found. Skipping API call.");
         grid.innerHTML = emptyStateHTML;
         btnLoadMore.style.display = 'none'; // Hide the load more button
@@ -556,8 +633,8 @@ async function fetchActivities(isLoadMore = false) {
     // 5. Build URL with dynamic offset
     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(',')}`;
+    if (typeof salesManagerWithHeadIds !== 'undefined' && salesManagerWithHeadIds.length > 0) {
+        url += `&assigned_to=${salesManagerWithHeadIds.join(',')}`;
     }
 
     console.log("Fetching API:", url); 
@@ -569,6 +646,15 @@ async function fetchActivities(isLoadMore = false) {
         const activityData = json.data || [];
         const totalrecords = json.total || 0;
         console.log("API Response:", activityData);
+
+        const tabLeadsCount = json.counts || {};
+
+        // ✅ Update tab counts
+        if (tabLeadsCount) {
+            document.querySelector('[data-filter="all"]').innerText         = `All (${tabLeadsCount.all ?? 0})`;
+            document.querySelector('[data-filter="Pending"]').innerText     = `Pending (${tabLeadsCount.pending ?? 0})`;
+            document.querySelector('[data-filter="Completed"]').innerText   = `Completed (${tabLeadsCount.completed ?? 0})`;
+        }
     
         const html = activityData
             .sort((a, b) => Number(b.activity_id) - Number(a.activity_id))
@@ -604,9 +690,18 @@ async function fetchActivities(isLoadMore = false) {
                             <div class="activity-lead-name">${a.company_name}</div>
                             <div class="activity-notes" title="${displayNote}">${displayNote}</div>
                             <div class="activity-meta">
-                                <span>📅 ${formattedCreatedDate}</span>
+                                <span>🗓️ ${formattedCreatedDate}</span>
                                 <span>👤 ${a.assigned_to_name}</span>
                             </div>
+                            ${a.additional_assigned_names ? `
+                                <div style="display:flex; justify-content:flex-start; margin-bottom:5px;">
+                                    <span style="font-size:11px; color:#999; text-align: right;
+                                        max-width: 75%; /* Forces long lists to wrap cleanly on the right side */
+                                        display: inline-block;">
+                                        👥 ${a.additional_assigned_names}
+                                    </span>
+                                </div>
+                            ` : ''}
                         </div>
                         
                             <div class="activity-actions">
@@ -697,10 +792,17 @@ async function viewDetail(id) {
 }
 
 function renderCard(opps) {
-    const cont = document.getElementById('opportunitiesContainer');
-    
-    cont.innerHTML = opps.length ? opps.map(o => {        
+    const opp_cont = document.getElementById('opportunitiesContainer');
+    opp_cont.innerHTML = opps.length ? opps.map(o => {        
         let lead_type = o.lead_type == 1 ? 'EB' : 'Non-EB';
+        let status = o.status?.toLowerCase();
+        let statusClass = {
+            won: 'status-text-won',
+            lost: 'status-text-lost'
+        }[status] || 'status-text-unknown';
+
+        let opp_status_value = o.status?.replace(/[-_']/g, ' ').toUpperCase();
+
         let formattedDate = new Date(o.created_at).toLocaleString('en-US', {
             month: 'short',
             day: 'numeric',
@@ -727,11 +829,21 @@ function renderCard(opps) {
                             <strong>Created At:</strong> ${formattedDate}
                         </div>
                         <div class="opportunity-detail-item">
-                            <strong>Status:</strong> ${o.status}
+                            <strong>Status:</strong> <span class="${statusClass}">${opp_status_value}</span>
                         </div>
                     </div>
                     <div class="opportunity-footer">
-                        ${o.notes || 'N/A'} 
+                      ${ `${o.status === 'lost' ? `
+                                <div class="lost-reason">
+                                    <strong>Reason for Loss:</strong> ${o.lost_reason || 'N/A'}
+                                </div>
+                                <div class="footer-divider"></div>
+                            ` : ``}
+                            <div class="notes">
+                                <strong>Remarks:</strong> ${o.notes || 'N/A'}
+                            </div>
+                            `
+                        }
                     </div>
                 </div>
             </div>`;
@@ -765,24 +877,35 @@ function renderTimeline(acts) {
     // <span style="font-size:11px; color:#999">${formattedDate}</span>
 
         return `
-            <div class="timeline-item">
+              <div class="timeline-item">
                 <div class="timeline-dot ${a.status==='completed'?'completed':''}"></div>
                 <div class="timeline-content">
-                    <div style="display:flex; justify-content:space-between; margin-bottom:5px;">
-                        <b>${icon} ${formattedType}</b>
-                        <span style="font-size:11px; color:#999"> 👤 ${a.assigned_to_name} | 🗓 ${formattedDate}</span>    
+                    
+                    <div style="display:flex; justify-content:space-between; align-items:flex-start; margin-bottom:2px;">
+                        <b style="white-space: nowrap; margin-right: 15px;">${icon} ${formattedType}</b>
+                        <span style="font-size:11px; color:#999; text-align:right;"> 👤 ${a.assigned_to_name} | 🗓️ ${formattedDate}</span>    
                     </div>
-                    <div style="display:flex; justify-content:space-between; font-size:13px; color:#444;">
+                    
+                    ${a.additional_assigned_names ? `
+                        <div style="display:flex; justify-content:flex-end; margin-bottom:5px;">
+                            <span style="font-size:11px; color:#999; text-align: right;
+                                max-width: 75%; /* Forces long lists to wrap cleanly on the right side */
+                                display: inline-block;">
+                                👥 ${a.additional_assigned_names}
+                            </span>
+                        </div>
+                    ` : '<div style="margin-bottom:8px;"></div>'}
+                    
+                    <div style="font-size:13px; color:#444; margin-bottom: 8px;">
                         ${a.notes}
                     </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},'frompopup')">Mark Complete</button>` : 
-                        `<div style="font-size:12px; color:#388e3c; margin-top:8px; font-weight:500;">✓ Outcome: ${a.completion_notes}</div>`
+                        `<button class="btn-primary" style="padding:4px 10px; font-size:11px; margin-top:4px;" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id})">Mark Complete</button>` : 
+                        `<div style="font-size:12px; color:#388e3c; margin-top:4px; font-weight:500;">✓ Outcome: ${a.completion_notes}</div>`
                     }
                 </div>
-            </div>
-        `;
+            </div>`;
     }).join('') : `<div class="empty-state"><div class="empty-icon">✓</div> No activities yet. Add one to get started!</div>`;
 }
 
@@ -897,7 +1020,8 @@ document.getElementById('activityForm').onsubmit = async (e) => {
             notes: actNotes, // Reused the trimmed variable from above
             scheduled_date: dbFormat,
             assigned_to: actOwner, // Reused the trimmed variable from above
-            status: 'pending'
+            status: 'pending',
+            additional_assigned_ids : Array.from(document.getElementById('act_multiple_owner').selectedOptions).map(o => o.value)
         };
 
         const res = await fetch(`${API}/activities`, {
@@ -1014,7 +1138,8 @@ document.getElementById('completeForm').onsubmit = async (e) => {
                     notes: document.getElementById('f_notes').value,
                     scheduled_date: dbFormat,
                     assigned_to: document.getElementById('f_assigned_to').value,
-                    status: 'pending'
+                    status: 'pending',
+                    additional_assigned_ids : Array.from(document.getElementById('f_multiple_owner').selectedOptions).map(o => o.value)
                 };
 
                 const res2 = await fetch(`${API}/activities`, {
diff --git a/app/Views/sales/branch_level_dashboard_view.php b/app/Views/sales/branch_level_dashboard_view.php
index fe1f6dba..a085a00b 100644
--- a/app/Views/sales/branch_level_dashboard_view.php
+++ b/app/Views/sales/branch_level_dashboard_view.php
@@ -1,294 +1,796 @@
 <style>
-    .dash-container { padding: 25px; background: #f8f9fa; font-family: 'Segoe UI', sans-serif; }
-    .top-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 25px; }
+    @import url('https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@400;500;600;700;800&display=swap');
+
+    .dash-container {
+        padding: 28px;
+        background: #f4f6fb;
+        font-family: 'Plus Jakarta Sans', 'Segoe UI', sans-serif;
+        min-height: 100vh;
+    }
+
+    /* ── Dashboard Header ── */
+    .dash-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 24px;
+        flex-wrap: wrap;
+        gap: 12px;
+    }
     
-    .stat-cards { display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px; margin-bottom: 30px; }
-    .card { background: white; padding: 25px; border-radius: 12px; border: 1px solid #edf2f7; box-shadow: 0 2px 4px rgba(0,0,0,0.02); }
-    .stat-val { font-size: 28px; font-weight: 700; color: #1a202c; }
-    .stat-label { color: #718096; font-size: 14px; margin-top: 4px; font-weight: 500; }
-    .stat-change { font-size: 11px; margin-top: 8px; font-weight: 600; }
-    .text-success { color: #48bb78; }
+    .page-title { font-size: 20px; font-weight: 800; color: #0f172a; margin: 0 0 4px 0; }
+    .page-sub   { font-size: 13px; color: #7c8db0; font-weight: 600; }
+    .fy-select-wrap select {
+        background: #fff;
+        padding: 10px 16px;
+        border-radius: 10px;
+        border: 1px solid #e4eaf5;
+        font-size: 13px;
+        font-weight: 700;
+        color: #0f172a;
+        cursor: pointer;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+        min-width: 200px;
+        appearance: none;
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%237c8db0' d='M6 8L1 3h10z'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-position: right 14px center;
+        padding-right: 36px;
+    }
+    .fy-select-wrap select:focus { outline: none; border-color: #4f46e5; }
 
-    .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;
-}
+    /* ── Stat Cards ── */
+    .stat-cards {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 18px;
+        margin-bottom: 24px;
+    }
+    .card-hero {
+        background: white;
+        padding: 22px 24px;
+        border-radius: 14px;
+        border: 1px solid #e8edf5;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.04);
+        position: relative;
+        overflow: hidden;
+        transition: transform 0.2s ease, box-shadow 0.2s ease;
+    }
+    .card-hero::before {
+        content: "";
+        position: absolute;
+        top: 0; left: 0;
+        width: 100%; height: 4px;
+    }
+    .card-hero:nth-child(1)::before { background: linear-gradient(90deg, #667eea, #764ba2); }
+    .card-hero:nth-child(2)::before { background: linear-gradient(90deg, #f093fb, #f5576c); }
+    .card-hero:nth-child(3)::before { background: linear-gradient(90deg, #fda085, #f6d365); }
+    .card-hero:nth-child(4)::before { background: linear-gradient(90deg, #43e97b, #38f9d7); }
+    .card-hero:hover { transform: translateY(-4px); box-shadow: 0 12px 24px rgba(0,0,0,0.09); }
+    .stat-icon { width: 42px; height: 42px; border-radius: 10px; display: flex; align-items: center; justify-content: center; font-size: 18px; margin-bottom: 14px; }
+    .stat-val   { font-size: 30px; font-weight: 800; color: #1a202c; line-height: 1; }
+    .stat-label { color: #8896aa; font-size: 13px; margin-top: 6px; font-weight: 600; }
 
-/* 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%);
-}
+    /* ── Shared Card ── */
+    .card { background: white; padding: 24px; border-radius: 14px; border: 1px solid #e8edf5; box-shadow: 0 2px 8px rgba(0,0,0,0.04); }
 
-.card-hero:hover {
-    transform: translateY(-5px);
-    box-shadow: 0 10px 15px rgba(0,0,0,0.1);
-}
+    /* ── Main Grid ── */
+    .main-grid { display: grid; grid-template-columns: 2fr 1fr; gap: 20px; margin-bottom: 24px; align-items: start; }
+    .main-grid > .card { height: 520px; display: flex; flex-direction: column; }
+    .table-scroll-area { flex: 1; overflow-y: auto; }
+    .table-scroll-area thead th { position: sticky; top: 0; background: white; z-index: 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; }
-    
-    .team-member { display: flex; align-items: center; padding: 15px 0; border-bottom: 1px solid #f1f5f9; }
-    .member-img { width: 40px; height: 40px; border-radius: 50%; background: #ff6b35; color: white; margin-right: 12px; display: flex; align-items: center; justify-content: center; font-weight: bold; font-size: 16px; }
+    /* ── Right Panel ── */
+    .right-panel { height: 520px; background: white; border-radius: 14px; border: 1px solid #e8edf5; box-shadow: 0 2px 8px rgba(0,0,0,0.04); padding: 22px; box-sizing: border-box; display: flex; flex-direction: column; overflow: hidden; }
+    .team-members-scroll { flex: 1; overflow-y: auto; margin-top: 10px; }
+    .team-member { display: flex; align-items: center; padding: 10px 0; border-bottom: 1px solid #f4f6fb; }
+    .team-member:last-child { border-bottom: none; }
+    .member-img { width: 38px; height: 38px; border-radius: 50%; color: white; margin-right: 12px; display: flex; align-items: center; justify-content: center; font-weight: 700; font-size: 15px; flex-shrink: 0; }
     .act-stats { text-align: right; }
     .act-stats .total { font-weight: 700; font-size: 13px; color: #1a202c; }
-    .act-stats .done { font-size: 11px; color: #38a169; font-weight: 600; margin-top: 2px; }
+    .act-stats .done  { font-size: 11px; color: #38a169; font-weight: 600; margin-top: 2px; }
 
-    .breakdown-card { margin-top: 20px; }
-    .breakdown-item { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; font-size: 13px; }
-    .dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; margin-right: 8px; }
+    /* ── Activity Breakdown ── */
+    .breakdown-section { flex-shrink: 0; margin-top: 12px; border: 1px solid #f0f4fa; border-radius: 12px; padding: 14px; background: #fafbfd; }
+    .breakdown-item { display: flex; justify-content: space-between; align-items: center; margin-bottom: 9px; font-size: 13px; }
+    .breakdown-item:last-child { margin-bottom: 0; }
+    .breakdown-bar-wrap { flex: 1; height: 5px; background: #eef0f5; border-radius: 99px; margin: 0 10px; overflow: hidden; }
+    .breakdown-bar { height: 100%; border-radius: 99px; }
 
+    /* ── Table ── */
+    .table-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px; }
     table { width: 100%; border-collapse: collapse; }
-    th { text-align: left; padding: 12px; color: #718096; font-size: 11px; text-transform: uppercase; letter-spacing: 0.05em; border-bottom: 1px solid #edf2f7; }
-    td { padding: 15px 12px; border-bottom: 1px solid #f1f5f9; font-size: 14px; vertical-align: middle; }
-    
-    .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; }
+    th { text-align: left; padding: 10px 12px; color: #8896aa; font-size: 11px; text-transform: uppercase; letter-spacing: 0.07em; border-bottom: 1px solid #edf2f7; background: white; font-weight: 700; }
+    td { padding: 13px 12px; border-bottom: 1px solid #f4f6fb; font-size: 14px; vertical-align: middle; }
+    tbody tr:hover { background: #fafbfe; }
 
-    .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; }
+    /* ── Status Pills ── */
+    .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; }
+    .leads-table-wrap          { max-height: 480px; overflow-y: auto; }
+    .leads-table-wrap thead th { position: sticky; top: 0; background: white; z-index: 1; }
+    .empty-state { text-align: center; padding: 50px 20px; color: #aaa; }
+    .empty-icon  { width: 70px; height: 70px; margin: 0 auto 16px; background: #f5f5f5; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-size: 32px; }
 
+    /* ── Responsive ── */
+    @media (max-width: 1200px) { .stat-cards { grid-template-columns: repeat(2, 1fr); } }
+    @media (max-width: 992px) { .main-grid { grid-template-columns: 1fr; } .main-grid > .card, .right-panel { height: 450px; } .stat-cards { grid-template-columns: repeat(2, 1fr); } }
+    @media (max-width: 576px) { .dash-container { padding: 14px; } .stat-cards { grid-template-columns: 1fr 1fr; gap: 10px; } .stat-val { font-size: 24px; } .main-grid > .card, .right-panel { height: 400px; } table th, table td { padding: 10px 8px; font-size: 12px; } .dash-header { flex-direction: column; align-items: flex-start; } }
+
+    /* ══ TEAM ACHIEVEMENT SECTION ══ */
+    .section-head { display: flex; justify-content: space-between; align-items: flex-end; margin-bottom: 16px; }
+    .section-title { font-size: 16px; font-weight: 800; color: #0f172a; }
+    .section-sub { font-size: 12px; color: #7c8db0; font-weight: 600; margin-top: 3px; }
+    .branch-summary { text-align: right; }
+    .branch-amt { font-size: 20px; font-weight: 800; color: #0f172a; }
+    .branch-bar-wrap { width: 180px; height: 5px; background: #e4eaf5; border-radius: 99px; overflow: hidden; margin: 6px 0 4px auto; }
+    .branch-bar-fill { height: 100%; border-radius: 99px; background: linear-gradient(90deg,#4f46e5,#818cf8); }
+    .branch-pct-lbl { font-size: 11px; color: #4f46e5; font-weight: 700; }
+    .achieve-list { background: #fff; border-radius: 14px; border: 1px solid #e4eaf5; box-shadow: 0 2px 12px rgba(15,23,42,0.06); overflow: hidden; }
+    .list-col-head { display: grid; grid-template-columns: 260px 1fr 130px 130px 130px 110px 80px; padding: 10px 22px; background: #f8fafd; border-bottom: 1px solid #e4eaf5; }
+    .col-lbl { font-size: 10px; font-weight: 700; color: #7c8db0; letter-spacing: .07em; text-transform: uppercase; display: flex; align-items: center; }
+    .col-lbl.right { justify-content: flex-end; }
+    .col-lbl.center { justify-content: center; }
+    .achieve-row { display: grid; grid-template-columns: 260px 1fr 130px 130px 130px 110px 80px; padding: 16px 22px; border-bottom: 1px solid #f1f5f9; align-items: center; cursor: pointer; transition: background .15s; position: relative; }
+    .achieve-row:last-child { border-bottom: none; }
+    .achieve-row:hover { background: #f8fafd; }
+    .achieve-row:hover .row-arrow { opacity: 1; transform: translateY(-50%) translateX(0); }
+    .member-cell { display: flex; align-items: center; gap: 12px; }
+    .m-avatar { width: 42px; height: 42px; border-radius: 12px; display: flex; align-items: center; justify-content: center; font-weight: 800; font-size: 16px; color: #fff; flex-shrink: 0; }
+    .m-name { font-weight: 700; font-size: 14px; color: #0f172a; }
+    .m-role { font-size: 11px; color: #7c8db0; font-weight: 600; margin-top: 2px; }
+    .prog-row { display: flex; justify-content: space-between; align-items: center; margin-bottom: 5px; }
+    .prog-pct { font-size: 13px; font-weight: 800; }
+    .prog-amts { font-size: 11px; color: #7c8db0; font-weight: 600; }
+    .prog-bar-wrap { height: 6px; background: #f0f3fa; border-radius: 99px; overflow: hidden; }
+    .prog-bar { height: 100%; border-radius: 99px; }
+    .num-cell { text-align: right; }
+    .num-val { font-size: 15px; font-weight: 800; }
+    .num-lbl { font-size: 10px; color: #7c8db0; font-weight: 700; margin-top: 2px; letter-spacing: .04em; }
+    .num-cell.center-col { text-align: center; }
+    .badge { display: inline-flex; align-items: center; gap: 5px; padding: 4px 12px; border-radius: 99px; font-size: 11px; font-weight: 700; white-space: nowrap; }
+    .b-achieved { background: #ecfdf5; color: #059669; }
+    .b-ontrack  { background: #eff6ff; color: #2563eb; }
+    .b-behind   { background: #fff7ed; color: #c2410c; }
+    .b-atrisk   { background: #fef2f2; color: #b91c1c; }
+    .row-arrow  { position: absolute; right: 18px; top: 50%; transform: translateY(-50%) translateX(4px); color: #cbd5e1; font-size: 16px; opacity: 0; transition: opacity .15s, transform .15s; }
+
+    /* ══ MODAL ══ */
+    .modal-overlay { display: none; position: fixed; inset: 0; background: rgba(10,15,30,0.55); backdrop-filter: blur(6px); z-index: 1000; align-items: center; justify-content: center; padding: 20px; }
+    .modal-overlay.open { display: flex; animation: fadeIn .2s ease; }
+    @keyframes fadeIn { from { opacity: 0 } to { opacity: 1 } }
+    .modal-box { background: #fff; border-radius: 20px; width: 100%; max-width: 780px; max-height: 90vh; overflow: hidden; display: flex; flex-direction: column; box-shadow: 0 32px 80px rgba(15,23,42,0.25); animation: slideUp .25s ease; }
+    @keyframes slideUp { from { transform: translateY(30px); opacity: 0 } to { transform: translateY(0); opacity: 1 } }
+    .modal-header { padding: 20px 24px 16px; border-bottom: 1px solid #e4eaf5; display: flex; align-items: center; gap: 14px; flex-shrink: 0; }
+    .modal-ava  { width: 50px; height: 50px; border-radius: 14px; display: flex; align-items: center; justify-content: center; font-size: 21px; font-weight: 800; color: #fff; flex-shrink: 0; }
+    .modal-name { font-size: 17px; font-weight: 800; }
+    .modal-fy-badge { font-size: 11px; font-weight: 700; background: #eff6ff; color: #2563eb; padding: 3px 10px; border-radius: 99px; margin-top: 4px; display: inline-block; }
+    .modal-close { margin-left: auto; background: #f1f5f9; border: none; width: 34px; height: 34px; border-radius: 50%; cursor: pointer; font-size: 18px; display: flex; align-items: center; justify-content: center; color: #7c8db0; transition: background .2s; }
+    .modal-close:hover { background: #e2e8f0; color: #0f172a; }
+    .modal-summary { display: grid; grid-template-columns: repeat(4,1fr); background: #f8fafd; border-bottom: 1px solid #e4eaf5; flex-shrink: 0; }
+    .ms-box { padding: 14px 18px; text-align: center; border-right: 1px solid #e4eaf5; }
+    .ms-box:last-child { border-right: none; }
+    .ms-num { font-size: 19px; font-weight: 800; }
+    .ms-lbl { font-size: 10px; color: #7c8db0; font-weight: 700; letter-spacing: .05em; margin-top: 2px; }
+    .modal-body { padding: 22px 24px; overflow-y: auto; flex: 1; }
+
+    /* ── Modal Tabs ── */
+    .modal-tabs { display: flex; gap: 4px; background: #f1f5f9; border-radius: 10px; padding: 4px; margin-bottom: 20px; }
+    .modal-tab { flex: 1; padding: 9px 16px; border: none; border-radius: 8px; font-size: 13px; font-weight: 700; cursor: pointer; background: transparent; color: #7c8db0; transition: all .2s; }
+    .modal-tab.active { background: #fff; color: #0f172a; box-shadow: 0 2px 8px rgba(15,23,42,0.08); }
+    .modal-tab-panel { display: none; }
+    .modal-tab-panel.active { display: block; }
+
+    .overall-prog { background: linear-gradient(135deg,#0f172a,#1e293b); border-radius: 14px; padding: 18px 20px; color: #fff; margin-bottom: 20px; }
+    .op-label { font-size: 10px; font-weight: 700; letter-spacing: .08em; color: #94a3b8; }
+    .op-row { display: flex; justify-content: space-between; align-items: flex-end; margin: 6px 0 12px; }
+    .op-achieved { font-size: 24px; font-weight: 800; }
+    .op-target { font-size: 12px; color: #94a3b8; font-weight: 600; }
+    .op-pct { font-size: 26px; font-weight: 800; color: #818cf8; }
+    .op-bar-wrap { background: rgba(255,255,255,0.12); height: 7px; border-radius: 99px; overflow: hidden; }
+    .op-bar-fill { height: 100%; border-radius: 99px; background: linear-gradient(90deg,#818cf8,#67e8f9); }
+    .op-foot { display: flex; justify-content: space-between; font-size: 11px; color: #94a3b8; font-weight: 600; margin-top: 7px; }
+    .split-section-title { font-size: 13px; font-weight: 800; margin-bottom: 12px; }
+    .split-table { width: 100%; border-collapse: collapse; font-size: 13px; }
+    .split-table thead th { background: #f8fafd; padding: 9px 12px; text-align: left; font-size: 10px; text-transform: uppercase; letter-spacing: .07em; color: #7c8db0; font-weight: 500; border-bottom: 2px solid #e4eaf5; }
+    .split-table thead th:last-child { text-align: right; }
+    .split-table tbody tr { border-bottom: 1px solid #f1f5f9; }
+    .split-table tbody tr:hover { background: #f8fafd; }
+    .split-table td { padding: 12px; vertical-align: middle; }
+    .split-table td:last-child { text-align: right; }
+    .split-name { font-weight: 700; font-size: 13px; }
+    .split-dates { font-size: 11px; color: #7c8db0; font-weight: 600; margin-top: 1px; }
+    .mini-prog-wrap { width: 80px; height: 4px; background: #e4eaf5; border-radius: 99px; overflow: hidden; margin-top: 4px; }
+    .mini-prog-bar { height: 100%; border-radius: 99px; }
+    .split-pct-badge { display: inline-block; padding: 3px 10px; border-radius: 99px; font-size: 11px; font-weight: 700; }
+    .act-chips { display: flex; gap: 8px; flex-wrap: wrap; margin-top: 14px; }
+    .act-chip { display: flex; align-items: center; gap: 6px; background: #f1f5f9; border-radius: 99px; padding: 5px 13px; font-size: 12px; font-weight: 700; }
+    .act-dot { width: 7px; height: 7px; border-radius: 50%; }
+
+    /* Opportunities tab */
+    .opp-summary-cards { display: grid; grid-template-columns: repeat(3,1fr); gap: 12px; margin-bottom: 20px; }
+    .opp-card { background: #f8fafd; border-radius: 12px; padding: 16px; border: 1px solid #e4eaf5; text-align: center; }
+    .opp-card-val { font-size: 22px; font-weight: 800; color: #0f172a; }
+    .opp-card-lbl { font-size: 11px; color: #7c8db0; font-weight: 700; margin-top: 4px; letter-spacing: .04em; }
+
+    @media(max-width:900px) { .list-col-head,.achieve-row { grid-template-columns: 220px 1fr 110px 110px 110px; } .col-lbl:nth-child(6),.col-lbl:nth-child(7),.achieve-row>*:nth-child(6),.achieve-row>*:nth-child(7) { display: none; } }
+    @media(max-width:640px) { .list-col-head { display: none; } .achieve-row { grid-template-columns: 1fr auto; gap: 12px; padding: 14px 16px; } .achieve-row>*:not(:nth-child(1)):not(:nth-child(7)) { display: none; } .section-head { flex-direction: column; align-items: flex-start; gap: 12px; } .modal-summary { grid-template-columns: repeat(2,1fr); } .opp-summary-cards { grid-template-columns: 1fr 1fr; } }
 </style>
 
 <div class="dash-container">
-    <!-- <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>
-        </div>
-        <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 class="stat-cards">
-        <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> -->
+    <!-- ── Dashboard Header ── -->
+    <div class="dash-header">
+        <div>
+            <div class="page-title">Branch Dashboard</div>
+            <div class="page-sub" id="fySubLabel">—</div>
         </div>
-        <div class="card-hero">
-            <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 class="fy-select-wrap">
+            <select id="financial_year" name="financial_year" onchange="onFinancialYearChange(this)">
+                <?php if(!empty($fin_years)): ?>
+                    <?php foreach($fin_years as $year): ?>
+                        <option value="<?= $year; ?>"><?= $year; ?></option>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </select>
         </div>
-        <div class="card-hero">
-            <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 $total_completed_acts ?></div>
-            <div class="stat-label">Completed Activities</div>
-            <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
-        </div>
-        <!-- <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>
 
+    <!-- ── Stat Cards ── -->
+    <div class="stat-cards">
+        <div class="card-hero">
+            <div class="stat-icon" style="background:#ede9fe;">👥</div>
+            <div class="stat-val"><?php echo $total_leads; ?></div>
+            <div class="stat-label">Total Leads</div>
+        </div>
+        <div class="card-hero">
+            <div class="stat-icon" style="background:#fce7f3;">⚡</div>
+            <div class="stat-val"><?php echo $total_acts ?></div>
+            <div class="stat-label">Total Activities</div>
+        </div>
+        <div class="card-hero">
+            <div class="stat-icon" style="background:#fef3c7;">⏳</div>
+            <div class="stat-val"><?php echo $total_pending_acts ?></div>
+            <div class="stat-label">Pending Activities</div>
+        </div>
+        <div class="card-hero">
+            <div class="stat-icon" style="background:#d1fae5;">✅</div>
+            <div class="stat-val"><?php echo $total_completed_acts ?></div>
+            <div class="stat-label">Completed Activities</div>
+        </div>
+    </div>
+
+    <!-- ══ TEAM ACHIEVEMENT SECTION ══ -->
+    <div class="section-head">
+        <div>
+            <div class="section-title">Team Achievement Overview</div>
+            <!-- <div class="section-sub">Click any row to view split-wise & opportunities achievement</div> -->
+             <div class="section-sub"></div>
+        </div>
+        <div class="branch-summary">
+            <div style="font-size:11px;color:#7c8db0;font-weight:700;">Branch Total</div>
+            <div class="branch-amt" id="branchTotalAmt">—</div>
+            <div class="branch-bar-wrap"><div class="branch-bar-fill" id="branchBarFill" style="width:0%;"></div></div>
+            <div class="branch-pct-lbl" id="branchPctLbl">—</div>
+        </div>
+    </div>
+
+    <div class="achieve-list">
+        <div class="list-col-head">
+            <div class="col-lbl">Member</div>
+            <div class="col-lbl">Progress</div>
+            <div class="col-lbl right">Achieved</div>
+            <div class="col-lbl right">Target</div>
+            <div class="col-lbl right">Remaining</div>
+            <div class="col-lbl center">Status</div>
+            <div class="col-lbl center">Acts</div>
+        </div>
+        <div id="achieveList"></div>
+    </div>
+    <br>
+
+    <!-- ── Main Grid ── -->
     <div class="main-grid">
+
+        <!-- LEFT: Pending Activities -->
         <div class="card">
             <div class="table-header">
-                <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>
+                <h3 style="font-size:15px; font-weight:700; margin:0;">Pending Activities — All Team</h3>
+                <span style="color:#8896aa; font-size:12px; font-weight:600;">
+                    <?= count($pending_acts) . ' ' . (count($pending_acts) == 1 ? 'activity' : 'activities') ?>
+                </span>
             </div>
+            <div class="table-scroll-area">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Company</th>
+                            <th>Activity &amp; Assigned</th>
+                            <th>Date</th>
+                            <th>Status</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php if (!empty($pending_acts)): ?>
+                            <?php foreach ($pending_acts as $a): ?>
+                                <?php
+                                    $activityIcons = ['Call'=>'📞','Email'=>'✉️','Meeting'=>'📅','Visit'=>'🚗','Demo'=>'🖥️','Share Docs'=>'📄','To Do'=>'✓'];
+                                    $icon = $activityIcons[$a['activity_type']] ?? '📌';
+                                    $statusClass = strtolower(str_replace(' ', '-', $a['status']));
+                                    $formattedscheduledDate = date('M d, Y, h:i A', 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:#8896aa;"><?= esc($a['assigned_to_name'] ?? 'ID: ' . $a['assigned_to']) ?></div>
+                                    </td>
+                                    <td style="color:#4a5568; font-weight:500; font-size:13px;"><?= $formattedscheduledDate ?></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 pending activities</div></td></tr>
+                        <?php endif; ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <!-- RIGHT: Sales Team Performance + Activity Breakdown -->
+        <div class="right-panel">
+            <div style="font-size:15px; font-weight:700; padding-bottom:10px; border-bottom:1px solid #f0f4fa; flex-shrink:0;">
+                Sales Team Performance
+            </div>
+            <div class="team-members-scroll">
+                <?php
+                    if (!empty($team)):
+                    $colors = ['#ff6b35','#667eea','#48bb78','#ed8936','#9f7aea'];
+                    foreach ($team as $member):
+                        $firstLetter = strtoupper(substr($member['first_name'], 0, 1));
+                        $fullName    = $member['first_name'] . ' ' . $member['last_name'];
+                        $color       = $colors[abs(crc32($member['first_name'])) % count($colors)];
+                ?>
+                    <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;"><?= esc($fullName) ?></div>
+                            <div style="font-size:11px; color:#8896aa;"><?= esc($member['role']) ?></div>
+                        </div>
+                        <div class="act-stats">
+                            <div class="total"><?= $member['total_acts'] ?> acts</div>
+                            <div class="done"><?= $member['done_acts'] ?> done</div>
+                        </div>
+                    </div>
+                <?php endforeach; else: ?>
+                    <div class="empty-state">No team data found</div>
+                <?php endif; ?>
+            </div>
+
+            <div class="breakdown-section">
+                <h3 style="font-size:13px; font-weight:700; margin:0 0 12px 0; color:#1a202c;">Activity Breakdown</h3>
+                <?php
+                    $activityConfig = [
+                        'Call'       => ['color'=>'#667eea','icon'=>'📞'],
+                        'Email'      => ['color'=>'#48bb78','icon'=>'✉️'],
+                        'Meeting'    => ['color'=>'#4299e1','icon'=>'📅'],
+                        'Visit'      => ['color'=>'#ecc94b','icon'=>'🚗'],
+                        'Demo'       => ['color'=>'#9f7aea','icon'=>'🖥️'],
+                        'Share Docs' => ['color'=>'#ed8936','icon'=>'📄'],
+                        'To Do'      => ['color'=>'#718096','icon'=>'✓'],
+                    ];
+                ?>
+                <?php if (!empty($activity_breakdown)): ?>
+                    <?php foreach ($activity_breakdown as $item): ?>
+                        <?php $cfg = $activityConfig[$item['activity_type']] ?? ['color'=>'#718096','icon'=>'📌']; ?>
+                        <div class="breakdown-item">
+                            <span style="min-width:90px;"><?= $cfg['icon'] ?> <?= esc($item['activity_type']) ?></span>
+                            <div class="breakdown-bar-wrap">
+                                <div class="breakdown-bar" style="width:<?= $item['percentage'] ?>%; background:<?= $cfg['color'] ?>;"></div>
+                            </div>
+                            <strong style="min-width:34px; text-align:right; color:#1a202c;"><?= $item['percentage'] ?>%</strong>
+                        </div>
+                    <?php endforeach; ?>
+                <?php else: ?>
+                    <div style="text-align:center; color:#aaa; font-size:13px;">No activities found</div>
+                <?php endif; ?>
+            </div>
+        </div>
+
+    </div><!-- end .main-grid -->
+
+    <!-- ── All Leads Overview ── -->
+    <div class="card" style="width:100%; box-sizing:border-box;">
+        <div class="table-header">
+            <h3 style="font-size:15px; font-weight:700; margin:0;">All Leads Overview</h3>
+        </div>
+        <div class="leads-table-wrap">
             <table>
                 <thead>
                     <tr>
                         <th>Company</th>
-                        <th>Activity & Assigned</th>
-                        <th>Date</th>
                         <th>Status</th>
+                        <th>Assigned To</th>
+                        <th style="text-align:center;">Activities</th>
+                        <th style="text-align:center;">Opportunities</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php if (!empty($pending_acts)): ?>
-                        <?php foreach ($pending_acts as $a): ?>
-                            <?php
-                                $activityIcons = [
-                                    'Call'    => '📞',
-                                    'Email'   => '✉️',
-                                    'Meeting' => '📅',
-                                    'Visit'   => '🚗',
-                                    'Demo'    => '🖥️',
-                                    'Share'   => '📄',
-                                    'Todo'    => '✓'
-                                ];
-                                $icon = $activityIcons[$a['activity_type']] ?? '📌';
-                                $statusClass = strtolower(str_replace(' ', '-', $a['status']));
-                                $formattedscheduledDate = date('M d, Y, h:i A', strtotime($a['scheduled_date']));
-                            ?>
+                    <?php if (!empty($leads_overview)): ?>
+                        <?php foreach ($leads_overview as $lead): ?>
+                            <?php $statusClass = strtolower(str_replace(' ', '-', $lead['status'])); ?>
                             <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>
-                                    <!-- <div style="font-size: 12px; color: #718096;">
-                                        <?= esc($a['notes'] ?? 'ID: ' . $a['assigned_to']) ?>
-                                    </div> -->
-                                </td>
-                                <td style="color: #4a5568; font-weight: 500;"><?= $formattedscheduledDate ?></td>
-                                <td><span class="status-pill status-<?= $statusClass ?>"><?= ucfirst(esc($a['status'])) ?></span></td>
+                                <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="4">
-                                <div class="empty-state">
-                                    <div class="empty-icon">✓</div> No activities found
-                                </div>
-                            </td>
-                        </tr>
+                        <tr><td colspan="5"><div class="empty-state"><div class="empty-icon">👤</div>No leads 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>
-                <?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: #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> -->
-                <?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 style="background: <?= $color ?>;"></span>
-                                    <?= $icon ?> <?= esc($type) ?>
-                                </span>
-                                <strong><?= $item['percentage'] ?>%</strong>
-                            </div>
-                        <?php endforeach; ?>
-                    <?php else: ?>
-                        <div class="empty-state">
-                                    <div class="empty-icon">✓</div> No activities found
-                        </div>
-                    <?php endif; ?>
-            </div>
-        </div>
     </div>
 
-    <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 <?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;"
-                onmouseover="this.style.color='#ff6b35';"
-                onmouseout="this.style.color='#718096';">
-                Click a lead to see details 
-            </a>
-        </div>
-        <table>
-            <thead>
-                <tr>
-                    <th>Company</th>
-                    <th>Status</th>
-                    <th>Assigned To</th>
-                    <th style="text-align: center !important;">Activities</th>
-                    <th style="text-align: center !important;">Opportunities</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?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">
-                                    <div class="empty-icon">👤</div> No leads found
-                            </div>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-            </tbody>
-        </table>
+</div><!-- end .dash-container -->
+
+<!-- ══ MODAL ══ -->
+<div class="modal-overlay" id="modalOverlay">
+  <div class="modal-box">
+    <div class="modal-header">
+      <div class="modal-ava" id="modalAva"></div>
+      <div>
+        <div class="modal-name" id="modalName"></div>
+        <div class="modal-fy-badge" id="modalFyBadge"></div>
+      </div>
+      <button class="modal-close" onclick="closeModal()">&#x2715;</button>
     </div>
-</div>
\ No newline at end of file
+    <div class="modal-summary" id="modalSummary"></div>
+    <div class="modal-body" id="modalBody"></div>
+  </div>
+</div>
+
+
+<script>
+/* ── Data injected from PHP ── */
+const TEAM     = <?php echo json_encode($team_achievement ?? []); ?>;
+const OPP_DATA = <?php echo json_encode($opp_achievement ?? []); ?>;
+/* OPP_DATA shape per userId:
+   { total_policies, total_exp_amt, target_amt,
+     policies: [{ policy_no, issue_date, amount, created_at }] } */
+
+/* ── JS Helpers ── */
+const ACT_ICONS  = {Call:'📞',Email:'✉️',Meeting:'📅',Visit:'🚗',Demo:'🖥️','Share Docs':'📄','To Do':'✓'};
+const ACT_COLORS = {Call:'#4f46e5',Email:'#10b981',Meeting:'#06b6d4',Visit:'#f59e0b',Demo:'#ec4899','Share Docs':'#f97316','To Do':'#64748b'};
+const fmt      = v => '₹' + (v / 100000).toFixed(1) + 'L';
+const fmtFull  = v => '₹' + Number(v).toLocaleString('en-IN');
+const pct      = (a, t) => t > 0 ? Math.min(100, Math.round(a / t * 100)) : 0;
+const badge    = p => p >= 100 ? ['b-achieved','🏆 Achieved'] : p >= 75 ? ['b-ontrack','🎯 On Track'] : p >= 50 ? ['b-behind','⚡ Behind'] : ['b-atrisk','⚠️ At Risk'];
+const progColor= p => p >= 100 ? 'linear-gradient(90deg,#10b981,#34d399)' : p >= 75 ? 'linear-gradient(90deg,#06b6d4,#67e8f9)' : p >= 50 ? 'linear-gradient(90deg,#f97316,#fbbf24)' : 'linear-gradient(90deg,#ef4444,#fca5a5)';
+
+/* ── Date formatters ── */
+const MONTHS = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+
+function fmtIssueDate(str) {
+    // Input: "2026-03-10" or any date string → "Mar 10, 2026"
+    if (!str) return '—';
+    const d = new Date(str);
+    if (isNaN(d)) return str;
+    return MONTHS[d.getMonth()] + ' ' + String(d.getDate()).padStart(2,'0') + ', ' + d.getFullYear();
+}
+
+function fmtCreatedAt(str) {
+    // Input: "2025-03-04 10:00:00" → "Mar 04, 2025, 10:00 AM"
+    if (!str) return '—';
+    const d = new Date(str.replace(' ', 'T'));
+    if (isNaN(d)) return str;
+    let h = d.getHours(), mi = d.getMinutes();
+    const ampm = h >= 12 ? 'PM' : 'AM';
+    h = h % 12 || 12;
+    return MONTHS[d.getMonth()] + ' ' + String(d.getDate()).padStart(2,'0') + ', ' + d.getFullYear()
+         + ', ' + String(h).padStart(2,'0') + ':' + String(mi).padStart(2,'0') + ' ' + ampm;
+}
+
+/* ── Financial Year helpers ── */
+function getCurrentFY() {
+    const today = new Date();
+    const year  = today.getFullYear();
+    const month = today.getMonth();
+    const startYear = month >= 3 ? year : year - 1;
+    return startYear + '-' + String(startYear + 1);
+}
+function formatFYLabel(fy) {
+    if (!fy) return '';
+    const parts = fy.split('-');
+    if (parts.length === 2) return 'FY ' + parts[0] + '-' + parts[1].slice(-2);
+    return 'FY ' + fy;
+}
+
+/* ── Init ── */
+function initFY() {
+    const select = document.getElementById('financial_year');
+    const params = new URLSearchParams(window.location.search);
+    let fy = params.get('fy');
+    if (!fy) {
+        fy = getCurrentFY();
+        let matched = false;
+        for (let opt of select.options) { if (opt.value === fy) { matched = true; break; } }
+        if (!matched && select.options.length > 0) fy = select.options[0].value;
+    }
+    select.value = fy;
+    updateFYLabel(fy);
+    renderBranchSummary();
+    renderList();
+}
+function updateFYLabel(fy) {
+    document.getElementById('fySubLabel').textContent = '' + formatFYLabel(fy);
+}
+function onFinancialYearChange(select) {
+    const url = new URL(window.location.href);
+    url.searchParams.set('fy', select.value);
+    window.location.href = url.toString();
+}
+
+/* ── Branch Summary ── */
+function renderBranchSummary() {
+    if (!TEAM || TEAM.length === 0) return;
+    const totalAchieved = TEAM.reduce((s, m) => s + (parseFloat(m.achieved_amt) || 0), 0);
+    const totalTarget   = TEAM.reduce((s, m) => s + (parseFloat(m.target_amt)   || 0), 0);
+    const p = pct(totalAchieved, totalTarget);
+    document.getElementById('branchTotalAmt').innerHTML = fmt(totalAchieved) + ' <span style="font-size:13px;color:#7c8db0;font-weight:600;">/ ' + fmt(totalTarget) + '</span>';
+    document.getElementById('branchBarFill').style.width = p + '%';
+    document.getElementById('branchPctLbl').textContent  = p + '% of branch target';
+}
+
+/* ── Achievement List ── */
+function renderList() {
+    if (!TEAM || TEAM.length === 0) {
+        document.getElementById('achieveList').innerHTML = '<div class="empty-state"><div class="empty-icon">👤</div>No team achievement data</div>';
+        return;
+    }
+    const sorted = [...TEAM].sort((a, b) => pct(b.achieved_amt, b.target_amt) - pct(a.achieved_amt, a.target_amt));
+    document.getElementById('achieveList').innerHTML = sorted.map((m, i) => {
+        const p   = pct(m.achieved_amt, m.target_amt);
+        const rem = Math.max(0, m.target_amt - m.achieved_amt);
+        const [bc, bt] = badge(p);
+        const grad  = m.grad  || 'linear-gradient(135deg,#4f46e5,#818cf8)';
+        const color = m.color || '#4f46e5';
+        return '<div class="achieve-row" onclick="openModal(' + m.id + ')">'
+            + '<div class="member-cell">'
+            +   '<div style="font-size:14px;font-weight:800;color:#cbd5e1;min-width:26px;">#' + (i+1) + '</div>'
+            +   '<div class="m-avatar" style="background:' + grad + ';">' + (m.first_name||'?')[0] + '</div>'
+            +   '<div><div class="m-name">' + m.first_name + ' ' + m.last_name + '</div></div>'
+            + '</div>'
+            + '<div style="padding-right:20px;">'
+            +   '<div class="prog-row"><span class="prog-pct" style="color:' + color + ';">' + p + '%</span><span class="prog-amts">' + fmt(m.achieved_amt) + ' / ' + fmt(m.target_amt) + '</span></div>'
+            +   '<div class="prog-bar-wrap"><div class="prog-bar" style="width:' + p + '%;background:' + grad + ';"></div></div>'
+            + '</div>'
+            + '<div class="num-cell"><div class="num-val">' + fmt(m.achieved_amt) + '</div></div>'
+            + '<div class="num-cell"><div class="num-val" style="color:#7c8db0;">' + fmt(m.target_amt) + '</div></div>'
+            + '<div class="num-cell"><div class="num-val" style="color:' + (rem > 0 ? '#f97316' : '#10b981') + ';">' + (rem > 0 ? fmt(rem) : '—') + '</div></div>'
+            + '<div style="display:flex;justify-content:center;"><span class="badge ' + bc + '">' + bt + '</span></div>'
+            + '<div class="num-cell center-col"><div class="num-val">' + m.done_acts + '<span style="color:#cbd5e1;font-size:12px;font-weight:600;">/' + m.total_acts + '</span></div><div class="num-lbl">DONE/TOTAL</div></div>'
+            + '<span class="row-arrow">›</span>'
+            + '</div>';
+    }).join('');
+}
+
+/* ── Modal ── */
+function openModal(id) {
+    const m = TEAM.find(x => x.id == id);
+    if (!m) return;
+
+    const p   = pct(m.achieved_amt, m.target_amt);
+    const rem = Math.max(0, m.target_amt - m.achieved_amt);
+    const [bc, bt] = badge(p);
+    const grad = m.grad || 'linear-gradient(135deg,#4f46e5,#818cf8)';
+
+    const fySelect = document.getElementById('financial_year');
+    const currentFY = fySelect ? fySelect.value : getCurrentFY();
+    const fyLabel   = formatFYLabel(currentFY);
+
+    document.getElementById('modalAva').style.background = grad;
+    document.getElementById('modalAva').textContent      = (m.first_name || '?')[0];
+    document.getElementById('modalName').textContent     = m.first_name + ' ' + m.last_name;
+    document.getElementById('modalFyBadge').textContent  = fyLabel;
+
+    document.getElementById('modalSummary').innerHTML =
+        '<div class="ms-box"><div class="ms-num" style="color:#4f46e5;">' + fmt(m.achieved_amt) + '</div><div class="ms-lbl">ACHIEVED</div></div>'
+      + '<div class="ms-box"><div class="ms-num">' + fmt(m.target_amt) + '</div><div class="ms-lbl">TARGET</div></div>'
+      + '<div class="ms-box"><div class="ms-num" style="color:#f97316;">' + fmt(rem) + '</div><div class="ms-lbl">REMAINING</div></div>'
+      + '<div class="ms-box"><div class="ms-num" style="color:' + (p>=75?'#10b981':p>=50?'#f97316':'#ef4444') + ';">' + p + '%</div><div class="ms-lbl">ACHIEVED %</div></div>';
+
+    /* ── Overall progress block (shared) ── */
+    const overallHtml =
+        '<div class="overall-prog">'
+      +   '<div class="op-label">OVERALL TARGET ACHIEVEMENT</div>'
+      +   '<div class="op-row">'
+      +     '<div><div class="op-achieved">' + fmt(m.achieved_amt) + '</div><div class="op-target">of ' + fmt(m.target_amt) + ' target</div></div>'
+      +     '<div class="op-pct">' + p + '%</div>'
+      +   '</div>'
+      +   '<div class="op-bar-wrap"><div class="op-bar-fill" style="width:' + p + '%;"></div></div>'
+      +   '<div class="op-foot"><span>Remaining: <strong style="color:#fbbf24;">' + fmt(rem) + '</strong></span>'
+      +     '<span class="badge ' + bc + '" style="background:rgba(255,255,255,.1);color:#e2e8f0;">' + bt + '</span>'
+      +   '</div>'
+      + '</div>';
+
+    /* ════════════════════════════
+       TAB 1 — Quarter-wise splits
+    ════════════════════════════ */
+    const splits    = m.splits || [];
+    const splitRows = splits.map(function(s) {
+        const sp   = pct(s.achieved, s.target);
+        const srem = Math.max(0, s.target - s.achieved);
+        const [sbc, sbt] = badge(sp);
+
+        /* % cell: number on top, badge below (badge hidden when 0%) */
+        const pctColor  = sp >= 75 ? '#10b981' : sp >= 50 ? '#f97316' : '#ef4444';
+        const pctCell   = '<div style="font-weight:800;font-size:15px;color:' + pctColor + ';">' + sp + '%</div>'
+                        + (sp > 0 ? '<div style="margin-top:3px;"><span class="split-pct-badge ' + sbc + '" style="font-size:10px;padding:2px 8px;">' + sbt + '</span></div>' : '');
+
+        /* Activities cell: total bold on top, done in muted smaller text below */
+        const actsCell  = '<div style="font-weight:800;font-size:15px;">' + s.acts + '</div>'
+                        + '<div style="font-size:11px;color:#94a3b8;font-weight:600;margin-top:2px;">' + s.done + ' done</div>';
+
+        return '<tr>'
+            + '<td><div class="split-name">' + s.name + '</div><div class="split-dates">📅 ' + s.start + ' → ' + s.end + '</div></td>'
+            + '<td><div style="font-weight:800;">' + fmt(s.achieved) + '</div><div class="mini-prog-wrap"><div class="mini-prog-bar" style="width:' + sp + '%;background:' + progColor(sp) + ';"></div></div></td>'
+            + '<td style="font-weight:700;color:#7c8db0;">' + fmt(s.target) + '</td>'
+            + '<td style="font-weight:700;color:#f97316;">' + (srem > 0 ? fmt(srem) : '—') + '</td>'
+            + '<td>' + pctCell + '</td>'
+            + '<td>' + actsCell + '</td>'
+            + '<td style="font-weight:700;">' + s.leads + '</td>'
+            + '</tr>';
+    }).join('');
+
+    const actChips = Object.entries(m.activities || {}).map(function(entry) {
+        const k = entry[0], v = entry[1];
+        return '<div class="act-chip">'
+             + '<div class="act-dot" style="background:' + (ACT_COLORS[k]||'#64748b') + ';"></div>'
+             + (ACT_ICONS[k]||'📌') + ' ' + k + ': <strong>' + v + '</strong>'
+             + '</div>';
+    }).join('');
+
+    const tab1Html = overallHtml
+        + '<div class="split-section-title">📊 Quarter-wise Achievement Breakdown</div>'
+        + '<div style="overflow-x:auto;margin-bottom:20px;">'
+        +   '<table class="split-table">'
+        +     '<thead><tr>'
+        +       '<th>Quarter</th><th>Achieved</th><th>Target</th><th>Remaining</th>'
+        +       '<th style="text-align:center;">Achievement %</th>'
+        +       '<th style="text-align:center;">Activities</th>'
+        +       '<th style="text-align:center;">Leads</th>'
+        +     '</tr></thead>'
+        +     '<tbody>' + (splitRows || '<tr><td colspan="7" style="text-align:center;color:#aaa;padding:20px;">No split data available</td></tr>') + '</tbody>'
+        +   '</table>'
+        + '</div>'
+        + '<div class="split-section-title">⚡ Activity Breakdown</div>'
+        + '<div class="act-chips">' + (actChips || '<span style="color:#aaa;font-size:13px;">No activity data</span>') + '</div>';
+
+    /* ════════════════════════════
+       TAB 2 — Opportunities
+    ════════════════════════════ */
+    const opp = OPP_DATA[id] || null;
+    let tab2Html = '';
+
+    if (opp) {
+        const oppPct       = pct(opp.total_exp_amt, opp.target_amt);
+        const [obc, obt]   = badge(oppPct);
+        const oppPctColor  = oppPct >= 75 ? '#10b981' : oppPct >= 50 ? '#f97316' : '#ef4444';
+
+        /* Summary cards */
+        const summaryCards =
+            '<div class="opp-summary-cards">'
+          +   '<div class="opp-card"><div class="opp-card-val" style="color:#4f46e5;">' + opp.total_policies + '</div><div class="opp-card-lbl">TOTAL POLICIES WON</div></div>'
+          +   '<div class="opp-card"><div class="opp-card-val" style="color:#10b981;">' + fmtFull(opp.total_exp_amt) + '</div><div class="opp-card-lbl">TOTAL EXP AMOUNT</div></div>'
+          +   '<div class="opp-card"><div class="opp-card-val" style="color:' + oppPctColor + ';">' + oppPct + '%</div><div class="opp-card-lbl">VS TARGET</div></div>'
+          + '</div>';
+
+        /* Dark progress bar */
+        const oppProgress =
+            '<div style="background:linear-gradient(135deg,#0f172a,#1e293b);border-radius:14px;padding:18px 20px;color:#fff;margin-bottom:20px;">'
+          +   '<div class="op-label">OPPORTUNITIES ACHIEVEMENT</div>'
+          +   '<div class="op-row">'
+          +     '<div><div class="op-achieved">' + fmtFull(opp.total_exp_amt) + '</div><div class="op-target">of ' + fmtFull(opp.target_amt) + ' target</div></div>'
+          +     '<div class="op-pct">' + oppPct + '%</div>'
+          +   '</div>'
+          +   '<div class="op-bar-wrap"><div class="op-bar-fill" style="width:' + oppPct + '%;"></div></div>'
+          +   '<div class="op-foot"><span>' + opp.total_policies + ' policies won</span>'
+          +     '<span class="badge ' + obc + '" style="background:rgba(255,255,255,.1);color:#e2e8f0;">' + obt + '</span>'
+          +   '</div>'
+          + '</div>';
+
+        /* Policy rows — NO quarter grouping */
+        const policies = opp.policies || [];
+        const policyRows = policies.map(function(pol) {
+            return '<tr>'
+                + '<td style="font-weight:700;color:#0f172a;">' + (pol.policy_no || '—') + '</td>'
+                + '<td style="font-weight:600;color:#334155;">' + fmtIssueDate(pol.issue_date) + '</td>'
+                + '<td style="font-weight:800;color:#0f172a;">' + fmtFull(pol.amount || 0) + '</td>'
+                + '<td style="font-size:12px;color:#64748b;">' + fmtCreatedAt(pol.created_at) + '</td>'
+                + '</tr>';
+        }).join('');
+
+        tab2Html = "";
+        // tab2Html = summaryCards
+        //     + oppProgress
+        //     + '<div class="split-section-title">📋 Policy Details</div>'
+        //     + '<div style="overflow-x:auto;">'
+        //     +   '<table class="split-table">'
+        //     +     '<thead><tr>'
+        //     +       '<th>Policy No.</th>'
+        //     +       '<th>Issue Date</th>'
+        //     +       '<th>Amount</th>'
+        //     +       '<th>Created Date</th>'
+        //     +     '</tr></thead>'
+        //     +     '<tbody>' + (policyRows || '<tr><td colspan="4" style="text-align:center;color:#aaa;padding:24px;">No policies found</td></tr>') + '</tbody>'
+        //     +   '</table>'
+        //     + '</div>';
+
+        /* ── Won Leads Table (Table 2) ── */
+        const wonLeads = opp.won_leads || [];
+        const wonRows  = wonLeads.map(function(l) {
+            const typeBadgeClass = l.lead_type === 'EB'
+                ? 'style="background:#eff6ff;color:#2563eb;padding:3px 10px;border-radius:99px;font-size:11px;font-weight:700;"'
+                : 'style="background:#f0fdf4;color:#16a34a;padding:3px 10px;border-radius:99px;font-size:11px;font-weight:700;"';
+            return '<tr>'
+                + '<td style="font-weight:700;color:#0f172a;">' + (l.company || '—') + '</td>'
+                + '<td><span ' + typeBadgeClass + '>' + (l.lead_type || '—') + '</span></td>'
+                + '<td style="font-size:12px;color:#64748b;">' + fmtCreatedAt(l.created_at) + '</td>'
+                + '</tr>';
+        }).join('');
+
+        tab2Html +=
+            '<div class="split-section-title" style="margin-top:24px;"> Opportunities </div>'
+          + '<div style="overflow-x:auto;">'
+          +   '<table class="split-table">'
+          +     '<thead><tr>'
+          +       '<th>Company</th>'
+          +       '<th>Opportunity Type</th>'
+          +       '<th>Date</th>'
+          +     '</tr></thead>'
+          +     '<tbody>' + (wonRows || '<tr><td colspan="3" style="text-align:center;color:#aaa;padding:24px;">No leads found</td></tr>') + '</tbody>'
+          +   '</table>'
+          + '</div>';
+
+    } else {
+        tab2Html = '<div class="empty-state"><div class="empty-icon">📋</div>No opportunities data available</div>';
+    }
+
+    /* ── Inject tabs ── */
+    document.getElementById('modalBody').innerHTML =
+        '<div class="modal-tabs">'
+      +   '<button class="modal-tab active" onclick="switchTab(0,this)">📊 ' + fyLabel + ' Split-wise Achievement</button>'
+      +   '<button class="modal-tab" onclick="switchTab(1,this)">🏆 Opportunities Achievement</button>'
+      + '</div>'
+      + '<div class="modal-tab-panel active" id="tabPanel0">' + tab1Html + '</div>'
+      + '<div class="modal-tab-panel" id="tabPanel1">' + tab2Html + '</div>';
+
+    document.getElementById('modalOverlay').classList.add('open');
+    document.body.style.overflow = 'hidden';
+}
+
+function switchTab(idx, btn) {
+    document.querySelectorAll('.modal-tab').forEach(function(t) { t.classList.remove('active'); });
+    document.querySelectorAll('.modal-tab-panel').forEach(function(p) { p.classList.remove('active'); });
+    btn.classList.add('active');
+    document.getElementById('tabPanel' + idx).classList.add('active');
+}
+function closeModal() {
+    document.getElementById('modalOverlay').classList.remove('open');
+    document.body.style.overflow = '';
+}
+
+document.getElementById('modalOverlay').addEventListener('click', function(e) { if (e.target === e.currentTarget) closeModal(); });
+document.addEventListener('keydown', function(e) { if (e.key === 'Escape') closeModal(); });
+
+document.addEventListener('DOMContentLoaded', initFY);
+</script>
\ No newline at end of file
diff --git a/app/Views/sales/branch_level_dashboard_view_1mar.php b/app/Views/sales/branch_level_dashboard_view_1mar.php
new file mode 100644
index 00000000..efc8d3cb
--- /dev/null
+++ b/app/Views/sales/branch_level_dashboard_view_1mar.php
@@ -0,0 +1,294 @@
+<style>
+    .dash-container { padding: 25px; background: #f8f9fa; font-family: 'Segoe UI', sans-serif; }
+    .top-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 25px; }
+    
+    .stat-cards { display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px; margin-bottom: 30px; }
+    .card { background: white; padding: 25px; border-radius: 12px; border: 1px solid #edf2f7; box-shadow: 0 2px 4px rgba(0,0,0,0.02); }
+    .stat-val { font-size: 28px; font-weight: 700; color: #1a202c; }
+    .stat-label { color: #718096; font-size: 14px; margin-top: 4px; font-weight: 500; }
+    .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; }
+    
+    .team-member { display: flex; align-items: center; padding: 15px 0; border-bottom: 1px solid #f1f5f9; }
+    .member-img { width: 40px; height: 40px; border-radius: 50%; background: #ff6b35; color: white; margin-right: 12px; display: flex; align-items: center; justify-content: center; font-weight: bold; font-size: 16px; }
+    .act-stats { text-align: right; }
+    .act-stats .total { font-weight: 700; font-size: 13px; color: #1a202c; }
+    .act-stats .done { font-size: 11px; color: #38a169; font-weight: 600; margin-top: 2px; }
+
+    .breakdown-card { margin-top: 20px; }
+    .breakdown-item { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; font-size: 13px; }
+    .dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; margin-right: 8px; }
+
+    table { width: 100%; border-collapse: collapse; }
+    th { text-align: left; padding: 12px; color: #718096; font-size: 11px; text-transform: uppercase; letter-spacing: 0.05em; border-bottom: 1px solid #edf2f7; }
+    td { padding: 15px 12px; border-bottom: 1px solid #f1f5f9; font-size: 14px; vertical-align: middle; }
+    
+    .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>
+            <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>
+        </div>
+        <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 class="stat-cards">
+        <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>
+        <div class="card-hero">
+            <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_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 $total_completed_acts ?></div>
+            <div class="stat-label">Completed Activities</div>
+            <!-- <div class="stat-change text-success">↑ 15% this month</div> -->
+        </div>
+        <!-- <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 class="main-grid">
+        <div class="card">
+            <div class="table-header">
+                <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>
+                    <tr>
+                        <th>Company</th>
+                        <th>Activity & Assigned</th>
+                        <th>Date</th>
+                        <th>Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php if (!empty($pending_acts)): ?>
+                        <?php foreach ($pending_acts as $a): ?>
+                            <?php
+                                $activityIcons = [
+                                    'Call'    => '📞',
+                                    'Email'   => '✉️',
+                                    'Meeting' => '📅',
+                                    'Visit'   => '🚗',
+                                    'Demo'    => '🖥️',
+                                    'Share Docs'   => '📄',
+                                    'To Do'    => '✓'
+                                ];
+                                $icon = $activityIcons[$a['activity_type']] ?? '📌';
+                                $statusClass = strtolower(str_replace(' ', '-', $a['status']));
+                                $formattedscheduledDate = date('M d, Y, h:i A', 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>
+                                    <!-- <div style="font-size: 12px; color: #718096;">
+                                        <?= esc($a['notes'] ?? 'ID: ' . $a['assigned_to']) ?>
+                                    </div> -->
+                                </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; ?>
+                    <?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>
+                <?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: #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> -->
+                <?php
+                    $activityConfig = [
+                        'Call'    => ['color' => '#ff6b35', 'icon' => '📞'],
+                        'Email'   => ['color' => '#48bb78', 'icon' => '✉️'],
+                        'Meeting' => ['color' => '#4299e1', 'icon' => '📅'],
+                        'Visit'   => ['color' => '#ecc94b', 'icon' => '🚗'],
+                        'Demo'    => ['color' => '#9f7aea', 'icon' => '🖥️'],
+                        'Share Docs'   => ['color' => '#ed8936', 'icon' => '📄'],
+                        'To Do'    => ['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 style="background: <?= $color ?>;"></span>
+                                    <?= $icon ?> <?= esc($type) ?>
+                                </span>
+                                <strong><?= $item['percentage'] ?>%</strong>
+                            </div>
+                        <?php endforeach; ?>
+                    <?php else: ?>
+                        <div class="empty-state">
+                                    <div class="empty-icon">✓</div> No activities found
+                        </div>
+                    <?php endif; ?>
+            </div>
+        </div>
+    </div>
+
+    <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> 
+            <!-- <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>
+                <tr>
+                    <th>Company</th>
+                    <th>Status</th>
+                    <th>Assigned To</th>
+                    <th style="text-align: center !important;">Activities</th>
+                    <th style="text-align: center !important;">Opportunities</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?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">
+                                    <div class="empty-icon">👤</div> No leads found
+                            </div>
+                        </td>
+                    </tr>
+                <?php endif; ?>
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/sales/sales_manager_level_dashboard.php b/app/Views/sales/sales_manager_level_dashboard.php
index cfca7b7b..dcf9906d 100644
--- a/app/Views/sales/sales_manager_level_dashboard.php
+++ b/app/Views/sales/sales_manager_level_dashboard.php
@@ -74,7 +74,7 @@
             <p style="color:#666; font-size:13px; margin-top: 4px;">Welcome back, <?= $user_name ?></p> -->
         </div>
         <div style="position: relative;">
-            <select id="financial_year" name="financial_year" onchange="onFinancialYearChange(this)" style="background:#f5f5f5; padding:10px 20px; border-radius:8px; border:none; width: 250px; font-size: 13px; cursor: pointer;">
+            <select id="financial_year" name="financial_year" onchange="onFinancialYearChange(this)" style="width: 250px; font-size: 13px; cursor: pointer;">
                 <?php if(!empty($fin_years)): ?>
                     <?php foreach($fin_years as $year): ?>
                         <option value="<?= $year; ?>"><?= $year; ?></option>
@@ -133,8 +133,11 @@
                 <button class="badge-done" onclick="openComp(<?= $u['activity_id'] ?>,<?= $u['lead_id'] ?>)">✓ Mark as completed</button>
             </div>
             <?php endforeach; ?> -->
+             <?php if (!empty($upcoming)) : ?>
+            
+        
             <?php foreach($upcoming as $u): 
-                    $activityIcons = [ 'Call'    => '📞', 'Email'   => '✉️', 'Meeting' => '📅', 'Visit'   => '🚗', 'Demo'    => '🖥️', 'Share'   => '📄', 'Todo'    => '✓' ];
+                    $activityIcons = [ 'Call'    => '📞', 'Email'   => '✉️', 'Meeting' => '📅', 'Visit'   => '🚗', 'Demo'    => '🖥️', 'Share Docs'   => '📄', 'To Do'    => '✓' ];
                     $icon = $activityIcons[$u['activity_type']] ?? '📌';
                     $formattedscheduledDate = date('M d, Y, h:i A', strtotime($u['scheduled_date']));
             ?>
@@ -160,11 +163,19 @@
                     </div>
                 </div>
             <?php endforeach; ?>
+            <?php else : ?>
+
+            <div class="text-center text-muted py-3">
+                No Upcoming Activities for this Financial Year.
+            </div>
+
+        <?php endif; ?>
         </div>
 
     
         <div class="list-card">
             <h3 style="font-size:16px; font-weight: 700; margin-bottom:20px;">My Recent Leads</h3>
+            <?php if (!empty($recent_leads)) : ?>
             <?php foreach($recent_leads as $rl): ?>
             <!-- <div class="list-item">
                 <div style="display:flex; gap:12px; align-items:center;">
@@ -206,6 +217,13 @@
 
             </div>
             <?php endforeach; ?>
+            <?php else : ?>
+
+            <div class="text-center text-muted py-3">
+                No Leads Found for this Financial Year.
+            </div>
+
+        <?php endif; ?>
         </div>
     </div>
 </div>
diff --git a/app/Views/sales/target_view.php b/app/Views/sales/target_view.php
new file mode 100644
index 00000000..a165ace6
--- /dev/null
+++ b/app/Views/sales/target_view.php
@@ -0,0 +1,602 @@
+<style>
+* { margin: 0; padding: 0; box-sizing: border-box; }
+body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: #f5f5f5; color: #333; }
+
+/* ═══════════════════════════════════════════
+   LAYOUT — Page Shell
+═══════════════════════════════════════════ */
+.main-content { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
+
+.top-bar {
+    display: flex;
+    justify-content: space-between;  /* pushes subtitle left, search right */
+    align-items: center;             /* vertically centers both */
+    padding: 14px 28px;
+    background: white;
+    /* border-bottom: 1px solid #e0e0e0; */
+}
+
+/* ═══════════════════════════════════════════
+   SEARCH INPUT
+═══════════════════════════════════════════ */
+.search-input { padding: 9px 14px; border: 1px solid #e0e0e0; border-radius: 8px; font-size: 14px; width: 240px; outline: none; background: #f5f5f5; transition: border-color .2s;}
+.search-input:focus { border-color: #ff6b35; }
+
+/* ═══════════════════════════════════════════
+   CONTENT AREA
+═══════════════════════════════════════════ */
+.content-area { width: 100%; }
+.content { padding: 10px; width: 100%; max-width: 100%;}
+.subtitle { font-size: 13px; color: #999; margin-bottom: 20px; }
+.view-container { display: none; }
+.view-container.active { display: block; }
+
+/* ═══════════════════════════════════════════
+   MAIN TABLE
+═══════════════════════════════════════════ */
+.tt-table-wrapper { border: 1px solid #e0e0e0; border-radius: 10px; overflow: hidden; width: 100%;}
+.tt-main-table { width: 100%;border-collapse: collapse;table-layout: fixed;}
+.tt-main-table thead { display: table; width: 100%; table-layout: fixed; }
+.tt-main-table thead th { background: #f4f4f4; padding: 11px 14px; text-align: left;font-size: 12px;font-weight: 700;color: #777;text-transform: uppercase;letter-spacing: .4px;border-bottom: 1px solid #e0e0e0;}
+.tt-main-table tbody { display: block; max-height: 530px; overflow-y: auto;}
+.tt-main-table tbody tr { display: table; width: 100%; table-layout: fixed; }
+.tt-main-table tbody td { padding: 12px 14px; font-size: 14px; border-bottom: 1px solid #f0f0f0; vertical-align: middle;}
+.tt-main-table tbody tr:last-child td { border-bottom: none; }
+.tt-main-table tbody tr:hover td { background: #fafafa; }
+/* Empty row — must stay as table-row (not display:table override) */
+.tt-main-table tbody tr.empty-row { display: table-row; width: 100%; }
+.tt-main-table tbody tr.empty-row td { width: 100%; text-align: center; }
+
+/* ═══════════════════════════════════════════
+   MEMBER AVATAR (used inside main table)
+═══════════════════════════════════════════ */
+.tt-person-cell { display: flex; align-items: center; gap: 1px;}
+/* .tt-avatar { width: 38px; height: 38px; border-radius: 50%; background: #ff6b35; color: white; font-size: 14px; font-weight: 700; display: flex; align-items: center; justify-content: center; flex-shrink: 0;} */
+
+/* ═══════════════════════════════════════════
+   EMPTY STATE
+═══════════════════════════════════════════ */
+.empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 40px 20px; color: #aaa; gap: 10px; }
+.empty-icon { font-size: 36px; opacity: 0.5; line-height: 1;}
+.empty-state p { margin: 0; font-size: 14px; font-weight: 500; color: #bbb;}
+.empty-row td { padding: 0 !important; border: none !important; background: transparent !important;}
+
+/* ═══════════════════════════════════════════
+   MODAL — Overlay & Box
+═══════════════════════════════════════════ */
+.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-box { background: white; border-radius: 14px; width: 92%; max-width: 640px; max-height: 90vh; display: flex; flex-direction: column; overflow: hidden; box-shadow: 0 8px 32px rgba(0, 0, 0, .18); animation: slideUp .2s ease;}
+.modal-header { padding: 6px 25px; border-bottom: 1px solid #e0e0e0; display: flex; justify-content: space-between; align-items: center; }
+.modal-body { padding: 25px; flex: 1; overflow-y: auto;}
+
+/* ═══════════════════════════════════════════
+   MODAL — Form Fields
+═══════════════════════════════════════════ */
+.form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 15px;}
+.form-group { margin-bottom: 20px; }
+.form-label { display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #333;}
+
+.form-input,
+.form-textarea,
+.form-select {
+    width: 100%;
+    padding: 10px 15px;
+    border: 1px solid #e0e0e0;
+    border-radius: 8px;
+    font-size: 14px;
+    font-family: inherit;
+    background: #f5f5f5;   /* grey background */
+    color: #333;
+    transition: border-color .2s, background .2s;
+}
+
+.form-textarea { resize: vertical; min-height: 100px;}
+
+.form-input:focus,
+.form-textarea:focus,
+.form-select:focus { outline: none; border-color: #ff6b35; background: #fff;}
+
+/* ═══════════════════════════════════════════
+   MODAL — Detail Table (targets list)
+═══════════════════════════════════════════ */
+.table-wrap { border: 1px solid #e0e0e0; border-radius: 10px; overflow: hidden; margin-top: 16px;}
+.table-wrap table { width: 100%; border-collapse: collapse; table-layout: fixed; }
+.table-wrap thead { display: table; width: 100%; table-layout: fixed; }
+.table-wrap thead th { background: #f8f8f8; padding: 12px 16px; text-align: left; font-size: 13px; font-weight: 600; color: #666; border-bottom: 1px solid #e0e0e0;}
+.table-wrap tbody { display: block; max-height: 220px; overflow-y: auto; }
+.table-wrap tbody tr { display: table; width: 100%; table-layout: fixed; }
+.table-wrap tbody td { padding: 12px 16px; border-bottom: 1px solid #f0f0f0; font-size: 14px; color: #333; vertical-align: middle;}
+.table-wrap tbody tr:last-child td { border-bottom: none; }
+.table-wrap tbody tr:hover td { background: #fafafa; }
+/* Empty row fix for modal table */
+.table-wrap tbody tr.empty-row { display: table-row; }
+.table-wrap tbody tr.empty-row td { padding: 0 !important; border: none !important; text-align: center;}
+
+/* ═══════════════════════════════════════════
+   BUTTONS
+═══════════════════════════════════════════ */
+
+/* Primary action — View Target (main table) */
+.btn-tt-view {
+    background: #ff6b35;
+    color: white;
+    border: none;
+    padding: 7px 16px;
+    border-radius: 7px;
+    font-size: 13px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: background .2s;
+}
+.btn-tt-view:hover { background: #ff5722; }
+
+/* Close button — modal header */
+.close-btn {
+    background: none;
+    border: none;
+    font-size: 22px;
+    cursor: pointer;
+    color: #888;
+    width: 32px;
+    height: 32px;
+    border-radius: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: background .2s;
+}
+.close-btn:hover { background: #f0f0f0; color: #333; }
+
+/* Edit row — modal detail table */
+.btn-edit {
+    background: #e8f4ff;
+    color: #1976d2;
+    border: none;
+    padding: 5px 12px;
+    border-radius: 5px;
+    cursor: pointer;
+    font-size: 12px;
+    font-weight: 600;
+    margin-right: 6px;
+    transition: background .2s;
+}
+.btn-edit:hover { background: #bbdefb; }
+
+/* Remove row — modal detail table */
+.btn-remove {
+    background: #ffeaea;
+    color: #d32f2f;
+    border: none;
+    padding: 5px 12px;
+    border-radius: 5px;
+    cursor: pointer;
+    font-size: 12px;
+    font-weight: 600;
+    transition: background .2s;
+}
+.btn-remove:hover { background: #ffcdd2; }
+
+/* ═══════════════════════════════════════════
+   ANIMATIONS
+═══════════════════════════════════════════ */
+@keyframes slideUp {
+    from { transform: translateY(20px); opacity: 0; }
+    to   { transform: translateY(0);    opacity: 1; }
+}
+
+/* ═══════════════════════════════════════════
+   RESPONSIVE
+═══════════════════════════════════════════ */
+@media (max-width: 540px) {
+    .form-row { grid-template-columns: 1fr; }
+    .search-input { width: 100%; }
+}
+
+/* ═══════════════════════════════════════════
+   GREY BOX — Input Section Container
+═══════════════════════════════════════════ */
+.grey-box {
+    background: #f5f5f5;
+    border: 1px solid #e0e0e0;
+    border-radius: 10px;
+    padding: 16px 18px;
+    margin-bottom: 20px;
+}
+
+.grey-box .form-row {
+    display: grid;
+    grid-template-columns: 1fr 1fr auto;  /* 2 fields + button */
+    gap: 15px;
+    align-items: flex-end;               /* aligns button to bottom of fields */
+}
+
+.grey-box .form-group {
+    margin-bottom: 0;                    /* remove default gap inside grey box */
+}
+
+.grey-box .btn {
+    white-space: nowrap;
+    height: 40px;                        /* match input height */
+    width: 100%;
+}
+@media (max-width: 540px) {
+    .grey-box .form-row {
+        grid-template-columns: 1fr;  /* stack vertically on mobile */
+    }
+}
+@keyframes fadeHighlight {
+    0%   { background-color: #fffbcc; }
+    100% { background-color: transparent; }
+}
+
+.row-highlight {
+    animation: fadeHighlight 2s ease forwards;
+}
+
+</style>
+<div class="main-content">
+    <hr class="my-0">
+    <div class="top-bar">
+        <p class="subtitle" id="memberCount"></p>
+        <input type="text" class="search-input" id="searchInput" placeholder="Search member…" oninput="filterMembers(this.value)">
+    </div>
+    <!-- Content -->
+    <div class="content">
+            <div class="content-area view-container active" id="teamtargetView">
+                <div class="tt-table-wrapper">
+                    <table class="tt-main-table">
+                        <thead>
+                            <tr>
+                                <th>Sales Manager</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody id="ttMainTableBody"></tbody>
+                    </table>
+                </div>
+            </div>
+    </div>
+
+</div>
+
+<!-- Modal -->
+<div class="modal" id="targetModal">
+    <div class="modal-box">
+        <div class="modal-header">
+            <span class="modal-title" id="modalTitle">–</span>
+            <button class="close-btn" onclick="closeModal()" title="Close">×</button>
+        </div>
+        <div class="modal-body">
+            <input type="hidden" id="recordId">
+            <input type="hidden" id="currentUserId">
+
+            <div class="grey-box">
+                <div class="form-row">
+                    <div class="form-group">
+                        <label class="form-label">Financial Year</label>
+                        <select class="form-select" id="fyYear"></select>
+                    </div>
+                    <div class="form-group">
+                        <label class="form-label">Amount (₹)</label>
+                        <input type="text" class="form-input" id="targetAmount" placeholder="e.g. 500000"
+                            oninput="this.value=this.value.replace(/[^0-9]/g,'')">
+                    </div>
+                    <div class="form-group">
+                        <button type="button" class="btn btn-primary waves-effect btn-sm w-100" id="btn-save" onclick="saveRecord()">Save Target</button>
+                    </div>
+                </div>
+            </div>
+
+            <div class="table-wrap">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Financial Year</th>
+                            <th>Amount</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody id="detailTableBody">
+                        <tr class="empty-row"><td colspan="3">No targets added yet.</td></tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const sales_manager = <?= json_encode($sales_manager ?? []) ?>;
+ 
+    /* ──────────────────────────────────────────
+       DATA
+    ────────────────────────────────────────── */
+    const teamMembers = sales_manager.map(user => ({
+        id: user.id,
+        name: user.first_name + ' ' + user.last_name
+    }));
+    const API = '<?= base_url('sales') ?>';
+
+    let activeUserId = null;
+
+    /* ──────────────────────────────────────────
+       RENDER MEMBER LIST
+    ────────────────────────────────────────── */
+    function renderMemberList(filter = '') {
+    const tbody   = document.getElementById('ttMainTableBody');
+    const countEl = document.getElementById('memberCount');
+    const term    = filter.trim().toLowerCase();
+
+    const filtered = teamMembers.filter(m =>
+        m.name.toLowerCase().includes(term)
+    );
+    
+
+    // countEl.textContent = `${filtered.length} member${filtered.length !== 1 ? 's' : ''}`;
+    countEl.textContent = ``;
+
+    tbody.innerHTML = '';
+
+    if (filtered.length === 0) {
+        tbody.innerHTML = `
+            <tr class="empty-row">
+                <td colspan="2">
+                    <div class="empty-state">
+                        <div class="empty-icon">👤</div>
+                        <p>No Member found</p>
+                    </div>
+                </td>
+            </tr>
+        `;
+        return;
+    }
+
+    filtered.forEach(m => {
+        // const initials = m.name.split(' ').map(w => w[0]).join('').substring(0, 2).toUpperCase();
+        const tr = document.createElement('tr');
+        tr.innerHTML = `
+            <td id="card_${m.id}">
+                <div class="tt-person-cell">
+                    <div class="avatar-md">
+                                <div class="avatar-title bg-soft-primary rounded-circle text-primary font-20 font-weight-semibold" 
+                                     style="background-color: #f1f3fa; width: 48px; height: 48px; display: flex; align-items: center; justify-content: center;">
+                                     ${(m.name || '?').charAt(0).toUpperCase()}
+                                </div>
+                    </div>
+                    <span>${m.name}</span>
+                </div>
+            </td>
+            <td>
+                <button class="btn btn-primary waves-effect waves-light" onclick="openModal(${m.id})">View Target</button>
+            </td>
+        `;
+        tbody.appendChild(tr);
+    });
+}
+
+    function filterMembers(val) {
+        renderMemberList(val);
+    }
+
+    /* ──────────────────────────────────────────
+       FY OPTIONS
+    ────────────────────────────────────────── */
+    function populateFY(selectedFY = null) {
+        const sel   = document.getElementById('fyYear');
+        const today = new Date();
+        const year  = today.getFullYear();
+        const month = today.getMonth(); // 0-11
+
+        // Determine current FY start year
+        let currentFYStart;
+
+        if (month >= 3) {  // April (3) or later
+            currentFYStart = year;
+        } else {           // Jan, Feb, Mar
+            currentFYStart = year - 1;
+        }
+
+        sel.innerHTML = '';
+
+        for (let i = 0; i < 10; i++) {
+            const startYear = currentFYStart - i;
+            const label     = `${startYear}-${startYear + 1}`;
+
+            const opt = document.createElement('option');
+            opt.value = label;
+            opt.textContent = label;
+
+            if (label === selectedFY) opt.selected = true;
+
+            sel.appendChild(opt);
+        }
+    }
+
+    /* ──────────────────────────────────────────
+       MODAL
+    ────────────────────────────────────────── */
+    function openModal(userId) {
+        
+        activeUserId = userId;
+
+        const member = teamMembers.find(m => Number(m.id) === Number(userId));
+        
+        document.getElementById('modalTitle').textContent  = member ? member.name : '–';
+        document.getElementById('currentUserId').value     = userId;
+        document.getElementById('recordId').value          = '';
+        document.getElementById('targetAmount').value      = '';
+        populateFY();
+        renderDetailTable(userId);
+        document.getElementById('targetModal').classList.add('active');
+    }
+
+    function closeModal() {
+        document.getElementById('targetModal').classList.remove('active');
+        activeUserId = null;
+    }
+
+    document.getElementById('targetModal').addEventListener('click', function(e) {
+        if (e.target === this) closeModal();
+    });
+
+    /* ──────────────────────────────────────────
+       RENDER DETAIL TABLE
+    ────────────────────────────────────────── */
+    async function renderDetailTable(userId) {
+        const tbody = document.getElementById('detailTableBody');
+        tbody.innerHTML = '<tr><td colspan="3">Loading...</td></tr>';
+
+        try {
+            const res     = await fetch(`${API}/targets/user/${userId}`);
+            const json    = await res.json();
+            const records = json.data || [];
+
+            if (records.length === 0) {
+                tbody.innerHTML = '<tr class="empty-row"><td colspan="3">No targets added yet.</td></tr>';
+                return;
+            }
+            // records.sort((a, b) => b.id - a.id);
+            records.sort((a, b) => {
+                    let startYearA = parseInt(a.fy_year.split('-')[0], 10);
+                    let startYearB = parseInt(b.fy_year.split('-')[0], 10);
+                    return startYearB - startYearA;
+            });
+
+            tbody.innerHTML = records.map(r => `
+                <tr id="row_${r.id}">
+                    <td>${r.fy_year}</td>
+                    <td>₹ ${formatNum(r.target_amount)}</td>
+                    <td>
+                        <button class="btn-edit"   onclick="editRecord(${r.id}, '${r.fy_year}', ${r.target_amount})">Edit</button>
+                        <button class="btn-remove" onclick="removeRecord(${r.id})">Remove</button>
+                    </td>
+                </tr>
+            `).join('');
+        } catch (err) {
+            tbody.innerHTML = '<tr><td colspan="3">Failed to load targets.</td></tr>';
+            console.error(err);
+        }
+    }
+
+    /* ──────────────────────────────────────────
+       SAVE (INSERT / UPDATE)
+    ────────────────────────────────────────── */
+    async function saveRecord() {
+        const userId   = activeUserId;
+        const recordId = document.getElementById('recordId').value.trim();
+        const fyYear   = document.getElementById('fyYear').value;
+        const amtRaw   = document.getElementById('targetAmount').value.trim();
+
+        // Validation
+        if (!fyYear)  { toastr.error('Please select a Financial Year.'); return; }
+        if (!amtRaw)  { toastr.error('Please enter an amount.'); return; }
+        const amount = parseInt(amtRaw, 10);
+        if (isNaN(amount) || amount <= 0) { toastr.error('Enter a valid positive amount.'); return; }
+
+        const existingRows = document.querySelectorAll('#detailTableBody tr[id^="row_"]');
+        for (const row of existingRows) {
+            const rowId    = row.id.replace('row_', '');
+            const rowFY    = row.cells[0].textContent.trim();
+            // Skip the row being edited
+            if (recordId && rowId === recordId) continue;
+            if (rowFY === fyYear) {
+                toastr.error(`A target for ${fyYear} already exists.`);
+                return;
+            }
+        }
+
+
+        const saveBtn          = document.getElementById('btn-save');
+        const originalBtnText  = saveBtn.innerText;
+        saveBtn.disabled       = true;
+        saveBtn.innerText      = recordId ? 'Updating...' : 'Saving...';
+
+        try {
+            const payload = {
+                user_id:       userId,
+                fy_year:       fyYear,
+                target_amount: amount
+            };
+
+            const isUpdate = !!recordId;
+            const url      = isUpdate ? `${API}/targets/${recordId}` : `${API}/targets`;
+            const method   = isUpdate ? 'PUT' : 'POST';
+
+            const res    = await fetch(url, {
+                method:  method,
+                headers: { 'Content-Type': 'application/json' },
+                body:    JSON.stringify(payload)
+            });
+            const result = await res.json();
+
+            if (res.ok) {
+                toastr.success(isUpdate ? 'Target updated!' : 'Target saved!');
+                // Reset form
+                document.getElementById('recordId').value     = '';
+                document.getElementById('targetAmount').value = '';
+                populateFY();
+                await renderDetailTable(userId); 
+                const savedId = result.data?.id || recordId;
+                const targetRow = document.getElementById(`row_${savedId}`);
+                if (targetRow) {
+                    targetRow.scrollIntoView({ behavior: 'smooth', block: 'center' });
+                    targetRow.classList.add('row-highlight');
+                    setTimeout(() => targetRow.classList.remove('row-highlight'), 3000);
+                }
+            } else {
+                toastr.error(result.message || 'Failed to save target.');
+            }
+        } catch (err) {
+            console.error(err);
+            toastr.error('A network error occurred.');
+        } finally {
+            saveBtn.disabled  = false;
+            saveBtn.innerText = originalBtnText;
+        }
+    }
+
+    /* ──────────────────────────────────────────
+       EDIT  — populate form from table row data
+    ────────────────────────────────────────── */
+    function editRecord(id, fyYear, amount) {
+        document.getElementById('recordId').value     = id;
+        document.getElementById('targetAmount').value = amount;
+        populateFY(fyYear);
+    }
+
+    /* ──────────────────────────────────────────
+       REMOVE
+    ────────────────────────────────────────── */
+    async function removeRecord(id) {
+        if (!confirm('Are you sure you want to remove this target?')) return;
+
+        try {
+            const res    = await fetch(`${API}/targets/${id}`, { method: 'DELETE' });
+            const result = await res.json();
+
+            if (res.ok) {
+                toastr.success('Target removed.');
+                renderDetailTable(activeUserId);
+            } else {
+                toastr.error(result.message || 'Failed to remove target.');
+                
+            }
+        } catch (err) {
+            console.error(err);
+            toastr.error('A network error occurred.');
+        }
+    }
+
+    /* ──────────────────────────────────────────
+       HELPERS
+    ────────────────────────────────────────── */
+    function formatNum(n) {
+        return Number(n).toLocaleString('en-IN');
+    }
+
+    /* ──────────────────────────────────────────
+       INIT
+    ────────────────────────────────────────── */
+    renderMemberList();
+</script>
\ No newline at end of file
diff --git a/app/Views/sales/tracker_view.php b/app/Views/sales/tracker_view.php
index 7e8c4a92..2f56569d 100644
--- a/app/Views/sales/tracker_view.php
+++ b/app/Views/sales/tracker_view.php
@@ -7,6 +7,8 @@
     
     .btn-primary { background: #02a8b5; 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: #02a8b5; transform: translateY(-1px); }
+    .btn-close { background: none; border: none; font-size: 22px; cursor: pointer; color: #888; width: 32px; height: 32px; border-radius: 6px; display: flex; align-items: center; justify-content: center; transition: background .2s; }
+    .btn-close:hover { background: #f0f0f0; color: #333; }
 
     /* Filter Tabs */
     .filter-tabs { display: flex; gap: 10px; padding: 20px 30px; }
@@ -24,6 +26,11 @@
     .status-potential { background: #fff3e0; color: #f57c00; }
     .status-prospects { background: #e8f5e9; color: #388e3c; }
     .status-not-a-prospects { background: #ffebee;  color: #d32f2f; }
+    .status-unknown { background: #000; color: #fff; }
+    .status-text-unknown { color: #000; font-weight: bold; }
+    .status-text-lost    { color: #d32f2f; font-weight: bold; }
+    .status-text-won    { color: #388e3c; font-weight: bold; }
+    
 
     /* 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; }
@@ -72,6 +79,9 @@
     .opportunity-details {  display: grid;  grid-template-columns: repeat(2, 1fr);  gap: 10px;  margin-top: 15px;}
     .opportunity-detail-item {  font-size: 13px;  color: #666;}
     .opportunity-footer {  margin-top: 15px; padding-top: 15px; border-top: 1px solid #f0f0f0; font-size: 13px; color: #666; }
+    .lost-reason { margin-bottom: 8px; color: #c0392b; /* soft red for lost */ }
+    .footer-divider { border-top: 1px dashed #ddd; margin: 8px 0; }
+    .notes { color: #555; }
 
     /* Base style for both tabs */
     .tab-item { cursor: pointer; padding-bottom: 10px; margin: 0; font-size: 16px; color: #999; /* Default grey for unselected */ border-bottom: 2px solid transparent; transition: all 0.2s ease; }
@@ -105,7 +115,20 @@
         border-color: #ff4d4d !important;
     }
 
-    
+.select2-container--default 
+.select2-selection--multiple 
+.select2-selection__choice {
+    background-color: #02a8b5 !important;
+    border: none !important;
+    border-color: #fff !important;
+    color: #fff !important;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #fff !important;
+}
+.modal .select2-container--default .select2-selection--multiple {
+  background-color: #fff !important;
+}
 </style>
 
 <div class="main-content">
@@ -137,7 +160,7 @@
             <!-- RIGHT SIDE -->
             <div class="lead-actions">
                 <input type="text" class="search-input" id="mainSearch"
-                    placeholder="Search leads..." onkeyup="fetchLeads(false)">
+                    placeholder="Search leads..." onkeyup="fetchLeads(false)" style="width: 300px !important;">
                 <button class="btn-primary" onclick="openModal('addLeadModal')">
                     + Add Lead
                 </button>
@@ -166,7 +189,7 @@
         <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('addLeadModal')">&times;</button>
+                <button class="btn-close" onclick="closeModal('addLeadModal')" title="Close">×</button>
             </div>
             <form class="parsley-examples" id="addLeadForm" enctype="multipart/form-data"> 
                     <hr class="my-0">
@@ -203,8 +226,8 @@
                                     <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 foreach($sales_manager_with_head as $sm): ?>
+                                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?> </option>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
@@ -228,7 +251,7 @@
                 <h2 id="det_company">Lead Detail</h2>
                 <span id="det_status_badge" class="lead-status" style="margin-top: unset;"></span>
             </div>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('leadDetailModal')">&times;</button>
+            <button class="btn-close" onclick="closeModal('leadDetailModal')" title="Close">×</button>
         </div>
         <hr class="my-0">
         <div class="modal-body">
@@ -270,7 +293,7 @@
     <div class="modal-content" style="max-width: 600px;">
         <div class="modal-header">
             <h2>Add Activity</h2>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('activityModal')">&times;</button>
+            <button class="btn-close" onclick="closeModal('activityModal')" title="Close">×</button>
         </div>
         <form class="parsley-examples" id="activityForm" enctype="multipart/form-data"> 
          <hr class="my-0">
@@ -285,8 +308,8 @@
                 <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>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="Share Docs" onclick="selectType('Share Docs', this)">📄 Share Docs</button>
+                <button type="button" class="activity-type-btn d_activity_type" data-type="To Do" onclick="selectType('To Do', this)">✓ To Do</button>
                 
             </div>
             <div class="form-group">
@@ -305,12 +328,20 @@
                 <div class="form-group">
                     <label class="form-label">Assigned To</label>
                     <select id="act_owner" class="search-input searchable" style="width:100%">
-                        <?php foreach($users as $user): ?>
-                            <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?></option>
+                        <?php foreach($sales_manager_with_head as $sm): ?>
+                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
                         <?php endforeach; ?>
                     </select>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="form-label">Additional Assigner</label>
+                <select id="act_multiple_owner" class="search-input searchable multi-searchable" style="width:100%;" multiple>
+                    <?php foreach($sales_team as $sm): ?>
+                        <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
          </div>
          <div class="modal-footer">
                         <div class="form-group text-right mb-0">
@@ -326,7 +357,7 @@
     <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>
+            <button class="btn-close" onclick="closeModal('completeModal')" title="Close">×</button>
         </div>
         <form class="parsley-examples" id="completeForm" enctype="multipart/form-data"> 
          <hr class="my-0">
@@ -354,8 +385,8 @@
                     <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('Share', this)">📄 Share Docs</button>
-                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Todo', this)">✓ To Do</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('Share Docs', this)">📄 Share Docs</button>
+                    <button type="button" class="activity-type-btn f_activity_type" onclick="selectFollowUpActivityType('To Do', this)">✓ To Do</button>
                     
 
                 </div>
@@ -374,12 +405,20 @@
                     <div class="form-group">
                         <label class="form-label">Assigned To <span class="text-danger">*</span></label>
                         <select id="f_assigned_to" class="search-input searchable" style="width:100%">
-                            <?php foreach($users as $user): ?>
-                                <option value="<?= $user['id'] ?>"><?= $user['first_name'] ?></option>
+                            <?php foreach($sales_manager_with_head as $sm): ?>
+                                <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="form-label">Additional Assigner <span class="text-danger">*</span></label>
+                    <select id="f_multiple_owner" class="search-input searchable multi-searchable" style="width:100%" multiple>
+                        <?php foreach($sales_team as $sm): ?>
+                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
             </div>
          </div>
          <div class="modal-footer">
@@ -397,7 +436,7 @@
     <div class="modal-content" style="max-width: 600px;">
         <div class="modal-header">
             <h2>Select Opportunity Type</h2>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('opportunityModal')">&times;</button>
+            <button class="btn-close" onclick="closeModal('opportunityModal')" title="Close">×</button>
         </div>
          <hr class="my-0">
          <div class="modal-body p-4">
@@ -429,61 +468,12 @@
         
     </div>
 </div>
-<!-- <div class="modal" id="opportunityModal">
-    <div class="modal-content" style="max-width: 600px;">
-        <div class="modal-header">
-            <h2>Add Opportunity</h2>
-            <button class="btn-primary" style="background:none; color:#666; font-size:24px;" title="Close" onclick="closeModal('opportunityModal')">&times;</button>
-        </div>
-        <form class="parsley-examples" id="OpportunityForm" enctype="multipart/form-data"> 
-         <hr class="my-0">
-         <div class="modal-body p-4">
-        
-            <input type="hidden" id="opp_lead_id">
-            <div class="form-group">
-                <label class="form-label">Opportunity Title</label>
-                <input type="text" name="title" class="search-input" style="width:100%">
-            </div>
-            <div class="form-row">
-                <div class="form-group ml-1">
-                    <label class="form-label">Expected Worth Amount</label>
-                    <input type="number" name="amount" class="search-input" style="width:100%">
-                </div>
-                <div class="form-group mr-1">
-                    <label class="form-label">Policy Type</label>
-                    <input type="text" name="policy_type" class="search-input" style="width:100%">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="form-label">Employee Count</label>
-                <input type="number" name="count" class="search-input" style="width:100%">
-            </div>
-            <div class="form-group">
-                <label class="form-label">Expected Close Date</label>
-                <input type="datetime-local" id="e_date" class="search-input" style="width:100%">
-            </div>
-            <div class="form-group">
-                <label class="form-label">Notes</label>
-                <textarea id="opp_notes" class="search-input" style="width:100%; height:100px;" placeholder="Add notes about this opportunity..." 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('opportunityModal')">Cancel</button>
-                               <button type="submit" class="btn-primary" >Create Opportunity</button>
-                        </div>
-         </div>
-        </form>
-    </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>
+                <button class="btn-close" onclick="closeModal('editLeadModal')" title="Close">×</button>
             </div>
             <form class="parsley-examples" id="editLeadForm" enctype="multipart/form-data"> 
                     <hr class="my-0">
@@ -525,46 +515,75 @@
                                 </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>
+                                <style>
+                                    .g-0-5 { --bs-gutter-x: 0.3rem; }
+                                    .g-0-5 > * { padding-right: calc(var(--bs-gutter-x) * .5); padding-left: calc(var(--bs-gutter-x) * .5); }
 
-                            <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,'')">
+                                    .primary-container {
+                                        display: flex;
+                                        flex-direction: column-reverse;
+                                        align-items: center;
+                                        justify-content: center;
+                                        /* Ensures the checkbox container height matches the standard input height */
+                                        height: 31px; 
+                                    }
+                                .primary-label {
+                                    font-size: 12px !important;
+                                    font-weight: bold;
+                                    /* Forces the text to take up exactly its own height */
+                                    line-height: 1; 
+                                    margin-top: 2px;
+                                    color: #888;
+                                    display: block;
+                                }
+
+                                /* This is the most important part */
+                                .primary-container .form-check-input {
+                                    margin: 0 !important; 
+                                    padding: 0 !important;
+                                    cursor: pointer;
+                                    /* Reset Bootstrap's default position: absolute if present */
+                                    position: static; 
+                                }
+                                    
+                                </style>
+
+                                <div class="col-12 ml-1">
+                                    <label class="form-label fw-bold small ml-1">Contact Persons</label>
+                                    <input type="hidden" id="editing_contact_id" value=""> 
+                                    <div class="row g-0-5 align-items-end ml-1"> 
+                                        <div class="col-md-3 col-12 mb-2 mb-md-0">
+                                            <input type="text" class="form-control form-control-sm" id="contact_name" placeholder="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 class="col-md-3 col-6">
+                                            <input type="text" class="form-control form-control-sm" id="contact_mobile" placeholder="Mobile" maxlength="10" oninput="this.value = this.value.replace(/[^0-9]/g, '').substring(0, 10);">
                                         </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
+                                        <div class="col-md-3 col-6">
+                                            <input type="text" class="form-control form-control-sm" id="contact_designation" placeholder="Designation" oninput="this.value = this.value.replace(/[^A-Za-z\s]/g, '')">
+                                        </div>
+
+                                        <div class="col-md-1 col-3">
+                                            <div class="primary-container">
+                                                <label for="contact_is_primary" class="primary-label">Primary</label>
+                                                <input class="form-check-input" type="checkbox" id="contact_is_primary">
+                                            </div>
+                                        </div>
+
+                                        <div class="col-md-2 col-6">
+                                            <button type="button" id="btnSaveContact" class="btn btn-sm btn-info text-white" style="width:85%">
+                                                ✔ Save
                                             </button>
                                         </div>
+                                    </div>
 
-                                
+                                    <div id="contactPersonsList" class="p-1">
+                                        <div id="noContactPersonsData" class="py-1 text-center">
+                                            <small class="text-muted fst-italic">No contact persons added yet</small>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
                             
                             <div class="form-row mb-1">
                                 <div class="col-md-12 ml-3" style="width: 97%;">
@@ -580,8 +599,8 @@
                                     <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 foreach($sales_manager_with_head as $sm): ?>
+                                            <option value="<?= $sm['id'] ?>"><?= $sm['first_name'] ?> </option>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
@@ -599,16 +618,32 @@
 </div>
 
 <script>
-$(document).ready(function() {
+document.addEventListener('DOMContentLoaded', function () {
     resetFlatpicker();
-    $('.searchable').each(function() {
-        let parentModal = $(this).closest('.modal');
-        $(this).select2({
+
+    // Single selects
+    document.querySelectorAll('.searchable:not(.multi-searchable)').forEach(function(el) {
+        let parentModal = el.closest('.modal');
+        $(el).select2({
             placeholder: "Select..",
-            dropdownParent: parentModal.length ? parentModal : $(document.body)
+            allowClear: false,
+            minimumResultsForSearch: 0,
+            dropdownParent: parentModal ? $(parentModal) : $(document.body)
         });
     });
 
+    // Multi selects
+    document.querySelectorAll('.multi-searchable').forEach(function(el) {
+        let parentModal = el.closest('.modal');
+        $(el).select2({
+            placeholder: "Search and select members...",
+            allowClear: false,
+            closeOnSelect: false,
+            minimumResultsForSearch: 0,
+            dropdownParent: parentModal ? $(parentModal) : $(document.body),
+            width: '100%'
+        });
+    });
 });
 
 function resetFlatpicker(){
@@ -626,7 +661,7 @@ function resetFlatpicker(){
         allowInput: false,
     });
 }
-const salesManagerIds = <?= json_encode($sales_manager_ids ?? []) ?>;
+const salesManagerHeadIds = <?= json_encode($sales_manager_with_head_ids ?? []) ?>;
 const API = '<?= base_url('sales') ?>';
 let filter = 'all';
 let lead_id = null;
@@ -648,7 +683,12 @@ function closeModal(id) {
         const form = modal.querySelector('form'); // Find the form inside this specific modal
         if (form) {
             form.reset(); // Resets standard inputs (text, email, select)
-            $(form).find('.searchable').val('').trigger('change'); // Clear jQuery/Select2/Searchable dropdowns if you use them
+            form.querySelectorAll('.searchable').forEach(function(el) {
+            // Reset native select
+            Array.from(el.options).forEach(o => o.selected = false);
+                // Notify Select2 to refresh its UI
+                $(el).trigger('change');
+            });
             $(form).find('.is-invalid').removeClass('is-invalid'); // Remove any "is-invalid" red borders from previous validation errors
         }
 
@@ -672,6 +712,15 @@ function closeModal(id) {
             switchTab('activity'); // Reset the tab back to 'activity'
             document.getElementById('btn_add_opportunity').style.display = 'none';
         }
+
+        if (id === 'editLeadModal') {
+            // const Eform = document.getElementById('editLeadForm');
+            // if (!Eform) return; // safety check
+            // Eform.reset();
+            form.querySelectorAll('[name="status"] option')
+                .forEach(opt => opt.hidden = false);
+            form.querySelector('[name="status"]').value = 'New';
+        }
     }
 }
 
@@ -733,7 +782,7 @@ async function fetchLeads(isLoadMore = false) {
     </div>`;
 
     // 2. 🛑 SHORT-CIRCUIT: If no sales manager IDs exist, show empty state and stop!
-    if (typeof salesManagerIds === 'undefined' || salesManagerIds.length === 0) {
+    if (typeof salesManagerHeadIds === 'undefined' || salesManagerHeadIds.length === 0) {
         console.log("No Sales Manager IDs found. Skipping API call.");
         grid.innerHTML = emptyStateHTML;
         btnLoadMore.style.display = 'none'; // Hide the load more button
@@ -759,9 +808,9 @@ async function fetchLeads(isLoadMore = false) {
 
     // 5. Build URL with dynamic offset
     let url = `${API}/leads?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(',')}`;
+    // url += `&assigned_to=${salesManagerHeadIds.join(',')}`; // We already proved it exists above!
+    if (typeof salesManagerHeadIds !== 'undefined' && salesManagerHeadIds.length > 0) {
+        url += `&assigned_to=${salesManagerHeadIds.join(',')}`;
     }
 
     console.log("Fetching API:", url); 
@@ -773,6 +822,17 @@ async function fetchLeads(isLoadMore = false) {
         const leadsData = json.data || [];
         const totalrecords = json.total || 0;
         console.log("API Response:", leadsData);
+
+        const tabLeadsCount = json.counts || {};
+
+        // ✅ Update tab counts
+        if (tabLeadsCount) {
+            document.querySelector('[data-filter="all"]').innerText         = `All (${tabLeadsCount.all ?? 0})`;
+            document.querySelector('[data-filter="New"]').innerText         = `New (${tabLeadsCount.New ?? 0})`;
+            document.querySelector('[data-filter="Potential"]').innerText   = `Potential (${tabLeadsCount.Potential ?? 0})`;
+            document.querySelector('[data-filter="Prospects"]').innerText   = `Prospects (${tabLeadsCount.Prospects ?? 0})`;
+            document.querySelector('[data-filter="Not a Prospects"]').innerText = `Not a Prospects (${tabLeadsCount['Not a Prospects'] ?? 0})`;
+        }
     
         const html = leadsData
             .sort((a, b) => Number(b.lead_id) - Number(a.lead_id))
@@ -801,7 +861,7 @@ async function fetchLeads(isLoadMore = false) {
                             </div>
                             <div class="dropdown">
                                 <a class="text-body dropdown-toggle" href="#" data-toggle="dropdown">
-                                    <i class="mdi mdi-dots-vertical font-20" title="Options"></i>
+                                    <i class="mdi mdi-dots-vertical font-20 btn-close" title="Options"></i>
                                 </a>
                                 <div class="dropdown-menu dropdown-menu-right">
                                     <a class="dropdown-item" href="javascript:void(0);" onclick="viewDetail(${l.lead_id})"> 👁 View</a>
@@ -894,10 +954,21 @@ async function viewDetail(id) {
 }
 
 function renderCard(opps) {
-    const cont = document.getElementById('opportunitiesContainer');
+    const opp_cont = document.getElementById('opportunitiesContainer');
     
-    cont.innerHTML = opps.length ? opps.map(o => {        
+    opp_cont.innerHTML = opps.length ? opps.map(o => {        
         let lead_type = o.lead_type == 1 ? 'EB' : 'Non-EB';
+        let status = o.status?.toLowerCase();
+        let statusClass = {
+            won: 'status-text-won',
+            lost: 'status-text-lost'
+        }[status] || 'status-text-unknown';
+
+        let opp_status_value = o.status?.replace(/[-_']/g, ' ').toUpperCase();
+
+    
+
+        
         let formattedDate = new Date(o.created_at).toLocaleString('en-US', {
             month: 'short',
             day: 'numeric',
@@ -924,11 +995,21 @@ function renderCard(opps) {
                             <strong>Created At:</strong> ${formattedDate}
                         </div>
                         <div class="opportunity-detail-item">
-                            <strong>Status:</strong> ${o.status}
+                            <strong>Status:</strong> <span class="${statusClass}">${opp_status_value}</span>
                         </div>
                     </div>
                     <div class="opportunity-footer">
-                        ${o.notes || 'N/A'} 
+                       ${ `${o.status === 'lost' ? `
+                                <div class="lost-reason">
+                                    <strong>Reason for Loss:</strong> ${o.lost_reason || 'N/A'}
+                                </div>
+                                <div class="footer-divider"></div>
+                            ` : ``}
+                            <div class="notes">
+                                <strong>Remarks:</strong> ${o.notes || 'N/A'}
+                            </div>
+                            `
+                        }
                     </div>
                 </div>
             </div>`;
@@ -936,7 +1017,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 Docs": "📄", "To Do": "✓"};
 
     if (acts.length === 0) {
         cont.classList.add('no-line');
@@ -961,29 +1042,41 @@ function renderTimeline(acts) {
 // <span style="font-size:11px; color:#999">${formattedDate}</span>
 
         return `
-            <div class="timeline-item">
+              <div class="timeline-item">
                 <div class="timeline-dot ${a.status==='completed'?'completed':''}"></div>
                 <div class="timeline-content">
-                    <div style="display:flex; justify-content:space-between; margin-bottom:5px;">
-                        <b>${icon} ${formattedType}</b>
-                        <span style="font-size:11px; color:#999"> 👤 ${a.assigned_to_name} | 🗓 ${formattedDate}</span>    
+                    
+                    <div style="display:flex; justify-content:space-between; align-items:flex-start; margin-bottom:2px;">
+                        <b style="white-space: nowrap; margin-right: 15px;">${icon} ${formattedType}</b>
+                        <span style="font-size:11px; color:#999; text-align:right;"> 👤 ${a.assigned_to_name} | 🗓️ ${formattedDate}</span>    
                     </div>
-                    <div style="display:flex; justify-content:space-between; font-size:13px; color:#444;">
+                    
+                    ${a.additional_assigned_names ? `
+                        <div style="display:flex; justify-content:flex-end; margin-bottom:5px;">
+                            <span style="font-size:11px; color:#999; text-align: right;
+                                max-width: 75%; /* Forces long lists to wrap cleanly on the right side */
+                                display: inline-block;">
+                                👥 ${a.additional_assigned_names}
+                            </span>
+                        </div>
+                    ` : '<div style="margin-bottom:8px;"></div>'}
+                    
+                    <div style="font-size:13px; color:#444; margin-bottom: 8px;">
                         ${a.notes}
                     </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>` : 
-                        `<div style="font-size:12px; color:#388e3c; margin-top:8px; font-weight:500;">✓ Outcome: ${a.completion_notes}</div>`
+                        `<button class="btn-primary" style="padding:4px 10px; font-size:11px; margin-top:4px;" onclick="openComp(${a.activity_id},${a.assigned_to},${a.lead_id})">Mark Complete</button>` : 
+                        `<div style="font-size:12px; color:#388e3c; margin-top:4px; font-weight:500;">✓ Outcome: ${a.completion_notes}</div>`
                     }
                 </div>
-            </div>
-        `;
+            </div>`;
     }).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_owner')).trigger('change'); // tells Select2 to update display
+    //  document.getElementById('act_owner').dispatchEvent(new Event('change'));
     document.getElementById('act_lead_id').value = lead_id;
     openModal('activityModal');
 }
@@ -996,7 +1089,8 @@ 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('f_assigned_to').dispatchEvent(new Event('change'));
+    $(document.getElementById('f_assigned_to')).trigger('change'); // tells Select2 to update display
+    // document.getElementById('f_assigned_to').dispatchEvent(new Event('change'));
     document.getElementById('f_typeButtons').querySelectorAll('.f_activity_type')
             .forEach(btn => btn.classList.remove('active'));
     selectedFollowUpActivityType = '';
@@ -1242,11 +1336,14 @@ document.getElementById('editLeadForm').onsubmit = async (e) => {
         
         if(res.ok) { 
             toastr.success('Leads Updated Successfully'); 
+            e.target.reset(); 
             closeModal('editLeadModal'); 
             fetchLeads(); 
-            e.target.reset(); 
-            $('#savedContactsContainer').empty(); 
-            $('#NoData').show(); 
+            // CLEANUP: Reset the contact UI for the next time it opens
+            $('#contactPersonsList').find('.contact-card').remove(); 
+            $('#noContactPersonsData').show(); 
+            document.getElementById('editing_contact_id').value = '';
+            document.getElementById('btnSaveContact').innerHTML = "✔ Save";
         } else {
             let err = await res.json();
             if (res.status === 400) {
@@ -1338,7 +1435,9 @@ document.getElementById('activityForm').onsubmit = async (e) => {
             notes: actNotes, // Reused the trimmed variable from above
             scheduled_date: dbFormat,
             assigned_to: actOwner, // Reused the trimmed variable from above
-            status: 'pending'
+            status: 'pending',
+            additional_assigned_ids : Array.from(document.getElementById('act_multiple_owner').selectedOptions).map(o => o.value)
+            
         };
 
         const res = await fetch(`${API}/activities`, {
@@ -1475,7 +1574,8 @@ document.getElementById('completeForm').onsubmit = async (e) => {
                     notes: document.getElementById('f_notes').value,
                     scheduled_date: dbFormat,
                     assigned_to: document.getElementById('f_assigned_to').value,
-                    status: 'pending'
+                    status: 'pending',
+                    additional_assigned_ids : Array.from(document.getElementById('f_multiple_owner').selectedOptions).map(o => o.value)
                 };
 
                 const res2 = await fetch(`${API}/activities`, {
@@ -1586,146 +1686,11 @@ document.getElementById('do_follow').addEventListener('change', function () {
     }
 });
 
-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();
-    let lead_id = document.getElementById('hidden_lead_id').value.trim();
-
-    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 };
-    
-    try {
-        const res = await fetch(`${API}/contacts`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(payload)
-        });
-
-        const contactResult = await res.json(); // Get the response body
-
-        if (res.ok) {
-            // Clear inputs
-            document.getElementById('contact_name').value = '';
-            document.getElementById('contact_mobile').value = '';
-            
-            // Hide "No Data" message
-            const noData = document.getElementById('NoData');
-            if(noData) noData.style.display = 'none';
-
-            // Create the HTML string
-            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="${contactResult.data.contact_id}">
-                    <div>
-                        <div class="fw-bold">${contactResult.data.name}</div>
-                        <div class="text-muted">${contactResult.data.mobile}</div>
-                    </div>
-                    <button type="button" 
-                            class="btn btn-danger btn-sm btnRemoveContact" 
-                            data-id="${contactResult.data.contact_id}">
-                        Remove
-                    </button>
-                </div>
-            `;
-
-            // <button type="button" 
-                            // class="btn btn-secondary btn-sm btnEditContact" 
-                            // data-id="${contactResult.data.contact_id}">
-                        // Update
-                    // </button>
-            // Append to container using Vanilla JS
-            document.getElementById('savedContactsContainer').insertAdjacentHTML('beforeend', contactHtml);
-            toastr.success('Contact saved successfully');
-        } else {
-            
-            if (res.status === 400) {
-                let errorMessages = "";
-                let seenMessages = [];
-                if (contactResult.messages) {
-                    Object.entries(contactResult.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');
-
-                            // Focus on the first error field
-                            if (isFirstError) {
-                                // The 100ms delay safely bypasses Bootstrap's modal focus block
-                                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(contactResult.message || 'Validation failed', 'Warning');
-                }
-            }
-            else {
-                toastr.error(contactResult.message || 'Error adding lead');
-            }
-    }
-    } catch (error) {
-        console.error(error);
-        toastr.error('An error occurred');
-    }
-};
-}
-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');
-        }
-    }
-};
-}
 
 async function openEditLeadModal(id) {
     // 1. Reset UI State
     document.getElementById('hidden_lead_id').value = id;
-    const container = $('#savedContactsContainer');
+    const container = $('#contactPersonsList');
     // Remove only previous contact cards, keep the NoData span for now
     container.find('.contact-card').remove();
     
@@ -1749,35 +1714,49 @@ async function openEditLeadModal(id) {
         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="status"]').value = lead.status || 'New';
+        form.querySelector('[name="assigned_to"]').value = lead.assigned_to || '';
         form.querySelector('[name="assigned_to"]').value = lead.assigned_to || '';
         $(form.querySelector('[name="assigned_to"]')).trigger('change');
+        const statusSelect = form.querySelector('[name="status"]');
+        statusSelect.value = lead.status || 'New';
+        updateStatusOptions(statusSelect.value);
 
         // 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();
-            
+            $('#noContactPersonsData').hide();
             contacts.forEach(contact => {
+                const isPrimary = contact.is_primary == 1;
+                const primaryBadge = isPrimary ? `<div style="margin-top:2px;"><span class="badge bg-warning text-dark ml-1" style="font-size:9px;">PRIMARY</span></div>` : '';
+            
                 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 class="contact-card d-flex align-items-center mb-2 p-2 px-3" 
+                        style="background: ${isPrimary ? '#fff9c4' : '#f8f8f8'}; border: 1px solid ${isPrimary ? '#fbc02d' : '#eee'}; border-radius: 8px; gap: 12px;">
+
+                        <div style="flex: 2; min-width: 0;">
+                            <div class="fw-bold text-truncate" style="font-size:14px;">${contact.name} ${primaryBadge}</div>
                         </div>
-                        <button type="button" 
-                                class="btn btn-danger btn-sm btnRemoveContact" 
-                                data-id="${contact.contact_id}">
-                            Remove
-                        </button>
-                    </div>`;
+
+                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;">${contact.mobile}</div>
+                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;"><div class="text-truncate">${contact.designation}</div></div>
+
+                        <div class="d-flex" style="gap:5px;">
+                            <button type="button" class="btnEditContact" data-id="${contact.contact_id}" data-info='${JSON.stringify(contact)}' title="Edit Contact Person"
+                                style="background:none; border:none; cursor:pointer; color:#1976d2; font-size:18px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;"
+                                onmouseover="this.style.background='#e3f2fd'" onmouseout="this.style.background='none'">✏️</button>
+                            <button type="button" class="btnRemoveContact" data-id="${contact.contact_id}" title="Remove Contact Person"
+                                style="background:none; border:none; cursor:pointer; color:#1976d2; font-size:18px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;" 
+                                onmouseover="this.style.background='#ffebee'" onmouseout="this.style.background='none'">🗑️</button>
+                        </div>
+                    </div>
+                `;
                 container.append(contactHtml);
             });
-        } else {
-            $('#NoData').show();
+        }
+        else {
+            $('#noContactPersonsData').show();
         }
 
         // 5. Open the Modal
@@ -1789,6 +1768,125 @@ async function openEditLeadModal(id) {
     }
 }
 
+// --- 1. HANDLE EDIT & REMOVE (Event Delegation) ---
+document.getElementById('contactPersonsList').onclick = async (e) => {
+    const btnEdit = e.target.closest('.btnEditContact');
+    const btnRemove = e.target.closest('.btnRemoveContact');
+
+    // EDIT LOGIC
+    if (btnEdit) {
+        const card = btnEdit.closest('.contact-card');
+        const contactData = JSON.parse(btnEdit.dataset.info);
+
+        // Fill Form
+        document.getElementById('editing_contact_id').value = contactData.contact_id;
+        document.getElementById('contact_name').value = contactData.name;
+        document.getElementById('contact_mobile').value = contactData.mobile;
+        document.getElementById('contact_designation').value = contactData.designation;
+        document.getElementById('contact_is_primary').checked = contactData.is_primary == 1;
+
+        // Change Button UI
+        const saveBtn = document.getElementById('btnSaveContact');
+        saveBtn.innerHTML = "Update";
+        
+        document.getElementById('contact_name').focus();
+    }
+
+    // REMOVE LOGIC
+    if (btnRemove) {
+        const contactId = btnRemove.dataset.id;
+        if (!confirm('Are you sure you want to remove this contact?')) return;
+
+        try {
+            const res = await fetch(`${API}/contacts/${contactId}`, { method: 'DELETE' });
+            if (res.ok) {
+                toastr.success('Removed successfully');
+                openEditLeadModal(document.getElementById('hidden_lead_id').value); // Refresh
+            }
+        } catch (err) { console.error(err); }
+    }
+};
+
+// --- 2. SAVE / UPDATE LOGIC ---
+const btnSaveContact = document.getElementById('btnSaveContact');
+if (btnSaveContact) {
+    btnSaveContact.onclick = async (e) => {
+        const editingId = document.getElementById('editing_contact_id').value;
+        const leadId = document.getElementById('hidden_lead_id').value;
+        
+        let payload = {
+            lead_id: leadId,
+            name: document.getElementById('contact_name').value.trim(),
+            mobile: document.getElementById('contact_mobile').value.trim(),
+            designation: document.getElementById('contact_designation').value.trim(),
+            is_primary: document.getElementById('contact_is_primary').checked ? 1 : 0
+        };
+
+        if (!payload.name || !payload.mobile) {
+            return toastr.warning('Name and Mobile are required');
+        }
+
+        // Determine if we POST (new) or PUT (edit)
+        const url = editingId ? `${API}/contacts/${editingId}` : `${API}/contacts`;
+        const method = editingId ? 'PUT' : 'POST';
+
+        try {
+            const res = await fetch(url, {
+                method: method,
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload)
+            });
+
+            if (res.ok) {
+                toastr.success(editingId ? 'Contact Updated' : 'Contact Saved');
+                
+                // Reset Form UI
+                document.getElementById('editing_contact_id').value = '';
+                document.getElementById('contact_name').value = '';
+                document.getElementById('contact_mobile').value = '';
+                document.getElementById('contact_designation').value = '';
+                document.getElementById('contact_is_primary').checked = false;
+                
+                const saveBtn = document.getElementById('btnSaveContact');
+                saveBtn.innerHTML = "✔ Save";
+                // Refresh List
+                openEditLeadModal(leadId); 
+            } else {
+                const err = await res.json();
+                toastr.error(err.message || 'Error processing request');
+            }
+        } catch (error) { console.error(error); }
+    };
+ }
+
+
+    const statusOrder = ['New', 'Potential', 'Prospects', 'Not a Prospects'];
+
+    function updateStatusOptions(currentStatus) {
+        
+        let Eform = document.getElementById('editLeadForm');
+        if (!Eform) return; // safety check
+        
+         
+        let select = Eform.querySelector('[name="status"]');
+        let currentIndex = statusOrder.indexOf(currentStatus);
+
+        // First show all
+        select.querySelectorAll('option').forEach(opt => {
+            opt.hidden = false;
+        });
+
+        // Hide previous ones
+        if (currentIndex > -1) {
+            statusOrder.slice(0, currentIndex).forEach(status => {
+                const opt = select.querySelector(`option[value="${status}"]`);
+                if (opt) opt.hidden = true;
+            });
+        }
+    }
+
+
+
 function convertDBFormatted(input) {
 
     if (!input) return null;
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index 45eabbc3..a84dcf12 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -46,6 +46,17 @@
 
                     <div class="col-auto d-flex align-items-center">
 
+
+                        <?php if (
+                                $ticket_data['is_tpa_api_service_enabled'] == true &&
+                                empty($ticket_data['tpa_claim_push_reference_no']) &&
+                                empty($ticket_data['claim_number'])
+                            ) : ?>
+                            <a href="#" class="btn btn-success mr-2" onclick="manualTpaClaimPush(); return false;">
+                                Manual TPA Claim Push
+                            </a>
+                        <?php endif; ?>
+
                         <?php if(isset($ticket_data['tpa_claim_push_reference_no']) && !empty($ticket_data['tpa_claim_push_reference_no'])) : ?>
                             <a href="#" class="btn btn-success mr-2" onclick="fetchTpaClaimStatus()">
                                 Fetch Claim Status
@@ -385,6 +396,57 @@
         });
     }
 
+    function manualTpaClaimPush() {
+        let ticket_master_id = $('#ticket_master_id').val();
+        if (!ticket_master_id) {
+            toastr.warning('Claim ID not found. Please ensure the form is loaded.', 'Warning');
+            return;
+        }
+
+        Swal.fire({
+            title: 'Manual TPA Claim Push',
+            text: 'Do you want to push this claim to the TPA now?',
+            icon: 'question',
+            showCancelButton: true,
+            confirmButtonColor: '#00999E',
+            cancelButtonColor: '#6c757d',
+            confirmButtonText: 'Yes, push claim',
+            cancelButtonText: 'Cancel'
+        }).then((result) => {
+            if (result.isConfirmed) {
+                $('.loader').fadeIn();
+                $('.loader-mask').fadeIn();
+
+                let requestData = { claim_id: ticket_master_id };
+                let url = '<?= base_url('ticket/manualTpaClaimPush') ?>';
+
+                sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    console.log('Manual TPA claim push response:', response);
+                    if (response.status) {
+                        toastr.success(response.message || 'Claim pushed to TPA successfully', 'Success');
+                        window.location.reload(true);
+                    } else {
+                        toastr.warning(response.message || 'Claim push failed', 'Warning');
+                    }
+                }, function(xhr, status, error) {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    console.error('Error pushing claim:', error);
+                    console.error(xhr.responseText);
+                    let msg = 'An error occurred while pushing the claim to TPA.';
+                    if (xhr.responseJSON && xhr.responseJSON.message) {
+                        msg = xhr.responseJSON.message;
+                    } else if (xhr.status === 404) {
+                        msg = 'Manual TPA Claim Push endpoint is not configured. Please contact support.';
+                    }
+                    toastr.error(msg, 'Error');
+                });
+            }
+        });
+    }
+
     function fetchTpaClaimStatus(){
 
         let ticket_master_id = $('#ticket_master_id').val();
diff --git a/public/assets/images/expense_icon.png b/public/assets/images/expense_icon.png
new file mode 100644
index 00000000..d1cba8e8
Binary files /dev/null and b/public/assets/images/expense_icon.png differ
diff --git a/tests/unit/ExpenseControllerTest.php b/tests/unit/ExpenseControllerTest.php
new file mode 100644
index 00000000..84ea3b29
--- /dev/null
+++ b/tests/unit/ExpenseControllerTest.php
@@ -0,0 +1,399 @@
+<?php
+
+namespace PhpOption {
+    /**
+     * Lightweight stub of PhpOption\Option used only for testing env() handling.
+     * This is intentionally minimal and should not be relied on in application code.
+     */
+    class Option
+    {
+        private $value;
+
+        public function __construct($value)
+        {
+            $this->value = $value;
+        }
+
+        public static function fromValue($value): self
+        {
+            return new self($value);
+        }
+
+        public function map($callback): self
+        {
+            if ($this->value !== null) {
+                $this->value = $callback($this->value);
+            }
+
+            return $this;
+        }
+
+        public function getOrCall($callback)
+        {
+            return $this->value !== null ? $this->value : $callback();
+        }
+
+        public function getOrThrow($exception)
+        {
+            if ($this->value === null) {
+                throw $exception;
+            }
+
+            return $this->value;
+        }
+    }
+}
+
+namespace App\Filters {
+    use CodeIgniter\Filters\FilterInterface;
+    use CodeIgniter\HTTP\RequestInterface;
+    use CodeIgniter\HTTP\ResponseInterface;
+
+    // Test stubs for application filters to bypass logging, ACL, and security checks during tests.
+
+    class AclFilter implements FilterInterface
+    {
+        public function before(RequestInterface $request, $arguments = null) { return null; }
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) { return; }
+    }
+
+    class HttpRequestLog implements FilterInterface
+    {
+        public function before(RequestInterface $request, $arguments = null) { return null; }
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) { return; }
+    }
+
+    class SecurityInputFilter implements FilterInterface
+    {
+        public function before(RequestInterface $request, $arguments = null) { return null; }
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) { return; }
+    }
+
+    class GlobalPostFileUploadGuard implements FilterInterface
+    {
+        public function before(RequestInterface $request, $arguments = null) { return null; }
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) { return; }
+    }
+
+    class Cors implements FilterInterface
+    {
+        public function before(RequestInterface $request, $arguments = null) { return null; }
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) { return; }
+    }
+}
+
+namespace Dotenv\Repository {
+    interface RepositoryInterface
+    {
+        public function get($name);
+
+        public function set($name, $value);
+    }
+
+    class RepositoryBuilder
+    {
+        public static function createWithDefaultAdapters(): self
+        {
+            return new self();
+        }
+
+        public function addAdapter($adapter): self
+        {
+            // No-op for testing.
+            return $this;
+        }
+
+        public function immutable(): self
+        {
+            return $this;
+        }
+
+        public function make(): RepositoryInterface
+        {
+            return new class() implements RepositoryInterface {
+                public function get($name)
+                {
+                    $value = getenv($name);
+
+                    return $value === false ? null : $value;
+                }
+
+                public function set($name, $value)
+                {
+                    putenv("$name=$value");
+                }
+            };
+        }
+    }
+}
+
+namespace Dotenv\Repository\Adapter {
+    class PutenvAdapter
+    {
+        // Stub class used only to satisfy Illuminate\Support\Env references.
+    }
+}
+
+namespace Tests\unit {
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\FeatureTestTrait;
+
+class ExpenseControllerTest extends CIUnitTestCase
+{
+    use FeatureTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Override routes for testing to avoid filters/middleware.
+        $this->withRoutes([
+            ['get',  'expense',              'ExpenseController::index'],
+            ['post', 'expense/save',         'ExpenseController::save'],
+            ['get',  'expense/get/(:num)',   'ExpenseController::getExpense/$1'],
+            ['post', 'expense/delete/(:num)','ExpenseController::delete/$1'],
+            ['get',  'expense/client-policies', 'ExpenseController::clientPolicies'],
+        ]);
+
+        // Clean up any test data from previous runs
+        $db = db_connect('default');
+        $db->table('expenses')->like('description', 'CI4_TEST_', 'after')->delete();
+    }
+
+    /**
+     * Helper to insert an expense row directly into the database.
+     */
+    private function createExpenseRecord(array $overrides = []): int
+    {
+        $db = db_connect('default');
+
+        $data = array_merge([
+            'client_id'        => 1,
+            'client_policy_id' => 1,
+            'description'      => 'CI4_TEST_' . uniqid('', true),
+            'approved_by'      => 1,
+            'amount'           => 100.00,
+            'created_at'       => date('Y-m-d H:i:s'),
+            'is_active'        => 1,
+        ], $overrides);
+
+        $db->table('expenses')->insert($data);
+
+        return (int) $db->insertID();
+    }
+
+    public function testCreateExpenseSuccess(): void
+    {
+        $payload = [
+            'client_id'        => '1',
+            'client_policy_id' => '1',
+            'approved_by'      => '1',
+            'description'      => 'CI4_TEST_Valid Description 123-ABC',
+            'expense_date'     => '12-01-2026',
+            'amount'           => '250.75',
+        ];
+
+        $result = $this->post('expense/save', $payload);
+
+        $result->assertStatus(200);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertIsArray($json);
+        $this->assertTrue($json['status'] ?? false);
+        $this->assertNotEmpty($json['id'] ?? null);
+
+        $insertedId = (int) $json['id'];
+
+        $db   = db_connect('default');
+        $row  = $db->table('expenses')
+            ->where('description', $payload['description'])
+            ->orderBy('id', 'DESC')
+            ->get()
+            ->getRowArray();
+
+        $this->assertNotEmpty($row);
+        $this->assertSame(1, (int) $row['is_active']);
+        $this->assertSame($payload['description'], $row['description']);
+        $this->assertEquals(250.75, (float) $row['amount']);
+    }
+
+    public function testCreateExpenseValidationFailureMissingFields(): void
+    {
+        $payload = [
+            // all required fields missing / empty
+        ];
+
+        $result = $this->post('expense/save', $payload);
+
+        $result->assertStatus(400);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertFalse($json['status'] ?? true);
+        $this->assertSame('Input validation failed', $json['message'] ?? '');
+        $this->assertArrayHasKey('client_id', $json['errors'] ?? []);
+        $this->assertArrayHasKey('client_policy_id', $json['errors'] ?? []);
+        $this->assertArrayHasKey('approved_by', $json['errors'] ?? []);
+        $this->assertArrayHasKey('description', $json['errors'] ?? []);
+        $this->assertArrayHasKey('amount', $json['errors'] ?? []);
+        $this->assertArrayHasKey('expense_date', $json['errors'] ?? []);
+    }
+
+    public function testCreateExpenseValidationFailureInvalidDescription(): void
+    {
+        $payload = [
+            'client_id'        => '1',
+            'client_policy_id' => '1',
+            'approved_by'      => '1',
+            'description'      => 'Invalid @ Description <>', // invalid characters
+            'expense_date'     => '12-01-2026',
+            'amount'           => '100.00',
+        ];
+
+        $result = $this->post('expense/save', $payload);
+
+        $result->assertStatus(400);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertFalse($json['status'] ?? true);
+        $this->assertArrayHasKey('description', $json['errors'] ?? []);
+        $this->assertStringContainsString(
+            'invalid characters',
+            strtolower($json['errors']['description'] ?? '')
+        );
+    }
+
+    public function testUpdateExpenseSuccess(): void
+    {
+        $id = $this->createExpenseRecord([
+            'description' => 'CI4_TEST_Original Description',
+            'amount'      => 50.00,
+        ]);
+
+        $payload = [
+            'id'              => (string) $id,
+            'client_id'       => '1',
+            'client_policy_id'=> '1',
+            'approved_by'     => '1',
+            'description'     => 'Updated Description 456',
+            'expense_date'    => '13-01-2026',
+            'amount'          => '75.50',
+        ];
+
+        $result = $this->post('expense/save', $payload);
+
+        $result->assertStatus(200);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertTrue($json['status'] ?? false);
+        $this->assertSame($id, (int) ($json['id'] ?? 0));
+
+        $db  = db_connect('default');
+        $row = $db->table('expenses')->where('id', $id)->get()->getRowArray();
+
+        $this->assertNotEmpty($row);
+        $this->assertSame('Updated Description 456', $row['description']);
+        $this->assertEquals(75.50, (float) $row['amount']);
+    }
+
+    public function testUpdateExpenseValidationFailureInvalidAmount(): void
+    {
+        $id = $this->createExpenseRecord();
+
+        $payload = [
+            'id'              => (string) $id,
+            'client_id'       => '1',
+            'client_policy_id'=> '1',
+            'approved_by'     => '1',
+            'description'     => 'Another Valid Description',
+            'expense_date'    => '14-01-2026',
+            'amount'          => '-10', // invalid negative
+        ];
+
+        $result = $this->post('expense/save', $payload);
+
+        $result->assertStatus(400);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertFalse($json['status'] ?? true);
+        $this->assertArrayHasKey('amount', $json['errors'] ?? []);
+        $this->assertStringContainsString(
+            'cannot be negative',
+            strtolower($json['errors']['amount'] ?? '')
+        );
+    }
+
+    public function testDeleteExpenseSoftDeleteSuccess(): void
+    {
+        $id = $this->createExpenseRecord();
+
+        $result = $this->post('expense/delete/' . $id);
+
+        $result->assertStatus(200);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertTrue($json['status'] ?? false);
+
+        $db  = db_connect();
+        $row = $db->table('expenses')->where('id', $id)->get()->getRowArray();
+
+        $this->assertNotEmpty($row);
+        $this->assertSame(0, (int) $row['is_active']);
+    }
+
+    public function testDeleteExpenseInvalidId(): void
+    {
+        $result = $this->post('expense/delete/0');
+
+        $result->assertStatus(400);
+
+        $json = json_decode($result->getJSON(), true);
+
+        $this->assertFalse($json['status'] ?? true);
+        $this->assertSame('Invalid expense id', $json['message'] ?? '');
+    }
+
+    public function testSearchFilterByClientAndDescription(): void
+    {
+        // Create two distinct expenses
+        $this->createExpenseRecord([
+            'client_id'   => 10,
+            'description' => 'FilterMatch Description',
+        ]);
+
+        $this->createExpenseRecord([
+            'client_id'   => 20,
+            'description' => 'Other Description',
+        ]);
+
+        $result = $this->get('expense?client_id=10&description=FilterMatch');
+
+        $result->assertStatus(200);
+
+        $body = $result->getBody();
+
+        $this->assertStringContainsString('FilterMatch Description', $body);
+        $this->assertStringNotContainsString('Other Description', $body);
+    }
+
+    public function testSearchFilterValidationInvalidCharacters(): void
+    {
+        $result = $this->get('expense?description=<script>alert(1)</script>');
+
+        $result->assertStatus(200);
+
+        $body = $result->getBody();
+
+        $this->assertStringContainsString('Description filter contains invalid characters.', $body);
+    }
+}
+
+}
+
+
diff --git a/tests/unit/PolicyTransactionControllerTest.php b/tests/unit/PolicyTransactionControllerTest.php
new file mode 100644
index 00000000..50abd143
--- /dev/null
+++ b/tests/unit/PolicyTransactionControllerTest.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace Tests\unit;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use App\Controllers\PolicyTransactionController;
+use App\Models\PolicyTransactionModel;
+
+class PolicyTransactionControllerTest extends CIUnitTestCase
+{
+    /**
+     * Helper to build a fully initialised controller instance.
+     */
+    protected function makeController(): PolicyTransactionController
+    {
+        $controller = new PolicyTransactionController();
+
+        $request  = \Config\Services::request();
+        $response = \Config\Services::response();
+        $logger   = \Config\Services::logger();
+
+        $controller->initController($request, $response, $logger);
+
+        return $controller;
+    }
+
+    /**
+     * Helper to inject a stubbed PolicyTransactionModel into the controller.
+     *
+     * @param PolicyTransactionController $controller
+     * @param array                       $stubData
+     */
+    protected function injectBdsStubModel(PolicyTransactionController $controller, array $stubData): void
+    {
+        $stubModel = new class($stubData)
+        {
+            private array $data;
+
+            public function __construct(array $data)
+            {
+                $this->data = $data;
+            }
+
+            public function getBDSReportList(
+                $start_date = 0,
+                $end_date = 0,
+                $client_id = 0,
+                $insurer_id = 0,
+                $policy_type_id = 0,
+                $date_type = 0,
+                $issuer = 0,
+                $client_branch_id = 0,
+                $insurer_branch_id = 0,
+                $client_policy_id = 0,
+                $user_id = 0,
+                $where = [],
+            ) {
+                return $this->data;
+            }
+        };
+
+        $refClass = new \ReflectionClass($controller);
+        $prop     = $refClass->getProperty('policyTransactionModel');
+        $prop->setAccessible(true);
+        $prop->setValue($controller, $stubModel);
+    }
+
+    public function testCronDailyBDSReportReturnsUnauthorizedWithoutKey(): void
+    {
+        putenv('cron.secretKey=unit-test-secret');
+
+        $_GET = [];
+
+        $controller = $this->makeController();
+
+        $response = $controller->cronDailyBDSReport();
+
+        $this->assertSame(401, $response->getStatusCode());
+
+        $body = json_decode($response->getBody(), true);
+        $this->assertIsArray($body);
+        $this->assertSame('error', $body['status'] ?? null);
+    }
+
+    public function testCronDailyBDSReportNoRecordsReturnsSuccessMessage(): void
+    {
+        putenv('cron.secretKey=unit-test-secret');
+        putenv('bds.reportEmails='); // no recipients for this test
+
+        $_GET['key'] = 'unit-test-secret';
+
+        $controller = $this->makeController();
+
+        $this->injectBdsStubModel($controller, []);
+
+        $response = $controller->cronDailyBDSReport();
+
+        $this->assertSame(200, $response->getStatusCode());
+
+        $body = json_decode($response->getBody(), true);
+        $this->assertIsArray($body);
+        $this->assertSame('success', $body['status'] ?? null);
+        $this->assertStringContainsString(
+            'No BDS records for today',
+            $body['message'] ?? ''
+        );
+    }
+
+    /**
+     * Integration-style test: generate an Excel file for today's BDS data
+     * and store it in the user's Downloads folder as BDS_DAILY_REPORT_TEST_CASE.xlsx.
+     *
+     * This reuses the same transformation logic as cronDailyBDSReport.
+     */
+    public function testGenerateDailyBdsReportExcelToDownloads(): void
+    {
+        helper(['excel_import_export_helper', 'utility_helper']);
+
+        // Sample BDS row to generate a test Excel (no DB dependency)
+        $today = date('Y-m-d');
+        $reportList = [
+            [
+                'user_name'             => 'Test User',
+                'policy_issue_month'    => 'Mar 2026',
+                'revenue_type'          => 'Fresh',
+                'client_type'           => 'Group',
+                'client_name'           => 'Test Client',
+                'action_type'           => 'Policy',
+                'policy_type'           => 'Health',
+                'bap'                   => 'BAP-GRP',
+                'vehicle_no'            => 'TN01AB1234',
+                'policy_no'             => 'P-TEST-001',
+                'endorsement_no'        => 'E-TEST-001',
+                'insurer_branch_name'   => 'Chennai Branch',
+                'endorse_eff_date'      => $today,
+                'policy_start_date'     => $today,
+                'policy_end_date'       => $today,
+                'ref'                   => 'REF-001',
+                'remarks'               => 'Test remark',
+                'bp_amt'                => 1000,
+                'tp_or_ter'             => 500,
+                'premium_wo_gst'        => 1500,
+                'total_premium'         => 1770,
+                'agreed_bp_per'         => 10,
+                'agreed_tp_or_ter_per'  => 5,
+                'reward'                => 100,
+                'total_irda_amt'        => 800,
+                'billed_amt'            => 300,
+                'salse_person_name'     => 'Sales Person',
+                'service_person_name'   => 'Service Person',
+                'nhance_branch'         => 'Nhance Chennai',
+                'installment'           => '1',
+                'data_received_date'    => $today,
+                'renewal_date'          => $today,
+                'co_share'              => 'No',
+                'bro_payable_by'        => 'No',
+                'salse_manager_name'    => 'Sales Manager',
+                'service_manager_name'  => 'Service Manager',
+                'service_branch'        => 'Service Branch',
+                'rollover_date'         => $today,
+                'policy_holder_name'    => 'Holder Name',
+                'same_as_proposer'      => 'Yes',
+                'follower_policy_no'    => 'F-TEST-001',
+                'co_share_per'          => 0,
+                'non_comm_per_amt'      => 0,
+                'bp_cgst'               => 0,
+                'bp_sgst'               => 0,
+                'bp_igst'               => 0,
+                'stamp_duty'            => 0,
+                'standerd_bp_per'       => 0,
+                'standerd_tp_per'       => 0,
+                'actual_bp_amt'         => 0,
+                'actual_tp_amt'         => 0,
+                'actual_bp_per'         => 0,
+                'actual_tp_per'         => 0,
+                'actual_tep_brokerage_amt' => 0,
+                'actual_tp_brokerage_amt'  => 0,
+                'cd_ac_no'              => 'CD-001',
+            ],
+        ];
+
+        $headers = [
+            'S. No', 'User', 'Month', 'Business Type', 'Client Type', 'Insured Name', 'Transaction Type',
+            'Policy Type', 'BAP Group', 'Vehicle Number', 'Policy No', 'Endorsement No', 'Insurer Branch',
+            'Endorsement Effective Date', 'Policy Effective Date', 'Policy Expiry Date', 'Reference', 'Remarks',
+            'BP Premium', 'TP Premium', 'Premium (without GST)', 'Total Premium', 'Agreed BP %', 'Agreed TP %',
+            'Rewards', 'Agreed Amount', 'Invoiced Amount', 'Outstanding Amount',
+            'Salse Person', 'Service Person', 'Salse Person Branch', 'Installment', 'Data Received Date', 'Renewal Date',
+            'Co-Premium', 'Remuneration Pay By Leader', 'Salse Person Manager', 'Service Person Manager',
+            'Service Person Branch', 'Rollover Date', 'Policyholder Name', 'Insured (Same as Proposer)',
+            'Follower Policy No', 'Co-Share %', 'Non Commissional Premium Amount', 'CGST', 'SGST', 'IGST',
+            'Stamp Duty', 'Standard BP %', 'Standard TP %', 'Actual BP Amount', 'Actual TP Amount',
+            'Actual BP %', 'Actual TP %', 'Actual BP Remuneration Amount', 'Actual TP Remuneration Amount',
+            'CD Account No'
+        ];
+
+        $excelData = [];
+        foreach ($reportList as $idx => $row) {
+            $totalIrda = (float)($row['total_irda_amt'] ?? 0);
+            $billedAmt = (float)($row['billed_amt'] ?? 0);
+            $unbilledAmt = $totalIrda - $billedAmt;
+            if ($totalIrda == 0) {
+                $unbilledAmt = abs($unbilledAmt);
+            }
+            $unbilledAmt = ($unbilledAmt == 0 && $billedAmt == 0) ? $totalIrda : $unbilledAmt;
+
+            $hasIrda = ($totalIrda != 0);
+
+            $excelData[] = [
+                $idx + 1,
+                $row['user_name'] ?? 'N/A',
+                $row['policy_issue_month'] ?? 'N/A',
+                $row['revenue_type'] ?? 'N/A',
+                $row['client_type'] ?? 'N/A',
+                $row['client_name'] ?? 'N/A',
+                $row['action_type'] ?? 'N/A',
+                $row['policy_type'] ?? 'N/A',
+                $row['bap'] ?? 'N/A',
+                $row['vehicle_no'] ?? 'N/A',
+                $row['policy_no'] ?? 'N/A',
+                $row['endorsement_no'] ?? 'N/A',
+                $row['insurer_branch_name'] ?? 'N/A',
+                !empty($row['endorse_eff_date']) ? change_date_format($row['endorse_eff_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                !empty($row['policy_start_date']) ? change_date_format($row['policy_start_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                !empty($row['policy_end_date']) ? change_date_format($row['policy_end_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                $row['ref'] ?? 'N/A',
+                $row['remarks'] ?? 'N/A',
+                $hasIrda ? ($row['bp_amt'] ?? '0.00') : '0.00',
+                $hasIrda ? ($row['tp_or_ter'] ?? '0.00') : '0.00',
+                $hasIrda ? ($row['premium_wo_gst'] ?? '0.00') : '0.00',
+                $hasIrda ? ($row['total_premium'] ?? '0.00') : '0.00',
+                $hasIrda ? ($row['agreed_bp_per'] ?? '0.00') . '%' : '0.00%',
+                $hasIrda ? ($row['agreed_tp_or_ter_per'] ?? '0.00') . '%' : '0.00%',
+                $row['reward'] ?? '0.00',
+                $row['total_irda_amt'] ?? '0.00',
+                !empty($row['billed_amt']) ? $row['billed_amt'] : '0.00',
+                number_format((float)$unbilledAmt, 2, '.', ''),
+                $row['salse_person_name'] ?? 'N/A',
+                $row['service_person_name'] ?? 'N/A',
+                $row['nhance_branch'] ?? 'N/A',
+                $row['installment'] ?? 'N/A',
+                !empty($row['data_received_date']) ? change_date_format($row['data_received_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                !empty($row['renewal_date']) ? change_date_format($row['renewal_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                $row['co_share'] ?? 'No',
+                $row['bro_payable_by'] ?? 'No',
+                $row['salse_manager_name'] ?? 'N/A',
+                $row['service_manager_name'] ?? 'N/A',
+                $row['service_branch'] ?? 'N/A',
+                !empty($row['rollover_date']) ? change_date_format($row['rollover_date'], 'Y-m-d', 'd/m/Y') : 'N/A',
+                $row['policy_holder_name'] ?? 'N/A',
+                $row['same_as_proposer'] ?? 'No',
+                $row['follower_policy_no'] ?? 'N/A',
+                number_format((float)($row['co_share_per'] ?? 0), 2),
+                number_format((float)($row['non_comm_per_amt'] ?? 0), 2),
+                number_format((float)($row['bp_cgst'] ?? 0), 2),
+                number_format((float)($row['bp_sgst'] ?? 0), 2),
+                number_format((float)($row['bp_igst'] ?? 0), 2),
+                number_format((float)($row['stamp_duty'] ?? 0), 2),
+                number_format((float)($row['standerd_bp_per'] ?? 0), 2),
+                number_format((float)($row['standerd_tp_per'] ?? 0), 2),
+                number_format((float)($row['actual_bp_amt'] ?? 0), 2),
+                number_format((float)($row['actual_tp_amt'] ?? 0), 2),
+                number_format((float)($row['actual_bp_per'] ?? 0), 2),
+                number_format((float)($row['actual_tp_per'] ?? 0), 2),
+                number_format((float)($row['actual_tep_brokerage_amt'] ?? 0), 2),
+                number_format((float)($row['actual_tp_brokerage_amt'] ?? 0), 2),
+                $row['cd_ac_no'] ?? 'N/A'
+            ];
+        }
+
+        $filePath = '/home/venkat/Downloads/BDS_DAILY_REPORT_TEST_CASE.xlsx';
+
+        $generated = generate_excel($headers, $excelData, $filePath);
+
+        $this->assertTrue($generated, 'Failed to generate BDS_DAILY_REPORT_TEST_CASE.xlsx in Downloads');
+    }
+}
+