Commit Graph

3893 Commits

Author SHA1 Message Date
marshal
b43763ad39 Merge pull request #927 from Tria-plc/freight_feature/usermanagement
implement freight permissions for trains, wagons, and routes
2026-07-23 09:04:24 +03:00
Marshal
fd05655ecc implement freight permissions for trains, wagons, and routes 2026-07-23 06:03:43 +00:00
marshal
f5f41e0a5a Merge pull request #926 from Tria-plc/freight_feature/usermanagement
implement freight permissions for trains, wagons, and routes
2026-07-23 08:57:59 +03:00
Marshal
129a4d1d0a implement freight permissions for trains, wagons, and routes 2026-07-23 05:57:14 +00:00
marshal
edfd0a859d Merge pull request #925 from Tria-plc/freight_feature/usermanagement
add e2e test
2026-07-23 08:27:29 +03:00
Stephanos A.
6f06e3e6e8 Merge pull request #924 from Tria-plc/alpha
Payment report and missing ticket generation updates
2026-07-23 07:30:06 +03:00
Stephanos A
e2bdc21c95 Payment report and missing ticket generation updates 2026-07-23 07:27:05 +03:00
Marshal
2481f43f1f add e2e test 2026-07-22 23:44:32 +00:00
marshal
091dd0bfa3 Merge pull request #923 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-23 00:02:55 +03:00
Marshal
b0f561a935 Add end-to-end tests for import corridor flows
- Implement full train import journey with six container bookings filling a 54-wagon train.
- Create tests for split offer and rebooking scenarios, handling payment expiry and waiting list promotions.
- Add tests for handling waiting bookings expiration when the train is full.
- Implement tests for reopening booking windows after expired reservations.
- Seed database with necessary corridor data for import flows, including yards, container types, locomotives, and rates.
2026-07-22 21:02:17 +00:00
Marshal
5709801590 enhance shipment form and booking process 2026-07-22 17:25:01 +00:00
Stephanos A.
02939ac6e7 Merge pull request #922 from Tria-plc/alpha
Build issue resolution
2026-07-22 19:52:25 +03:00
Stephanos A
614fab806d Build issue resolution 2026-07-22 19:50:49 +03:00
Stephanos A.
dd7ad3c25b Merge pull request #921 from Tria-plc/alpha
Hidden package quick info
2026-07-22 19:27:35 +03:00
Stephanos A
e9a43fe454 Hidden package quick info 2026-07-22 19:24:55 +03:00
Stephanos A.
f23ccb585b Merge pull request #920 from Tria-plc/alpha
Hide package seats
2026-07-22 19:02:40 +03:00
Stephanos A
af28abb0f0 Hide package seats 2026-07-22 18:59:55 +03:00
mulish77
54d3481230 Merge pull request #919 from Tria-plc/tests
Fixing isssues usins AI
2026-07-22 17:30:23 +03:00
Muluhabt
e31a2d64e5 Fixing isssues usins AI 2026-07-22 17:29:40 +03:00
Hagernesh Tadesse
7d90112822 Merge pull request #918 from Tria-plc/testfixes
fix(portal): Table has no size prop in BulkTruckUploadModal
2026-07-22 17:13:14 +03:00
Hagernesh
15540f78e2 fix(portal): Table has no size prop in BulkTruckUploadModal 2026-07-22 14:11:58 +00:00
mulish77
cd3b2b3873 Merge pull request #917 from Tria-plc/tests
Tests
2026-07-22 16:44:46 +03:00
Muluhabt
9782dd0fe3 Fixing isssues usins AI 2026-07-22 16:42:07 +03:00
Muluhabt
87ebec8b51 Merge remote-tracking branch 'origin/dev' into tests 2026-07-22 16:33:07 +03:00
Stephanos A.
42bd87d9e3 Merge pull request #916 from Tria-plc/alpha
Passenger portal build issue resolution
2026-07-22 16:32:08 +03:00
Stephanos A
62fcf6a8d2 Passenger portal build issue resolution 2026-07-22 16:31:03 +03:00
Hagernesh Tadesse
a20b78b716 Merge pull request #915 from Tria-plc/testfixes
Operations permissons and dispatecand procurement and Asset Feature
2026-07-22 16:22:15 +03:00
Stephanos A.
47ca3cf25e Merge pull request #914 from Tria-plc/alpha
Alpha
2026-07-22 16:20:51 +03:00
Stephanos A
1cb9666796 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-22 16:19:16 +03:00
Stephanos A
e5be205bd8 Informational updates 2026-07-22 16:18:58 +03:00
Hagernesh
ec066f3d29 Fix:
Added assertCapacity() checks before saving (matches single receive)
Added applyCapacityDelta() after save to increment counters
Now validates warehouse → yard → zone capacity hierarchy
Single receive already had both checks; bulk receive was gap.
2026-07-22 13:18:36 +00:00
Nathnael Wondisha
93cf4d1e2a Merge pull request #913 from Tria-plc/freight/feat/fixes-v1q
Freight/feat/fixes v1
2026-07-22 16:06:02 +03:00
Nathnael
919c3a84ff Merge branch 'dev' into freight/feat/fixes-v1 2026-07-22 13:05:19 +00:00
Nathnael
9baffb6439 refactor: remove duplicate header components and consolidate layout 2026-07-22 12:57:56 +00:00
Abubeker Yasin
1382910508 fix: ( payment ) stop re-finalizing already-completed payments on intent read 2026-07-22 15:41:34 +03:00
marshal
a3037749b4 Merge pull request #912 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-22 15:35:11 +03:00
Marshal
ef840241c0 permision 2026-07-22 12:34:08 +00:00
Marshal
5640c43eb1 permision 2026-07-22 12:33:57 +00:00
marshal
d1c67e4acd Merge pull request #911 from Tria-plc/freight_feature/usermanagement
changes
2026-07-22 15:21:25 +03:00
Marshal
410bfa5b2b changes 2026-07-22 12:19:51 +00:00
Hagernesh Tadesse
684d13963d Merge pull request #910 from Tria-plc/testfixes
Operations permissons and dispatechand procurement and Asset Feature
2026-07-22 15:18:35 +03:00
Hagernesh
8dc4dd585e feat(procurement): validate acquisition lease fields and enforce bulk-receive capacity
Reject lease start/end and monthly payment on PURCHASE acquisitions (create and
update, validated against the resulting record). Add asset_acquisitions.item_name
column + migration. Enforce warehouse/yard/zone capacity on bulk receive and apply
capacity-counter deltas on save. Adds acquisition-guard spec.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-22 12:15:47 +00:00
Hagernesh
59f06a9bd1 feat(warehouses): enforce yard/zone capacity limits; broaden dispatcher perms
Yard create/update now rejects capacities that overflow the parent warehouse,
and zone create/update rejects capacities that overflow the parent yard, via
BadRequestException. Dispatcher permission preset expanded to full CRUD on
warehouse and fleet management; allocation and fee rules remain view-only.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-22 12:15:47 +00:00
Nathnael
8389b2735d fix: sidebar in user management 2026-07-22 11:54:54 +00:00
Stephanos A.
09ac88f01d Merge pull request #909 from Tria-plc/alpha
Ticketing seats conflict issue resolution
2026-07-22 14:32:25 +03:00
Stephanos A
c6f6616218 Restore ticket generation guard 2026-07-22 14:31:27 +03:00
Stephanos A
7ff98bfb81 Ticketing seats conflict issue resolution 2026-07-22 14:28:47 +03:00
Stephanos A.
567baa12e9 Merge pull request #908 from Tria-plc/alpha
Ticketing updates
2026-07-22 14:07:50 +03:00
Stephanos A
2632e2d50c Ticketing updates 2026-07-22 14:06:00 +03:00
marshal
2f58986f0a Merge pull request #907 from Tria-plc/freight_feature/usermanagement
chnages
2026-07-22 14:04:45 +03:00