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

GWM : commission report changes

Browse Source
This commit is contained in:
Gowtham M 2026-06-02 12:32:59 +05:30
parent 764af47e21
commit 0bc046f48a
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/Controllers/PolicyController.php
View File

@ -1825,7 +1825,7 @@ class PolicyController extends ResourceController
. 'ins.short_name AS insurer_short_name, ipti.insurance_plan_type AS insurance_plan_type, '
. 'pp.policy_number AS policy_no, pp.premium_amount AS premium, '
. 'pp.commission_amount, pp.insured_name, pe.reg_no, pp.weight, pp.fuel_type, '
. 'pp.vehicle_type, pp.issued_date'
. 'pp.vehicle_type, pp.issued_date, pp.od, pp.tp, pp.pa, pp.cgst, pp.sgst, pp.igst'
);
$builder->select(
'COALESCE((SELECT GROUP_CONCAT(piu.utr_no ORDER BY piu.id SEPARATOR ", ") '
@ -1993,9 +1993,10 @@ class PolicyController extends ResourceController
'Q3' => 'A+B (NET)',
'R3' => 'S.TAX',
'S3' => 'TOTAL',
'T3' => "PAYMENT MODE",
'U3' => 'UTR NO',
'V3' => 'UTR DATE',
'T3' => 'PAYOUT',
'U3' => "PAYMENT MODE",
'V3' => 'UTR NO',
'W3' => 'UTR DATE',
];
$headerNumberCols = ['A', 'O', 'P', 'Q', 'R', 'S', 'I'];
@ -2021,6 +2022,15 @@ class PolicyController extends ResourceController
$weight = $row['weight'] ?? '';
$commissionAmt = (float) ($row['commission_amount'] ?? 0); // payout amount
$premium = (float) ($row['premium'] ?? 0);
$od = (float) ($row['od'] ?? 0);
$tp = (float) ($row['tp'] ?? 0);
$pa = (float) ($row['pa'] ?? 0);
$cgst = (float) ($row['cgst'] ?? 0);
$sgst = (float) ($row['sgst'] ?? 0);
$igst = (float) ($row['igst'] ?? 0);
$tpWithPa = $tp + $pa;
$netAmount = $od + $tp + $pa;
$serviceTax = $cgst + $sgst + $igst;
$utrNo = $row['utr_no'] ?? '';
$utrDate = $row['utr_date'] ?? '';
$payoutStatus = ($row['received_or_not'] ?? '') === 'yes' ? 'LINK' : 'PENDING';
@ -2040,14 +2050,15 @@ class PolicyController extends ResourceController
'L' => isset($row['issued_date']) ? date('d-m-Y', strtotime($row['issued_date'])) : '',
'M' => '', // Company / insurer – add to query if available
'N' => '', // Make & Variant – add if available
'O' => 0, // A (OD)
'P' => $commissionAmt, // B (TP) => payout amount
'Q' => $commissionAmt, // A+B Net => payout amount
'R' => 0, // S.TAX – add if available
'O' => $od, // A (OD) => od
'P' => $tpWithPa, // B (TP) => tp+pa
'Q' => $netAmount, // A+B Net => od+tp+pa
'R' => $serviceTax, // S.TAX => cgst+igst+sgst
'S' => $premium, // TOTAL => premium amount
'T' => $payoutStatus,
'U' => $utrNo,
'V' => $utrDate,
'T' => $commissionAmt, // PAYOUT => payout amount
'U' => $payoutStatus,
'V' => $utrNo,
'W' => $utrDate,
];
$dataNumberCols = ['A', 'I', 'O', 'P', 'Q', 'R', 'S'];