cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vapor/production' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into vapor/staging

Browse Source
This commit is contained in:
Edmond Lang
2025-12-30 23:30:10 +08:00
parent b00d40bb7e 74785ad6fb
commit f0d988446c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue
+5 -3
View File
@@ -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}`;
resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
+2 -2
View File
@@ -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
});
resources/views/pages/payments_redirect.blade.php
+1 -1
View File
@@ -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'
});
})();