Commit Graph

190 Commits

Author SHA1 Message Date
natib21
75427ea63a fix tracker 2026-07-07 06:39:02 +00:00
natib21
42710261e2 fix 2026-07-06 13:49:30 +00:00
natib21
fb4ffa5d67 fix 2026-07-06 12:23:25 +00:00
natib21
6b0db45be2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-06 12:06:22 +00:00
natib21
998a6801ab fleet 2026-07-06 12:05:52 +00:00
Marshal
3485a7d63d add loading confirmation for import-Djibouti trains before dispatch 2026-07-05 21:07:03 +00:00
Marshal
1433796db0 add loading status management for bookings 2026-07-05 19:56:21 +00:00
Marshal
3e2299960a add script to seed freight contracts across flow variants 2026-07-05 18:06:24 +00:00
Marshal
3447394e32 add bookings management and settings 2026-07-05 10:22:58 +00:00
marshal
4f31794abd Merge pull request #458 from Tria-plc/freight_feature/usermanagement
refactor: remove gate pass granting logic from clearance services and UI
2026-07-04 10:45:22 +03:00
Marshal
145240d3bd refactor: remove gate pass granting logic from clearance services and UI
- Removed the gate pass granting functionality from the BookingClearanceService and ContractClearanceService, replacing it with a new method to retrieve gate pass status from train schedules.
- Updated the ContractsController to eliminate endpoints related to gate pass granting.
- Refactored the UI components (ExportClearanceStepper and PhasedClearanceActionPanel) to reflect the new gate pass securing process, linking to the train scheduling interface instead.
- Cleaned up related constants and query hooks, removing unused code and references to the gate pass functionality.
- Adjusted types in the contracts to accommodate changes in the gate pass handling logic.
2026-07-04 07:43:03 +00:00
natib21
9d3efe7f15 fix 2026-07-04 03:47:36 +00:00
natib21
2e31fd12e1 fix 2026-07-04 02:26:19 +00:00
natib21
bd88424167 fix 2026-07-04 01:47:28 +00:00
natib21
58c49d34b2 fix 2026-07-04 01:31:08 +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
marshal
21d8b44518 Merge pull request #440 from Tria-plc/freight_feature/usermanagement
enhance booking windows section with pagination and improved UI
2026-07-04 03:43:46 +03:00
Marshal
97cc9d76b1 enhance booking windows section with pagination and improved UI 2026-07-04 00:41:28 +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
1d8f095831 fix 2026-07-03 22:43:45 +00:00
natib21
7155ec7e01 mile 2026-07-03 20:59:21 +00:00
natib21
4ddf03e357 mile 2026-07-03 20:43:26 +00:00
natib21
16bd7fabcc mile 2026-07-03 20:21:16 +00:00
natib21
77dc14f6a5 mile 2026-07-03 20:00:41 +00:00
yaschalew10
aeb8095809 Merge pull request #431 from Tria-plc/freight/feature/first_mile_invoice
Freight/feature/first mile invoice
2026-07-03 22:59:10 +03:00
natib21
8d17d9111e mile 2026-07-03 19:44:27 +00:00
yaschalew10
dc9e54764e Merge pull request #430 from Tria-plc/freight/feature/first_mile_invoice
mile
2026-07-03 22:22:42 +03:00
natib21
a1dfb439ff mile 2026-07-03 19:17:45 +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
natib21
e893af8133 fix 2026-07-03 15:22:51 +00:00
natib21
0e6ebda6f6 fix 2026-07-03 15:21:23 +00:00
Marshal
7eae1a920e Add contract booking windows feature 2026-07-03 15:01:16 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03: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
c977deb460 modify booking request page 2026-07-03 14:01:50 +00:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
Hagernesh
e2867e3086 import loading backend 2026-07-03 13:47:45 +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
Nathnael
1611c6be22 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-03 06:28:38 +00:00
Nathnael
1e408536aa feat: add invoice pages and api to the backoffice 2026-07-03 06:21:25 +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
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
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00