Commit Graph

259 Commits

Author SHA1 Message Date
natib21
9d3efe7f15 fix 2026-07-04 03:47:36 +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
marshal
4ced5ebef5 Merge pull request #437 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 02:38:09 +03:00
natib21
5b2091cdd5 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 23:33:12 +00:00
Marshal
69818ab3f9 add booking window to gl 2026-07-03 23:30:49 +00:00
natib21
18926c32cb enhance phase countdown and booking window descriptions for clarity 2026-07-03 23:24:41 +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
6bf8da2934 mile 2026-07-03 21:21:42 +00:00
marshal
9d974bf7a9 Merge pull request #433 from Tria-plc/freight_feature/usermanagement
feat: enhance contract clearance process with linked booking details
2026-07-04 00:05:34 +03: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
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
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
0ac5adcee9 Add countdown timer component and integrate phase deadlines in booking windows 2026-07-03 17:11:35 +00:00
natib21
2550172480 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 17:08:57 +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
natib21
e02cb52e19 fix 2026-07-03 16:34:06 +00:00
Marshal
907ff2138b Add ScheduleWorkspacePanel and integrate it into TrainScheduleV2DetailPage with tabs 2026-07-03 15:56:26 +00:00
natib21
c643d30624 fix 2026-07-03 15:47:12 +00:00
natib21
f2f6c89c0e fix 2026-07-03 15:37:24 +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
Hagernesh Tadesse
f0eb96d2f9 Merge pull request #426 from Tria-plc/naming_convention
Naming convention no digit or symbol allowed
2026-07-03 17:45:18 +03:00
Hagernesh
44317a6bbc Naming convention no digit or symbol allowed 2026-07-03 14:39:47 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
c2535bec5e fix 2026-07-03 14:14:35 +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
Hagernesh
bf5b0b5dc8 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:03:02 +00:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +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
3925a11dd4 feat: add invoice to customer detail on backoffice 2026-07-03 07:21:19 +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
natib21
d8f1ed8899 fix issue 2026-07-02 13:44:19 +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