From e632e6175cf7f5d9da23108974282c085bc91933 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 5 Feb 2026 10:48:10 +0800 Subject: [PATCH] E-Invoice - Fix a problem reported by Mira some transfer E-Invoice cannot be generated --- .../Processors/CreateInvoiceTransactionV2Processor.php | 4 +++- app/Http/Resources/BookingResource.php | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php index 230296e4..fcfc96e3 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php @@ -166,7 +166,9 @@ class CreateInvoiceTransactionV2Processor $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); $bookingCreatedDate = Carbon::parse($booking->created_at); $eInvoiceRequestedDate = Carbon::parse($supplier->e_invoice_requested_at); - if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $supplier->e_invoice === 1) { + + // if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $supplier->e_invoice === 1) + if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $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 e118f2e9..a1a1768c 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -30,8 +30,9 @@ class BookingResource extends JsonResource $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); $bookingCreatedDate = Carbon::parse($this->created_at); $eInvoiceRequestedDate = Carbon::parse($this->company->e_invoice_requested_at); - //cief todo: 90 - for testing - if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $this->company->e_invoice === 1) { //&& $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 480 cief todo: 90 + + // if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $this->company->e_invoice === 1) { + if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $this->company->e_invoice === 1) { $eInvoice = true; }