From b6495a6e4fc75fe557bd59b9ae6e6f31ae052ef9 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Tue, 9 Dec 2025 19:27:36 +0530
Subject: [PATCH] FIX_recommit

---
 app/Controllers/DashboardController.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index ddbe48d..b923723 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -886,11 +886,11 @@ class DashboardController extends ResourceController
 
     }
 
-    //Step 3
+    //Step 3 no buiness
     public function agentNoPolicyTimeRange($manager_id, $raw){
         
-        $interval = "DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL 10 DAY)";
 
+        $interval = "DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL 10 DAY)";
         $builder = $this->db->table('partner_agent pa');
         $builder->select('
             pa.id AS agent_id,
@@ -902,14 +902,13 @@ class DashboardController extends ResourceController
             ');
 
             $builder->join(
-                'partner_policy pp',
-                "pa.id = pp.agent_id AND pp.issued_date >= $interval",
+        'partner_policy pp',
+                "pa.id = pp.agent_id AND pp.issued_date >= $interval AND pp.manager_id = $manager_id",
                 'left',
                 false   // IMPORTANT → allows raw SQL
             );
 
             $builder->where('pa.manager_id',$manager_id);
-            $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 === true) {
@@ -922,14 +921,11 @@ class DashboardController extends ResourceController
     
     //Step 4
     public function agentBelow50tPremiumTimeRange($manager_id, $raw){
-        
-        $builder = $this->db->table('partner_policy pp');
-
-        
+            
         $builder = $this->db->table('partner_policy pp');
 
         $builder->select("
-            pa.id AS agent_id,
+             pa.id AS agent_id,
             pa.name AS agent_name,
             pa.agent_code,
             SUM(pp.premium_amount) AS total_premium_amount,
@@ -943,7 +939,8 @@ class DashboardController extends ResourceController
         $builder->join('partner_agent pa', 'pa.id = pp.agent_id', 'inner');
 
         $builder->where('pp.manager_id', $manager_id);
-        $builder->where('pp.premium_amount <', 50000);
+        
+        $builder->having('total_premium_amount <', 50000);
 
         // RAW condition must be inside where() with FALSE
         $builder->where("