1aa6bb9829
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development
2024-10-26 03:16:54 +08:00
153338704b
Laravel Vapor - New UI and date filter for long qeury report download
2024-10-26 03:15:07 +08:00
23235156c6
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development
2024-10-16 05:55:23 +08:00
5e4c864854
Laravel Vapor - Fix Export in Excel through S3 bucket
2024-10-16 05:55:12 +08:00
050d0a96d7
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development
2024-10-16 05:27:42 +08:00
75af3516f3
Laravel Vapor - Code cleanup
2024-10-16 04:14:07 +08:00
c03df14827
Merge branch 'development' into vapor/development
2024-10-15 00:52:46 +08:00
63087a410a
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
2024-10-12 15:37:02 +08:00
f6a8f1d31a
Laravel Vapor - New UI for admin to download reports (sync code from Shipping Portal)
2024-10-12 15:35:03 +08:00
63d426a4f9
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
2024-10-12 14:54:38 +08:00
0a8794cb9a
Laravel Vapor - New UI for admin to download reports (sync code from Shipping Portal)
2024-10-12 14:54:01 +08:00
a07be04c4c
Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development
2024-08-14 02:22:35 +08:00
1ba95de72d
Merge branch 'master' into dillon/34.6-jenkins-vapor
2024-08-14 02:13:51 +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
751e388815
Merge branch 'dillon/34.4-jenkins-vapor' into dillon/34.5-jenkins-vapor
2024-06-22 12:18:59 +08:00
4ca90c3f29
Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development
2024-06-22 11:37:30 +08:00
7f4a8ca911
Merge branch 'dillon/34.4-jenkins-vapor' into dillon/34.5-jenkins-vapor
2024-06-22 11:35:24 +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
22b1b5cbcb
Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development
2024-06-18 11:43:51 +08:00
fcaee29be3
Export pdf file from Laravel Vapor through S3 bucket
2024-06-18 11:38:43 +08:00
Dillon Ngo
Jia Sheng
edmondlang
Aqqil Azman