From 92981609e68ddb245cf3c4d733807937dae7cab9 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 26 Feb 2026 12:38:48 +0800 Subject: [PATCH 1/2] E-Invoice - Fix an issue reported by Mira on missing data on '01R - RECEIVE PAYMENT [AR RECEIVED PAYMENT] export' --- .../ExportsReceivePaymentForBookingReport.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php b/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php index cacbd43b..c8010325 100644 --- a/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php @@ -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; + } + } } } From cc4865d296e10c5a3aecf42e1f3947743e892a79 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 28 Feb 2026 21:12:27 +0800 Subject: [PATCH 2/2] Sync code fixes from Shipping Portal --- resources/views/layouts/base.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index c820242e..aaf598f0 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -8,7 +8,7 @@ visibility: hidden; } - + @@ -20,4 +20,4 @@ @include('vendor/js') @stack('scripts') - \ No newline at end of file +