Commit Graph

3471 Commits

Author SHA1 Message Date
Jia Sheng 9b0fbb66f4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-16 00:22:43 +08:00
Jia Sheng 26177eba66 add account holder name for usd order whiteform 2024-07-16 00:22:21 +08:00
Jia Sheng 53071e21a7 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-15 21:10:28 +08:00
Jia Sheng 8debbd4ef4 add order reference to white form 2024-07-15 21:09:57 +08:00
edmondlang 6fd276e240 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 21:08:40 +08:00
edmondlang faa1b2ce44 update 1688 ORDER REFERENCE design 2024-07-14 21:06:40 +08:00
edmondlang d8b1426336 update 1688 ORDER REFERENCE design 2024-07-14 21:00:11 +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 34d95bbcb7 fix console error messages 2024-07-14 19:57:54 +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 f533810e42 update 2024-07-13 14:13:23 +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
edmondlang 6e4127a1df Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-09 13:07:40 +08:00
edmondlang d76e3cc620 fix bug - customer cant see the Purchase Order section 2024-07-09 13:07:17 +08:00
edmondlang f4488524fe Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-08 19:10:18 +08:00
edmondlang 4f9c6f574e Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 19:08:01 +08:00
edmondlang a68e919a84 Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 19:07:46 +08:00
edmondlang 91ce365c62 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 19:07:29 +08:00
edmondlang 726d06871b 1688 changes 2024-07-08 19:07:06 +08:00
edmondlang 28ef7fe7de Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-changes 2024-07-08 19:03:37 +08:00
edmondlang 93ad34b2b8 Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-08 18:57:18 +08:00
edmondlang a77481084c Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-08 13:29:15 +08:00
edmondlang 74e19b1325 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-08 13:28:54 +08:00
Jia Sheng 6d522fdb97 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 12:33:03 +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 e4e2a8a9a1 Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 12:10:28 +08:00
Jia Sheng 369054c81d -add note under booking payment history
-add additional note when creating booking
2024-07-08 12:09:33 +08:00
Jia Sheng eab43a7d05 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-05 20:49:15 +08:00
Jia Sheng e8cb4b8f5a update pdf top header 2024-07-05 20:46:48 +08:00
edmondlang 8d11f54b01 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 23:36:57 +08:00
edmondlang 17df7fda44 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-04 23:36:18 +08:00
Jia Sheng 1ac4c58a18 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 23:04:12 +08:00
Jia Sheng 659a48d7ad update export refund 2024-07-04 23:03:43 +08:00
Jia Sheng 0758123216 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 22:29:10 +08:00
Jia Sheng c43c635661 update 2024-07-04 22:28:44 +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
Jia Sheng 77140ec751 -change the heading in pdf from credit note to refund note for those transaction after 02 April 2024 2024-07-04 22:07:24 +08:00
Dillon Ngo 416ec42ebc Merge branch 'dillon/63-voucherify-updates' into 'master'
Test sending welcome voucher email through server

See merge request CIEFWorldwideSdnBhd/exchange-2.0!164
2024-07-03 11:22:27 +00:00
Dillon Ngo 929cb2c0a6 Test sending welcome voucher email through server 2024-07-03 19:21:50 +08:00
Dillon Ngo 734acfb8d9 Merge branch 'dillon/63-voucherify-updates' into 'master'
Test sending welcome voucher email through server

See merge request CIEFWorldwideSdnBhd/exchange-2.0!163
2024-07-03 11:17:24 +00:00
Dillon Ngo 09b3ffe2d5 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-03 18:41:54 +08:00