FIX_vehicletypeAndbrokerkannansir

app/Controllers/PolicyController.php

@@ -91,10 +91,10 @@ class PolicyController extends ResourceController
     public function findPolicy()
     {
         try {
-             
             $id = $this->request->getGet('id');
-            $record = $this->PolicyModel->select('partner_policy.* , ipti.insurance_plan_type,pq.insurer_id,,A.retention_rate as agent_retention_rate,S.retention_rate as manager_retention_rate')
+            $record = $this->PolicyModel->select('partner_policy.* , ipti.insurance_plan_type,pq.insurer_id,,A.retention_rate as agent_retention_rate,S.retention_rate as manager_retention_rate, pe.vehicle_type_id as enquiry_vehicle_type_id_for_commission,pe.broker_id as enquiry_broker_id_for_commission')
                                         ->join('partner_quotation pq', 'pq.id = partner_policy.quotation_id', 'left')
+                                        ->join('partner_enquiry pe', 'pe.id = partner_policy.enquiry_id', 'left')
                                         ->join('partner_insurance_plan_type_master ipti', 'ipti.id = pq.insurance_plan_type_id', 'left')
                                         ->join('partner_agent A', 'A.id = partner_policy.agent_id', 'left')
                                         ->join('partner_staff S', 'S.id = partner_policy.manager_id', 'left')
@@ -272,6 +272,31 @@ class PolicyController extends ResourceController
                 'is_data_accuracy_checked'=> 1
             ];
 
+
+            $updateData = [];
+
+            if (!empty($data['enquiry_broker_id_for_commission'])) {
+                $updateData['broker_id'] = $data['enquiry_broker_id_for_commission'];
+            }
+
+            if (!empty($data['enquiry_vehicle_type_id_for_commission'])) {
+                $updateData['vehicle_type_id'] = $data['enquiry_vehicle_type_id_for_commission'];
+            }
+
+            if (!empty($updateData)) {
+                $policy = $this->PolicyModel
+                    ->select('enquiry_id')
+                    ->where('id', $id)
+                    ->first();
+
+                if (!empty($policy['enquiry_id'])) {
+                    $this->db->table('partner_enquiry')
+                        ->where('id', $policy['enquiry_id'])
+                        ->update($updateData);
+                }
+            }
+
+
             $uploadPath = WRITEPATH . 'uploads/policy/';
 
             // PDF Update

app/Controllers/PolicyReportController.php

@@ -103,9 +103,15 @@ class PolicyReportController extends Controller
                                 THEN 'N/A'
                                 ELSE DATE_FORMAT(pp.created_on, '%d-%m-%Y %h:%i %p')
                             END AS inward_date,
+                            CASE 
+                                WHEN pp.issued_date IS NULL 
+                                    OR pp.issued_date = '0000-00-00 00:00:00'
+                                THEN 'N/A'
+                                ELSE DATE_FORMAT(pp.issued_date, '%d-%m-%Y %h:%i %p')
+                            END AS issued_date,
                             pa.name                                        AS partner_name,
                             ins.short_name                                 AS insurer, 
-                            pp.policy_number,
+                            CONCAT('\t', pp.policy_number)                 AS policy_number,
                             pp.insured_name,
                             iptm.insurance_plan_type                       AS plan_type,
                             pp.vehicle_type                                AS product,
@@ -153,7 +159,18 @@ class PolicyReportController extends Controller
                             pp.commission_amount                           AS grid_amount,
                             pp.year_of_manufacture,
                             pp.weight                                      AS vehicle_weight,
-                            pe.remarks                                     AS remark
+                            pe.remarks                                     AS remark,
+                            pp.fuel_type,
+                            pp.rto_code,
+                            v.vehicle_no,
+                            CASE 
+                                WHEN pp.date_of_registration IS NULL 
+                                    OR pp.date_of_registration = '0000-00-00'
+                                THEN 'N/A'
+                                ELSE DATE_FORMAT(pp.date_of_registration, '%d-%m-%Y')
+                            END AS date_of_registration,
+                            pp.make,
+                            pp.model
                 FROM partner_enquiry pe
                 LEFT JOIN partner_agent pa ON pa.id = pe.agent_id
                 LEFT JOIN partner_staff ps ON ps.id = pe.assigned_to
@@ -165,6 +182,7 @@ class PolicyReportController extends Controller
                 LEFT JOIN partner_sales_executive pse ON pse.id = pa.sales_executive_id
                 LEFT JOIN partner_staff ps2 ON ps2.id = pse.manager_id
                 LEFT JOIN partner_brokers pb ON pb.id = pe.broker_id
+                LEFT JOIN vehicle v ON v.id = pp.vehicle_id
                 LEFT JOIN partner_insurance_plan_type_master iptm ON pq.insurance_plan_type_id = iptm.id
                 WHERE pe.is_active = 1
                 AND pe.is_quick_quote = 0
@@ -230,6 +248,17 @@ class PolicyReportController extends Controller
             'BOOKING REF NO','GRID %','GRID AMT','REMARK'
         ];
 
