FIX_partner dashboard error solved
This commit is contained in:
parent
9679619553
commit
befdfb41b5
@ -430,8 +430,8 @@ class DashboardController extends ResourceController
|
|||||||
|
|
||||||
$raw = false;
|
$raw = false;
|
||||||
$manager_id = $this->request->getGet('manager_id');
|
$manager_id = $this->request->getGet('manager_id');
|
||||||
$raw_param = strtolower($this->request->getGet('raw') ?? '');
|
$raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
|
||||||
$raw = ($raw_param === 'true' || $raw_param === '1');
|
$raw = in_array($raw_param, ['true', '1'], true);
|
||||||
|
|
||||||
// Initialize the details array to ensure the final output is always structured.
|
// Initialize the details array to ensure the final output is always structured.
|
||||||
$details = [ 'brokerWise' => [], 'productWise' => [], 'insurerWise' => []];
|
$details = [ 'brokerWise' => [], 'productWise' => [], 'insurerWise' => []];
|
||||||
@ -495,7 +495,7 @@ class DashboardController extends ResourceController
|
|||||||
public function partnerDashboard()
|
public function partnerDashboard()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
$raw = false;
|
||||||
$manager_id = $this->request->getGet('manager_id');
|
$manager_id = $this->request->getGet('manager_id');
|
||||||
$raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
|
$raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
|
||||||
$raw = in_array($raw_param, ['true', '1'], true);
|
$raw = in_array($raw_param, ['true', '1'], true);
|
||||||
@ -568,8 +568,8 @@ class DashboardController extends ResourceController
|
|||||||
|
|
||||||
$raw = false;
|
$raw = false;
|
||||||
$manager_id = $this->request->getGet('manager_id');
|
$manager_id = $this->request->getGet('manager_id');
|
||||||
$raw_param = strtolower($this->request->getGet('raw') ?? '');
|
$raw_param = strtolower(trim($this->request->getGet('raw') ?? ''));
|
||||||
$raw = ($raw_param === 'true' || $raw_param === '1');
|
$raw = in_array($raw_param, ['true', '1'], true);
|
||||||
|
|
||||||
// Initialize the details array to ensure the final output is always structured.
|
// Initialize the details array to ensure the final output is always structured.
|
||||||
$details = [ 'StaffWise' => []];
|
$details = [ 'StaffWise' => []];
|
||||||
@ -752,6 +752,10 @@ class DashboardController extends ResourceController
|
|||||||
$builder->groupBy('pb.id');
|
$builder->groupBy('pb.id');
|
||||||
$builder->orderBy('pb.id');
|
$builder->orderBy('pb.id');
|
||||||
|
|
||||||
|
if ($raw === true) {
|
||||||
|
return $builder->getCompiledSelect();
|
||||||
|
}
|
||||||
|
|
||||||
$query = $builder->get();
|
$query = $builder->get();
|
||||||
$result = $query->getResultArray();
|
$result = $query->getResultArray();
|
||||||
return $result;
|
return $result;
|
||||||
@ -808,6 +812,10 @@ class DashboardController extends ResourceController
|
|||||||
|
|
||||||
$builder->groupBy('pp.vehicle_type');
|
$builder->groupBy('pp.vehicle_type');
|
||||||
|
|
||||||
|
if ($raw === true) {
|
||||||
|
return $builder->getCompiledSelect();
|
||||||
|
}
|
||||||
|
|
||||||
$query = $builder->get();
|
$query = $builder->get();
|
||||||
|
|
||||||
$result = $query->getResultArray();
|
$result = $query->getResultArray();
|
||||||
@ -840,6 +848,10 @@ class DashboardController extends ResourceController
|
|||||||
$builder->orderBy('policy_count', 'DESC');
|
$builder->orderBy('policy_count', 'DESC');
|
||||||
$builder->limit(50);
|
$builder->limit(50);
|
||||||
|
|
||||||
|
if ($raw === true) {
|
||||||
|
return $builder->getCompiledSelect();
|
||||||
|
}
|
||||||
|
|
||||||
$result = $builder->get()->getResultArray();
|
$result = $builder->get()->getResultArray();
|
||||||
return $result;
|
return $result;
|
||||||
|
|
||||||
@ -863,11 +875,11 @@ class DashboardController extends ResourceController
|
|||||||
$builder->where("YEAR(pp.issued_date) = YEAR('$customDate')", null, false);
|
$builder->where("YEAR(pp.issued_date) = YEAR('$customDate')", null, false);
|
||||||
$builder->where('pp.manager_id',$manager_id);
|
$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->orderBy('total_premium_amount', 'DESC');
|
||||||
$builder->limit(50);
|
$builder->limit(50);
|
||||||
if ($raw) {
|
if ($raw === true) {
|
||||||
return $builder->getCompiledSelect();
|
return $builder->getCompiledSelect();
|
||||||
}
|
}
|
||||||
$result = $builder->get()->getResultArray();
|
$result = $builder->get()->getResultArray();
|
||||||
return $result;
|
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.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) {
|
if ($raw === true) {
|
||||||
return $builder->getCompiledSelect();
|
return $builder->getCompiledSelect();
|
||||||
}
|
}
|
||||||
$result = $builder->get()->getResultArray();
|
$result = $builder->get()->getResultArray();
|
||||||
@ -950,8 +962,8 @@ class DashboardController extends ResourceController
|
|||||||
$builder->orderBy('total_premium_amount', 'DESC');
|
$builder->orderBy('total_premium_amount', 'DESC');
|
||||||
$builder->orderBy('last_business_date', 'ASC');
|
$builder->orderBy('last_business_date', 'ASC');
|
||||||
|
|
||||||
if ($raw) {
|
if ($raw === true) {
|
||||||
return $builder->getCompiledSelect();
|
return $builder->getCompiledSelect();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $builder->get()->getResultArray();
|
return $builder->get()->getResultArray();
|
||||||
@ -1015,8 +1027,8 @@ class DashboardController extends ResourceController
|
|||||||
// Group by sales exec + vehicle type
|
// Group by sales exec + vehicle type
|
||||||
$builder->groupBy("pa.sales_executive_id, pp.vehicle_type");
|
$builder->groupBy("pa.sales_executive_id, pp.vehicle_type");
|
||||||
$builder->orderBy("pa.sales_executive_id");
|
$builder->orderBy("pa.sales_executive_id");
|
||||||
if ($raw) {
|
if ($raw === true) {
|
||||||
return $builder->getCompiledSelect();
|
return $builder->getCompiledSelect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user