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,037 Commits 175 Branches 0 Tags
white-form-list-upload-bank-slips
Commit Graph

3037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jia Sheng 5d299b9ec9 upload bank slip from white form list 2024-10-31 19:38:40 +08:00
Dillon Ngo ac41cd4948 Merge branch 'dillon/70-laravel-vapor' into 'master' 
Laravel Vapor - Disable all schedule commands + maintenance page

See merge request CIEFWorldwideSdnBhd/exchange-2.0!179
 2024-10-15 17:15:52 +00:00
Dillon Ngo 5ca86b4982 Laravel Vapor - Disable all schedule commands 2024-10-15 21:25:40 +08:00
Dillon Ngo bf5dd998e0 New website under maintenance page 2024-10-15 21:24:34 +08:00
Dillon Ngo c139a8d1f8 Merge branch 'dillon/71-exchange-benchmarking' into 'master' 
Middleware to log all request path (preparation for migration to Laravel Vapor)

See merge request CIEFWorldwideSdnBhd/exchange-2.0!178
 2024-10-10 15:17:01 +00:00
Dillon Ngo d59a5cf0c3 Middleware to log all request path 2024-10-10 23:11:53 +08:00
Dillon Ngo 7be8b3b861 Middleware to log all request path 2024-10-10 23:10:07 +08:00
Dillon Ngo 89c92a1730 Middleware to log all request path 2024-10-10 23:04:46 +08:00
Dillon Ngo 2f0f67f000 Middleware to log all request path 2024-10-09 14:57:22 +08:00
Dillon Ngo b6fe8fbf10 Middleware to log all request path 2024-10-09 14:47:34 +08:00
Dillon Ngo e0fb9d63d7 Middleware to log all request path 2024-10-09 14:44:23 +08:00
Dillon Ngo 9429480ffb Middleware to log all request path 2024-10-09 14:40:20 +08:00
Dillon Ngo e5a1322602 Middleware to log all request path 2024-10-09 14:33:46 +08:00
Dillon Ngo 3dfc0d9b06 Middleware to log all request path 2024-10-09 14:21:52 +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 8c9264b26a Solve a problem where voucher cannot be added to a user account if user does not exist at Voucherify 2024-08-23 12:24:18 +08:00
edmondlang bedee606bc fix proforma invoice 2024-08-23 11:48:03 +08:00
edmondlang bef54204ff fix proforma invoice 2024-08-23 11:38:38 +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 886a7b2767 delete refund 2024-08-14 09:48:51 +08:00
edmondlang 78c4b4db63 delete refund 2024-08-14 09:44:19 +08:00
Dillon Ngo de008d593e Minor UI update to show Terms requested by KS 2024-08-13 15:59:07 +08:00
Dillon Ngo 45533c9179 Quick fix on error when lock booking info forwarded to voucherify 2024-08-13 14:55:05 +08:00
edmondlang ca1d36bac6 fix code merging 2024-08-12 23:39:17 +08:00
edmondlang 204ebf04ca fix merge code error 2024-08-12 23:19:12 +08:00
edmondlang f24c1b6263 Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding 2024-08-12 23:11:12 +08:00
edmondlang b798f5f92b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding 
# Conflicts:
#	app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
 2024-08-12 23:10:42 +08:00
Jia Sheng 1d5b5f7865 fix group with currency rate more than 100 2024-08-12 22:41:39 +08:00
Dillon Ngo f3303493c4 Merge branch 'dillon/68-exchange-debugging-refund' into 'master' 
Fix an error with refund for transaction that used a voucher earlier, get...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!174
 2024-08-12 14:30:09 +00:00
Dillon Ngo 13dd19d0a1 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 22:29:04 +08:00
Jia Sheng 03472dc6be fix fully refund oustanding 2024-08-12 21:25:48 +08:00
edmondlang 08e56acc24 update pending_orders, order by updated_at desc 2024-08-12 14:17:07 +08:00
edmondlang a6174c61bf revert update on pending_orders 2024-08-12 14:10:35 +08:00
Dillon Ngo a87862d724 Merge branch 'dillon/66.2-exchange-debug' into 'master' 
Comments on code

See merge request CIEFWorldwideSdnBhd/exchange-2.0!173
 2024-08-12 02:50:34 +00:00
Dillon Ngo a36b6f5e57 Comments on code 2024-08-12 10:48:35 +08:00
Dillon Ngo 92dc84a590 Merge branch 'dillon/66.2-exchange-debug' into 'master' 
Quick fix on recipient_bank_account is null error on frontend

See merge request CIEFWorldwideSdnBhd/exchange-2.0!172
 2024-08-12 02:27:57 +00: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 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