db296a511f
test ga4
2024-02-20 11:16:38 +08:00
86cc8bbf9d
test ga4
2024-02-20 11:07:35 +08:00
b7bc14b98f
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
# resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
2024-02-19 01:10:43 +08:00
48247abbd4
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
...
# Conflicts:
# resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
2024-02-19 01:00:51 +08:00
609b71f549
code upfate for refund booking
2024-02-19 00:57:42 +08:00
f083434390
update refund ui and logic
2024-02-16 14:59:11 +08:00
39d78d2d42
Merge branch 'revert-304379b1' into 'master'
...
REVERT THE REVERT REINSTATING THE COMMIT WITH MESSAGE: "Proof of concept - Vue Polling a workaround for AWS API Gateway limitation"
See merge request CIEFWorldwideSdnBhd/exchange-2.0!158
2024-02-11 10:30:08 +00:00
f8230990f4
Revert "Merge branch 'revert-b9668bb6' into 'master'"
...
This reverts merge request !157
2024-02-11 10:28:05 +00:00
304379b147
Merge branch 'revert-b9668bb6' into 'master'
...
Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"
See merge request CIEFWorldwideSdnBhd/exchange-2.0!157
2024-02-11 09:54:00 +00:00
ea4795e5c8
Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"
...
This reverts merge request !152
2024-02-11 09:53:09 +00:00
d5305b71f8
Merge branch 'revert-6637d057' into 'development'
...
Revert "Merge branch 'revert-c28544c6' into 'development'"
See merge request CIEFWorldwideSdnBhd/exchange-2.0!156
2024-02-11 09:48:42 +00:00
83448e25df
Revert "Merge branch 'revert-c28544c6' into 'development'"
...
This reverts merge request !154
2024-02-11 09:47:30 +00:00
6637d05702
Merge branch 'revert-c28544c6' into 'development'
...
Revert "Merge branch 'dillon/51.2-test-revert-merge-request' into 'development'"
See merge request CIEFWorldwideSdnBhd/exchange-2.0!154
2024-02-11 09:42:22 +00:00
240cda76a5
Revert "Merge branch 'dillon/51.2-test-revert-merge-request' into 'development'"
...
This reverts merge request !153
2024-02-11 09:41:41 +00:00
c28544c67e
Merge branch 'dillon/51.2-test-revert-merge-request' into 'development'
...
test revert merge request
See merge request CIEFWorldwideSdnBhd/exchange-2.0!153
2024-02-11 09:38:26 +00:00
92f8b19b3e
Test revert merge request
2024-02-11 17:34:46 +08:00
1c9290c9e5
Merge branch 'dillon/51-vue-polling-experimental-2' into dillon/51.2-test-revert-merge-request
2024-02-11 17:33:45 +08:00
b9668bb61b
Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'
...
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation
See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
2024-02-11 09:16:08 +00:00
dcb1dbeca4
Merge branch 'dillon/51-vue-polling-experimental-2' into development
2024-02-11 16:15:06 +08:00
7151caa9b8
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation
2024-02-11 16:11:42 +08:00
ddcad4969e
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
2024-02-06 12:02:06 +08:00
17785cd08f
Merge branch 'dillon/41-voucherify-phase-2b' into 'master'
...
Voucherify minor interface update to allow user easily select and apply available voucher on checkout
See merge request CIEFWorldwideSdnBhd/exchange-2.0!151
2024-01-25 14:00:54 +00:00
8f20c7d021
update create booking payment with wallet logic
2024-01-19 21:45:07 +08:00
42becd0cf5
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
2024-01-15 23:47:57 +08:00
402a2e03bc
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
2024-01-15 23:44:05 +08:00
c8cabee97b
update
2024-01-15 23:41:12 +08:00
ef43e1616d
update
2024-01-14 12:20:28 +08:00
e5a96e179c
add refund transaction under booking payment history, update on admin currency order dashboard to show the correct amount after refunded
2024-01-13 13:27:24 +08:00
0e332c18d0
fix bug on development
2024-01-11 14:46:07 +08:00
aa57a79ab7
fix ExportsInvoiceTransactions - $row is inside an array
2024-01-11 11:22:46 +08:00
b5958a95fb
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-01-11 10:56:18 +08:00
f56ee08a53
Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
2024-01-10 21:15:37 +08:00
836e5f86cc
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
2024-01-10 21:14:44 +08:00
82f8eac478
Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
2024-01-10 15:34:48 +08:00
e5dc9c4e1b
fix the invoice date for IZYIM when export invoice to autocount
2024-01-09 09:12:06 +08:00
1e16872933
fix the invoice date for IZYIM when export invoice to autocount
2024-01-09 09:08:44 +08:00
8a05620edf
update
2024-01-08 22:41:59 +08:00
a28c695aab
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
2024-01-08 21:54:23 +08:00
79bc1dff91
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# config/logging.php
2024-01-08 18:28:08 +08:00
435927ba19
update code fix po
2024-01-08 18:07:04 +08:00
9a39976ed0
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-po
2024-01-08 17:49:06 +08:00
77b93d2c9b
fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review
2024-01-05 12:07:53 +08:00
24d246d721
fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review
2024-01-05 12:06:08 +08:00
b2dd059fa4
update logging for GuzzleShippingPortal
2024-01-03 10:12:06 +08:00
02a37caf5a
change posting date to invoice date for shipping portal when export invoice to autocount
2024-01-03 09:10:30 +08:00
74c6ca7330
change posting date to invoice date for shipping portal when export invoice to autocount
2024-01-03 09:08:54 +08:00
8d30467486
Merge branch 'fix-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-01-02 19:40:58 +08:00
c599ae5887
code update
2024-01-02 19:40:38 +08:00
77c8f776dc
Merge branches 'development' and 'fix-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-01-02 19:37:13 +08:00
6cac8e6e09
code update
2024-01-02 19:36:47 +08:00
edmondlang
Dillon Ngo
JiaSheng
Steve Ng