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,634 Commits 175 Branches 0 Tags
260fda4c3d82900e77d87ef7d5801cfc81d8dac4
Commit Graph

3634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dillon Ngo 260fda4c3d Merge branch 'dillon/71-exchange-benchmarking' into development 2024-10-09 14:40:50 +08:00
Dillon Ngo 9429480ffb Middleware to log all request path 2024-10-09 14:40:20 +08:00
Dillon Ngo 1e48184238 Merge branch 'dillon/71-exchange-benchmarking' into development 2024-10-09 14:34:23 +08:00
Dillon Ngo e5a1322602 Middleware to log all request path 2024-10-09 14:33:46 +08:00
Dillon Ngo 6b68194294 Merge branch 'dillon/71-exchange-benchmarking' into development 2024-10-09 14:23:36 +08:00
Dillon Ngo 3dfc0d9b06 Middleware to log all request path 2024-10-09 14:21:52 +08:00
Jia Sheng 8840bf60ff Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-09-24 22:09:24 +08:00
Jia Sheng c76587d08a update on ambank csv file format 2024-09-24 22:08:49 +08:00
Jia Sheng 6cbc7539f4 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement 
# Conflicts:
#	app/Classes/Modules/Accounting/ControllersLogic/ImportAmbankStatementLogic.php
#	app/Classes/Modules/Accounting/ControllersLogic/ImportCiefLiteStatementLogic.php
#	app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
 2024-09-23 21:00:19 +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 16f3b27b5f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-26 22:16:02 +08: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 e736faddd8 Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-26 21:24:30 +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 3363735695 Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development 2024-08-25 13:12:11 +08:00
Dillon Ngo 97a8dfbb46 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 13:11:51 +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 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 84da7086f6 voucher_campaigns table update for development environment only 2024-08-24 18:42:17 +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 97b783d668 Merge branch 'fix-proforma-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 16:59:48 +08:00
edmondlang eecb351fb3 fix proforma invoice 2024-08-23 16:59:05 +08:00
Dillon Ngo d1fa27d0bc Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 12:25:00 +08:00
Dillon Ngo a4e4cfaa6f Merge branch 'dillon/63.7-company-with-multiple-employees' into development 2024-08-23 12:24:39 +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 6e451b329c Merge branch 'fix-proforma-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 11:48:24 +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 755f8c266a Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 11:05:20 +08:00
edmondlang 8963d5ff28 fix Proforma Invoice 2024-08-23 11:04:38 +08:00
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 78c6bf36fa Merge branch 'dillon/63.4-debugging' into development 2024-08-18 19:56:40 +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
Dillon Ngo 89ca4b48ac Merge branch 'dillon/63.5-ui-update' into development 2024-08-17 09:07:29 +08: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