Masters valication

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) {
 
 
 
- });
+//  });
 
 
 

app/Controllers/InvoiceController.php

@@ -190,20 +190,22 @@ 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.*')
+                ->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', 'left')
+                ->join(
-                                ->where('pe.broker_id', $broker_id)
+                    'partner_enquiry pe',
-                                ->where('partner_policy.agent_id', $agent_id)
+                    'pe.id = partner_policy.enquiry_id AND pe.broker_id = ' . (int)$input['broker_id'],
-                                ->where('partner_policy.issued_date <=', $issued_date)
+                    '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([
                 'status' => 'success',
                 'code'   => 200,