Commit Graph

498 Commits

Author SHA1 Message Date
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
ghost2023
1754c18ede fix: apiconfig 2026-07-01 14:46:24 +03:00
ghost2023
fbda15bac8 Merge branch 'dev' into freight/feat/invoice 2026-07-01 14:40:58 +03:00
marshal
612df8daff Enhance clearance milestone management and introduce new contract actions
- Added new milestones for 'Transit Permit Uploaded' and 'Export Transport Document Issued' in the clearance milestone catalog.
- Implemented methods in ClearanceMilestoneService to skip milestones and complete them with metadata.
- Updated ContractBookingService to check boundary conditions before booking creation.
- Introduced new endpoints in ContractsController for uploading customs declarations, advising duty, and handling various document uploads.
- Enhanced the UI to support new clearance actions and display relevant components based on milestone statuses.
2026-07-01 10:20:16 +03:00
Nathnael
e5aab84f51 feat: ui changes and pdf setup on the clients 2026-07-01 06:56:58 +00:00
marshal
ccd5d6de31 Implement contract document download functionality and enhance clearance review status checks
- Added methods to assert clearance reviewable, finalizable, and uploadable statuses in the ContractClearanceService.
- Introduced a new endpoint in ContractsController for downloading contract PDFs.
- Implemented download functionality in the contracts service for both backoffice and portal applications.
- Updated UI components to include download buttons for contract PDFs in relevant pages.
- Enhanced contract request and view pages to support contract document downloads.
2026-07-01 07:27:53 +03:00
Marshal
28c1089ce6 Remove estimated shipment date from contract forms and related components 2026-07-01 02:42:05 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
hagiye
38db9a4177 Delivery approval customer handover signature 2026-06-30 17:05:53 +03:00
hagiye
98d1065f11 Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 16:53:54 +03:00
hagiye
156747f42f Approve delivery button for customer to sign or acknowlegde delivery 2026-06-30 16:48:08 +03:00
Nathnael
3eb4a24199 fix: terminal clearing int vite 2026-06-30 11:29:28 +00:00
ghost2023
9619fbd9b0 fix: the hardcoded api url 2026-06-30 13:58:57 +03:00
ghost2023
fdb77a7036 fix: testing the env 2026-06-30 13:49:52 +03:00
ghost2023
0f762172bf fix: api url backoffice 2026-06-30 09:19:32 +03:00
hagiye
831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 07:20:10 +03:00
hagiye
9f5c22c1ee Goods recieved notes and Booking delivery 2026-06-30 07:19:12 +03:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
yaschalew
1193e2bfa9 fix commit 2026-06-29 18:35:51 +03:00
Nathnael
feae27d0c3 feat: improve the invoices in the portal 2026-06-29 14:26:25 +00:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +03:00