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
d1fa27d0bc
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-23 12:25:00 +08:00
a4e4cfaa6f
Merge branch 'dillon/63.7-company-with-multiple-employees' into development
2024-08-23 12:24:39 +08:00
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
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
bef54204ff
fix proforma invoice
2024-08-23 11:38:38 +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
78c6bf36fa
Merge branch 'dillon/63.4-debugging' into development
2024-08-18 19:56:40 +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
886a7b2767
delete refund
2024-08-14 09:48:51 +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
45533c9179
Quick fix on error when lock booking info forwarded to voucherify
2024-08-13 14:55:05 +08:00
ca1d36bac6
fix code merging
2024-08-12 23:39:17 +08:00
204ebf04ca
fix merge code error
2024-08-12 23:19:12 +08:00
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
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
c60a5d3d88
Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-12 22:43:18 +08:00
1d5b5f7865
fix group with currency rate more than 100
2024-08-12 22:41:39 +08:00
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
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
2e09553e26
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-12 22:06:39 +08:00
3b767b2cd3
Merge branch 'dillon/68-exchange-debugging-refund' into development
2024-08-12 22:02:54 +08:00
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
03472dc6be
fix fully refund oustanding
2024-08-12 21:25:48 +08:00
08e56acc24
update pending_orders, order by updated_at desc
2024-08-12 14:17:07 +08:00
a6174c61bf
revert update on pending_orders
2024-08-12 14:10:35 +08:00
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
a36b6f5e57
Comments on code
2024-08-12 10:48:35 +08:00
9cadaafbe7
Merge branch dillon/66.2-exchange-debug into development
2024-08-12 10:32:56 +08:00
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
77e314c52b
Quick fix on recipient_bank_account is null error on frontend
2024-08-12 10:25:57 +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
Dillon Ngo
edmondlang
Jia Sheng