From 00b1afd8fbd00def2ac181c2f27749779305670b Mon Sep 17 00:00:00 2001
From: Venkatesh <venkatesh.r@venbainfotech.com>
Date: Mon, 29 Jun 2026 18:27:58 +0530
Subject: [PATCH] FIX_Opportunities_LIVE_ISSUES

---
 app/Controllers/ClientController.php | 4 ++--
 app/Controllers/LeadsController.php  | 5 +++++
 app/Models/LeadsModel.php            | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 0af6898a..beadfa73 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -471,7 +471,7 @@ class ClientController extends AdminController
         $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
         //  $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
-        $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
+        $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList([1, 3]);
         
         $rawList = $this->clientModel->getCreatedByUserName(1); 
         $clientRM = $data['client_rm'];
@@ -1037,7 +1037,7 @@ class ClientController extends AdminController
         $editData['client_branch']    = $this->clientBranchModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
         $editData['client_relation']  = $this->clientRMModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
         $editData['client_branch']['role'] = get_role_id();
-        $editData['lead_data'] = $this->leadsModel->getLeadForInsertClientList(null, $id);
+        $editData['lead_data'] = $this->leadsModel->getLeadForInsertClientList([2], $id);
         $clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($id);
 
         foreach ($clientPoliceData as $key => $value) {
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index d6cd0df5..41f4252e 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -2895,6 +2895,11 @@ class LeadsController extends BaseController
             $filename = "{$rfq_data['client_name']}_{$rfq_data['policy_type']}_{$string}_" . $policy_year . '_' . '.xlsx';
         }
 
+        $filenameBase = pathinfo($filename, PATHINFO_FILENAME);
+        $filenameBase = preg_replace('/[^a-zA-Z0-9\-_ ]/u', '', $filenameBase);
+        $filenameBase = preg_replace('/\s+/', ' ', trim($filenameBase));
+        $filename     = ($filenameBase !== '' ? $filenameBase : 'export') . '.xlsx';
+
         //claim history new sheet;
         if ($claim_history == 1 && !empty($rfq_data['fin_years_claims'])) {
 
diff --git a/app/Models/LeadsModel.php b/app/Models/LeadsModel.php
index ef88ba21..ba841687 100644
--- a/app/Models/LeadsModel.php
+++ b/app/Models/LeadsModel.php
@@ -205,7 +205,7 @@ class LeadsModel extends Model
             ->groupEnd();
 
         if ($type) {
-            $query->where('leads.lead_type', $type);
+            $query->whereIn('leads.lead_type', $type);
         }
         if ($client_id) {
             $query->where('leads.client_id', $client_id);