Stephanos A
2567e25173
Supplementary amount issue resolution
2026-07-17 19:47:11 +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
Roba Boru
0c584cce88
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-17 10:21:12 +03:00
Roba Boru
610580e15e
Added discrepancy management for duplicate seats
2026-07-17 10:20:35 +03:00
Nathnael Wondisha
f769d97135
Merge pull request #752 from Tria-plc/freight/feat/fixes-v1
...
Freight/feat/fixes v1
2026-07-17 10:01:44 +03:00
Roba Boru
ea8f91a415
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-17 08:43:08 +03:00
Roba Boru
2366b28610
remove the cron job
2026-07-17 08:42:42 +03:00
Stephanos A
f3c0fd6cbb
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-17 00:49:50 +03:00
Stephanos A
e59b797477
Minor updates
2026-07-17 00:49:35 +03:00
Roba Boru
1bba6dd9fc
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 23:22:55 +03:00
Roba Boru
969c524afe
Added cron job that check duplicate seat and assign if free available
2026-07-16 23:22:20 +03:00
marshal
d8ec9b3436
Merge pull request #749 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-16 23:13:01 +03:00
Marshal
71507b27fd
changes
2026-07-16 20:09:59 +00:00
Marshal
35c53e3f36
changes
2026-07-16 20:03:35 +00:00
Stephanos A
ef37ce4c31
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-16 21:31:13 +03:00
Abubeker Yasin
718c384a06
Update tickets.controller.ts
2026-07-16 21:15:10 +03:00
Stephanos A
17c0123161
Add unique constraint to JourneySegment for seat bookings per schedule
2026-07-16 21:10:02 +03:00
Stephanos A
3726ac8390
Add seat block schedule id for consistency
2026-07-16 20:11:42 +03:00
Stephanos A
8ae327e779
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-16 19:28:12 +03:00
Stephanos A
e3075d1486
Seats holding, booking, blocking inconsistencies resolution
2026-07-16 19:28:00 +03:00
Roba Boru
6d524ce6be
Fix payment fallback redirect
2026-07-16 17:27:32 +03:00
Roba Boru
fe5b258fca
Fix confirmation page pending payment
2026-07-16 17:02:23 +03:00
Roba Boru
f9b87b9911
Fix waiting time loading
2026-07-16 16:41:36 +03:00
Nathnael
e626e1db63
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-16 13:23:40 +00:00
Roba Boru
e3e70707a3
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 16:17:15 +03:00
Roba Boru
8790e020ee
Fix loading message
2026-07-16 16:16:51 +03:00
marshal
1a3fa4bc5a
Merge pull request #738 from Tria-plc/freight_feature/usermanagement
...
fix issue
2026-07-16 16:00:07 +03:00
Marshal
b50adc4666
fix issue
2026-07-16 12:59:28 +00:00
Roba Boru
10968410b2
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 15:45:13 +03:00
Roba Boru
43c0f5b01e
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 15:45:01 +03:00
Roba Boru
0142c94bb0
Check payment before generating ticket
2026-07-16 15:44:47 +03:00
Nathnael
e2f42136a8
fix: add password form to account
2026-07-16 12:37:52 +00:00
Abubeker Yasin
cc56ad7748
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-16 15:37:25 +03:00
Abubeker Yasin
e0abfddf10
Update payment-events.consumer.ts
2026-07-16 15:36:02 +03:00
Stephanos A.
211505a585
Merge pull request #736 from Tria-plc/alpha
...
Alpha
2026-07-16 15:19:07 +03:00
Stephanos A
e28372306f
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-16 15:18:16 +03:00
Stephanos A
6b5a80b597
Supplementary payments client pages
2026-07-16 15:18:01 +03:00
Nathnael Wondisha
8ee3f13bdb
Merge pull request #735 from Tria-plc/freight/feat/payment-revert
...
fix: revert the testing
2026-07-16 15:13:30 +03:00
Nathnael
f71bbbf782
feat: setup account page for customer and centeralize the otps and phone usages to use the iam user
2026-07-16 12:08:45 +00:00
Nathnael
c19e4260c1
fix: revert the testing
2026-07-16 12:04:58 +00:00
marshal
35a9d25aaa
Merge pull request #734 from Tria-plc/freight_feature/usermanagement
...
fix u=issue
2026-07-16 15:02:40 +03:00
Marshal
e8e12c1363
fix u=issue
2026-07-16 12:02:11 +00:00
Roba Boru
fa7a517410
Fallback cron job for ticketing if rabbitmq disconnected.
2026-07-16 14:34:53 +03:00
Roba Boru
8a1c9bfeb7
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 13:54:33 +03:00
Roba Boru
9161b24f98
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-16 13:54:22 +03:00
Stephanos A.
478d52a623
Merge pull request #732 from Tria-plc/alpha
...
totalMinor with displayTotalMinor updates
2026-07-16 13:40:51 +03:00
Roba Boru
e316e59eda
Update altenative dates
2026-07-16 13:39:44 +03:00
Stephanos A
b2ab65245a
totalMinor with displayTotalMinor updates
2026-07-16 13:38:34 +03:00
Hagernesh
d5182c5d85
feat(last-mile): wire multi-container assignment, bulk drawdown + EDR exit papers
...
Frontend for the per-truck EDR backend:
- Assign modal takes a container LOAD per truck (MultiSelect, max 2) instead of a
single container, so a truck can carry one 40ft or two 20ft. Sends
containerNumbers[]; the API enforces the size rule.
- requiredVehicles is now size-aware: a 40ft fills a truck (1 each), two 20ft
share one. It previously assumed ceil(containers / 2) regardless of size, so a
2x40ft booking under-counted the trucks needed.
- Bulk bookings show the drawdown in the assign modal — remaining vs total
tonnage, what's been hauled, and a "fully hauled" state when it reaches 0.
- New "Truck exit papers" row action opens a per-truck list (plate, containers,
arrival, exit, net weight) with a per-truck exit-paper download.
- last-mile findAll/findById now load each assignment's containers so the UI can
hydrate a truck's load.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-16 09:24:22 +00:00
