Commit Graph

551 Commits

Author SHA1 Message Date
Dillon Ngo 0d0ad81544 Merge branch 'dillon/90-e-invoice-c' into vapor/development 2025-06-06 03:23:26 +08:00
Dillon Ngo 893631064b E-Invoice - Partial completion of => Doc Delivery - E-INVOICE, E-CN, E-RN 2025-06-06 03:17:52 +08:00
Dillon Ngo 8f25af3878 Merge branch 'dillon/90-e-invoice-b' into vapor/development 2025-05-10 16:51:31 +08:00
Dillon Ngo 8559332d34 E-Invoice - Initial commit main feature integration 2025-05-10 00:48:20 +08:00
Dillon Ngo 05ffa39c4e E-Invoice - e-Invoice debtor report 2025-05-04 08:37:33 +08:00
Dillon Ngo 91803bafa7 Merge branch 'dillon/74-admin-workflow-2-20250228' into vapor/development 2025-02-28 16:30:39 +08:00
Dillon Ngo 45b005944d Merge branch 'dillon/74-admin-workflow' into dillon/74-admin-workflow-2-20250228 2025-02-28 16:13:01 +08:00
edmondlang 518e4e0baa Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development 2025-02-26 12:55:08 +08:00
edmondlang 000af925f1 fix bug on proforma invoice 2025-02-26 12:54:34 +08:00
edmondlang a80b439c25 Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
# Conflicts:
#	resources/views/pages/pdfs/purchase_order_table.blade.php
#	routes/web.php
2025-02-20 10:32:30 +08:00
edmondlang 941a4e78e1 add a test route to trigger re deploy 2025-02-01 01:08:16 +07:00
Dillon Ngo c7e23a52cd Merge branch 'dillon/74-admin-workflow' into vapor/development 2025-01-03 04:08:45 +08:00
Dillon Ngo 2e625828e7 Admin Workflow - New UI for Admin to go through questions and answers 2025-01-03 01:51:33 +08:00
Dillon Ngo 5fde602a27 Merge branch 'dillon/74-admin-workflow' into vapor/development 2024-12-04 14:15:59 +08:00
Dillon Ngo a76d03d548 Admin Workflow 2024-12-04 14:15:50 +08:00
Dillon Ngo 061ebfb35e Merge branch 'dillon/74-admin-workflow' into vapor/development 2024-12-04 12:33:54 +08:00
Dillon Ngo c1bd61dfc7 Admin Workflow Initial Commit 2024-12-02 23:06:44 +08:00
Dillon Ngo 0824a45b41 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production 2024-11-13 16:52:27 +08:00
Dillon Ngo 6942a5b64d Laravel Vapor - Fix an issue reported by Josephine 20241113, item not showing at /pending_orders 2024-11-13 16:51:58 +08:00
Dillon Ngo 0f286d740b Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-11-12 08:26:37 +08:00
Dillon Ngo 5533df67ed Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production 2024-11-12 08:23:52 +08:00
Dillon Ngo 4a2836d9c7 Laravel Vapor - Remove comments 2024-11-12 08:23:36 +08:00
edmondlang 4fd712350b Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development 2024-11-12 00:17:23 +08:00
Dillon Ngo 07f6729bfb Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-11-07 03:36:54 +08:00
Dillon Ngo b2cb073427 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production 2024-11-07 03:35:49 +08:00
Dillon Ngo 525fbded32 Laravel Vapor - Fix issues reported by Josephine 20241030 2024-11-07 03:34:30 +08:00
Dillon Ngo 6e86579507 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production 2024-11-01 08:05:15 +08:00
Dillon Ngo c0542a6d14 Laravel Vapor - Fix error 404 files 2024-11-01 08:04:57 +08:00
Dillon Ngo a531983070 Laravel Vapor - Fix error 404 files 2024-11-01 07:17:39 +08:00
Jia Sheng 519ed95c54 Merge branch 'white-form-list-upload-bank-slips' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/production
# Conflicts:
#	app/Console/Kernel.php
2024-10-31 22:46:57 +08:00
Jia Sheng 5d299b9ec9 upload bank slip from white form list 2024-10-31 19:38:40 +08:00
Dillon Ngo 1aa6bb9829 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-10-26 03:16:54 +08:00
Dillon Ngo 153338704b Laravel Vapor - New UI and date filter for long qeury report download 2024-10-26 03:15:07 +08:00
Dillon Ngo 23235156c6 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-10-16 05:55:23 +08:00
Dillon Ngo 5e4c864854 Laravel Vapor - Fix Export in Excel through S3 bucket 2024-10-16 05:55:12 +08:00
Dillon Ngo 050d0a96d7 Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development 2024-10-16 05:27:42 +08:00
Dillon Ngo 75af3516f3 Laravel Vapor - Code cleanup 2024-10-16 04:14:07 +08:00
Dillon Ngo c03df14827 Merge branch 'development' into vapor/development 2024-10-15 00:52:46 +08:00
Dillon Ngo 63087a410a Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-10-12 15:37:02 +08:00
Dillon Ngo f6a8f1d31a Laravel Vapor - New UI for admin to download reports (sync code from Shipping Portal) 2024-10-12 15:35:03 +08:00
Dillon Ngo 63d426a4f9 Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-10-12 14:54:38 +08:00
Dillon Ngo 0a8794cb9a Laravel Vapor - New UI for admin to download reports (sync code from Shipping Portal) 2024-10-12 14:54:01 +08:00
Dillon Ngo a07be04c4c Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development 2024-08-14 02:22:35 +08:00
Dillon Ngo 1ba95de72d Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-08-14 02:13:51 +08:00
Jia Sheng 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
edmondlang 08e56acc24 update pending_orders, order by updated_at desc 2024-08-12 14:17:07 +08:00
edmondlang a6174c61bf revert update on pending_orders 2024-08-12 14:10:35 +08:00
Dillon Ngo 9cadaafbe7 Merge branch dillon/66.2-exchange-debug into development 2024-08-12 10:32:56 +08:00
Dillon Ngo 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
edmondlang f58dea32ac revert fixed pending_orders table 2024-08-07 18:27:58 +08:00