Commit Graph

1417 Commits

Author SHA1 Message Date
Dillon Ngo d9d3e01e9c Laravel Vapor - disable vue polling component 2024-09-30 20:25:37 +08:00
Dillon Ngo d501e51373 Laravel Vapor - sync code from Shipping Portal 2024-09-30 19:56:41 +08:00
Dillon Ngo 0d592ce84f Laravel Vapor - sync code from Shipping Portal 2024-09-30 19:24:32 +08:00
Dillon Ngo db642ebf17 Laravel Vapor - sync code from Shipping Portal 2024-09-30 19:03:55 +08:00
Dillon Ngo fa4479a1e4 Laravel Vapor - code sync with Shipping Portal 2024-09-09 18:41:32 +08:00
Dillon Ngo fabc7522ae Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-09-03 17:42:44 +08:00
Dillon Ngo 87bc029187 Laravel Vapor - debug leadsData.xls cannot be exported, with new component to trigger download 2024-09-02 23:00:28 +08:00
Dillon Ngo 6634c5aa67 Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into 'master'
New voucherify promotion voucher

See merge request CIEFWorldwideSdnBhd/exchange-2.0!177
2024-09-02 14:13:22 +00:00
edmondlang d0c5412e67 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-08-26 22:15:11 +08:00
Jia Sheng 49f3b62398 update to new segment id 2024-08-26 21:22:41 +08:00
Jia Sheng 13118cd4a1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-08-26 21:14:18 +08:00
Jia Sheng 8f34548641 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into manual-po-segment-update 2024-08-26 21:13:51 +08:00
Dillon Ngo 97a8dfbb46 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 13:11:51 +08:00
Dillon Ngo 5b2a29ce0e Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:51:33 +08:00
Dillon Ngo b7fd252bf0 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:43:33 +08:00
Dillon Ngo 834c65ccea Merge branch 'dillon/63.7-company-with-multiple-employees' into 'master'
Allow user account to see and use all vouchers that belongs to all employees...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!176
2024-08-23 12:12:19 +00:00
edmondlang eecb351fb3 fix proforma invoice 2024-08-23 16:59:05 +08:00
Dillon Ngo 811057173d Merge branch 'dillon/63.7-company-with-multiple-employees' into dillon/34.6-jenkins-vapor 2024-08-23 13:36:18 +08:00
edmondlang bedee606bc fix proforma invoice 2024-08-23 11:48:03 +08:00
edmondlang 8963d5ff28 fix Proforma Invoice 2024-08-23 11:04:38 +08:00
Dillon Ngo 2905edef5e Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees 2024-08-21 22:04:09 +08:00
Dillon Ngo 6093ce896e Allow user account to see and use all vouchers that belongs to all employees under the same company in checkout 2024-08-20 17:21:00 +08:00
Dillon Ngo 8331251c98 Merge branch 'dillon/63.5-ui-update' into 'master'
Minor UI update to show Terms requested by KS

See merge request CIEFWorldwideSdnBhd/exchange-2.0!175
2024-08-17 01:12:00 +00:00
edmondlang 78c4b4db63 delete refund 2024-08-14 09:44:19 +08:00
Dillon Ngo 1ba95de72d Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-08-14 02:13:51 +08:00
Dillon Ngo de008d593e Minor UI update to show Terms requested by KS 2024-08-13 15:59:07 +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
Dillon Ngo 3245abe05d Merge branch 'dillon/66.1-payment-bank-details' into 'master'
New feature to allow recipient bank details to be edited independently (from booking by default) for payment

See merge request CIEFWorldwideSdnBhd/exchange-2.0!171
2024-08-11 16:02:27 +00:00
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
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
edmondlang a90c3644c8 Update c2c display amount 2024-08-05 22:27:59 +08:00
Dillon Ngo bce914a3d3 Sorry voucher minor UI update 2024-08-04 21:24:56 +08: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 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
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 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