Commit Graph

2730 Commits

Author SHA1 Message Date
Nathnael
6126b55784 feat: setup attachment to the freight chat 2026-07-18 08:52:06 +00:00
Stephanos A.
2fcea650f4 Merge pull request #785 from Tria-plc/alpha
Alpha
2026-07-18 11:50:09 +03:00
Abubeker Yasin
aecd02933c Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 11:46:29 +03:00
Stephanos A
282bb949ba Migration issue resolution 2026-07-18 11:45:35 +03:00
Stephanos A
af39ab0394 Migration issue resolution 2026-07-18 11:44:11 +03:00
natib21
20eb54521b fix 2026-07-18 08:34:43 +00:00
Stephanos A.
6ed6f82372 Merge pull request #784 from Tria-plc/alpha
Seat reservation unique constrains, package totalMinor updates
2026-07-18 11:32:48 +03:00
Stephanos A
854177c93b Seat reservation unique constrains, package totalMinor updates 2026-07-18 11:30:43 +03:00
Abubeker Yasin
4806768cea Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 09:55:31 +03:00
Abubeker Yasin
85de05cb40 feat: ( payments ) add merchant-order and booking/PNR payment status lookups 2026-07-18 09:55:09 +03:00
marshal
5702933870 Merge pull request #783 from Tria-plc/freight_feature/usermanagement
fix
2026-07-18 02:34:47 +03:00
Marshal
6100a121d2 fix 2026-07-17 23:33:47 +00:00
marshal
f8d5030e97 Merge pull request #782 from Tria-plc/freight_feature/usermanagement
add lashing surcharge for cargo types with hasLashing flag
2026-07-18 02:27:50 +03:00
Marshal
3a1a08b1e1 add lashing surcharge for cargo types with hasLashing flag
add lashing surcharge for cargo types with hasLashing flag
2026-07-17 23:25:53 +00:00
Stephanos A
0669635095 Dashboard updates 2026-07-18 00:41:26 +03:00
Stephanos A
8eb0582e4e Dashboard, seats report, package pricing updates 2026-07-18 00:34:12 +03:00
Stephanos A
eee14a5051 Package pricing issue resolution, passenger report updates 2026-07-17 23:48:49 +03:00
Stephanos A
1d9238fa39 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-17 23:20:10 +03:00
Stephanos A
f2c037a5b7 Package pricing issue resolution, passenger report, tickets filter updates 2026-07-17 23:18:52 +03:00
Roba Boru
b2e5f58119 Enable skip fayda for dev 2026-07-17 22:41:03 +03:00
Roba Boru
7e1966d469 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:13:31 +03:00
Roba Boru
4a4e58043f Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:13:13 +03:00
Roba Boru
738b7df5cf Added Checkin duration configuration 2026-07-17 22:12:54 +03:00
Muluhabt
ffafd9bcfc Steph payment isssues fix 2026-07-17 19:50:35 +03:00
Stephanos A
2567e25173 Supplementary amount issue resolution 2026-07-17 19:47:11 +03:00
Muluhabt
daeabe1d79 Steph payment isssues fix 2026-07-17 19:24:27 +03:00
Stephanos A.
e8c80378b8 Merge pull request #773 from Tria-plc/alpha
Alpha
2026-07-17 18:45:57 +03:00
Stephanos A
c3f4ba1f4e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-17 18:42:24 +03:00
Stephanos A
2e37bd7b4e Supplementary payments issue resolution 2026-07-17 18:41:59 +03:00
natib21
c8ec0be6b2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 15:01:51 +00:00
natib21
6ee771c953 fix search 2026-07-17 15:01:30 +00:00
marshal
2e3e5d20dd Merge pull request #771 from Tria-plc/freight_feature/usermanagement
fix
2026-07-17 16:59:36 +03:00
Marshal
6467173c76 fix 2026-07-17 13:57:59 +00:00
natib21
0d98ccb04b fix 2026-07-17 13:10:27 +00:00
natib21
6f126a2345 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 12:01:39 +00:00
Hagernesh Tadesse
41d7a04d2f Merge pull request #768 from Tria-plc/intercity-load-unload
feat(intercity): show intercity cargo across every train
2026-07-17 15:00:15 +03:00
natib21
30188c1031 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 11:59:13 +00:00
natib21
47780c614a fix 2026-07-17 11:59:00 +00:00
marshal
f690b635eb Merge pull request #767 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-17 14:40:59 +03:00
Marshal
3a697e12f2 changes 2026-07-17 11:40:25 +00:00
Marshal
221c49fcda fix issue 2026-07-17 11:38:54 +00:00
natib21
838ea5efc8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 11:30:49 +00:00
natib21
149e4105f4 seed vehicle 2026-07-17 11:30:25 +00:00
Hagernesh
30f48ea37f feat(intercity): show intercity cargo across every train
Intercity bookings never get their own train — they ride whichever import/export
train passes through their corridor — so the work is scattered across other
people's schedules and there was nowhere to see it as a whole. The per-schedule
ride-along panel answers "what can THIS train carry"; this answers "what is
happening to intercity cargo".

Purely additive: the existing ride-along panel and the schedule detail page are
untouched, and loading/unloading still happens there, where the train's position
is confirmed. This is a read-only view that points back to it.

Each row carries both ends' facility status, because a booking whose origin or
destination has no equipment can never be worked there — the operator should see
that while the train is still coming, not when the load is refused. Those
bookings are counted and called out.

New GET /train-scheduling/intercity/bookings; the type is IntercityRideAlongRow,
not IntercityBookingRow, which already means the per-schedule candidate row.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 11:27:40 +00:00
Nathnael Wondisha
4abc2aa7ae Merge pull request #765 from Tria-plc/freight/feat/chat-app
Freight/feat/chat app
2026-07-17 14:12:05 +03:00
Nathnael
d0411f9da2 feat: add support page to the admin routes 2026-07-17 11:06:44 +00:00
natib21
35303ece58 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 11:03:37 +00:00
natib21
57f49a9333 fix 2026-07-17 11:03:23 +00:00
Nathnael
031e5ab292 Merge branch 'dev' into freight/feat/chat-app 2026-07-17 11:01:39 +00:00
Nathnael
e862a228d4 feat: add support to freight portal 2026-07-17 11:00:17 +00:00