Commit Graph

1391 Commits

Author SHA1 Message Date
Marshal
08977fcd19 feat(bookings): add estimated shipment date handling and validation for binding shipment day 2026-06-25 00:28:54 +00:00
Marshal
d4c58e7d78 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 23:56:07 +00:00
Marshal
e0c3044933 feat(train-sets): implement multi-locomotive support for train sets
- Added TrainSetLocomotive entity to link multiple locomotives to a train set.
- Updated TrainSet entity to include a OneToMany relationship with TrainSetLocomotive.
- Modified the train scheduling logic to require at least two locomotives for a train set.
- Enhanced the UI components to support selecting multiple locomotives.
- Introduced new permissions for viewing customs clearance.
- Updated migrations to create the train_set_locomotives table and backfill existing data.
- Implemented utility functions for managing train numbers based on cargo type and direction.
- Added tests for train number utilities to ensure correct functionality.
2026-06-24 23:54:45 +00:00
Marshal
15ab9f906e feat(bookings): enhance booking process with customs clearing and document handling
- Update bookings service to prioritize uploaded documents over profile snapshots.
- Refactor pricing data seeder to remove unused service types and streamline cargo type seeding.
- Add customs clearing information to BookingRouteServiceCard, displaying agent details if applicable.
- Extend BookingDetail type to include customs clearing options.
- Modify NewBookingPage to remove the scheduling step, integrating estimated shipment date into the route step.
- Update StepIndicator to reflect the new step structure.
- Revise document handling in StepDocuments to allow for user uploads while displaying onboarding documents.
- Adjust Step2ServiceType to manage customs clearing agent input based on service type.
- Implement shipment date input in Step4Route for one-time bookings.
- Revise Step8Review to reflect changes in document handling and scheduling.
2026-06-24 23:37:55 +00:00
hagiye
503878110f DJbouti port Export Unloading 2026-06-24 23:25:34 +03:00
natib21
a1bb458a91 fix ui 2026-06-24 14:37:45 +00:00
natib21
f7bdd19a07 fix ui 2026-06-24 14:32:04 +00:00
natib21
c43201639d Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:25:27 +00:00
natib21
5b9fcc0f89 fix btn color 2026-06-24 14:25:04 +00:00
yaschalew
28675cd5dc fix vehicle 2026-06-24 17:05:25 +03:00
yaschalew
6239358bf2 fix url 2026-06-24 16:56:02 +03:00
hagiye
46bfa9cb87 Release Order plus Storage Allocation Rule and fee 2026-06-24 16:21:45 +03:00
Nathnael
083a87ab9e fix: rm the otp on signup 2026-06-24 13:21:03 +00:00
yaschalew
cefcaa7184 fix conflict 2026-06-24 16:18:35 +03:00
hagiye
060d6b5988 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:51:03 +03:00
Nathnael
2261675e21 chore: add api errors 2026-06-24 12:48:42 +00:00
Nathnael
b31b27ce52 fix: the company onboading flow 2026-06-24 12:45:10 +00:00
hagiye
9719bd02d7 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:27:38 +03:00
hagiye
c69dd3c238 Release Order plus Storage fee 2026-06-24 15:23:50 +03:00
Nathnael
66d3ae8093 fix: onboarding 2026-06-24 12:18:31 +00:00
Nathnael
9b48955eaf feat: centralized the user onboaridn requriements 2026-06-24 11:50:28 +00:00
hagiye
8ee31789c6 merge conflict fix 2026-06-24 12:31:59 +03:00
yaschalew
b455d81ede Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:30:57 +03:00
yaschalew
833e55385d fix 2026-06-24 12:30:43 +03:00
natib21
79860c807c fix 2026-06-24 09:30:11 +00:00
natib21
b1e0a403a6 fix 2026-06-24 09:02:09 +00:00
Nathnael
c9694177d8 style: ui improvement to kpi in portal 2026-06-24 08:55:09 +00:00
yaschalew
f99e6b87db Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 11:21:44 +03:00
yaschalew
a1b72e591e fix issue 2026-06-24 11:21:13 +03:00
Nathnael
9d5c195d94 style: improvment to the booking 2026-06-24 08:16:49 +00:00
natib21
7fed72ea7a fix 2026-06-24 08:16:24 +00:00
marshal
bd7c97a8a8 fix(freight-web): switch API_BASE_URL from localhost to production 2026-06-24 11:15:45 +03:00
marshal
b1dfdeb4c5 fix(freight-web): comment out unused onBlur prop and UserCheck import 2026-06-24 11:09:45 +03:00
marshal
fd4cc8f080 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 10:58:57 +03:00
yaschalew
5897dc342d fix conflict 2026-06-24 10:08:19 +03:00
hagiye
0255adffe6 changes 2026-06-24 09:56:12 +03:00
marshal
baf12fd38e Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 04:33:15 +03:00
Marshal
d7688fce21 feat(freight-web): polish document clearance, general contracts list and detail UIs 2026-06-24 01:32:40 +00:00
marshal
9bd9ff99d1 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 03:40:30 +03:00
Marshal
3655e50f2e feat(bookings): refactor location handling for first/last mile and improve geocoding logic 2026-06-24 00:39:43 +00:00
Marshal
7ec06f2ff0 feat(bookings): enhance operation request flow and add location selection for first/last mile 2026-06-24 00:36:01 +00:00
Marshal
5be181aba8 feat(bookings): enhance operation request flow and add location selection for first/last mile 2026-06-24 00:35:37 +00:00
marshal
5d3aa1b66a Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 03:21:22 +03:00
Marshal
8ef7641048 feat(bookings): add contract validity window and customs clearing features
- Introduced contract validity days, valid from and valid until fields in the booking model.
- Updated booking acceptance logic to enforce validity window constraints.
- Added customs clearing agent and first/last mile pickup/delivery coordinates to the booking model.
- Implemented LocationPicker component for address selection with map integration using Leaflet.
- Enhanced booking review step to display customs clearing agent details.
- Updated API and DTOs to accommodate new booking fields.
- Added migration scripts for database schema changes.
- Implemented tests for booking acceptance and DTO transformations.
2026-06-24 00:21:01 +00:00
marshal
44b46c99e7 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 02:49:34 +03:00
marshal
0379de8147 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 02:49:24 +03:00
Marshal
07cd7dc111 feat: enhance booking operations to support freight forwarder variants and improve consolidation handling 2026-06-23 23:48:45 +00:00
Marshal
9d81a2e1ee integrate global logistics staff user into seeder
refactor pricing data seeder to fold surcharge types into rates
update route meta subtitle to remove surcharge types
enhance RuleEngineFormDialog to support conditional field visibility
 remove surcharge types from URL constants and related services
add cargo leaf options query for bulk cargo type selection
update RuleEngineResourcePage to utilize cargo leaf options
modify resources configuration to remove surcharge types
implement migration to fold surcharge types into rates
create utility to derive legacy rate types from new rate structure
2026-06-23 23:15:32 +00:00
Marshal
2b4dfc6490 feat: implement staff price adjustment feature for bookings 2026-06-23 22:54:32 +00:00
marshal
72df5ce689 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 01:22:31 +03:00