Commit Graph

225 Commits

Author SHA1 Message Date
Dillon Ngo a4681bee3d Merge branch 'dillon/83-yd-order-tracking-query-ui' into vapor/development 2025-03-22 11:40:42 +08:00
Dillon Ngo d5a9e3923e New UI to show YD Order Tracking infomation 2025-03-22 11:39:31 +08:00
Dillon Ngo cda80293a0 Merge branch 'dillon/79-group-payment-approval-not-working' into vapor/development 2025-02-01 21:50:05 +08:00
edmondlang 236b3769f8 add more district in seeder 2025-01-21 12:35:16 +08:00
Dillon Ngo 798bf4e70e Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production 2024-11-14 12:02:24 +08:00
Dillon Ngo 04b9861eea Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development 2024-11-14 11:48:40 +08:00
Dillon Ngo aa833f7a9f Laravel Vapor - YD API integration code rewrite to fix eta/etd 2024-11-14 11:48:26 +08:00
Dillon Ngo 8dd3fbf97a Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production 2024-11-13 21:38:36 +08:00
Dillon Ngo 3bb0affba3 Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development 2024-11-11 12:50:34 +08:00
Dillon Ngo 26812f723a Laravel Vapor - YD API integration code rewrite to fix eta/etd 2024-11-11 12:48:52 +08:00
edmondlang e90f84d5dc Merge branch 'vapor/tax-rebate-qr' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development
# Conflicts:
#	app/Models/Order.php
2024-10-22 23:00:25 +08:00
edmondlang 4a65031aa3 tax rebate qr 2024-10-22 22:58:06 +08:00
Dillon Ngo e5e2cb40ae Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-10-04 02:13:54 +08:00
Dillon Ngo 0e6d1b7633 Laravel Vapor - New UI for admin to download reports 2024-10-04 02:13:41 +08:00
Dillon Ngo 3117ea59e6 Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-09-26 06:09:55 +08:00
Dillon Ngo 3e888c7c08 Laravel Vapor - Fix missing packages summary info on customer page 2024-09-26 06:09:29 +08:00
Dillon Ngo d0c39b7221 Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development 2024-09-19 04:49:45 +08:00
Dillon Ngo c0ff60c5e7 Laravel Vapor - New table and command to handle delayed jobs 2024-09-19 04:49:31 +08:00
Dillon Ngo 512e5b1aea Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development 2024-09-12 22:36:57 +08:00
Dillon Ngo 2e871cd42f Laravel Vapor - New index for packages table 2024-09-12 22:36:03 +08:00
Dillon Ngo a69ab986f3 Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development 2024-09-11 06:52:06 +08:00
Dillon Ngo 3d0bdd70d5 Laravel Vapor - New Index for order table 2024-09-11 06:51:46 +08:00
Dillon Ngo 826e6125a5 Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development 2024-07-01 11:00:53 +08:00
Dillon Ngo 6a20acbb40 Laravel Vapor - New indexes through migration 2024-07-01 11:00:32 +08:00
edmondlang 4087df6649 Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
#	app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
#	app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
#	app/Models/Address.php
2024-06-12 12:06:00 +08:00
edmondlang 9d0924c674 address extra fields 2024-06-12 12:02:31 +08:00
Dillon Ngo bb0ecc42c3 Merge branch 'dillon/62-fixes-and-new-features' into development 2024-06-02 10:25:30 +08:00
Dillon Ngo df3024186b Redirect a link + New terms and conditions checkbox when creating an order 2024-06-02 09:56:56 +08:00
Omair Saleh 863dc94dad Revert "Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'""
This reverts commit a49920973e.
2024-04-18 02:09:16 +08:00
Omair Saleh a49920973e Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'"
This reverts commit 7cd376a9b5, reversing
changes made to 6176135f85.
2024-04-16 13:21:07 +08:00
Dillon Ngo b26fea9a49 Merge branch 'dillon/58-shipping-portal-sst' into development 2024-04-07 10:43:32 +08:00
Dillon Ngo 68ce8373e9 SST Impelemtation 2024-04-07 09:27:09 +08:00
Dillon Ngo 4e0f04eae2 Merge branch 'dillon/46.8-warehouse-storage-charges-fixes' into development 2024-03-09 21:43:57 +08:00
Dillon Ngo 56aec95d50 Attempt to resolve gitlab pipeline job error 2024-03-09 21:43:48 +08:00
edmondlang bc6a31d458 Merge branch 'permits-reminder' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-01-30 00:38:46 +08:00
edmondlang ee65e5fcd1 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
#	routes/web.php
2024-01-30 00:35:50 +08:00
edmondlang 006a327a5f Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into permits-reminder 2024-01-30 00:34:51 +08:00
Dillon Ngo 064ee3e41a Implement a solution to selectively waived a selected storage invoice 2024-01-24 06:50:18 +08:00
edmondlang 3375934651 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into permits-reminder
# Conflicts:
#	routes/api.php
2024-01-16 21:16:11 +08:00
edmondlang c79f58d246 permits reminder first commit 2024-01-16 21:15:29 +08:00
edmondlang ce86dda0b9 comment on route logs table 2024-01-11 15:52:45 +08:00
Dillon Ngo 8f695401d2 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-01-04 02:33:59 +08:00
edmondlang 55f7637d9c Merge branch 'add-attached-timestamp' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2023-12-30 16:58:29 +08:00
edmondlang 1578085bab add attached timestamp 2023-12-30 16:55:45 +08:00
Dillon Ngo 8ea00e0383 Proof of concept - Vue Polling - Performance Improvement and tweaking for better user experience 2023-12-24 21:59:41 +08:00
Dillon Ngo 18df1c0c7b Proof of concept - Vue Polling a workaround for AWS API Gateway limitation 2023-12-20 14:47:56 +08:00
Dillon Ngo e7279ec4d0 Merge branch 'master' into dillon/46-warehouse-storage-charges-2-merge-conflict 2023-12-11 21:29:06 +08:00
Dillon Ngo 4794251a0c Merge branch 'dillon/48-feedback-form-improvement' into development 2023-12-09 12:50:57 +08:00
Dillon Ngo bef2c05c06 Merge branch 'dillon/45-air-shipment-2-update-with-master' into development 2023-12-09 12:28:25 +08:00
Dillon Ngo 9384236294 Added new columns to handle multiple different kind of notification from WePost 2023-12-09 12:27:57 +08:00