Commit Graph

131 Commits

Author SHA1 Message Date
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
2c0e115c14 update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:23:10 +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
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
7eae1a920e Add contract booking windows feature 2026-07-03 15:01:16 +00:00
Marshal
c977deb460 modify booking request page 2026-07-03 14:01:50 +00:00
marshal
07e524eea4 user managemnt and wight limit rule 2026-07-03 13:56:34 +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
marshal
4d17787dbd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 11:28:55 +03:00
Marshal
75cda22a48 Implement consolidated booking handling and UI updates for shared wagons 2026-07-03 05:07:23 +00:00
Marshal
bb2cedc87f Add allocation management features and update permissions for container allocation 2026-07-03 04:15:16 +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
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
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
e5fed081fc fix 2026-07-02 14:27:09 +00:00
Marshal
f77e4d150b Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 13:44:50 +00:00
ghost2023
2c5e553d7c Merge branch 'dev' into freight/feat/fixes-v1 2026-07-02 16:43:16 +03: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
fe40d9f4be update import gl flow 2026-07-02 13:24:39 +00:00
ghost2023
79c3293a72 fix: booking paid trigger 2026-07-02 16:18:46 +03:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
ghost2023
4098b5476f fix(temp): invoice no for the telebirr 2026-07-02 15:37:49 +03:00
Nathnael
787da1ccc0 chore: fix the invoice event 2026-07-02 12:35:43 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
Nathnael
5aafa436c1 fixes 2026-07-02 09:38:14 +00:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +03:00
ghost2023
1c012ce1e2 refactor(payment): centralize invoice processing with detailed tracking and configurable logging 2026-07-02 11:47:35 +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
2f79178496 fix: booking invoice issue 2026-07-01 16:11:47 +03:00
ghost2023
aef868bc40 fix: the invoice status syncing with booking payment window 2026-07-01 15:46:13 +03:00
ghost2023
7e96fa65b9 feat: rm the hardcoded invoice types 2026-07-01 15:10:04 +03:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
natib21
04bc9eded6 fix 2026-06-29 15:28:04 +00:00
natib21
d94b73fe02 fix 2026-06-29 15:09:34 +00:00
natib21
6fa315db0f fix 2026-06-29 14:45:22 +00:00
Nathnael
31a2e93c49 fix: rm the hardcode false for general contract 2026-06-29 14:42:53 +00:00
Nathnael
f7f0f6aef3 fix: update the invoice generation to the new booking creation 2026-06-29 13:45:35 +00:00
Nathnael
662d96571e fix 2026-06-29 11:14:42 +00:00
Nathnael
c37e8acfdc Merge branch 'dev' into freight/feat/invoice 2026-06-29 10:58:12 +00:00
Marshal
0f7cac2b68 add booking request functionality for GENERAL customs contracts
- Create migration for booking_requests table with necessary fields and indexes.
- Implement BookingRequestRepository for database operations related to booking requests.
- Develop BookingRequestService to handle business logic for submitting, accepting, rejecting, and canceling booking requests.
- Create DTOs for creating booking requests and reviewing them.
- Define BookingRequest entity to map to the booking_requests table.
- Add UI components for managing shipment requests, including detail and list pages.
- Implement OperationDatePicker component for selecting available shipment days.
2026-06-29 09:30:44 +00:00
Nathnael
4be4286fbf feat: rewired up the billing and payment with the booking 2026-06-29 09:25:46 +00:00
Nathnael
9cd24d9b51 feat(WIP): Wire up the invoice with the booking. 2026-06-29 08:29:07 +00:00
Marshal
4be4cc9054 feat: implement first and last mile trucking pricing logic in booking and contract services 2026-06-28 23:54:51 +00:00
Marshal
e1d54746c2 add GL operations for customs risk assignment, duty advising, and incident reporting 2026-06-28 16:09:45 +00:00
Nathnael
98e34593c4 feat: add government support to the companies. add seeding and constrain on booking 2026-06-27 09:08:15 +00:00