From 1441cbcec96b3ffe841dddbd427e0798de9913ab Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 24 Sep 2025 09:50:58 +0800
Subject: [PATCH] E-Invoice - Update to Sales Invoice Report template ref
 column

---
 .../Commands/V2/ProcessSalesInvoiceReportV2CommandJob.php   | 5 ++++-
 .../Modules/Exports/Services/ExportsSalesInvoiceReport.php  | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Jobs/Commands/V2/ProcessSalesInvoiceReportV2CommandJob.php b/app/Classes/Jobs/Commands/V2/ProcessSalesInvoiceReportV2CommandJob.php
index 66a4d457..61eb1d5d 100644
--- a/app/Classes/Jobs/Commands/V2/ProcessSalesInvoiceReportV2CommandJob.php
+++ b/app/Classes/Jobs/Commands/V2/ProcessSalesInvoiceReportV2CommandJob.php
@@ -14,6 +14,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Models\Booking;
+use App\Models\Transaction;
 use Illuminate\Support\Facades\Log;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 
@@ -73,7 +74,9 @@ class ProcessSalesInvoiceReportV2CommandJob implements ShouldQueue
             'EInvoiceValidationLink' => $eInvoiceValidationLink,
         ]);
 
-        $booking = Booking::where('marking', $ref)->first();
+        // $booking = Booking::where('marking', $ref)->first();
+        $transaction = Transaction::where('bill_no', $ref)->first();
+        $booking = $transaction->owner;
         if($booking){
             if($docNo != "" && $docNo != "<<New>>"){
                 $this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_DOCNO_INVOICE, $docNo);
diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
index e3a7cdc1..8a083933 100644
--- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
@@ -163,7 +163,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
                 $firstItem ? '<<New>>' : '',
                 $formattedDocumentDate,
                 $company->debtor,
-                $booking->marking,
+                $invoiceTransaction->bill_no,
                 $booking->marking,
                 '500-0000',
                 'PRODUCT NAME :',
@@ -200,7 +200,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
             '',
             $formattedDocumentDate,
             $company->debtor,
-            $booking->marking,
+            $invoiceTransaction->bill_no,
             $booking->marking,
             '500-0000',
             'PRODUCT NAME :',
@@ -246,7 +246,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
             '',
             $formattedDocumentDate,
             $company->debtor,
-            $booking->marking,
+            $invoiceTransaction->bill_no,
             $booking->marking,
             '500-0000',
             'PRODUCT NAME :',