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
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
5cfd227c44
Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-07 17:41:19 +08:00
698d38db4f
added missing <td>
2024-08-07 17:38:41 +08:00
cfb12dde00
fixed pending_orders table
2024-08-07 17:34:03 +08:00
957389feed
include the fix by edmond, for some reason VSCode is acting wierd today
2024-08-07 17:26:30 +08:00
1d5e97fe8f
removed headers
2024-08-07 17:25:17 +08:00
79666dded5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-07 15:41:51 +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
8648cd401f
Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-07 09:59:15 +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
e732e475bf
Fix some merge conflict done wrong
2024-08-07 07:55:21 +08:00
191a787ecc
Merge branch 'dillon/66.1-payment-bank-details' into development
2024-08-07 07:23:58 +08:00
039d8deeea
Fix some breaking changes that is already deployed to master branch
2024-08-07 07:23:45 +08:00
714e1ad340
Merge branch 'dillon/66.1-payment-bank-details' into development
2024-08-07 07:13:08 +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
9f72823932
Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-06 23:11:14 +08:00
53950459e2
show warning on manual po, add periodic 1688 manual po
2024-08-06 22:33:07 +08:00
966c5522ae
Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-06 19:42:46 +08:00
7e9ffd67e2
rearrange the pending order based on account and PM's request
2024-08-06 19:40:25 +08:00
dea49e7e4a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
2024-08-05 22:31:07 +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
0e7b9d113a
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
2024-08-04 21:25:22 +08: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
a7e422646c
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
2024-08-04 03:56:17 +08: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
f44f5d3ffd
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
2024-08-04 03:23:12 +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
Dillon Ngo
Jia Sheng
edmondlang
Aqqil Azman