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 1/2] 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 2/2] 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'
                 });
             })();