cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-e' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2026-02-26 12:39:13 +08:00
parent b1393fc4d7 92981609e6
commit 11a0306079
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php
+12 -3
View File
@@ -80,9 +80,18 @@ class ExportsReceivePaymentForBookingReport implements FromQuery, WithHeadings,
}
if($booking){
$metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($metadata){
$autoCountSalesInvoiceId = $metadata->value;
$invoiceTransaction = $booking->transactions->where('type', TransactionType::INVOICE)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
if($invoiceTransaction){
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($invoiceTransactionKVP){
$autoCountSalesInvoiceId = $invoiceTransactionKVP->value;
}
else {
$metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($metadata){
$autoCountSalesInvoiceId = $metadata->value;
}
}
}
}