Commit Graph

2523 Commits

Author SHA1 Message Date
Stephanos A
e55dd01c50 Migration issues resolution 2026-07-18 12:47:05 +03:00
Stephanos A
cca822cab8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 12:31:28 +03:00
Stephanos A
56057a1e16 Migration conflict issues resolution 2026-07-18 12:31:19 +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
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
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
Stephanos A
2567e25173 Supplementary amount issue resolution 2026-07-17 19:47:11 +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
Nathnael
f278756d76 feat: add support to freight backoffice 2026-07-17 11:00:09 +00:00
Nathnael
1fd46afaaa fix: added chat to the freight api 2026-07-17 10:59:25 +00:00
Hagernesh
c3ba9999c5 feat(yards): let staff mark a yard as a load/unload facility
Which yards can handle cargo is data, not a constant — the set grows. The Yards
config screen now carries the flag, so adding a facility is a toggle rather than
a code change. Config-driven, so this is a column plus a form field.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 10:40:16 +00:00
Hagernesh
a73faecbe3 feat(intercity): raise a GRN when a facility loads or unloads cargo
Every facility raises a GRN — the goods changed hands, whether or not anyone
stores them. What differs is what happens next: Indode has a warehouse, so cargo
left there goes through the existing warehouse flow and accrues storage and
demurrage; Sebeta, Modjo, Adama and Dire Dawa only move cargo between train and
truck, so the handling event and its GRN are the whole record.

facility_handling_events carries that record because warehouse_inventory cannot:
its warehouse/yard/zone are NOT NULL, so a facility with equipment but no
warehouse could never have a row there. inventory_id links the storage record
when the facility does keep the cargo, which is what ties an Indode handover to
its demurrage.

generateGrnNumber moves to common/grn.util.ts so a GRN raised at a facility is
indistinguishable from one raised in a warehouse — the two live in different
tables, and a second generator would let the formats drift.

Recording is best-effort: the cargo moved regardless, so paperwork must never
fail the journey.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 10:40:16 +00:00
Hagernesh
a411e0bdd0 feat(intercity): only load/unload where the yard has a facility
Intercity cargo rides a passing train and is handled at the booking's own yards,
so those yards need the equipment to do it — a train stopping somewhere is not
the same as somewhere being able to load it. Loading at an origin or unloading at
a destination without has_facility is now refused, naming the yard.

The check sits inside loadBooking/unloadBooking rather than the intercity
controller wrapper, because recording a checkpoint auto-unloads every booking
destined at that yard (autoUnloadAtYard) and would otherwise route around it.

Import/export are untouched: their cargo is handled at the route's terminal
ports, not at an arbitrary mid-corridor yard, so the gate returns early for
anything that isn't DOMESTIC.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 10:40:16 +00:00
Hagernesh
ce3ef15e7c feat(yards): record which yards can load/unload cargo
Intercity cargo is loaded at its origin yard and unloaded at its destination, but
only some yards have the equipment. EDR's facilities are Indode, Sebeta, Modjo,
Adama and Dire Dawa — and the set grows, so it has to be data.

- yards.has_facility marks a yard as a load/unload point; the new yard_facilities
  record says what it can do. Only Indode stores cargo (has_warehouse), so only it
  accrues storage/demurrage — the rest just move cargo on and off the train.
- facility_handling_events records each load/unload and carries its GRN.
  warehouse_inventory cannot: its warehouse/yard/zone are NOT NULL, so a facility
  without a warehouse could never have a row. inventory_id links to the storage
  record when there is one.
- YardFacilitiesService.facilityForYard is the single resolver the handling flows
  share, so they cannot drift on what a facility is.
- The seeder flags EXISTING yards and creates none. The codes are historical and
  do not read like the facility names — Indode is KALITY ("Gelan Multi Purpose
  Port (Indode)") and Sebeta is LEGACY_DEST — so it maps by code. Creating fresh
  INDODE/SEBETA yards would have split data that routes and bookings already
  reference.

Negad is deliberately absent: NAGAD ("DCT/SGDT") is in Djibouti while
NEGAD_FY_BCC is in Ethiopia and inactive, and which one is the intercity facility
is unsettled.

No behaviour change yet — nothing reads has_facility until the gate lands.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 10:40:16 +00:00
natib21
3376f106b7 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 10:37:46 +00:00