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
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
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
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
5be2b60e1c
update to fix for round up precision
2024-08-08 21:45:00 +08:00
f58dea32ac
revert fixed pending_orders table
2024-08-07 18:27:58 +08:00
8a0005aa17
fix pending_orders table header
2024-08-07 15:40:24 +08:00
764f242e87
fix pending_orders table header
2024-08-07 13:13:26 +08:00
ea06152dbf
update pending_orders table header
2024-08-07 10:51:27 +08:00
7013dd4256
added table headers due to account oversight on the database structure, mixing Marking and Ref No up
2024-08-07 09:58:39 +08:00
039d8deeea
Fix some breaking changes that is already deployed to master branch
2024-08-07 07:23:45 +08:00
32833064b3
Fix some breaking changes that is already deployed to master branch
2024-08-07 06:56:49 +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
53950459e2
show warning on manual po, add periodic 1688 manual po
2024-08-06 22:33:07 +08:00
7e9ffd67e2
rearrange the pending order based on account and PM's request
2024-08-06 19:40:25 +08:00
a90c3644c8
Update c2c display amount
2024-08-05 22:27:59 +08:00
68fa965d7b
Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
...
Sorry voucher minor UI update
See merge request CIEFWorldwideSdnBhd/exchange-2.0!170
2024-08-04 13:28:49 +00:00
bce914a3d3
Sorry voucher minor UI update
2024-08-04 21:24:56 +08:00
5248dfd281
Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
...
Fix a problem where voucherify campaign vouchers limit not displaying with...
See merge request CIEFWorldwideSdnBhd/exchange-2.0!169
2024-08-03 20:04:05 +00:00
79d5471d9e
Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month
2024-08-04 03:56:05 +08:00
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
14f2bd7f2c
Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
...
Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue
See merge request CIEFWorldwideSdnBhd/exchange-2.0!168
2024-08-03 17:36:09 +00:00
bdf0a3afeb
Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue
2024-08-04 01:35:18 +08:00
02e3dce557
Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master'
...
Sorry voucher implementation problem debug
See merge request CIEFWorldwideSdnBhd/exchange-2.0!167
2024-08-03 16:36:40 +00:00
8b50b89449
Sorry voucher debug
2024-08-04 00:32:12 +08:00
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
bd5ef4a0d2
Merge branch 'supplier-bill-group-dashboard' into 'master'
...
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier
See merge request CIEFWorldwideSdnBhd/exchange-2.0!165
2024-07-31 16:33:17 +00:00
7e42bda76e
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier
2024-07-31 22:39:04 +08:00
e80ad9a6ec
Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details
2024-07-25 19:34:43 +08:00
05ceb32ac2
Sorry Voucher with new features enhancement requested by KS
2024-07-25 17:57:20 +08:00
facced08ff
Sorry Voucher with new features enhancement requested by KS
2024-07-24 15:18:49 +08:00
0d60226c44
Sorry Voucher with new features enhancement requested by KS
2024-07-23 19:11:36 +08:00
1467d0880f
update bill group to include the service charge
2024-07-22 00:46:07 +08:00
2a26c58dda
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
2024-07-17 10:22:21 +08:00
Dillon Ngo
edmondlang
Jia Sheng
Aqqil Azman
omair saleh