Commit Graph

1319 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
Jia Sheng cb7c38a50d 1688 order reference 2024-07-14 19:15:43 +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
edmondlang d76e3cc620 fix bug - customer cant see the Purchase Order section 2024-07-09 13:07:17 +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
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
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
edmondlang 66c2bb0cca 1688 fields changes 2024-07-03 14:54:47 +08:00
Dillon Ngo ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail 2024-07-03 12:08:57 +08:00
Aqqil Azman 6a8006c0b0 continue workflow, added Issue, approve PO and edit order 2024-06-25 13:27:14 +08:00
Aqqil Azman 286ed8c73c added approve_po v-if condition and the order number box for approve_po as well as the designated buttons 2024-06-21 17:54:04 +08:00
edmondlang 60b1bbeee6 admin 1688 work flow template 2024-06-21 15:11:10 +08:00
Jia Sheng 3f6dde7462 add cancel bill group function 2024-06-18 23:25:55 +08:00
edmondlang 9a4dba7fdd fix the error mock up white form cannot be created 2024-06-12 10:16:31 +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 c4bbc1a967 after remarks in refund is submitted, reload to get the resource again 2024-05-30 22:51:35 +08:00
Omair Saleh bb31790061 Merge remote-tracking branch 'origin/master' 2024-05-27 12:08:46 +08:00
Omair Saleh 474e6ce406 update express and saver SLA 2024-05-27 12:08:29 +08:00
edmondlang 400a5f6bf9 fix refund remarks 2024-05-23 10:28:27 +08:00
edmondlang 6fd7b2f610 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-update 2024-05-22 23:37:47 +08:00
edmondlang 7feb05d784 make refund remarks required 2024-05-22 22:23:59 +08:00
edmondlang 000c418315 make refund remarks required 2024-05-22 21:17:11 +08:00
JiaSheng 5425c37e52 -request multiple refund
-show remark for refund in dashboard
-show refund remark in export page
2024-05-22 19:28:42 +08:00
edmondlang 16b67c2ea3 Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-05-21 11:16:50 +08:00
edmondlang e5cc4481fe update RefundConfirmationComponent display text 2024-05-20 11:47:29 +08:00
edmondlang 3d107e9009 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-20 11:41:53 +08:00
edmondlang 3f5c735a43 update export currency vendor order 2024-05-20 11:41:21 +08:00
Dillon Ngo 1550ebb3cb Vue Polling - Sync code from Shipping Portal, Refactor code to use vuex 2024-05-20 03:05:36 +08:00
Dillon Ngo 56f89113a8 Vue Polling - Sync code from Shipping Portal, Refactor code to use vuex 2024-05-20 02:34:44 +08:00