From 6a694b1fad3db99a16018ca6f5c7fbfa1786e701 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 7 Jan 2026 13:08:42 +0800
Subject: [PATCH] E-Invoice - Fix an issue normal invoice not appearing for
 previous transfer after customer opted in for einvoice

---
 .../Processors/CreateInvoiceTransactionV2Processor.php         | 3 ++-
 app/Http/Resources/BookingResource.php                         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
index bb77f79a..b0d6fb7d 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
@@ -166,7 +166,8 @@ class CreateInvoiceTransactionV2Processor
         $eInvoice = false;
         $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00'));
         $bookingCreatedDate = Carbon::parse($booking->created_at);
-        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $supplier->e_invoice === 1) {
+        $eInvoiceRequestedDate = Carbon::parse($supplier->e_invoice_requested_at);
+        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $supplier->e_invoice === 1) {
             $eInvoice = true;
         }
         $kvp = $booking->attributesKVP()->where('key', KVPKey::BOOKING_EINVOICE_ELIGIBLE)->first();
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 73571b1b..e118f2e9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -13,6 +13,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\KVPKey;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
@@ -30,7 +31,7 @@ class BookingResource extends JsonResource
         $bookingCreatedDate = Carbon::parse($this->created_at);
         $eInvoiceRequestedDate = Carbon::parse($this->company->e_invoice_requested_at);
         //cief todo: 90 - for testing
-        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $this->company->e_invoice === 1) { //&& $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 480 cief todo: 90
+        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $this->company->e_invoice === 1) { //&& $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 480 cief todo: 90
             $eInvoice = true;
         }