 Dillon Ngo
|
7ed66f6414
|
Merge branch 'dillon/63.2-sorry-voucher' into development
|
2024-07-25 18:01:05 +08:00 |
|
|
Dillon Ngo
|
05ceb32ac2
|
Sorry Voucher with new features enhancement requested by KS
|
2024-07-25 17:57:20 +08:00 |
|
|
Dillon Ngo
|
2a04ef5bd2
|
Merge branch 'dillon/63.2-sorry-voucher' into development
|
2024-07-23 19:12:40 +08:00 |
|
|
Dillon Ngo
|
0d60226c44
|
Sorry Voucher with new features enhancement requested by KS
|
2024-07-23 19:11:36 +08:00 |
|
 Jia Sheng
|
d95f4829cb
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-22 00:46:40 +08:00 |
|
|
Jia Sheng
|
1467d0880f
|
update bill group to include the service charge
|
2024-07-22 00:46:07 +08:00 |
|
 edmondlang
|
2a26c58dda
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-17 10:22:21 +08:00 |
|
|
edmondlang
|
fc005a9ef5
|
Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-14 19:58:52 +08:00 |
|
|
edmondlang
|
3e9ceed23a
|
Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-14 19:32:53 +08:00 |
|
|
Jia Sheng
|
f2f12a6eb4
|
Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-14 19:16:07 +08:00 |
|
|
Jia Sheng
|
cb7c38a50d
|
1688 order reference
|
2024-07-14 19:15:43 +08:00 |
|
|
Jia Sheng
|
ba74a90d87
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-14 12:23:08 +08:00 |
|
|
Jia Sheng
|
c865b28315
|
update
|
2024-07-14 12:22:04 +08:00 |
|
|
Jia Sheng
|
37e42ed249
|
Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-14 11:00:58 +08:00 |
|
|
Jia Sheng
|
63118efc0b
|
delete duplicated 1688 bank account
|
2024-07-14 11:00:33 +08:00 |
|
|
Jia Sheng
|
830097f857
|
Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-13 14:13:49 +08:00 |
|
|
Jia Sheng
|
d1f319582a
|
alipay service
|
2024-07-13 14:12:54 +08:00 |
|
|
Jia Sheng
|
bceaa03e38
|
Merge branch 'fix-partial-refund-show-fully-refund' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-13 11:08:26 +08:00 |
|
|
Jia Sheng
|
c43e8e3f10
|
fix partial refund show fully refund
|
2024-07-13 11:07:43 +08:00 |
|
|
Dillon Ngo
|
c3961d102e
|
AbstractRule class update, with abstract authorized function updated to accept a parameter
|
2024-07-12 13:27:31 +08:00 |
|
|
edmondlang
|
91ce365c62
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 19:07:29 +08:00 |
|
|
Jia Sheng
|
7f16b9ead1
|
update refund logic where E2E do not refund service charge
|
2024-07-08 12:30:34 +08:00 |
|
|
Jia Sheng
|
79dd0554b1
|
Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 22:08:30 +08:00 |
|
|
Dillon Ngo
|
929cb2c0a6
|
Test sending welcome voucher email through server
|
2024-07-03 19:21:50 +08:00 |
|
|
Dillon Ngo
|
508260221e
|
Merge branch 'dillon/63-voucherify-updates' into development
|
2024-07-03 18:41:21 +08:00 |
|
|
Dillon Ngo
|
692789d014
|
Test sending welcome voucher email through server
|
2024-07-03 18:41:03 +08:00 |
|
|
Jia Sheng
|
92dea42a44
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-30 12:19:10 +08:00 |
|
|
Jia Sheng
|
a4b09cedb1
|
include refund service charges for partial refund
|
2024-06-30 12:18:40 +08:00 |
|
|
Jia Sheng
|
9fb4ac7d63
|
Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-24 22:45:43 +08:00 |
|
|
Jia Sheng
|
c34bacccfd
|
-fix expired booking command to ignore 1688 as 1688 may not have PO initally
-create command to revert those fully refunded payment transaction from status EXPIRED to REFUNDED
|
2024-06-24 22:45:21 +08:00 |
|
|
Jia Sheng
|
95bcf23fc1
|
Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-24 21:06:30 +08:00 |
|
|
Jia Sheng
|
84ff900629
|
comment out booking expired command in kernel
|
2024-06-24 21:06:05 +08:00 |
|
|
Jia Sheng
|
4a555afdbf
|
remove log in update group logic
|
2024-06-18 23:29:10 +08:00 |
|
|
Jia Sheng
|
e5bac3db51
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 23:27:57 +08:00 |
|
|
Jia Sheng
|
3f6dde7462
|
add cancel bill group function
|
2024-06-18 23:25:55 +08:00 |
|
|
Jia Sheng
|
204a8e6f5b
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 22:48:45 +08:00 |
|
|
Jia Sheng
|
4e33069574
|
test log
|
2024-06-18 22:47:53 +08:00 |
|
|
Jia Sheng
|
28472aed41
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-16 12:12:13 +08:00 |
|
 JiaSheng
|
b31d592e4a
|
update command logic
|
2024-06-16 11:50:29 +08:00 |
|
|
JiaSheng
|
764b82dc1c
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-09 14:45:14 +08:00 |
|
|
JiaSheng
|
ff88dcecf4
|
-check group total not tally with bill group total due to transfer fee not being included
-include the transfer fee calculation
-script to update the bill group to include the transfer fee calculation
|
2024-06-09 14:44:06 +08:00 |
|
|
edmondlang
|
ab4f56e4c1
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
|
2024-05-23 13:37:25 +08:00 |
|
|
edmondlang
|
a17812be3b
|
check duplicate refunds
|
2024-05-22 23:22:44 +08:00 |
|
 Aqqil Azman
|
3b4f3281b1
|
Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-17 10:46:54 +08:00 |
|
|
edmondlang
|
0797f26fe1
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module
|
2024-05-16 17:58:47 +08:00 |
|
|
edmondlang
|
7f2af7adf4
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-16 10:56:23 +08:00 |
|
|
edmondlang
|
531b65686f
|
export white form transactions
|
2024-05-16 10:56:02 +08:00 |
|
|
Aqqil Azman
|
97a8e34f3d
|
initial commit
|
2024-05-13 09:58:28 +08:00 |
|
|
JiaSheng
|
cb367d0033
|
bug fix for update booking amount
|
2024-05-11 00:01:49 +08:00 |
|
|
edmondlang
|
8fa956e0d7
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
|
2024-05-10 00:17:08 +08:00 |
|