diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 21a0fb3..e7b166f 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -627,17 +627,10 @@ class DashboardController extends ResourceController $builder = $this->db->table('partner_policy pp'); $builder->select(" - DATE_FORMAT(CURRENT_DATE(), '%b') AS curr_month, - YEAR(CURRENT_DATE()) AS year_of_curr_month, - DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH), '%b') AS pre_month, - YEAR(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)) AS year_of_last_month, i.name, i.short_name, i.id AS insurer_id, - pq.insurer_id AS PQ_insurer_id, - pq.insurer_id, pp.insured_name, - COUNT( CASE WHEN MONTH(pp.issued_date) = MONTH(CURRENT_DATE()) @@ -701,14 +694,8 @@ class DashboardController extends ResourceController $builder = $this->db->table('partner_policy pp'); $builder->select(" - DATE_FORMAT(CURRENT_DATE(), '%b') AS curr_month, - YEAR(CURRENT_DATE()) AS year_of_curr_month, - DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH), '%b') AS pre_month, - YEAR(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)) AS year_of_last_month, pb.name AS broker_name, pb.id AS broker_id, - pe.broker_id AS PE_broker_id, - COUNT( CASE WHEN MONTH(pp.issued_date) = MONTH(CURRENT_DATE()) @@ -768,12 +755,7 @@ class DashboardController extends ResourceController public function productWise($manager_id){ $builder = $this->db->table('partner_policy pp'); $builder->select(" - DATE_FORMAT(CURRENT_DATE(), '%b') AS curr_month, - YEAR(CURRENT_DATE()) AS year_of_curr_month, - DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH), '%b') AS pre_month, - YEAR(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)) AS year_of_last_month, pp.vehicle_type, - COUNT( CASE WHEN MONTH(pp.issued_date) = MONTH(CURRENT_DATE()) @@ -837,7 +819,6 @@ class DashboardController extends ResourceController $builder = $this->db->table('partner_policy pp'); $builder->select(" - pp.agent_id AS PP_agent_id, pa.id AS agent_id, pa.name AS agent_name, pa.agent_code, @@ -870,7 +851,6 @@ class DashboardController extends ResourceController $builder = $this->db->table('partner_policy pp'); $builder->select(" - pp.agent_id AS PP_agent_id, pa.id AS agent_id, pa.name AS agent_name, pa.agent_code, @@ -941,7 +921,6 @@ class DashboardController extends ResourceController pa.id AS agent_id, pa.name AS agent_name, pa.agent_code AS agent_code, - pp.agent_id AS PP_agent_id, SUM(pp.premium_amount) AS total_premium_amount, CASE WHEN pa.is_active = 1 THEN 'Active Agent' @@ -968,7 +947,6 @@ class DashboardController extends ResourceController $builder->select(" pa.sales_executive_id, pse.name as sales_executive_name, - pp.vehicle_type AS vechile_type, COUNT( CASE