diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index e0f4f9a..e4022cc 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -139,6 +139,7 @@ class DashboardController extends ResourceController ->where('pe.manager_id', $manager_id) ->where('pe.is_active', 1) ->where('pe.assigned_to IS NOT NULL') + ->where('ps.name IS NOT NULL') ->where('pe.assigned_to !=', 0) ->groupBy('pe.assigned_to') ->orderBy('ps.name', 'ASC') diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index 3b2588e..bc60b89 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -180,7 +180,7 @@ class EnquiryController extends ResourceController } //Get enquiry details - $enquiry = $this->enquiryModel->select('partner_enquiry.* , I.name as insurer_name , I.short_name , VT.vehicle_type as vehicle_type ,PB.name as broker_name ,PA.name as agent_name') + $enquiry = $this->enquiryModel->select('partner_enquiry.* , I.name as insurer_name , I.short_name , VT.vehicle_type as vehicle_type ,PB.name as broker_name ,PA.name as agent_name,PA.agent_code') ->join('insurers I', 'I.id = partner_enquiry.insurer_id', 'left') ->join('vehicle_type VT', 'VT.id = partner_enquiry.vehicle_type_id', 'left') ->join('partner_brokers PB', 'PB.id = partner_enquiry.broker_id', 'left') @@ -801,6 +801,8 @@ class EnquiryController extends ResourceController try { $data = $this->request->getJSON(true); + print_r($data);die; + if (!isset($data['id'])) { return $this->respond(['status' => 'failed', 'code' => 200, 'error' => 'ID Required'], 200); } diff --git a/app/Controllers/InvoiceController.php b/app/Controllers/InvoiceController.php index a90590c..0f9d45d 100644 --- a/app/Controllers/InvoiceController.php +++ b/app/Controllers/InvoiceController.php @@ -253,7 +253,7 @@ class InvoiceController extends ResourceController // Build the main query $query = $this->PolicyModel - ->select('partner_policy.policy_number as policy_no, partner_policy.id as policy_id, partner_policy.issued_date, partner_policy.commission_amount, partner_policy.insured_name as customer_name, pe.agent_id ,pa.name as agent_name, partner_policy.premium_amount, pi.id as invoice_id, pi.invoice_no') + ->select('partner_policy.policy_number as policy_no, partner_policy.id as policy_id, partner_policy.issued_date, partner_policy.commission_amount, partner_policy.insured_name as customer_name, pe.agent_id ,pa.name as agent_name,pa.agent_code, partner_policy.premium_amount, pi.id as invoice_id, pi.invoice_no') ->join( 'partner_enquiry pe', 'pe.id = partner_policy.enquiry_id AND pe.broker_id = ' . (int)$input['broker_id'],