From f8bb4e7f520b82ab3bcdcc21bca40227cfd4a980 Mon Sep 17 00:00:00 2001
From: Edmond Lang <edmond_wuiming@hotmail.com>
Date: Wed, 10 Dec 2025 00:15:29 +0800
Subject: [PATCH 1/4] fb gtag update

---
 .../forms/RegistrationFormComponent.vue       | 12 ++++++++++++
 .../forms/confirmBookingComponent.vue         | 14 ++++++++++++++
 resources/assets/vue/utils/tracking.js        | 13 +++++++++++++
 .../views/pages/payments_redirect.blade.php   | 19 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/utils/tracking.js

diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index d6f05b1b..a046a7eb 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -169,6 +169,7 @@
 </template>
 <script>
     import registrationFormValidation from '../../../general/mixins/accounts/validation/registrationFormValidation'
+    import { track } from '../../../utils/tracking';
     export default {
         data() {
             return {
@@ -205,6 +206,17 @@
             },
             submitForm(){
                 this.step === 2 ? this.submit(this.route('api.account.registration.register'), 'post', 'registrationSection', false, false) : this.changeStep('next');
+            },
+            successHandler(response){
+                // fire to gtag manager for fb pixel tracking: CompleteRegistration
+                track('exchange_complete_registration', {
+                    content_name: this.parameters.type === 1 ? 'Company' : 'Personal',
+                    currency: 'MYR'
+                });
+                
+                // Call parent success handler logic from authenticationHandler mixin
+                this.formHandler('');
+                this.$store.dispatch('userAuthentication', {access_token: response.payload.access_token, redirect_url: response.payload.redirect_url});
             }
         },
         mixins: [registrationFormValidation]
diff --git a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
index d0a92e59..c2c0afca 100644
--- a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
@@ -11,6 +11,7 @@
 
 <script>
     import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { track } from '../../../utils/tracking';
     export default {
         props:{
             order_reference_no: {
@@ -26,6 +27,12 @@
         },
         methods: {
             submitForm(){
+                // fire to gtag manager for fb pixel tracking: AddToCart — fired when the user clicks Confirm Order (user intent, OK even if API fails)
+                track('exchange_add_to_cart', {
+                    value: this.data.amount,
+                    currency: 'MYR'
+                });
+
                 this.parameters = {
                     company_id: this.data.company.id,
                     type: this.data.type,
@@ -42,6 +49,13 @@
                 this.submit(route('api.booking.create'), 'post', this.section, true, true)
             },
             successHandler(response){
+                // fire to gtag manager for fb pixel tracking: InitiateCheckout — booking created
+                track('exchange_checkout', {
+                    value: this.data.amount,
+                    currency: 'MYR',
+                    booking_id: response.payload.data.marking
+                });
+
                 window.location.href = this.route('booking.details', response.payload.data.marking)
 
             }
diff --git a/resources/assets/vue/utils/tracking.js b/resources/assets/vue/utils/tracking.js
new file mode 100644
index 00000000..a14b0318
--- /dev/null
+++ b/resources/assets/vue/utils/tracking.js
@@ -0,0 +1,13 @@
+// resources/assets/vue/utils/tracking.js
+export function track(event, payload = {}) {
+    if (typeof window === 'undefined') return;
+
+    // console.log('tracking', event, payload);
+  
+    window.dataLayer = window.dataLayer || [];
+    window.dataLayer.push({
+      event,
+      ...payload,
+    });
+  }
+  
\ No newline at end of file
diff --git a/resources/views/pages/payments_redirect.blade.php b/resources/views/pages/payments_redirect.blade.php
index e7f98d9c..c7e198fe 100644
--- a/resources/views/pages/payments_redirect.blade.php
+++ b/resources/views/pages/payments_redirect.blade.php
@@ -103,4 +103,21 @@
 
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+    @if($status === 2 && isset($transaction) && $transaction)
+        <script>
+            (function() {
+                // fire to gtag manager for fb pixel tracking: exchange_purchase
+                window.dataLayer = window.dataLayer || [];
+                window.dataLayer.push({
+                    event: 'exchange_purchase',
+                    transaction_id: @json($transaction->payment_reference ?? ''),
+                    value: {{ (float)($transaction->amount ?? 0) }},
+                    currency: 'MYR'
+                });
+            })();
+        </script>
+    @endif
+@endpush
\ No newline at end of file

From 5ab978023f5e25d05307f23442231f76737d8544 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 29 Dec 2025 22:41:25 +0800
Subject: [PATCH 2/4] E-Invoice - Reinstate removed WALLET TOP UP REPORT from
 drop down list /payments page

---
 .../bookings/elements/DownloadUploadComponent.vue         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue
index 81f1a195..1d48c642 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue
@@ -24,6 +24,7 @@
                                                 6. 01DRW - Sales Deposit by Wallet [AR PAYMENT ENTRY] → Filters by Created Date<br/>
                                                 7. 01DRF - Sales Deposit by Wallet [AR REFUND ENTRY] → Filters by Created Date<br/>
                                                 8. 01DD - Sales Deposit by Wallet [AR DEPOSIT ENTRY] → Filters by Created Date<br/>
+                                                9. WALLET TOP UP REPORT [Wallet Deposit Received] → Filters by Top Up Date<br/>
                                             </div>
                                         ">
                                         <i class="fa fa-info-circle"></i>
@@ -52,6 +53,7 @@
                                                 6. 01DRW - Sales Deposit by Wallet [AR PAYMENT ENTRY] → Filters by Created Date<br/>
                                                 7. 01DRF - Sales Deposit by Wallet [AR REFUND ENTRY] → Filters by Created Date<br/>
                                                 8. 01DD - Sales Deposit by Wallet [AR DEPOSIT ENTRY] → Filters by Created Date<br/>
+                                                9. WALLET TOP UP REPORT [Wallet Deposit Received] → Filters by Top Up Date<br/>
                                             </div>
                                         ">
                                         <i class="fa fa-info-circle"></i>
@@ -196,10 +198,10 @@ export default {
                 '01D - Sales Deposit Received [AR DEPOSIT ENTRY]',
                 '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]',
                 'Credit Note Report',
-                //'WALLET TOP UP REPORT [Wallet Deposit Received]',
                 '01DRW - Sales Deposit by Wallet [AR PAYMENT ENTRY]',
                 '01DRF - Sales Deposit by Wallet [AR REFUND ENTRY]',
-                '01DD - Sales Deposit by Wallet [AR DEPOSIT ENTRY]'
+                '01DD - Sales Deposit by Wallet [AR DEPOSIT ENTRY]',
+                'WALLET TOP UP REPORT [Wallet Deposit Received]'
             ];
         },
         handleExportClick(){
@@ -215,10 +217,10 @@ export default {
                 '01D - Sales Deposit Received [AR DEPOSIT ENTRY]': route('api.export.transactions.receive_payment_deposit_entry'),
                 '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]': route('api.export.transactions.receive_payment_for_booking'),
                 'Credit Note Report': route('api.export.transactions.ar_credit_note'),
-                //'WALLET TOP UP REPORT [Wallet Deposit Received]': route('api.export.transactions.wallet_top_up_deposit_entry'),
                 '01DRW - Sales Deposit by Wallet [AR PAYMENT ENTRY]': route('api.export.transactions.sales_deposit_by_wallet_payment_entry'),
                 '01DRF - Sales Deposit by Wallet [AR REFUND ENTRY]': route('api.export.transactions.sales_deposit_by_wallet_refund_entry'),
                 '01DD - Sales Deposit by Wallet [AR DEPOSIT ENTRY]': route('api.export.transactions.sales_deposit_by_wallet_deposit_entry'),
+                'WALLET TOP UP REPORT [Wallet Deposit Received]': route('api.export.transactions.wallet_top_up_deposit_entry'),
             };
 
             let url = `${routesMap[reportType]}?startDate=${this.parameters.startDate}&endDate=${this.parameters.endDate}`;

From 74785ad6fbd2a4483f7b81e62f57d38bf7c412ec Mon Sep 17 00:00:00 2001
From: Edmond Lang <edmond_wuiming@hotmail.com>
Date: Tue, 30 Dec 2025 23:29:55 +0800
Subject: [PATCH 3/4] update gtag amount

---
 .../vue/components/bookings/forms/confirmBookingComponent.vue | 4 ++--
 resources/views/pages/payments_redirect.blade.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
index c2c0afca..6fc7e203 100644
--- a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
@@ -29,7 +29,7 @@
             submitForm(){
                 // fire to gtag manager for fb pixel tracking: AddToCart — fired when the user clicks Confirm Order (user intent, OK even if API fails)
                 track('exchange_add_to_cart', {
-                    value: this.data.amount,
+                    value: Number(String(this.data.amount).replace(/,/g, '')),
                     currency: 'MYR'
                 });
 
@@ -51,7 +51,7 @@
             successHandler(response){
                 // fire to gtag manager for fb pixel tracking: InitiateCheckout — booking created
                 track('exchange_checkout', {
-                    value: this.data.amount,
+                    value: Number(String(this.data.amount).replace(/,/g, '')),
                     currency: 'MYR',
                     booking_id: response.payload.data.marking
                 });
diff --git a/resources/views/pages/payments_redirect.blade.php b/resources/views/pages/payments_redirect.blade.php
index c7e198fe..946f0222 100644
--- a/resources/views/pages/payments_redirect.blade.php
+++ b/resources/views/pages/payments_redirect.blade.php
@@ -114,7 +114,7 @@
                 window.dataLayer.push({
                     event: 'exchange_purchase',
                     transaction_id: @json($transaction->payment_reference ?? ''),
-                    value: {{ (float)($transaction->amount ?? 0) }},
+                    value: {{ number_format((float)($transaction->amount ?? 0), 2, '.', '') }},
                     currency: 'MYR'
                 });
             })();

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 4/4] 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;
         }