Commit Graph

123 Commits

Author SHA1 Message Date
Dillon Ngo def171a2b0 Merge branch 'dillon/76-new-voucherify-voucher' into vapor/development 2024-12-12 04:01:53 +08:00
Dillon Ngo 0a72c05ac6 New voucher CIEFPC30 setup with new business logic 2024-12-12 04:01:18 +08:00
Dillon Ngo 84daa9e4c9 New voucher CIEFPC30, development environment data patch 2024-12-09 09:46:38 +08:00
Dillon Ngo 86320a8bb3 Merge branch 'dillon/76-new-voucherify-voucher' into vapor/development 2024-12-09 08:56:19 +08:00
Dillon Ngo 0ab5ed76a5 New voucher CIEFPC30 setup with new business logic - Initial Commit 2024-12-09 05:23:53 +08:00
Dillon Ngo 061ebfb35e Merge branch 'dillon/74-admin-workflow' into vapor/development 2024-12-04 12:33:54 +08:00
Dillon Ngo a24f41e5bd Admin Workflow 2024-12-04 11:18:47 +08:00
Dillon Ngo b360019668 Admin Workflow 2024-12-02 23:57:47 +08:00
Dillon Ngo c1bd61dfc7 Admin Workflow Initial Commit 2024-12-02 23:06:44 +08:00
Dillon Ngo 426667eb3c Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-11-07 07:17:05 +08:00
Dillon Ngo f11adef938 Laravel Vapor - Fix a problem on downloading Wallet Transaction History 2024-11-07 07:16:04 +08:00
Dillon Ngo caa0d3011f Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-10-15 04:48:09 +08:00
Dillon Ngo a91a323e54 Laravel Vapor - New index for admin /customers page 2024-10-15 04:47:52 +08:00
Dillon Ngo f673b0c8b9 Laravel Vapor - New index for admin /customers page 2024-10-15 04:47:14 +08:00
Dillon Ngo 5d6d6552ea Voucherify data patch for development environment only 2024-10-14 03:17:28 +08:00
Dillon Ngo 0538a9cf8f Merge branch 'dillon/63.8-development-branch-amendment' into development 2024-08-25 12:53:52 +08:00
Dillon Ngo 8b3afd7385 Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development 2024-08-25 12:53:22 +08:00
Dillon Ngo b7fd252bf0 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:43:33 +08:00
Dillon Ngo 84da7086f6 voucher_campaigns table update for development environment only 2024-08-24 18:42:17 +08:00
Dillon Ngo 714e1ad340 Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:13:08 +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
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
edmondlang 6b2f674c17 Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-02 01:20:15 +08:00
edmondlang c340c9d4d8 1688 work flow 2024-07-23 22:58:36 +08:00
Dillon Ngo 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-23 19:12:40 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +08:00
edmondlang 28a775e926 update 1688 admin workflow 2024-07-23 15:53:53 +08:00
edmondlang 8d48f6f4eb 1688 admin work flow clean up and call api 2024-07-22 01:12:51 +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
edmondlang f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/api.php
#	routes/web.php
2024-04-25 16:50:48 +08:00
edmondlang 631282eaf5 add remarks table migration 2024-04-24 18:09:22 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
Dillon Ngo 7ba34965e3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development 2024-03-18 12:22:31 +08:00
Dillon Ngo 36cde82a19 Send welcome email with voucher to user upon successful verification of customer email adddress 2024-03-14 15:52:20 +08:00
Sai0224 b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-24 12:16:33 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
Sai0224 ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-21 21:14:51 +08:00
Dillon Ngo f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'"
This reverts merge request !157
2024-02-11 10:28:05 +00:00
Dillon Ngo ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"
This reverts merge request !152
2024-02-11 09:53:09 +00:00
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
2024-02-11 09:16:08 +00:00
Dillon Ngo dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +08:00
Dillon Ngo 6da337b9dc Code sync from Shipping Portal, independent deployment of Vue Polling, additional amendment to run Vue Polling at /billings 2023-12-30 01:26:58 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
Steve Ng ca07fc161e add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:49:36 +08:00
Steve Ng 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang 0abebbe167 comment route_logs migration 2023-12-19 00:12:18 +08:00