Nhances/nhance_partner_be
Nhances/nhance_partner_be
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_recommit

Browse Source
This commit is contained in:
sanjeev.p 2025-12-09 19:27:36 +05:30
parent befdfb41b5
commit b6495a6e4f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Controllers/DashboardController.php
View File

@ -886,11 +886,11 @@ class DashboardController extends ResourceController
} }
//Step 3 //Step 3 no buiness
public function agentNoPolicyTimeRange($manager_id, $raw){ 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 = $this->db->table('partner_agent pa');
$builder->select(' $builder->select('
pa.id AS agent_id, pa.id AS agent_id,
@ -902,14 +902,13 @@ class DashboardController extends ResourceController
'); ');
$builder->join( $builder->join(
'partner_policy pp', 'partner_policy pp',
"pa.id = pp.agent_id AND pp.issued_date >= $interval", "pa.id = pp.agent_id AND pp.issued_date >= $interval AND pp.manager_id = $manager_id",
'left', 'left',
false // IMPORTANT → allows raw SQL false // IMPORTANT → allows raw SQL
); );
$builder->where('pa.manager_id',$manager_id); $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->where('pp.id', null);
$builder->orderBy('pa.name'); $builder->orderBy('pa.name');
if ($raw === true) { if ($raw === true) {
@ -922,14 +921,11 @@ class DashboardController extends ResourceController
//Step 4 //Step 4
public function agentBelow50tPremiumTimeRange($manager_id, $raw){ public function agentBelow50tPremiumTimeRange($manager_id, $raw){
$builder = $this->db->table('partner_policy pp');
$builder = $this->db->table('partner_policy pp'); $builder = $this->db->table('partner_policy pp');
$builder->select(" $builder->select("
pa.id AS agent_id, pa.id AS agent_id,
pa.name AS agent_name, pa.name AS agent_name,
pa.agent_code, pa.agent_code,
SUM(pp.premium_amount) AS total_premium_amount, 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->join('partner_agent pa', 'pa.id = pp.agent_id', 'inner');
$builder->where('pp.manager_id', $manager_id); $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 // RAW condition must be inside where() with FALSE
$builder->where(" $builder->where("