diff --git a/app/Config/Routes.php b/app/Config/Routes.php index fad46d7..b25b841 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -142,11 +142,11 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) { $routes->post('invoice/commission-rate-list', 'InvoiceController::getCommissionRateList'); - // $routes->get('salesExecutive/executiveList', 'SalesExecutive::salesExecutiveList'); - // $routes->get('salesExecutive/findExecutive', 'SalesExecutive::findSalesExecutive'); - // $routes->post('salesExecutive/createExecutive', 'SalesExecutive::createSalesExecutive'); - // $routes->post('salesExecutive/updateExecutive', 'SalesExecutive::updateSalesExecutive'); - // $routes->post('salesExecutive/changeExecutiveStatus', 'SalesExecutive::changeSalesExecutiveStatus'); + $routes->get('salesExecutive/executiveList', 'SalesExecutive::salesExecutiveList'); + $routes->get('salesExecutive/findExecutive', 'SalesExecutive::findSalesExecutive'); + $routes->post('salesExecutive/createExecutive', 'SalesExecutive::createSalesExecutive'); + $routes->post('salesExecutive/updateExecutive', 'SalesExecutive::updateSalesExecutive'); + $routes->post('salesExecutive/changeExecutiveStatus', 'SalesExecutive::changeSalesExecutiveStatus'); @@ -154,13 +154,13 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) { $routes->get("dashboard/businessDashboard", "DashboardController::businessDashboard"); $routes->get("dashboard/partnerDashboard", "DashboardController::partnerDashboard"); - $routes->get("dashboard/newDashboard", "DashboardController::newDashboard"); + $routes->get("dashboard/productivityDashboard", "DashboardController::productivityDashboard"); // $routes->get('agent/agentList', 'AgentController::agentList'); - $routes->get('salesExecutive/executiveList', 'SalesExecutive::salesExecutiveList'); - $routes->get('salesExecutive/findExecutive', 'SalesExecutive::findSalesExecutive'); - $routes->post('salesExecutive/createExecutive', 'SalesExecutive::createSalesExecutive'); - $routes->post('salesExecutive/updateExecutive', 'SalesExecutive::updateSalesExecutivedetails'); - $routes->post('salesExecutive/changeExecutiveStatus', 'SalesExecutive::changeSalesExecutiveStatus'); + // $routes->get('salesExecutive/executiveList', 'SalesExecutive::salesExecutiveList'); + // $routes->get('salesExecutive/findExecutive', 'SalesExecutive::findSalesExecutive'); + // $routes->post('salesExecutive/createExecutive', 'SalesExecutive::createSalesExecutive'); + // $routes->post('salesExecutive/updateExecutive', 'SalesExecutive::updateSalesExecutivedetails'); + // $routes->post('salesExecutive/changeExecutiveStatus', 'SalesExecutive::changeSalesExecutiveStatus'); $routes->cli('cli/processjob', 'JobWorker::processJob'); $routes->cli('cli/processjobs', 'JobWorker::processJobs'); diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index bc5675c..5b11e34 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -560,7 +560,7 @@ class DashboardController extends ResourceController } - public function newDashboard(){ + public function productivityDashboard(){ $manager_id = $this->request->getGet('sales_executive_id'); @@ -1024,6 +1024,7 @@ class DashboardController extends ResourceController ", null, false); $builder->where('pp.manager_id',$manager_id); + $builder->where("pp.is_active",1); $builder->where("pq.insurer_id != 0"); $builder->groupBy('pq.insurer_id'); $builder->orderBy('pq.insurer_id');