Commit Graph

418 Commits

Author SHA1 Message Date
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
marshal
0bf81490fe Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:49:18 +03:00
Marshal
488a135054 changes 2026-07-02 18:49:00 +00:00
marshal
fc5d49f34c Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:15:45 +03:00
Marshal
8d056c5014 finalize gl flow for import 2026-07-02 18:15:16 +00:00
marshal
d4561b948a Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:02:22 +03:00
Marshal
dd47068a4b finilize gl flow for export 2026-07-02 17:55:59 +00:00
Nathnael Wondisha
9d14414bf1 Merge pull request #410 from Tria-plc/freight/feat/fixes-v1
fix: merge marker in invoice detial page
2026-07-02 17:14:40 +03:00
Nathnael
635d674bbe fix: merge marker in invoice detial page 2026-07-02 14:11:34 +00:00
Marshal
71894ae2d3 merge conflict 2026-07-02 13:43:07 +00:00
Marshal
860af20e0d Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 13:29:10 +00:00
Marshal
fec2a5d320 update import gl flow 2026-07-02 13:27:59 +00:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
Nathnael
03740ee719 fix: types isses 2026-07-02 11:09:25 +00:00
ghost2023
79490d5979 fix 2026-07-02 13:44:20 +03:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
Nathnael
602453ff7a fix: invoice based payment on the client 2026-07-02 09:22:07 +00:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +03:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +03:00
hagiye
14a00af341 train gate pass, Telebirr and Wafi 2026-07-01 16:23:52 +03:00
ghost2023
43d1634823 feat: add payment modal to the invoice detail page 2026-07-01 16:11:32 +03:00