From befdfb41b55c6d68afa4defe4dad2458a8ff7e29 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Tue, 9 Dec 2025 19:02:56 +0530
Subject: [PATCH] FIX_partner dashboard error solved

---
 app/Controllers/DashboardController.php | 38 ++++++++++++++++---------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 0da8ee9..ddbe48d 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -430,8 +430,8 @@ class DashboardController extends ResourceController
 
         $raw = false;
         $manager_id   = $this->request->getGet('manager_id');
-        $raw_param = strtolower($this->request->getGet('raw') ?? '');
-        $raw = ($raw_param === 'true' || $raw_param === '1');
+        $raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
+        $raw = in_array($raw_param, ['true', '1'], true);
 
         // Initialize the details array to ensure the final output is always structured.
         $details = [ 'brokerWise' => [], 'productWise' => [], 'insurerWise' => []];
@@ -495,7 +495,7 @@ class DashboardController extends ResourceController
     public function partnerDashboard()
     {
 
-        
+        $raw = false;
         $manager_id   = $this->request->getGet('manager_id');
         $raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
         $raw = in_array($raw_param, ['true', '1'], true);
@@ -568,8 +568,8 @@ class DashboardController extends ResourceController
 
         $raw = false;
         $manager_id   = $this->request->getGet('manager_id');
-        $raw_param = strtolower($this->request->getGet('raw') ?? '');
-        $raw = ($raw_param === 'true' || $raw_param === '1');
+        $raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
+        $raw = in_array($raw_param, ['true', '1'], true);
 
         // Initialize the details array to ensure the final output is always structured.
         $details = [ 'StaffWise' => []];
@@ -752,6 +752,10 @@ class DashboardController extends ResourceController
             $builder->groupBy('pb.id');
             $builder->orderBy('pb.id');
 
+            if ($raw === true) {
+                return $builder->getCompiledSelect();
+            }
+
             $query = $builder->get();
             $result = $query->getResultArray();   
             return $result;
@@ -808,6 +812,10 @@ class DashboardController extends ResourceController
 
             $builder->groupBy('pp.vehicle_type');
 
+            if ($raw === true) {
+                return $builder->getCompiledSelect();
+            }
+
             $query = $builder->get();
 
             $result = $query->getResultArray();   
@@ -840,6 +848,10 @@ class DashboardController extends ResourceController
         $builder->orderBy('policy_count', 'DESC');
         $builder->limit(50);
 
+        if ($raw === true) {
+                return $builder->getCompiledSelect();
+        }
+
         $result = $builder->get()->getResultArray();   
         return $result;
 
@@ -863,11 +875,11 @@ class DashboardController extends ResourceController
         $builder->where("YEAR(pp.issued_date) = YEAR('$customDate')", null, false);
         $builder->where('pp.manager_id',$manager_id);
         
-        $builder->groupBy(['pa.id, pa.name, pa.agent_code']);
+        $builder->groupBy(['pa.id','pa.name','pa.agent_code']);
         $builder->orderBy('total_premium_amount', 'DESC');
         $builder->limit(50);
-        if ($raw) {
-            return $builder->getCompiledSelect();
+        if ($raw === true) {
+                return $builder->getCompiledSelect();
         }
         $result = $builder->get()->getResultArray();   
         return $result;
@@ -900,7 +912,7 @@ class DashboardController extends ResourceController
             $builder->where("pp.issued_date >= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL 10 DAY)", null, false);
             $builder->where('pp.id', null);
             $builder->orderBy('pa.name');
-            if ($raw) {
+            if ($raw === true) {
                 return $builder->getCompiledSelect();
             }
             $result = $builder->get()->getResultArray();   
@@ -950,8 +962,8 @@ class DashboardController extends ResourceController
         $builder->orderBy('total_premium_amount', 'DESC');
         $builder->orderBy('last_business_date', 'ASC');
 
-        if ($raw) {
-            return $builder->getCompiledSelect();
+        if ($raw === true) {
+                return $builder->getCompiledSelect();
         }
 
         return $builder->get()->getResultArray();
@@ -1015,8 +1027,8 @@ class DashboardController extends ResourceController
         // Group by sales exec + vehicle type
         $builder->groupBy("pa.sales_executive_id, pp.vehicle_type");
         $builder->orderBy("pa.sales_executive_id");
-        if ($raw) {
-            return $builder->getCompiledSelect();
+        if ($raw === true) {
+                return $builder->getCompiledSelect();
         }