GWM : Merge

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');
@@ -152,7 +152,7 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) {
     
 
 
- });
+//  });
 
  $routes->get("api/policy/PolicyFilePath", "PolicyController::PolicyFilePath");
 

app/Controllers/PolicyController.php

@@ -782,9 +782,9 @@ class PolicyController extends ResourceController
                                 ->where('partner_policy.id', $policyId)
                                 ->first();
 
-        $apiUrl = "https://venbait.in/nhance/dev/getCommission";
+        $apiUrl = env('COMMISSION_CALCULATION_URL');
 
-        $token = "A7fP3xQ9mD2vT6sR1bW8kJ4yC0gN5zH3uL9pE2rF7cV1tX6hB0qM4dG8nS5aU3jK7";
+        $token = env('COMMISSION_CALCULATION_TOKEN');
 
         $manufactureYear = (int) $record['year_of_manufacture'];
         $currentYear     = (int) date("Y");

app/Models/EnquiryModel.php

@@ -53,11 +53,13 @@ class EnquiryModel extends Model
                                 P.policy_number,
                                 P.id as policy_id,
                                 P.policy_pdf_file_name,
+                                P.is_data_accuracy_checked,
                                 PB.name as broker_name,
                                 pm.id as payment_mode_id , 
                                 pm.value as payment_mode_value,
                                 ipti.insurance_plan_type
                             ')
+                            ->select('CASE WHEN P.client_id IS NOT NULL THEN 1 ELSE 0 END AS is_bds_pushed', false)
                 ->join('vehicle_type VT', 'VT.id = partner_enquiry.vehicle_type_id', 'left')
                 ->join('partner_agent A', 'A.id = partner_enquiry.agent_id', 'left')
                 ->join('partner_staff S', 'S.id = partner_enquiry.assigned_to', 'left')