Commit Graph

3036 Commits

Author SHA1 Message Date
edmondlang 602b69dcba show payment method and date 2024-08-09 19:47:58 +08:00
Jia Sheng 5be2b60e1c update to fix for round up precision 2024-08-08 21:45:00 +08:00
edmondlang f58dea32ac revert fixed pending_orders table 2024-08-07 18:27:58 +08:00
edmondlang 8a0005aa17 fix pending_orders table header 2024-08-07 15:40:24 +08:00
edmondlang 764f242e87 fix pending_orders table header 2024-08-07 13:13:26 +08:00
edmondlang ea06152dbf update pending_orders table header 2024-08-07 10:51:27 +08:00
Aqqil Azman 7013dd4256 added table headers due to account oversight on the database structure, mixing Marking and Ref No up 2024-08-07 09:58:39 +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 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
Jia Sheng 53950459e2 show warning on manual po, add periodic 1688 manual po 2024-08-06 22:33:07 +08:00
Aqqil Azman 7e9ffd67e2 rearrange the pending order based on account and PM's request 2024-08-06 19:40:25 +08:00
edmondlang a90c3644c8 Update c2c display amount 2024-08-05 22:27:59 +08:00
Dillon Ngo 68fa965d7b Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
Sorry voucher minor UI update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!170
2024-08-04 13:28:49 +00:00
Dillon Ngo bce914a3d3 Sorry voucher minor UI update 2024-08-04 21:24:56 +08:00
Dillon Ngo 5248dfd281 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
Fix a problem where voucherify campaign vouchers limit not displaying with...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!169
2024-08-03 20:04:05 +00:00
Dillon Ngo 79d5471d9e Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month 2024-08-04 03:56:05 +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 14f2bd7f2c Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue

See merge request CIEFWorldwideSdnBhd/exchange-2.0!168
2024-08-03 17:36:09 +00: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 02e3dce557 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
Sorry voucher implementation problem debug

See merge request CIEFWorldwideSdnBhd/exchange-2.0!167
2024-08-03 16:36:40 +00: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
omair saleh bd5ef4a0d2 Merge branch 'supplier-bill-group-dashboard' into 'master'
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier

See merge request CIEFWorldwideSdnBhd/exchange-2.0!165
2024-07-31 16:33:17 +00: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 05ceb32ac2 Sorry Voucher with new features enhancement requested by KS 2024-07-25 17:57:20 +08:00
Dillon Ngo facced08ff Sorry Voucher with new features enhancement requested by KS 2024-07-24 15:18:49 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +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 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
Dillon Ngo c3961d102e AbstractRule class update, with abstract authorized function updated to accept a parameter 2024-07-12 13:27:31 +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