From 92981609e68ddb245cf3c4d733807937dae7cab9 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Thu, 26 Feb 2026 12:38:48 +0800
Subject: [PATCH] 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;
+                    }
+                }
             }
         }