Commit Graph

2963 Commits

Author SHA1 Message Date
Aqqil Azman 4289c65e4f recovered elapsedTime 2024-07-22 18:09:46 +08:00
edmondlang 9070c5f0dd reverse commit 2024-07-22 18:04:01 +08:00
Aqqil Azman 8f1605c31e changed the timer to reset for every step 2024-07-22 17:45:43 +08:00
edmondlang 4f86ba5980 update typo 2024-07-22 15:06:56 +08:00
edmondlang 8d48f6f4eb 1688 admin work flow clean up and call api 2024-07-22 01:12:51 +08:00
edmondlang 31282492fe Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into admin-1688-work-flow-aqqill 2024-07-21 18:31:23 +08:00
Aqqil Azman f7bd74bee4 made buttons bigger and align them horizontally 2024-07-18 15:33:39 +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
Aqqil Azman 33e6bec752 Finished up 1688 workflow, approve PO and fill PO 2024-07-16 13:19:18 +08:00
edmondlang c3d94f8c4b Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-16 01:04:27 +08:00
Jia Sheng 26177eba66 add account holder name for usd order whiteform 2024-07-16 00:22:21 +08:00
edmondlang fd00b0ec51 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-15 23:13:21 +08:00
Jia Sheng 8debbd4ef4 add order reference to white form 2024-07-15 21:09:57 +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 cb7c38a50d 1688 order reference 2024-07-14 19:15:43 +08:00
Jia Sheng c865b28315 update 2024-07-14 12:22:04 +08:00
Jia Sheng 63118efc0b delete duplicated 1688 bank account 2024-07-14 11:00:33 +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 c43e8e3f10 fix partial refund show fully refund 2024-07-13 11:07:43 +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 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 7f16b9ead1 update refund logic where E2E do not refund service charge 2024-07-08 12:30:34 +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 e8cb4b8f5a update pdf top header 2024-07-05 20:46:48 +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 659a48d7ad update export refund 2024-07-04 23:03:43 +08:00
Jia Sheng c43c635661 update 2024-07-04 22:28:44 +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 692789d014 Test sending welcome voucher email through server 2024-07-03 18:41:03 +08:00
edmondlang 66c2bb0cca 1688 fields changes 2024-07-03 14:54:47 +08:00
Dillon Ngo 47d4a163c4 Merge branch 'dillon/63-voucherify-updates' into 'master'
Fix welcome voucher email out of alignment issue in yahoo mail

See merge request CIEFWorldwideSdnBhd/exchange-2.0!162
2024-07-03 04:10:34 +00:00
Dillon Ngo ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail 2024-07-03 12:08:57 +08:00
Jia Sheng cf17e9bb11 order export refund by created at 2024-07-02 20:46:53 +08:00
Jia Sheng a4b09cedb1 include refund service charges for partial refund 2024-06-30 12:18:40 +08:00
Aqqil Azman 6a8006c0b0 continue workflow, added Issue, approve PO and edit order 2024-06-25 13:27:14 +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 84ff900629 comment out booking expired command in kernel 2024-06-24 21:06:05 +08:00