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
3b14a2d1d0
Merge branch 'dillon/63.6-company-with-multiple-employees' into development
2024-08-20 17:31:08 +08:00
78c4b4db63
delete refund
2024-08-14 09:44:19 +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
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
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
049d3cc098
fix adding remark error
2024-08-02 01:18:56 +08:00
f94984d01e
added create_po_issue_remark and changed create_login_issue_remark to create_issue_remark
2024-07-29 14:24:39 +08:00
e80ad9a6ec
Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details
2024-07-25 19:34:43 +08:00
bfe1aa5efd
changed api route and api name for issue remark
2024-07-25 14:58:41 +08:00
5b88b0ee2e
added api for po issue remark
2024-07-25 11:27:21 +08:00
c340c9d4d8
1688 work flow
2024-07-23 22:58:36 +08:00
2a04ef5bd2
Merge branch 'dillon/63.2-sorry-voucher' into development
2024-07-23 19:12:40 +08:00
0d60226c44
Sorry Voucher with new features enhancement requested by KS
2024-07-23 19:11:36 +08:00
28a775e926
update 1688 admin workflow
2024-07-23 15:53:53 +08:00
2c568dd179
code review for 1688 login_successful node
2024-07-23 15:09:39 +08:00
d6e45a0817
added fetch_model_attributes
2024-07-23 10:20:15 +08:00
8d48f6f4eb
1688 admin work flow clean up and call api
2024-07-22 01:12:51 +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
2a26c58dda
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
2024-07-17 10:22:21 +08:00
f2f12a6eb4
Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-07-14 19:16:07 +08:00
cb7c38a50d
1688 order reference
2024-07-14 19:15:43 +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
e5bac3db51
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-06-18 23:27:57 +08:00
Jia Sheng
Dillon Ngo
edmondlang
Aqqil Azman