From 9f635f40bd0f7aedc21e7f2d807f987194c092c2 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 6 Aug 2025 15:17:34 +0800
Subject: [PATCH] E-Invoice - Emergency fix to allow admin to generate normal
 invoice instead of einvoice

---
 .../RegenerateInvoiceBookingLogic.php         |  3 +-
 .../forms/RegenerateEInvoiceComponent.vue     |  1 +
 ...generateNormalInvoiceEInvoiceComponent.vue | 42 +++++++++++++++++++
 .../BookingDetailsSectionComponent.vue        | 14 +++++--
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 resources/assets/vue/components/bookings/forms/RegenerateNormalInvoiceEInvoiceComponent.vue

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
index 39db1708..bf88251f 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
@@ -69,8 +69,9 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
                 'with_transactions' => true
             ]
         );
+        $normalInvoice = $request->input('normal_invoice', false);
 
-        $this->regenerateInvoiceBookingProcessor->execute($booking);
+        $this->regenerateInvoiceBookingProcessor->execute($booking, $normalInvoice);
 
         return $this->resourceResponse(new BookingResource($booking));
     }
diff --git a/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue b/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue
index 6d6d15f9..1d2dd9af 100644
--- a/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue
@@ -29,6 +29,7 @@
     export default {
           methods: {
             submitForm() {
+                this.parameters.normal_invoice = false;
                 this.submit(this.route('api.booking.einvoice.regenerate', this.data.id), 'post', this.section, true, true);
             },
             successHandler(){
diff --git a/resources/assets/vue/components/bookings/forms/RegenerateNormalInvoiceEInvoiceComponent.vue b/resources/assets/vue/components/bookings/forms/RegenerateNormalInvoiceEInvoiceComponent.vue
new file mode 100644
index 00000000..b3279d3e
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/RegenerateNormalInvoiceEInvoiceComponent.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="row">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to regenerate normal invoice instead of e-invoice for this payment?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submitForm()">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+          methods: {
+            submitForm() {
+                this.parameters.normal_invoice = true;
+                this.submit(this.route('api.booking.einvoice.regenerate', this.data.id), 'post', this.section, true, true);
+            },
+            successHandler(){
+                this.closeModal();
+                this.$store.dispatch('reloadList', {'name': "bookingDetailSection"});
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 68dffd3a..c7717536 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -334,7 +334,7 @@
                                     </general-confirmation-form-component>
                                 </modal-component>
                             </div>
-                             <div class="row m-t-15" v-if="booking.status === 3 && ($store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)) && booking.einvoice">
+                            <div class="row m-t-15" v-if="booking.status === 3 && ($store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)) && booking.einvoice">
                                 <div class="col-sm col-md-auto">
                                     <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal equal-width-button" data-type="regenerateEInvoice">Regenerate E-Invoice</div>
                                 </div>
@@ -342,6 +342,14 @@
                                     <regenerate-e-invoice-component :data="booking" :section="section" class="text-center"></regenerate-e-invoice-component>
                                 </modal-component>
                             </div>
+                            <div class="row m-t-15" v-if="booking.status === 3 && ($store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)) && booking.einvoice">
+                                <div class="col-sm col-md-auto">
+                                    <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal equal-width-button" data-type="regenerateNormalInvoiceEInvoice">Regenerate Normal Inv</div>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateNormalInvoiceEInvoice">
+                                    <regenerate-normal-invoice-e-invoice-component :data="booking" :section="section" class="text-center"></regenerate-normal-invoice-e-invoice-component>
+                                </modal-component>
+                            </div>
                         </div>
                         <div class="col-12 col-sm-12 col-md-5 mt-3 mt-sm-0">
                             <!-- <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component> -->
@@ -497,7 +505,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row m-t-5" v-if="$store.getters.isAdmin">
+                    <div class="row m-t-15" v-if="$store.getters.isAdmin">
                         <div class="col">
                             <div class="btn btn-xs all-caps b-rad-none btn-warning pointer requestModal equal-width-button" data-type="changeBookingOwner">Change Booking Owner</div>
                             <modal-component type="changeBookingOwner">
@@ -614,7 +622,7 @@
 </script>
 <style scoped>
     .equal-width-button {
-        min-width: 180px;
+        min-width: 200px;
         display: inline-block;
         text-align: center;
     }