+        $headers = [
+            'PARTNER CODE','PARTNER NAME','BOOKING REF NO','INSURED DATE','POLICY NO',
+            'ISSURED NAME','REG NO','PRODUCT','PRODUCT TYPE','FUEL TYPE',
+            'GVW','YEAR OF MFG','RTO CODE','RTO LOC.','DATE OF REGISTRATION',
+            'COMPANY','MAKE & VARIANT',
+            'A (OD)','B (TP)','A+B (NET)','S.TAX (CGST/IGST)','TOTAL',
+            'PAYMENT MODE','EXPIRY DATE',
+            'NCB %','BROKER CODE','ASSIDNED TO','SALES MANAGER','CONTACT NO',
+            'ADDRESS','PIN CODE','BOOKING STATUS','DATE OF BOOKING','REMARK'
+        ];
+
         // Header row
         $col = 'A';
         foreach ($headers as $header) {
@@ -242,30 +271,30 @@ class PolicyReportController extends Controller
         $row = 2;
         foreach ($data as $d) {
             $sheet->fromArray([
-                $d['enquiry_id'],
-                $d['pos_code'],
-                $d['pos_name'],
                 $d['ref_code'],
                 $d['partner_name'],
-                $d['inward_date'],
+                $d['booking_ref_no'],
-                $d['insurer'],
+                $d['issued_date'],
                 $d['policy_number'],
-                $d['reg_no'],
                 $d['insured_name'],
-                $d['plan_type'],
+                $d['reg_no'],
                 $d['product'],
                 $d['product_type'],
                 $d['year_of_manufacture'],
+                $d['rto_code'],
+                $d['rto_loc'],
                 $d['vehicle_weight'],
+                $d['date_of_registration'],
+                $d['make'], 
+                $d['model'], 
                 $d['od'],
                 $d['tp'],
                 $d['net_amount'],
                 $d['service_tax'],
                 $d['total_amount'],
                 $d['payment_mode'],
-                $d['rto_loc'],
-                $d['ncb_percent'],
                 $d['expire_date'],
+                $d['ncb_percent'],
                 $d['broker_code'],
                 $d['assigned_to'],
                 $d['sales_manager'],
@@ -275,15 +304,56 @@ class PolicyReportController extends Controller
                 $d['pincode'],
                 $d['booking_status'],
                 $d['booking_date'],
-                $d['booking_ref_no'],
-                $d['grid_percent'],
-                $d['grid_amount'],
                 $d['remark']
             ], null, "A$row");
 
             $row++;
         }
         
+        // foreach ($data as $d) {
+        //     $sheet->fromArray([
+        //         $d['enquiry_id'],
+        //         $d['pos_code'],
+        //         $d['pos_name'],
+        //         $d['ref_code'],
+        //         $d['partner_name'],
+        //         $d['inward_date'],
+        //         $d['insurer'],
+        //         $d['policy_number'],
+        //         $d['reg_no'],
+        //         $d['insured_name'],
+        //         $d['plan_type'],
+        //         $d['product'],
+        //         $d['product_type'],
+        //         $d['year_of_manufacture'],
+        //         $d['vehicle_weight'],
+        //         $d['od'],
+        //         $d['tp'],
+        //         $d['net_amount'],
+        //         $d['service_tax'],
+        //         $d['total_amount'],
+        //         $d['payment_mode'],
+        //         $d['rto_loc'],
+        //         $d['ncb_percent'],
+        //         $d['expire_date'],
+        //         $d['broker_code'],
+        //         $d['assigned_to'],
+        //         $d['sales_manager'],
+        //         $d['sales_executive'],
+        //         $d['contact_no'],
+        //         $d['address'],
+        //         $d['pincode'],
+        //         $d['booking_status'],
+        //         $d['booking_date'],
+        //         $d['booking_ref_no'],
+        //         $d['grid_percent'],
+        //         $d['grid_amount'],
+        //         $d['remark']
+        //     ], null, "A$row");
+
+        //     $row++;
+        // }
+
         // -----------------------------
         // DOWNLOAD RESPONSE
         // -----------------------------