Commit Graph

2343 Commits

Author SHA1 Message Date
Roba Boru
6f8dcaaf4a Comment out altenative schedules 2026-07-15 14:58:25 +03:00
SennayT
f9706c9fb0 refactor: separate base image configuration into Dockerfile.base for improved build management 2026-07-15 10:51:35 +00:00
SennayT
3416585a01 add puppeteer support 2026-07-15 13:42:42 +03:00
marshal
7700aa6358 Merge pull request #701 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-15 13:32:37 +03:00
Marshal
c71a0043d6 implement wagon maintenance feature: add functionality to detach wagons and move them to maintenance status 2026-07-15 10:32:09 +00:00
Roba Boru
30a91691c8 Update seat availability 2026-07-15 12:50:19 +03:00
Marshal
11771e5f92 remove reopen delay minutes from global rules and update related types
- Removed the  field from  and related components.
- Updated  to reflect the removal of the reopen delay input field.
- Modified  to include new train number fields:  and .
- Added  interface to manage active schedules with trade direction.
- Introduced  interface to track wagon shortages in bookings.
- Updated  logic to ensure consistent UI state representation.
- Created migrations to drop the  column and add  and  columns to the  table.
- Added tests for the new booking window display logic and wagon planning functionality.
2026-07-15 09:13:02 +00:00
Hagernesh
fd4c4d630f fix(warehouse): disable Receive-At-Warehouse once booking is received
The Warehouse Information card kept the receive button active after the booking
already had an inventory record. Disable it (relabel "Received At Warehouse",
add a tooltip) when an inventory item exists.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-15 07:54:23 +00:00
Hagernesh
b71a53c4a9 fix(warehouse): show booking reference instead of UUID in inventory table
The inventory table's Booking column rendered a truncated bookingId UUID; use
the bookingReference already attached to each row (fall back to the short UUID
only when absent). Keep the UUID in the tooltip.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-15 07:54:23 +00:00
Stephanos A
6b84f22a91 Fix seat class name assignment to ensure consistency with fare engine resolution 2026-07-15 10:48:36 +03:00
Stephanos A
b4992546d1 Build issue resolution 2026-07-15 10:43:19 +03:00
Stephanos A
9347f932a1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-15 10:28:14 +03:00
Stephanos A
e2529b9317 Payment amount for non ETB and exchange fixes 2026-07-15 10:27:17 +03:00
Marshal
9be7f356f0 enhance train scheduling logic to exclude cancelled trains and refine window filtering 2026-07-15 07:07:10 +00:00
Roba Boru
6a9227b0f6 Extend seat hold time if booking created 2026-07-15 09:15:49 +03:00
Roba Boru
658b8d0077 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-15 08:13:39 +03:00
Roba Boru
64b362ff51 Fix expired seat 2026-07-15 08:13:23 +03:00
Abubeker Yasin
89ae06a5a8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-15 00:45:39 +03:00
Abubeker Yasin
f8658d63b8 feat: ( currency ) add multiple from currency 2026-07-15 00:45:24 +03:00
Stephanos A
c0b99b50a9 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-15 00:40:08 +03:00
Stephanos A
25fdf88a77 Booking currency updates, audit logging updates 2026-07-15 00:39:53 +03:00
Roba Boru
ae2db7feb4 remove fare from seat selection summary 2026-07-14 22:59:46 +03:00
Roba Boru
effc9cefe2 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 22:51:43 +03:00
Roba Boru
7dc130d0ad Show seat left on booking result 2026-07-14 22:51:26 +03:00
Stephanos A
5aa1892e19 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 22:44:07 +03:00
Stephanos A
d92d1cdaa4 Segment price override enabled 2026-07-14 22:43:57 +03:00
Roba Boru
36ecbbe6d0 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:58:02 +03:00
Roba Boru
89b99b0a08 Fix seat label 2026-07-14 21:57:34 +03:00
Abubeker Yasin
0d29a940a6 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 21:26:36 +03:00
Abubeker Yasin
43aecf8376 Update page.tsx 2026-07-14 21:25:27 +03:00
Roba Boru
18d38891a4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:22:23 +03:00
Roba Boru
660c611a1c Fix route datetime on lookup page 2026-07-14 21:22:04 +03:00
Roba Boru
c2a7d99480 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:10:16 +03:00
Abubeker Yasin
9d93e5c300 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 21:10:02 +03:00
Abubeker Yasin
7d64c91915 feat: ( auth ) restore sign in/register UI in nav bar, sidebar, and auth-check 2026-07-14 21:09:49 +03:00
Stephanos A
05ff0c2595 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 20:58:36 +03:00
Stephanos A
f243fdd4e3 Currency and converted amount for non ETB 2026-07-14 20:51:40 +03:00
Abubeker Yasin
7439303eea Merge pull request #683 from Tria-plc/alpha
Alpha
2026-07-14 20:20:27 +03:00
Abubeker Yasin
c8fe2a78f8 Update schedules.controller.ts 2026-07-14 20:18:11 +03:00
Abubeker Yasin
38dd064e3f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 20:17:02 +03:00
Abubeker Yasin
fc684a0f65 feat: ( permissions ) add permssions for master data 2026-07-14 20:04:42 +03:00
Hagernesh
7e934b3433 feat(warehouse,last-mile): truck load size rule, dedup last-mile, driver-required + arrival prefill
Truck loading:
- loadTruck enforces max 2 containers / one 40ft (two 20ft) and auto-marks an
  assigned truck arrived on load; container-items payload + modal expose
  container size with a client-side selection cap.
- Show "#x containers pending assignment" in the portal truck card and the
  backoffice container modal.

Last-mile:
- create() is idempotent — return the existing record for a booking instead of
  inserting a duplicate delivery row (fixed the same booking showing twice in
  Assign-Mile).
- setVehicles/update reject a truck with no assigned driver; the Assign toast
  now surfaces the reason.
- New GET /last-mile/booking/:id/arrival-trucks returns assigned EDR trucks with
  driver details; ReleaseOrderModal fetches and auto-fills them so an assigned
  EDR truck no longer reads as "not assigned yet".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-14 14:16:45 +00:00
Roba Boru
ba05cecfca Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 16:54:49 +03:00
Roba Boru
12ab3f33b1 Fix stop route 2026-07-14 16:54:24 +03:00
marshal
5bc6d6b669 Merge pull request #680 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-14 16:52:06 +03:00
Marshal
b102a31fc1 fix train builder and consolidation 2026-07-14 13:51:31 +00:00
Marshal
5cffe2860c fix train builder and consolidation 2026-07-14 13:49:39 +00:00
Eyob T.
adaebbc83b Merge pull request #678 from Tria-plc/alpha
Update arrival time to terminal text
2026-07-14 16:12:28 +03:00
Marshal
01459bd73c train 2026-07-14 13:11:38 +00:00
Marshal
b5a97d344a train 2026-07-14 13:10:00 +00:00