From 34e7b37a7c9dc7e9e78f005685ae682a4d639331 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 27 Nov 2025 13:32:23 +0800 Subject: [PATCH] E-Invoice - Update the conditions for generating Sales Invoice Report with business logic update on generating invoice --- .../ControllersLogic/ApprovePurchaseOrderLogic.php | 7 ++++++- app/Http/Resources/BookingResource.php | 1 + .../bookings/sections/BookingDetailsSectionComponent.vue | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php index 7422d6ca..1a533294 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php @@ -67,7 +67,12 @@ class ApprovePurchaseOrderLogic extends AbstractControllerLogic $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED); - $this->createInvoiceTransactionProcessor->execute($booking); + $this->createInvoiceTransactionProcessor->execute($booking, "", null, [ + 'generateEInvoice' => false, + 'generateEInvoiceWithNormalInvoiceTemplate' => false, + 'generateEInvoiceRefund' => false, + 'bookingOriginalStatus' => $booking->status + ]); return $this->response([]); } diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index 9c6edf96..92824aeb 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -98,6 +98,7 @@ class BookingResource extends JsonResource })->latest()->get()) ]), 'einvoice' => $eInvoice, + 'is_invoice_generated' => $this->is_invoice_generated, ]; } } diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue index 0e702efc..c427f4d8 100644 --- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue @@ -6,7 +6,7 @@
-
+
@@ -122,7 +122,7 @@
-
+