From ec5d584f3cf16bd76cb0cf824ff032c76bf7ee83 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 9 Oct 2025 16:26:44 +0800 Subject: [PATCH] E-Invoice - Fix a problem Regenerating E-Invoice does not pick up latest data --- .../ControllersLogic/GenerateCreditNotePdfV2Logic.php | 3 ++- .../Transactions/Processors/CreateInvoiceDocumentProcessor.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php index 1ae1bfeb..5e3df2f5 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php @@ -81,7 +81,8 @@ class GenerateCreditNotePdfV2Logic } $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); + // $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); //wrong + $brn = $supplier->documents()->where('document_type', DocumentType::SSM_REGISTRATION)->latest()->first(); $eInvoiceStarted = false; $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php index b063ac93..08aade1f 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php @@ -52,7 +52,7 @@ class CreateInvoiceDocumentProcessor $booking = $transaction->owner->owner_type == Booking::class ? $transaction->owner->owner : null; } $currentPaidAmount = null; - $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); + $brn = $supplier->documents()->where('document_type', DocumentType::SSM_REGISTRATION)->latest()->first(); $documentDate = $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $booking->created_at; $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); $autoCountInvoiceId = '';