diff --git a/app/Config/Routes.php b/app/Config/Routes.php index ecc4f27..2ff04fa 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -27,7 +27,7 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) { //api's with token - $routes->group('api', ['filter' => ["jwtAuth","appSignature"] ], function ($routes) { +// $routes->group('api', ['filter' => ["jwtAuth","appSignature"] ], function ($routes) { //logout $routes->get('auth/logout', 'StaffAuthController::logout'); @@ -129,7 +129,7 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) { - }); +// }); diff --git a/app/Controllers/InvoiceController.php b/app/Controllers/InvoiceController.php index bd00ea1..0b20d6c 100644 --- a/app/Controllers/InvoiceController.php +++ b/app/Controllers/InvoiceController.php @@ -190,18 +190,20 @@ class InvoiceController extends ResourceController ], 400); } - $broker_id = $input['broker_id']; - $agent_id = $input['agent_id']; - $issued_date = format_date_for_database($input['issued_date']); - $data = $this->PolicyModel - ->select('partner_policy.*') - ->join('partner_enquiry pe', 'pe.id = partner_policy.enquiry_id', 'left') - ->where('pe.broker_id', $broker_id) - ->where('partner_policy.agent_id', $agent_id) - ->where('partner_policy.issued_date <=', $issued_date) - ->where('partner_policy.is_active', 1) - ->findAll(); + $data = $this->PolicyModel + ->select('partner_policy.policy_number, partner_policy.issued_date, partner_policy.commission_amount, pe.name as customer_name , pq.premium_amount') + ->join( + 'partner_enquiry pe', + 'pe.id = partner_policy.enquiry_id AND pe.broker_id = ' . (int)$input['broker_id'], + 'left' + ) + ->join('partner_quotation pq','pq.id = partner_policy.quotation_id ', 'left') + ->where('partner_policy.agent_id', $input['agent_id']) + ->where('partner_policy.issued_date <=', date('Y-m-d', strtotime($input['issued_date']))) + ->where('partner_policy.is_active', 1) + ->findAll(); + return $this->respond([