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
Roba Boru
d2f82fd097
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 09:16:09 +03:00
Roba Boru
6a9227b0f6
Extend seat hold time if booking created
2026-07-15 09:15:49 +03:00
Eyob T.
bf4b685748
Merge pull request #693 from Tria-plc/alpha
...
Fix expired seat
2026-07-15 08:16:21 +03:00
Roba Boru
7cca901913
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 08:14:06 +03:00
Roba Boru
85f221065f
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 08:13:54 +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
28ddc7b1c5
Merge pull request #692 from Tria-plc/dev
...
Merge to main
2026-07-15 01:03:47 +03:00
Abubeker Yasin
1faf936869
Merge pull request #691 from Tria-plc/alpha
...
Alpha
2026-07-15 01:02:07 +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
Abubeker Yasin
ad737d861b
Merge pull request #690 from Tria-plc/alpha
...
Alpha
2026-07-15 00:42:29 +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
Abubeker Yasin
7e1e600702
Merge pull request #689 from Tria-plc/alpha
...
Show seat left on booking result
2026-07-14 23:03:21 +03:00
Roba Boru
ae2db7feb4
remove fare from seat selection summary
2026-07-14 22:59:46 +03:00
Roba Boru
0aed560296
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 22:51:59 +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
Abubeker Yasin
761d28f994
Merge pull request #688 from Tria-plc/alpha
...
Alpha
2026-07-14 22:46:48 +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
robiman
2300fc5e3b
Merge pull request #687 from Tria-plc/alpha
...
Fix seat label
2026-07-14 22:00:36 +03:00
Roba Boru
93133ed0a1
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 21:58:17 +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
ef7ce03318
Merge pull request #686 from Tria-plc/alpha
...
Alpha
2026-07-14 21:30:57 +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
robiman
4521d7b496
Merge pull request #685 from Tria-plc/alpha
...
Fix route datetime on lookup page
2026-07-14 21:24:02 +03:00
Roba Boru
a934313dda
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 21:22:35 +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
Abubeker Yasin
dc57be8f49
Merge pull request #684 from Tria-plc/alpha
...
Alpha
2026-07-14 21:16:41 +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 Tadesse
bdbf05e1ad
Merge pull request #682 from Tria-plc/accrualdashboard
...
feat(warehouse,last-mile): truck load size rule, dedup last-mile, dri…
2026-07-14 17:25:43 +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
robiman
5e4e439c0f
Merge pull request #681 from Tria-plc/alpha
...
Fix stop route
2026-07-14 16:56:09 +03:00
