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

1582 Commits

Author SHA1 Message Date
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
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
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 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 bef54204ff fix proforma invoice 2024-08-23 11:38: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 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 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 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
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
Dillon Ngo 2e09553e26 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-12 22:06:39 +08:00
Dillon Ngo 3b767b2cd3 Merge branch 'dillon/68-exchange-debugging-refund' into development 2024-08-12 22:02:54 +08:00
Jia Sheng 74d3b901ea Merge branch 'fix-refund-outstanding' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/web.php
 2024-08-12 21:26:57 +08:00
Jia Sheng 03472dc6be fix fully refund oustanding 2024-08-12 21:25:48 +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
Jia Sheng 3767b41522 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-08 21:45:38 +08:00
Jia Sheng 5be2b60e1c update to fix for round up precision 2024-08-08 21:45:00 +08:00
Dillon Ngo 191a787ecc Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:23:58 +08:00
Dillon Ngo 039d8deeea Fix some breaking changes that is already deployed to master branch 2024-08-07 07:23:45 +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 32833064b3 Fix some breaking changes that is already deployed to master branch 2024-08-07 06:56:49 +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 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 bdf0a3afeb Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue 2024-08-04 01:35:18 +08:00
Dillon Ngo b0a1971ca1 Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 00:32:26 +08:00
Dillon Ngo 8b50b89449 Sorry voucher debug 2024-08-04 00:32:12 +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 cb9090ec03 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-31 22:39:46 +08:00