Nhances/nhance_partner_be
Nhances/nhance_partner_be
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of bitbucket.org:jubilian/nhance_partner_be

Browse Source
This commit is contained in:
sanjeev.p 2026-01-08 13:15:38 +05:30
commit 0a929fdf8c
6 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/DashboardController.php
View File

@ -135,7 +135,7 @@ class DashboardController extends ResourceController
SUM(CASE WHEN pe.enquiry_status = 'In progress' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_in_progress,
SUM(CASE WHEN pe.enquiry_status = 'Completed' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_completed,
")
->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left')
->join('partner_staff ps', 'ps.id = pe.assigned_to AND ps.is_active = 1', 'left')
->where('pe.manager_id', $manager_id)
->where('pe.is_active', 1)
->where('pe.assigned_to IS NOT NULL')

2
app/Controllers/EnquiryController.php
View File

@ -799,7 +799,7 @@ class EnquiryController extends ResourceController
public function setVehicleTypeToEnquiry()
{
try {
$data = $this->request->getPost();
$data = $this->request->getJSON(true);
print_r($data);die;

8
app/Controllers/PolicyController.php
View File

@ -348,9 +348,10 @@ class PolicyController extends ResourceController
}
//fetch enquiry_id & agent_id
$quotData = $this->QuotationModel->select('partner_quotation.*,E.agent_id,E.name ')
$quotData = $this->QuotationModel->select('partner_quotation.*,E.agent_id,E.name , VT.vehicle_type')
->join('partner_enquiry E', 'E.id = partner_quotation.enquiry_id', 'left')
->join('partner_agent A', 'A.id = E.agent_id', 'left')
->join('vehicle_type VT', 'VT.id = E.vehicle_type_id', 'left')
->where('partner_quotation.id',$data['quotation_id'])
->first();
@ -389,6 +390,7 @@ class PolicyController extends ResourceController
'insured_name' => $quotData['name'],
'manager_id' => $data['manager_id'],
'agent_id' => $quotData['agent_id'],
'vehicle_type' => $quotData['vehicle_type'],
'policy_pdf_file_name' => $pdfFileName,
'created_by' => $data['created_by']
];
@ -585,7 +587,7 @@ class PolicyController extends ResourceController
$policyData['make'] = $data['vehicle']['make'] ?? null;
$policyData['model'] = $data['vehicle']['model'] ?? null;
$policyData['cubic_capacity'] = $data['vehicle']['cubic_capacity'] ?? null;
$policyData['vehicle_type'] = $vehicleType;
$policyData['product'] = $vehicleType;
$policyData['rc_no'] = $data['vehicle']['reg_no'] ?? null;
$policyData['insured_name'] = $data['insured']['name'] ?? null;
@ -1050,7 +1052,7 @@ class PolicyController extends ResourceController
$policyData['make'] = $data['vehicle']['make'] ?? null;
$policyData['model'] = $data['vehicle']['model'] ?? null;
$policyData['cubic_capacity'] = $data['vehicle']['cubic_capacity'] ?? null;
$policyData['vehicle_type'] = $vehicleType;
$policyData['product'] = $vehicleType;
$policyData['rc_no'] = $data['vehicle']['reg_no'] ?? null;
$policyData['insured_name'] = $data['insured']['name'] ?? null;

21
app/Controllers/PolicyReportController.php
View File

@ -107,8 +107,9 @@ class PolicyReportController extends Controller
ins.short_name AS insurer,
pp.policy_number,
pp.insured_name,
pq.insurance_plan_type_id AS plan_type,
iptm.insurance_plan_type AS plan_type,
pp.vehicle_type AS product,
pp.product AS product_type,
CASE
WHEN pp.od IS NULL OR pp.od = '' THEN 0
ELSE pp.od
@ -139,6 +140,8 @@ class PolicyReportController extends Controller
pos.address,
pos.pincode,
pe.status AS booking_status,
pe.id AS enquiry_id,
pe.reg_no,
CASE
WHEN pe.created_on IS NULL
OR pe.created_on = '0000-00-00 00:00:00'
@ -148,6 +151,8 @@ class PolicyReportController extends Controller
pe.id AS booking_ref_no,
pp.agent_retention_rate AS grid_percent,
pp.commission_amount AS grid_amount,
pp.year_of_manufacture,
pp.weight AS vehicle_weight,
pe.remarks AS remark
FROM partner_enquiry pe
LEFT JOIN partner_agent pa ON pa.id = pe.agent_id
@ -160,6 +165,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 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
AND pp.id IS NOT NULL
@ -211,10 +217,12 @@ class PolicyReportController extends Controller
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
// enquiry_id,reg_no,year_of_manufacture
// EXACT HEADER FROM YOUR EXCEL
$headers = [
'POS CODE','POS NAME','REFF CODE','INWARD DATE','PARTNER NAME',
'INSURER','POLICY NO','ISSURED NAME','PLAN TYPE','PRODUCT',
'ENQUIRY ID','POS CODE','POS NAME','REFF CODE','PARTNER NAME','INWARD DATE',
'INSURER','POLICY NO','REG NO','ISSURED NAME','PLAN TYPE','PRODUCT','PRODUCT TYPE','YEAR OF MFG','WEIGHT',
'A (OD)','B (TP)','A+B (NET)','S.TAX','TOTAL',
'PAYMENT MODE','RTO LOC.','NCB %','Expire Date','BROKER CODE',
'ASSIDNED TO','SALES MANAGER','SALES EXECUTIVE','CONTACT NO',
@ -234,16 +242,21 @@ 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['inward_date'],
$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'],

1
app/Models/PolicyModel.php
View File

@ -49,6 +49,7 @@ class PolicyModel extends Model
'model',
'cubic_capacity',
'vehicle_type',
'product',
'broker_name',
'commission_amount',
'is_data_accuracy_checked',

3
app/Models/PtCoShareDetailsModel.php
View File

@ -68,7 +68,8 @@ class PtCoShareDetailsModel extends Model
'exp_amt',
'statement_id',
'follower_policy_no',
'non_comm_per_amt'
'non_comm_per_amt',
'pt_policy_issue_date'
];
// Auto timestamps