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
5d299b9ec9
upload bank slip from white form list
2024-10-31 19:38:40 +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
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
9cadaafbe7
Merge branch dillon/66.2-exchange-debug into development
2024-08-12 10:32:56 +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
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
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
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
6b2f674c17
Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-02 01:20:15 +08:00
31282492fe
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into admin-1688-work-flow-aqqill
2024-07-21 18:31:23 +08:00
1ac4c58a18
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-07-04 23:04:12 +08:00
659a48d7ad
update export refund
2024-07-04 23:03:43 +08:00
975ba1751c
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-07-02 20:47:19 +08:00
cf17e9bb11
order export refund by created at
2024-07-02 20:46:53 +08:00
60b1bbeee6
admin 1688 work flow template
2024-06-21 15:11:10 +08:00
e7a63149b3
revert update pending_orders, exclude approved refunds order from pending_orders list
2024-06-18 13:43:57 +08:00
cda6be373f
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-06-18 12:49:40 +08:00
c91273d15b
update pending_orders, exclude approved refunds order from pending_orders list
2024-06-18 12:49:12 +08:00
ab4f56e4c1
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
2024-05-23 13:37:25 +08:00
6fd7b2f610
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-update
2024-05-22 23:37:47 +08:00
40d20dc42e
update check duplicate refunds
2024-05-22 23:26:54 +08:00
a17812be3b
check duplicate refunds
2024-05-22 23:22:44 +08:00
5425c37e52
-request multiple refund
...
-show remark for refund in dashboard
-show refund remark in export page
2024-05-22 19:28:42 +08:00
d0c009443b
Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-05-20 11:42:16 +08:00
3f5c735a43
update export currency vendor order
2024-05-20 11:41:21 +08:00
3b4f3281b1
Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-05-17 10:46:54 +08:00
16a6954a76
changed route view for supplier_order_groupInvoice ti ...group_invoice
2024-05-16 19:19:55 +08:00
0797f26fe1
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module
2024-05-16 17:58:47 +08:00
b49a44c99b
feat: invoice export
2024-05-16 12:25:53 +08:00
7f2af7adf4
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-05-16 10:56:23 +08:00
531b65686f
export white form transactions
2024-05-16 10:56:02 +08:00
1c8d135074
feat: pdf export
2024-05-15 17:38:57 +08:00
a8a7d0eccd
refactor: export currency vendor order routes
2024-05-13 09:59:29 +08:00
27ee291a47
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-05-10 00:00:20 +08:00
Jia Sheng
edmondlang
Dillon Ngo
Aqqil Azman
JiaSheng