Commit Graph

286 Commits

Author SHA1 Message Date
Dillon Ngo 258a20f118 Laravel Vapor - Fix a 504 error at /bookings/urgent page 2024-10-15 16:02:23 +08:00
Dillon Ngo c9d3bc4b93 Laravel Vapor - Fix a 504 error at /bookings/urgent page 2024-10-15 15:40:49 +08:00
Dillon Ngo 10b0e2340c Laravel Vapor - Fix a 504 error at /bookings/urgent page 2024-10-15 15:15:07 +08:00
Dillon Ngo c44017486c Laravel Vapor - Fix a 504 error at /bookings/urgent page 2024-10-15 14:55:11 +08:00
Dillon Ngo fabc7522ae Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-09-03 17:42:44 +08:00
Dillon Ngo b7fd252bf0 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:43:33 +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
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 1ba95de72d Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-08-14 02:13:51 +08:00
Dillon Ngo a36b6f5e57 Comments on code 2024-08-12 10:48:35 +08:00
Dillon Ngo 77e314c52b Quick fix on recipient_bank_account is null error on frontend 2024-08-12 10:25:57 +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 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 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 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +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 d1f319582a alipay service 2024-07-13 14:12:54 +08:00
Dillon Ngo a2276ac977 Merge branch 'master' into dillon/34.4-jenkins-vapor 2024-05-25 02:06:50 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
Dillon Ngo f9d7e48b58 Merge branch 'master' into dillon/34.3-jenkins-vapor 2024-05-17 14:55:01 +08:00
edmondlang 8fa956e0d7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-10 00:17:08 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +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 1786ae63f3 Laravel Vapor - Created new resource files for Vue Polling Component 2024-03-26 03:50:06 +08:00
Dillon Ngo 5edf52eb5f Vue Polling - Revert back to original code, created new resource files for vue polling component, see next commit 2024-03-26 03:25:24 +08:00
Dillon Ngo bd7fd92cf0 Laravel Vapor - Delete comments 2024-03-24 20:14:38 +08:00
Dillon Ngo 93b44d816f Merge branch 'master' into dillon/34.1-jenkins-vapor 2024-03-22 14:05:47 +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 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
edmondlang 9aa75630ff update code for refund booking 2024-02-21 00:20:45 +08:00
edmondlang 48247abbd4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
2024-02-19 01:00:51 +08:00
edmondlang 609b71f549 code upfate for refund booking 2024-02-19 00:57:42 +08:00
edmondlang f083434390 update refund ui and logic 2024-02-16 14:59:11 +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 139f3b844c Merge branch 'dillon/51-vue-polling-experimental-2' into dillon/34-jenkins-vapor 2023-12-30 18:48:00 +08:00
Dillon Ngo bf5ea2b2f2 Code sync from Shipping Portal, independent deployment of Vue Polling, Performance Improvement and tweaking for better user experience 2023-12-30 18:35:17 +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 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
Dillon Ngo 5fd242b424 Vue Polling - Code sycn with fixes from Shipping Portal (dillon/51-vue-polling-experimental-1) 2023-12-18 17:21:57 +08:00
Dillon Ngo bf9b00c85f Vue Polling - Code sycn with fixes from Shipping Portal (dillon/51-vue-polling-experimental-1) 2023-12-18 16:59:48 +08:00