From 6268f9a98b8e2f6fc0994b7c0326015326c8224e Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 13 Oct 2025 11:44:06 +0800
Subject: [PATCH 1/2] E-Invoice - Update Sales Invoice Report

---
 .../Modules/Exports/Services/ExportsSalesInvoiceReport.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
index 8a083933..6e6adfb3 100644
--- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
@@ -13,6 +13,7 @@ use Maatwebsite\Excel\Concerns\WithHeadings;
 use Maatwebsite\Excel\Concerns\WithMapping;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundServiceCharge;
+use App\Classes\ValueObjects\Constants\KVPKey;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 
@@ -146,6 +147,9 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
         $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
 
         $firstItem = true;
+        $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
+        $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
+
         $transactionDetails = $purchaseOrder->transactionDetails;
         foreach ($transactionDetails as $detail) {
             $displayUnitPrice = 0;
@@ -160,7 +164,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
 
 
             $records[] = [
-                $firstItem ? '<<New>>' : '',
+                $firstItem ? $docNo : '',
                 $formattedDocumentDate,
                 $company->debtor,
                 $invoiceTransaction->bill_no,

From 92ed3088bc33a31c9f21f072481a5fc759699b72 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 13 Oct 2025 12:10:12 +0800
Subject: [PATCH 2/2] E-Invoice - Update Sales Invoice Report (with refund)

---
 .../Services/ExportsSalesInvoiceWithRefundReport.php        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
index ad650adc..a2ccfff0 100644
--- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
+++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
@@ -13,6 +13,7 @@ use Maatwebsite\Excel\Concerns\WithHeadings;
 use Maatwebsite\Excel\Concerns\WithMapping;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundServiceCharge;
+use App\Classes\ValueObjects\Constants\KVPKey;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 
@@ -138,6 +139,9 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
         $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
 
         $firstItem = true;
+        $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
+        $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
+
         $transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null;
         if($transactionDetails){
             foreach ($transactionDetails as $detail) {
@@ -153,7 +157,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
 
 
                 $records[] = [
-                    $firstItem ? '<<New>>' : '',
+                    $firstItem ? $docNo : '',
                     $formattedDocumentDate,
                     $company->debtor,
                     $invoiceTransaction ? $invoiceTransaction->bill_no : '',