Commit Graph

439 Commits

Author SHA1 Message Date
Marshal
1b92c57e23 refactor contract handling to support single route per contract and improve reference generation logic 2026-07-06 08:36:11 +00:00
Marshal
5192c6b949 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-05 22:22:34 +00:00
Marshal
57a504867b add contract reference to bookings list and enhance search functionality 2026-07-05 16:41:11 +00:00
Marshal
3447394e32 add bookings management and settings 2026-07-05 10:22:58 +00:00
Hagernesh Tadesse
81ea676767 Merge pull request #464 from Tria-plc/CutomerTruckAssign
Cutomer truck assign
2026-07-04 12:57:51 +03:00
Hagernesh
5954f9a349 Merge remote-tracking branch 'origin/dev' into CutomerTruckAssign
:qa!
2026-07-04 09:53:28 +00:00
Nathnael
e910e6c5bd fix 2026-07-04 09:51:06 +00:00
Hagernesh
00cd1fccf6 train loading for import 2026-07-04 09:33:07 +00:00
Nathnael
1d8fcaa4f1 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-04 09:28:05 +00:00
Nathnael
1c15a2117b feat: add verifcation on the document step 2026-07-04 09:27:22 +00:00
Nathnael
a70804da1c fix: gm step 2026-07-04 09:08:40 +00:00
Nathnael
b866b59478 feat: add etrade precheck 2026-07-04 09:02:49 +00:00
Hagernesh
5b4f624188 Per truck exit and per truck grn 2026-07-04 08:42:57 +00:00
Nathnael
de87845f22 style: auth clean up 2026-07-04 08:22:18 +00:00
Hagernesh
8916182a62 Truck assign containers 2026-07-04 07:56:23 +00:00
Nathnael
619ffa5419 style(WIP): auth ui clean up. 2026-07-04 07:17:05 +00:00
Hagernesh Tadesse
493af38ba2 Merge pull request #455 from Tria-plc/naming_convention
Handover customer sign
2026-07-04 10:04:23 +03:00
Nathnael
2f6f06b7c4 feat: add check validity to the user signup 2026-07-04 06:47:20 +00:00
Hagernesh
18f47481d7 Handover customer sign 2026-07-04 06:31:23 +00:00
Marshal
f37078d51d update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:59:51 +00:00
Marshal
3e94aa08f1 update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:22:03 +00:00
Marshal
8ea2c8e95a add hard capacity ceiling to weight limit rules 2026-07-04 01:11:23 +00:00
Marshal
97cc9d76b1 enhance booking windows section with pagination and improved UI 2026-07-04 00:41:28 +00:00
Marshal
c2649dae3c enhance phase countdown and booking window descriptions for clarity 2026-07-03 23:11:04 +00:00
Marshal
1f3368dcc3 refactor: remove unused variable assignment in ClearancePhaseStepper 2026-07-03 21:17:12 +00:00
Marshal
85c2fd1428 feat: enhance contract clearance process with linked booking details
- Added  and  to  for better visibility of GL-created shipment bookings.
- Implemented  method in  to fetch the latest clearance phase for contracts, improving list responses.
- Introduced  property in the  entity to store the latest clearance cycle's phase.
- Updated  to surface linked booking information in the clearance view.
- Created  component to display detailed container information in booking details.
- Refactored booking actions to remove contract-related actions from the booking request page.
- Enhanced the  component to reflect the current phase of clearance actions.
- Updated UI components to provide clearer messaging regarding the status of clearance and linked bookings.
- Adjusted action handling in  to include duty payment actions.
- Improved the  to show hints for each phase of the clearance process.
2026-07-03 21:04:46 +00:00
Marshal
c3f06b6aa9 Add contractKind field to BookingWindowRow and MyBookingWindow interfaces 2026-07-03 20:15:31 +00:00
Marshal
ff9cb4e6cd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 18:48:18 +00:00
Marshal
0ac5adcee9 Add countdown timer component and integrate phase deadlines in booking windows 2026-07-03 17:11:35 +00:00
Marshal
6dc6914397 Add migration to repair schema drift and implement contract step banner in UI 2026-07-03 15:24:12 +00:00
Marshal
7eae1a920e Add contract booking windows feature 2026-07-03 15:01:16 +00:00
marshal
6570268d91 Merge pull request #422 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-03 16:28:49 +03:00
Marshal
e14df58a47 fix issues 2026-07-03 13:26:40 +00:00
Nathnael
64fa2862eb Merge branch 'dev' into freight/feat/fixes-v1 2026-07-03 12:19:45 +00:00
Nathnael
79731e58ec feat: add otp to contract 2026-07-03 12:19:07 +00:00
Nathnael
d3707fe704 feat: merge the role and nationality step 2026-07-03 12:09:35 +00:00
Nathnael
2d71f24937 chore: rm the verify step in onboarding 2026-07-03 11:08:57 +00:00
marshal
a4c6848233 user managemnt and wight limit rule 2026-07-03 14:06:18 +03:00
marshal
07e524eea4 user managemnt and wight limit rule 2026-07-03 13:56:34 +03:00
marshal
02ee4cc743 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 13:54:29 +03:00
marshal
130625df54 user managemnt and wight limit rule 2026-07-03 13:54:12 +03:00
Marshal
35cb20da0b feat: implement 20ft container weight-pairing validation
- Added ContainerValidationService to handle 20ft weight-pairing logic.
- Introduced validate20ftWeightPairing utility function to check weight differences.
- Updated BookingPricingService to include overweight line details and pairing errors in price response.
- Enhanced BookingTransitionService to reject submissions with unpairable 20ft containers.
- Created ShipmentValidation interface for pre-submit validation of container contracts.
- Integrated shipment validation into the contract booking process, providing warnings for overweight containers and hard blocks for pairing errors.
- Updated front-end components to display validation results and prevent submission when errors are present.
2026-07-03 09:26:27 +00:00
Nathnael
515d59fb53 fix: file preview 2026-07-03 08:35:57 +00:00
marshal
4d17787dbd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 11:28:55 +03:00
Nathnael
300afb4c77 feat: add existing files to customer documet tab on portal 2026-07-03 06:57:56 +00:00
Marshal
75cda22a48 Implement consolidated booking handling and UI updates for shared wagons 2026-07-03 05:07:23 +00:00
marshal
01acd071cf Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-03 06:39:02 +03:00
Marshal
56de90892d Add booking window management and locomotive scheduling features
- Implemented migration to release stuck assigned locomotives.
- Added schedule window phases to train schedules.
- Created booking batch offers table for partial capacity bookings.
- Developed BookingSplitService to handle partial booking offers and splits.
- Introduced BookingWindowService to manage booking window lifecycle and transitions.
- Added BookingBatchOffer entity to represent offers made during booking splits.
- Enhanced locomotive options with warnings for scheduling.
- Created UpcomingWindowsSection component to display upcoming booking windows.
2026-07-03 03:36:06 +00:00
marshal
4c6920d297 Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 22:08:17 +03:00
Marshal
18c158fb61 changes 2026-07-02 19:06:22 +00:00