Commit Graph

192 Commits

Author SHA1 Message Date
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
93b8b69464 Add window close hour to booking desk configuration 2026-07-05 08:53:27 +00:00
Hagernesh
00cd1fccf6 train loading for import 2026-07-04 09:33:07 +00:00
Hagernesh
5b4f624188 Per truck exit and per truck grn 2026-07-04 08:42:57 +00:00
marshal
8084b411ca Merge pull request #453 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 08:00:26 +03: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
natib21
bd88424167 fix 2026-07-04 01:47:28 +00:00
marshal
82cefc63d2 Merge pull request #442 from Tria-plc/freight_feature/usermanagement
add hard capacity ceiling to weight limit rules
2026-07-04 04:13:01 +03:00
Marshal
8ea2c8e95a add hard capacity ceiling to weight limit rules 2026-07-04 01:11:23 +00:00
yaschalew10
ee3657467d Merge pull request #435 from Tria-plc/freight/feature/first_mile_invoice
Freight/feature/first mile invoice
2026-07-04 01:57:06 +03:00
natib21
16bd7fabcc mile 2026-07-03 20:21:16 +00:00
natib21
77dc14f6a5 mile 2026-07-03 20:00:41 +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
8db19dfacf Add snapshot of booking-window rules to train schedules and update related logic 2026-07-03 18:45:45 +00:00
Marshal
a5c46505e3 Add migration to widen window_duration_hours precision and update related components for duration handling 2026-07-03 16:37:09 +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
natib21
e893af8133 fix 2026-07-03 15:22:51 +00:00
natib21
0e6ebda6f6 fix 2026-07-03 15:21:23 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
e881e8de84 fix 2026-07-03 14:21:46 +00:00
natib21
e14e02e7f2 fix 2026-07-03 14:07:43 +00:00
Hagernesh
01bd01cc05 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:06:34 +00:00
marshal
7eb62a0ba2 Merge pull request #423 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-03 16:55:26 +03:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +00:00
Hagernesh
e2867e3086 import loading backend 2026-07-03 13:47:45 +00:00
Marshal
52f48b688d fix issues 2026-07-03 13:40:10 +00:00
Nathnael
414c9610dc chore: migrate to otp table 2026-07-03 11:57:40 +00:00
natib21
b218179d72 :wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 09:10:31 +00:00
natib21
e4b0c73c63 fix fayda 2026-07-03 09:10:05 +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
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
b7da024968 fix 2026-07-02 14:37:38 +00:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
natib21
1869790eab fix 2026-07-02 13:18:34 +00:00
natib21
e429a2cebf fix 2026-07-02 13:15:44 +00:00
natib21
64e346324b fix issue 2026-07-02 13:11:12 +00:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
natib21
58b3805d0b fix 2026-07-02 12:43:03 +00:00
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00
hagiye
129448e437 frist mile receive to warehouse and last mile truck arrival integration 2026-07-02 01:08:37 +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
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
8ab27a6721 feat: add expiration to invoice 2026-07-01 06:19:07 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00