From 2fafac04d19b26327952af4bb62d6cc69c67154e Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 8 Oct 2025 10:57:05 +0800
Subject: [PATCH] E-Invoice - Reinstate some old code to handle 202508 Credit
 Note Import

---
 .../ProcessCreditNoteReportV2CommandJob.php   | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/Classes/Jobs/Commands/V2/ProcessCreditNoteReportV2CommandJob.php b/app/Classes/Jobs/Commands/V2/ProcessCreditNoteReportV2CommandJob.php
index 41e2fe8b..f73315da 100644
--- a/app/Classes/Jobs/Commands/V2/ProcessCreditNoteReportV2CommandJob.php
+++ b/app/Classes/Jobs/Commands/V2/ProcessCreditNoteReportV2CommandJob.php
@@ -72,22 +72,7 @@ class ProcessCreditNoteReportV2CommandJob implements ShouldQueue
             'EInvoiceValidationLink' => $eInvoiceValidationLink,
         ]);
 
-        // $booking = Booking::where('marking', $ref)->first();
-        // if($booking){
-        //     if($docNo != "" && $docNo != "<<New>>"){
-        //         $payments = $booking->transactions()->payments()->get();
-        //         foreach ($payments as $payment) {
-        //             $refundTransaction = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->latest()->first();
-        //             if($refundTransaction){
-        //                 $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE, $docNo);
-        //                 if($eInvoiceValidationLink){
-        //                     $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE, $eInvoiceValidationLink);
-        //                 }
-        //                 break;
-        //             }
-        //         }
-        //     }
-        // }
+
 
         $transaction = Transaction::where('bill_no', $ref)->first();
         if($transaction){
@@ -98,6 +83,24 @@ class ProcessCreditNoteReportV2CommandJob implements ShouldQueue
                 }
             }
         }
+        else {
+            $booking = Booking::where('marking', $ref)->first();
+            if($booking){
+                if($docNo != "" && $docNo != "<<New>>"){
+                    $payments = $booking->transactions()->payments()->get();
+                    foreach ($payments as $payment) {
+                        $refundTransaction = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->latest()->first();
+                        if($refundTransaction){
+                            $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE, $docNo);
+                            if($eInvoiceValidationLink){
+                                $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE, $eInvoiceValidationLink);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
 
         $end = new Carbon();
         $elapsedTime = $start->diff($end)->format('%H:%I:%S');