marshal
3d8e130f47
Merge pull request #417 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-03 13:58:09 +03:00
marshal
07e524eea4
user managemnt and wight limit rule
2026-07-03 13:56:34 +03:00
marshal
02ee4cc743
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-07-03 13:54:29 +03:00
marshal
130625df54
user managemnt and wight limit rule
2026-07-03 13:54:12 +03:00
Abubeker Yasin
39d8a98e22
Merge pull request #416 from Tria-plc/alpha
...
Alpha
2026-07-03 12:26:39 +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
Abubeker Yasin
91e59abf0e
fix: passenger id
2026-07-03 12:21:41 +03:00
Nathnael Wondisha
20abc0288d
Merge pull request #415 from Tria-plc/freight/feat/fixes-v1
...
Implement invoice pagination and enhance file viewing features
2026-07-03 11:39:47 +03:00
Nathnael
515d59fb53
fix: file preview
2026-07-03 08:35:57 +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
d832e83b4a
update
2026-07-03 08:13:51 +00:00
Nathnael
3925a11dd4
feat: add invoice to customer detail on backoffice
2026-07-03 07:21:19 +00:00
Nathnael
43f7a039ad
fix: payment api crash
2026-07-03 07:20:31 +00:00
Nathnael
300afb4c77
feat: add existing files to customer documet tab on portal
2026-07-03 06:57:56 +00:00
Nathnael
33ca30461e
feat: extended the smartfileinput and add a global useFileViewer
2026-07-03 06:57:22 +00:00
Nathnael
1611c6be22
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-03 06:28:38 +00:00
Nathnael
633c7c52c5
feat: add viewing existingFiles to smartfileinput
2026-07-03 06:22:32 +00:00
Nathnael
1e408536aa
feat: add invoice pages and api to the backoffice
2026-07-03 06:21:25 +00:00
Nathnael
53fed882be
feat: setup pagination to find all invoice api
2026-07-03 06:20:05 +00: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
1735c4fdac
Merge pull request #413 from Tria-plc/contrat-backup2
...
Contrat backup2
2026-07-03 06:50:43 +03:00
marshal
c71849c487
chnage the base url
2026-07-03 06:49:43 +03: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
Stephanos A
868639084c
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-02 22:42:30 +03:00
Stephanos A
200476dfd6
Fare and route-coach, production checklist updates
2026-07-02 22:42:15 +03:00
marshal
4c6920d297
Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 22:08:17 +03:00
marshal
e2e72075c9
merge conflickt
2026-07-02 22:08:02 +03:00
Marshal
18c158fb61
changes
2026-07-02 19:06:22 +00:00
marshal
0bf81490fe
Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 21:49:18 +03:00
Marshal
488a135054
changes
2026-07-02 18:49:00 +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
yaschalew10
1f0af964ff
Merge pull request #412 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-02 18:09:08 +03:00
yaschalew
c449e73337
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 18:08:35 +03:00
yaschalew
49036abf7f
fix
2026-07-02 18:07:21 +03:00
yaschalew10
0a3b4fb225
Merge pull request #411 from Tria-plc/freight/feature/first_mile_invoice
...
fix
2026-07-02 18:03:14 +03:00
yaschalew
26e2974d87
fix
2026-07-02 18:02:23 +03:00
yaschalew10
7df24673a8
Merge pull request #403 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-02 17:57:45 +03:00
yaschalew
2b7e67b227
fix
2026-07-02 17:56:17 +03:00
yaschalew
8f24544f78
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:42:21 +03:00
natib21
eb5d8a7411
fix
2026-07-02 14:42:04 +00:00
yaschalew
71e1ab98f4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:37:54 +03:00
natib21
b7da024968
fix
2026-07-02 14:37:38 +00:00
yaschalew
9198fcd3e7
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:34:40 +03:00
natib21
2424e96e74
fix
2026-07-02 14:34:22 +00:00
yaschalew
60eba409ae
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:27:25 +03:00
