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

FIX_BDS_ID_REPLACE_WITH_PPID

Browse Source
This commit is contained in:
velz 2025-11-21 19:15:39 +05:30
parent 60dc7d2d0b
commit 0cfd3d64bc
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/PayoutController.php
View File

@ -221,6 +221,8 @@ class PayoutController extends BaseController
if ($type === 'add') {
// $invoiceNo = $this->generateInvoiceNumber();
$data['payouts'] = $this->invoiceModel->payoutList(1);
// print_rr($data['payouts']);die();
// print_rr($this->invoiceModel->getLastQuery());die();
// $data['invoice_number'] = $invoiceNo;
return $this->loadLayout('invoice_policy_mapping_add', $data);
}
@ -260,6 +262,7 @@ class PayoutController extends BaseController
public function saveInvoice()
{
$json = $this->request->getJSON(true);
// print_rr($json);die();
if (!$json) {
return $this->response->setJSON(['error' => 'Invalid JSON','message' => 'Invalid JSON received.'])->setStatusCode(400);
@ -293,7 +296,7 @@ class PayoutController extends BaseController
foreach ($json['policies'] as $p) {
$this->invoiceItemModel->insert([
'invoice_id' => $invoiceId,
'policy_id' => $p['policy_id'],
'policy_id' => $p['partner_policy_id'],
'policy_no' => $p['policy_no'],
'commission_amount' => $p['commission_amount'],
'is_active' => 1

10
app/Models/InvoiceModel.php
View File

@ -203,17 +203,19 @@ class InvoiceModel extends Model
DATE_FORMAT(pp.issued_date, "%d/%m/%Y") AS date,
pii.id AS invoiceItemId,
pii.commission_amount as paid_amount,
pi.payout_status
pi.payout_status,
pp.id as partner_policy_id,
pp.policy_transaction_id
')
->join('partner_invoice_items pii','pii.policy_no = pt.policy_no','left')
->join('partner_invoice pi','pi.id = pii.invoice_id','left')
->join('partner_policy pp','pt.policy_no = pp.policy_number AND pt.agent_id = pp.agent_id','left')
->join('partner_policy pp','pt.policy_no = pp.policy_number AND pt.agent_id = pp.agent_id AND pt.id = pp.policy_transaction_id')
->where('pt.is_active',1)
->where('pt.agent_id IS NOT NULL', null, false);
->where('pt.agent_id IS NOT NULL');
if ($flag == 1) { // Add mode
// EXCLUDE all policies that exist in partner_invoice_items
$builder->where("pt.policy_no NOT IN (SELECT policy_no FROM partner_invoice_items)", null, false);
$builder->where("pt.id NOT IN (SELECT policy_id FROM partner_invoice_items)", null, false);
}
if ($flag == 2) { // Edit mode

3
app/Views/invoice_policy_mapping.php
View File

@ -673,7 +673,8 @@ table.dataTable tbody td { padding: 4px 4px !important; }
return {
policy_id: p.id,
policy_no: p.policyNo,
commission_amount: finalAmount
commission_amount: finalAmount,
partner_policy_id : p.partner_policy_id
};
});

5
app/Views/invoice_policy_mapping_add.php
View File

@ -496,6 +496,8 @@ table.dataTable tbody td { padding: 4px 4px !important; }
const selectedPolicyData = filteredPolicies.filter(p => selectedPolicies.has(String(p.id)));
console.log('selectedPolicyData');
console.log(selectedPolicyData);
let totalAmount = 0;
const policies = selectedPolicyData.map(p => {
@ -504,7 +506,8 @@ table.dataTable tbody td { padding: 4px 4px !important; }
return {
policy_id: p.id,
policy_no: p.policyNo,
commission_amount: finalAmount
commission_amount: finalAmount,
partner_policy_id : p.partner_policy_id
};
});