45bb47e5aa
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-03-07 17:21:41 +08:00
4d501c8b7c
update log info
2024-03-07 17:21:18 +08:00
875fb79574
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
2024-03-07 17:16:22 +08:00
73819e967e
open partial refund, categorize refunds section in dashboard
2024-03-06 20:56:24 +08:00
e7ef63c511
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
2024-03-06 15:16:50 +08:00
2d5bbac3b1
update ExpiredBookingCommand logging - add timestamp
2024-03-02 00:32:55 +08:00
85cd73f577
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into uncomment-booking-expired-command
2024-03-02 00:25:55 +08:00
8b22b49937
remove testing code
2024-03-02 00:25:00 +08:00
42a399999a
uncomment and log to specific file for booking expired command
2024-03-01 23:28:14 +08:00
b2dd34106c
debug payment not showing issue
2024-03-01 22:51:56 +08:00
dfc2ddd09b
debug payment not showing issue
2024-03-01 22:49:14 +08:00
5cf55453fd
show-booking-expired for debug payment not showing
2024-03-01 21:57:06 +08:00
efb909555e
debug payment not showing issue
2024-03-01 14:28:52 +08:00
ca2f41e95c
fix bug for payment transaction not found after status update to refunded
2024-03-01 08:16:54 +08:00
5c10539824
resolve supplier refund amount to follow white form rate
2024-02-28 20:53:20 +08:00
5fd2f6ef7f
-complete supplier bill group when oustanding is 0
...
-create refund and supplier refund if the request refund order is in white form
2024-02-28 01:34:39 +08:00
8d84c970e2
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
2024-02-27 22:03:04 +08:00
f9f7cf74b6
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
2024-02-27 21:50:47 +08:00
f84b04c26c
update logging and indentation
2024-02-27 01:08:16 +08:00
28c0aeff77
dont show payment on homepage if it is in refund process
2024-02-26 00:38:25 +08:00
12bf3b214d
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-02-25 20:43:35 +08:00
767d6c84fe
update to bill refund for 1688 supplier
2024-02-25 20:43:01 +08:00
b67257b42f
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-02-24 12:16:33 +08:00
25de31ea2e
supplier bill payment refund module
2024-02-24 12:15:26 +08:00
ec0ebe3812
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
2024-02-21 21:14:51 +08:00
df17a8497d
comment partial refund function
2024-02-21 00:33:08 +08:00
9aa75630ff
update code for refund booking
2024-02-21 00:20:45 +08:00
9e3c34eb73
change payment status when it has been fully refunded
2024-02-20 22:41:28 +08:00
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
JiaSheng
edmondlang
Dillon Ngo