cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,652 Commits 175 Branches 0 Tags
development
Commit Graph

180 Commits

Author SHA1 Message Date
Dillon Ngo 12e6386c04 Merge branch 'dillon/63.7-company-with-multiple-employees' into development 2024-08-21 22:16:22 +08:00
Dillon Ngo be063d985a Merge branch 'dillon/57.1-second-voucher-first-milestone' into development 2024-08-21 22:13:58 +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 d8c53d11d7 Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees 2024-08-21 22:00:46 +08:00
Dillon Ngo 3b14a2d1d0 Merge branch 'dillon/63.6-company-with-multiple-employees' into development 2024-08-20 17:31:08 +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 f44f5d3ffd Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 03:23:12 +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 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-23 19:12:40 +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 27ee291a47 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-10 00:00:20 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng 0cd3e6fd9d add missing receiver in filters to development portal 2024-05-08 15:33:32 +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 d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-01 14:04:41 +08:00
Dillon Ngo eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings 2024-04-01 13:56:25 +08:00
JiaSheng b7505e4501 Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-31 22:21:40 +08:00
JiaSheng 9c08805d32 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-integration 
# Conflicts:
#	routes/api.php
 2024-03-31 22:21:01 +08:00
Dillon Ngo 8ac29fff76 Merge branch 'dillon/51.4-explore-multiple-queues' into 'master' 
Update info log location and queue with high_priority for processing job faster

See merge request CIEFWorldwideSdnBhd/exchange-2.0!160
 2024-03-18 12:10:50 +00:00
Dillon Ngo 064fba660b Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-18 12:58:31 +08:00
Dillon Ngo 122888f39a Vue Polling - update info log location when job is not found 2024-03-18 12:58:17 +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
JiaSheng 875fb79574 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
 2024-03-07 17:16:22 +08:00
JiaSheng 73819e967e open partial refund, categorize refunds section in dashboard 2024-03-06 20:56:24 +08:00
JiaSheng 5c10539824 resolve supplier refund amount to follow white form rate 2024-02-28 20:53:20 +08:00
JiaSheng f9f7cf74b6 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-27 21:50:47 +08:00
edmondlang 28c0aeff77 dont show payment on homepage if it is in refund process 2024-02-26 00:38:25 +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
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
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
JiaSheng 94596baf13 1688 integration 2024-01-25 16:52:06 +08:00
JiaSheng 42becd0cf5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
 2024-01-15 23:47:57 +08:00
JiaSheng c8cabee97b update 2024-01-15 23:41:12 +08:00
Steve Ng 77b93d2c9b fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review 2024-01-05 12:07:53 +08:00
Steve Ng 02a37caf5a change posting date to invoice date for shipping portal when export invoice to autocount 2024-01-03 09:10:30 +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 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
Steve Ng db4e9e6e95 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:06:37 +08:00
Steve Ng f2cc75a898 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:04:38 +08:00
Steve Ng 24a6c8cf53 fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-26 00:02:51 +08:00