ce5045e14f
Merge branch 'white-form-list-upload-bank-slips' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# app/Console/Kernel.php
2024-10-31 19:43:27 +08:00
bf5dd998e0
New website under maintenance page
2024-10-15 21:24:34 +08:00
d59a5cf0c3
Middleware to log all request path
2024-10-10 23:11:53 +08:00
87087f5502
Merge branch 'dillon/71-exchange-benchmarking' into development
2024-10-10 23:10:21 +08:00
7be8b3b861
Middleware to log all request path
2024-10-10 23:10:07 +08:00
1faeb0e535
Merge branch 'dillon/71-exchange-benchmarking' into development
2024-10-10 23:04:59 +08:00
89c92a1730
Middleware to log all request path
2024-10-10 23:04:46 +08:00
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
c76587d08a
update on ambank csv file format
2024-09-24 22:08:49 +08:00
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
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
d0c5412e67
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
2024-08-26 22:15:11 +08:00
e736faddd8
Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-26 21:24:30 +08:00
49f3b62398
update to new segment id
2024-08-26 21:22:41 +08:00
13118cd4a1
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
2024-08-26 21:14:18 +08:00
8f34548641
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into manual-po-segment-update
2024-08-26 21:13:51 +08:00
3363735695
Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development
2024-08-25 13:12:11 +08:00
97a8dfbb46
Voucherify - New promotion voucher (PROM150%) setup
2024-08-25 13:11:51 +08:00
8b3afd7385
Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development
2024-08-25 12:53:22 +08:00
5b2a29ce0e
Voucherify - New promotion voucher (PROM150%) setup
2024-08-25 12:51:33 +08:00
b7fd252bf0
Voucherify - New promotion voucher (PROM150%) setup
2024-08-25 12:43:33 +08:00
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
97b783d668
Merge branch 'fix-proforma-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-23 16:59:48 +08:00
eecb351fb3
fix proforma invoice
2024-08-23 16:59:05 +08:00
6e451b329c
Merge branch 'fix-proforma-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-23 11:48:24 +08:00
bedee606bc
fix proforma invoice
2024-08-23 11:48:03 +08:00
755f8c266a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-23 11:05:20 +08:00
8963d5ff28
fix Proforma Invoice
2024-08-23 11:04:38 +08:00
12e6386c04
Merge branch 'dillon/63.7-company-with-multiple-employees' into development
2024-08-21 22:16:22 +08:00
be063d985a
Merge branch 'dillon/57.1-second-voucher-first-milestone' into development
2024-08-21 22:13:58 +08:00
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
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
3b14a2d1d0
Merge branch 'dillon/63.6-company-with-multiple-employees' into development
2024-08-20 17:31:08 +08:00
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
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
89ca4b48ac
Merge branch 'dillon/63.5-ui-update' into development
2024-08-17 09:07:29 +08:00
78c4b4db63
delete refund
2024-08-14 09:44:19 +08:00
de008d593e
Minor UI update to show Terms requested by KS
2024-08-13 15:59:07 +08:00
3b767b2cd3
Merge branch 'dillon/68-exchange-debugging-refund' into development
2024-08-12 22:02:54 +08:00
9cadaafbe7
Merge branch dillon/66.2-exchange-debug into development
2024-08-12 10:32:56 +08:00
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
3245abe05d
Merge branch 'dillon/66.1-payment-bank-details' into 'master'
...
New feature to allow recipient bank details to be edited independently (from booking by default) for payment
See merge request CIEFWorldwideSdnBhd/exchange-2.0!171
2024-08-11 16:02:27 +00:00
602b69dcba
show payment method and date
2024-08-09 19:47:58 +08:00
3767b41522
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-08 21:45:38 +08:00
5be2b60e1c
update to fix for round up precision
2024-08-08 21:45:00 +08:00
e732e475bf
Fix some merge conflict done wrong
2024-08-07 07:55:21 +08:00
714e1ad340
Merge branch 'dillon/66.1-payment-bank-details' into development
2024-08-07 07:13:08 +08:00
6160ec0651
Merge branch 'master' into dillon/66.1-payment-bank-details
2024-08-07 06:49:31 +08:00
3bd708ed0e
Recipient Bank Details to follow payment overriding the default attached to Booking
2024-08-07 06:46:17 +08:00
9f72823932
Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-06 23:11:14 +08:00
Jia Sheng
Dillon Ngo
edmondlang