From 1dd54e1500e530b7f8aa8bc62cbeb9b29cd33400 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Thu, 9 Oct 2025 14:04:22 +0800
Subject: [PATCH] E-Invoice - Fix a problem Regenerating E-Invoice does not
 pick up latest reimport data

---
 .../Processors/RegenerateInvoiceBookingV2Processor.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/Processors/RegenerateInvoiceBookingV2Processor.php b/app/Classes/Modules/Bookings/Processors/RegenerateInvoiceBookingV2Processor.php
index c42aece9..3e143687 100644
--- a/app/Classes/Modules/Bookings/Processors/RegenerateInvoiceBookingV2Processor.php
+++ b/app/Classes/Modules/Bookings/Processors/RegenerateInvoiceBookingV2Processor.php
@@ -65,6 +65,11 @@ class RegenerateInvoiceBookingV2Processor
             ->orderBy('created_at', 'asc')
             ->first();
 
+        $latestInvoice = $booking->transactions()
+            ->whereIn('type', [TransactionType::INVOICE])
+            ->latest()
+            ->first();
+
         Log::info('RegenerateInvoiceBookingV2Processor booking: ' . json_encode($booking->marking));
 
         // get the first bill_no
@@ -99,7 +104,7 @@ class RegenerateInvoiceBookingV2Processor
                 $this->deletesDocument->execute($row);
             }
 
-            $kvpCopies = $firstInvoice->attributesKVP->map(function ($kvp) {
+            $kvpCopies = $latestInvoice->attributesKVP->map(function ($kvp) {
                 return $kvp->replicate();
             });