 Dillon Ngo
|
3b767b2cd3
|
Merge branch 'dillon/68-exchange-debugging-refund' into development
|
2024-08-12 22:02:54 +08:00 |
|
|
Dillon Ngo
|
9cadaafbe7
|
Merge branch dillon/66.2-exchange-debug into development
|
2024-08-12 10:32:56 +08:00 |
|
|
Dillon Ngo
|
77e314c52b
|
Quick fix on recipient_bank_account is null error on frontend
|
2024-08-12 10:25:57 +08:00 |
|
|
Dillon Ngo
|
cfcc5fbe26
|
Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown
|
2024-08-12 09:34:45 +08:00 |
|
 Jia Sheng
|
3767b41522
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-08-08 21:45:38 +08:00 |
|
|
Jia Sheng
|
5be2b60e1c
|
update to fix for round up precision
|
2024-08-08 21:45:00 +08:00 |
|
|
Dillon Ngo
|
191a787ecc
|
Merge branch 'dillon/66.1-payment-bank-details' into development
|
2024-08-07 07:23:58 +08:00 |
|
|
Dillon Ngo
|
039d8deeea
|
Fix some breaking changes that is already deployed to master branch
|
2024-08-07 07:23:45 +08:00 |
|
|
Dillon Ngo
|
714e1ad340
|
Merge branch 'dillon/66.1-payment-bank-details' into development
|
2024-08-07 07:13:08 +08:00 |
|
|
Dillon Ngo
|
32833064b3
|
Fix some breaking changes that is already deployed to master branch
|
2024-08-07 06:56:49 +08:00 |
|
|
Dillon Ngo
|
6160ec0651
|
Merge branch 'master' into dillon/66.1-payment-bank-details
|
2024-08-07 06:49:31 +08:00 |
|
|
Dillon Ngo
|
3bd708ed0e
|
Recipient Bank Details to follow payment overriding the default attached to Booking
|
2024-08-07 06:46:17 +08:00 |
|
|
Dillon Ngo
|
f44f5d3ffd
|
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
|
2024-08-04 03:23:12 +08:00 |
|
|
Dillon Ngo
|
8973e7b50f
|
Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month
|
2024-08-04 03:22:53 +08:00 |
|
|
Dillon Ngo
|
bdf0a3afeb
|
Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue
|
2024-08-04 01:35:18 +08:00 |
|
|
Dillon Ngo
|
b0a1971ca1
|
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
|
2024-08-04 00:32:26 +08:00 |
|
|
Dillon Ngo
|
8b50b89449
|
Sorry voucher debug
|
2024-08-04 00:32:12 +08:00 |
|
|
Dillon Ngo
|
de11cdb13c
|
Merge branch 'dillon/63.2-sorry-voucher' into 'master'
Sorry Voucher Implementation
See merge request CIEFWorldwideSdnBhd/exchange-2.0!166
|
2024-08-03 15:09:34 +00:00 |
|
 edmondlang
|
6b2f674c17
|
Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-08-02 01:20:15 +08:00 |
|
|
Jia Sheng
|
cb9090ec03
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-31 22:39:46 +08:00 |
|
|
Jia Sheng
|
7e42bda76e
|
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier
|
2024-07-31 22:39:04 +08:00 |
|
|
Dillon Ngo
|
e80ad9a6ec
|
Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details
|
2024-07-25 19:34:43 +08:00 |
|
|
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 |
|
|
edmondlang
|
c340c9d4d8
|
1688 work flow
|
2024-07-23 22:58:36 +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 |
|
|
edmondlang
|
28a775e926
|
update 1688 admin workflow
|
2024-07-23 15:53:53 +08:00 |
|
|
edmondlang
|
8d48f6f4eb
|
1688 admin work flow clean up and call api
|
2024-07-22 01:12:51 +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 |
|