Commit Graph

1296 Commits

Author SHA1 Message Date
marshal
f4b02501bb Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 10:09:45 +03:00
Marshal
861b8dc38a feat: Refactor general contract handling and introduce drawdown orders
- Updated ContractRouteLineView to clarify that routes carry no quantity and are pure origin-destination lanes.
- Modified GeneralContractService to reflect changes in route handling, removing quantity-related logic.
- Adjusted BookingsService to persist contracted routes without quantities, aligning with the new contract structure.
- Revised CreateBookingDto and CreateContractRouteDto to remove quantity fields, emphasizing shared pool usage.
- Added ContractOrdersPanel component to display drawdown orders and their associated pool.
- Implemented useContractOrders and useContractPool hooks for fetching order and pool data.
- Created booking-orders.service.ts to manage API interactions for drawdown orders and pool data.
- Updated BookingRequestDetailPage and PlaceOrderDialog to accommodate new order handling logic.
2026-06-25 07:06:48 +00:00
Marshal
dd352f0340 feat: synchronize order status with child booking and enhance contract status labels 2026-06-25 06:37:15 +00:00
marshal
104ffaef91 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 09:29:32 +03:00
Marshal
663bc96765 feat: enhance extra routes handling with dynamic yard options based on operation type 2026-06-25 06:29:01 +00:00
marshal
1a868cac30 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 09:12:55 +03:00
Marshal
8dff19eae1 refactor: optimize pool lines utilization calculation in ContractDetailPage 2026-06-25 06:12:31 +00:00
marshal
c82e925152 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 09:10:02 +03:00
Marshal
d31b4c668a feat: update booking form to remove per-route quantity input for general contracts 2026-06-25 06:09:21 +00:00
marshal
cf850c1fcd Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 08:56:13 +03:00
Marshal
a5a2f99dc0 feat: enhance clearance document submission process and UI feedback 2026-06-25 05:55:28 +00:00
marshal
44005fa754 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 06:17:38 +03:00
Marshal
c249c25731 refactor: update clearance review colors and styles for consistency
- Changed status colors in ClearanceReviewSection from blue to green for approved and from accent to gray for pending.
- Updated Loader color in DocumentClearanceDetailPage to green.
- Adjusted Badge colors in DocumentClearanceDetailPage and DocumentClearanceListPage to reflect new color scheme.
- Introduced DirectionIcon component for better visual representation of trade direction with tooltips.
- Enhanced ResubmitDocuments component to improve document handling and display.
- Added validation error alerts in ChangesRequestedView and ResubmitBookingModal.
- Implemented ContractSignButton for bookings ready for signature.
- Created useBookingDocumentSetting hook to fetch document settings based on company nationality.
2026-06-25 03:16:21 +00:00
marshal
9a240be315 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 05:46:43 +03:00
Marshal
9353d57585 feat: implement resubmit flow for CHANGES_REQUESTED bookings with document updates 2026-06-25 02:46:06 +00:00
marshal
1f5a6be2ff Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 05:19:54 +03:00
Marshal
76a45ac461 feat: implement clearance flow for booking operations
- Update booking form schema to remove customs clearing agent requirement.
- Add BookingActionButton component to trigger actions for bookings.
- Create BookingActionModal for handling document uploads and operation scheduling.
- Implement ClearanceFlow component to manage document statuses and uploads.
- Add OperationDatePicker for selecting shipment days.
- Introduce bookingNextAction utility to determine next actions based on booking status.
- Create useClearanceFlow hook to encapsulate clearance logic and state management.
- Export new components and utilities from the clearance module.
2026-06-25 02:19:32 +00:00
marshal
4aaddd57bd Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 05:10:44 +03:00
Marshal
6b6ca49e29 feat(bookings): add clearance review functionality and update UI components 2026-06-25 02:08:31 +00:00
marshal
b5d4a15831 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 04:50:42 +03:00
Marshal
da01b4d453 feat: add clearance review section and update booking status handling
- Introduced `ClearanceReviewSection` component for document review and approval process.
- Updated booking status configuration to include new clearance statuses.
- Modified `DocumentClearanceDetailPage` and `BookingRequestDetailPage` to integrate the new clearance review functionality.
- Adjusted `DocumentClearanceListPage` to filter customs bookings appropriately.
- Enhanced `ClearanceCard` in the portal to reflect customs clearance status.
- Removed unnecessary customs-related logic from clearance tabs and document review components.
2026-06-25 01:50:21 +00:00
marshal
84f037ee2a Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 04:29:30 +03:00
marshal
3c720af7df apiconfig chnages 2026-06-25 04:29:18 +03:00
Marshal
23b353999a feat: enhance cargo details handling and add document clearance features
- Improved handling of commodity selection in the cargo details form to prevent unwanted resets on re-renders.
- Added `isReefer` flag to the CreateBookingDto interface for booking-level refrigerated status.
- Introduced a new configuration file for clearance tabs to manage document clearance views.
- Implemented DocumentClearanceDetailPage for detailed review and management of clearance documents.
- Created DocumentClearanceListPage for listing and filtering clearance bookings with enhanced UI components.
2026-06-25 01:28:45 +00:00
Marshal
c8377958a8 fix(routes): prevent synthetic event recycling issue in name input handler 2026-06-25 00:48:14 +00:00
Marshal
08977fcd19 feat(bookings): add estimated shipment date handling and validation for binding shipment day 2026-06-25 00:28:54 +00:00
marshal
6ab9699c94 refactor(first-mile): update module imports to use forwardRef for circular dependency resolution 2026-06-25 03:01:56 +03: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
marshal
49ae46934a fix(freight-api): call acceptBooking after payment completion 2026-06-24 12:16:03 +03: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
7d1474896e fix hot fix 2026-06-24 10:43:25 +03:00
yaschalew10
0d19e090b1 Merge pull request #255 from Tria-plc/freight/develop
Freight/develop
2026-06-24 10:10:00 +03:00
yaschalew
5897dc342d fix conflict 2026-06-24 10:08:19 +03:00
yaschalew10
ef6e4800da Merge pull request #253 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-24 09:59:04 +03:00
yaschalew
f851948634 fix conflict 2026-06-24 09:41:52 +03:00
yaschalew
ef6cefbb3c fix lock file 2026-06-24 09:39:33 +03:00
natib21
f6ffea2b87 fix return value 2026-06-24 06:38:03 +00: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