Commit Graph

52 Commits

Author SHA1 Message Date
Marshal
30bfc84f8f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 14:13:50 +00:00
Marshal
421e0266bc feat(train-scheduling): implement day-level booking pool
- Added `unplaced` method in `BookingNotifierService` to log warnings for bookings that cannot be placed on any train.
- Introduced `getAvailableDays` method in `TrainSchedulingService` to retrieve distinct days with open departures for a given route.
- Created `AvailableDaysQueryDto` for querying available days based on origin and destination yards.
- Updated `TrainSchedulingController` to expose an endpoint for available days.
- Modified frontend components to support day-level booking, allowing customers to select only a day without pinning to a specific train.
- Removed references to train schedules in booking forms and review steps, emphasizing day selection.
- Added a database migration to create an index for efficient querying of bookings by route and day.
2026-06-18 14:12:46 +00:00
marshal
3ad18277ea Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 17:04:35 +03:00
Hagernesh
89d651693b automation of loading and unloading 2026-06-17 22:33:06 +00:00
Marshal
3798b28bcd implement auto-consolidation for freight bookings at submission time 2026-06-17 16:46:44 +00:00
Marshal
7eb6228d31 feat: add shipment tracking feature with live updates
- Implemented tracking functionality for bookings, allowing users to track their shipments in real-time.
- Added new API endpoints for fetching tracking data.
- Created a ShipmentTrackingModal component to display tracking information, including current status, checkpoints, and estimated arrival times.
- Enhanced the booking detail view to include tracking options for eligible bookings.
- Updated the train scheduling service to include scheduled departure and arrival times in the response.
- Introduced utility functions for managing tracking stages and statuses.
2026-06-17 13:23:40 +00:00
Marshal
cd31f3612c Implement user-based booking access control and enhance booking filtering options 2026-06-17 12:35:29 +00:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00
Marshal
524d3b6418 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:34:04 +00:00
Marshal
64fad99bdc Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 12:21:16 +00:00
Marshal
52a9462228 add booking endpoint for featch payable bookings 2026-06-16 12:20:49 +00:00
marshal
23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 13:34:18 +03:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Marshal
7151bce288 changes 2026-06-16 08:56:52 +00:00
ghost2023
44aef8c1b3 feat: add more fields to the reference service array 2026-06-15 09:56:59 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +03:00
marshal
87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI 2026-06-14 02:13:08 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Marshal
132f2150a8 add cron jobs and aslo 2026-06-11 20:59:19 +00:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
hagiye
7facbeda22 Train scheduling API,Routes and UI 2026-06-08 16:31:28 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
marshal
88df20be6b change price logic on the ,rule engine ui, auto generate the contrat 2026-06-08 10:04:23 +03:00
marshal
4993453993 generate contract by the system, add waggon type,fix ui 2026-06-07 01:20:52 +03:00
Eyosiyas
b5f64bc9ad providers 2026-06-06 11:32:14 +03:00
marshal
ba65a3f4cc booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions 2026-06-05 11:01:00 +03:00
marshal
d226d7ef22 booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions 2026-06-05 10:38:31 +03:00
ghost2023
c5859dba6c feat(bookings): Implement document upload API for DRAFT bookings 2026-06-05 09:51:12 +03:00
Hagernesh Tadesse
523d7e5842 Merge pull request #94 from Tria-plc/freight/feature/add_train_scheduling
Freight/feature/add train scheduling reviewed
2026-06-05 09:38:30 +03:00
marshal
810bbc1168 dynamic contract templates and companyId on bookings 2026-06-04 16:57:07 +03:00
marshal
8fea963ddb dynamic contract templates and companyId on bookings 2026-06-04 16:53:14 +03:00
Michael Abebe
8b3aaad5fd feat(freight): basics of train scheduling 2026-06-04 16:50:38 +03:00
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
marshal
4ed0e22f55 refactor(bookings): replace RFQ/quotation flow with submit, staff review, approval routing, and payment stubs 2026-06-03 15:45:38 +03:00
marshal
4285e704bd changes 2026-06-01 15:14:03 +03:00
marshal
6b6a1d56d6 update the Consolidation and wagon filling on booking and Add GET /bookings/reference-data endpoint for booking form catalog (yards, containers, services, shipping lines, cargo types) 2026-05-30 12:45:52 +03:00
marshal
badeeff345 complete rule engine and booking flow 2026-05-30 11:52:50 +03:00
marshal
430dc44937 complete rule engine and booking flow 2026-05-30 10:27:59 +03:00
marshal
800f036005 implement rule engine module with dynamic booking evaluation, 7 entities, and Postman endpoints 2026-05-29 10:00:45 +03:00
marshal
e1d05d5475 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:52:29 +03:00
marshal
6d49c38f48 allow customers booking 2026-05-28 10:31:31 +03:00
marshal
f23d570427 changes 2026-05-26 09:24:47 +03:00
marshal
9432814e3b implement file module and add files relation to booking entity and populate on fetch 2026-05-25 10:19:08 +03:00
ghost2023
8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs 2026-05-23 11:21:17 +03:00
marshal
ae317540c1 feat(bookings): support multiple containers per booking via JSONB array 2026-05-23 11:08:35 +03:00
marshal
2064e6efda change the schema from public to freight 2026-05-23 10:00:40 +03:00
marshal
82c6b1284e implement contract booking functionality and MinIO setup 2026-05-23 09:31:52 +03:00
Michael Abebe
0e0d2ea450 feat(freight:api): initial backend work 2026-05-18 10:25:33 +03:00