natib21
af57ffdda4
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI
2026-07-16 08:13:57 +00:00
natib21
4a04aa7e97
fic
2026-07-16 08:13:22 +00:00
Abubeker Yasin
edbef5ccf2
add permissions
2026-07-16 11:01:31 +03:00
Nathnael Wondisha
2db321b37a
Merge pull request #724 from Tria-plc/freight/feat/fixes-v1
...
Freight/feat/fixes v1
2026-07-16 10:59:36 +03:00
yaschalew10
b6d71ccc57
Merge pull request #723 from Tria-plc/freight/feature/user_management_UI
...
Freight/feature/user management UI
2026-07-16 10:50:34 +03:00
natib21
9d53552f95
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI
2026-07-16 07:48:27 +00:00
natib21
a4b3309412
add seed
2026-07-16 07:43:54 +00:00
Nathnael
5f6d8f9294
fix: cache invalidation
2026-07-16 07:17:22 +00:00
natib21
312014b678
fix first/last mile
2026-07-16 07:13:24 +00:00
Nathnael
08faf56c4f
fix: payment autopay on the payment init added for testing
2026-07-16 06:43:30 +00:00
Stephanos A.
bfc8477721
Merge pull request #722 from Tria-plc/alpha
...
Alpha
2026-07-16 08:47:56 +03:00
Stephanos A
3bc492ea83
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-16 08:41:53 +03:00
Stephanos A
b2b31f30bb
Generate ticket, dashboard, excess luggage rate updates
2026-07-16 08:41:35 +03:00
marshal
50d5ce5ad9
Merge pull request #721 from Tria-plc/freight_feature/usermanagement
...
fix issue
2026-07-16 04:06:52 +03:00
Marshal
fe29b38377
fix issue
2026-07-16 01:05:57 +00:00
marshal
ea22f38adf
Merge pull request #720 from Tria-plc/freight_feature/usermanagement
...
fix issue
2026-07-16 03:34:14 +03:00
Marshal
41fe04652f
fix issue
2026-07-16 00:33:31 +00:00
marshal
67bc835458
Merge pull request #719 from Tria-plc/freight_feature/usermanagement
...
implement empty-container return service: add return quantity handlin…
2026-07-16 02:06:08 +03:00
Marshal
234a74e812
implement empty-container return service: add return quantity handling, update related DTOs, services, and UI components
2026-07-15 22:48:04 +00:00
Abubeker Yasin
70724ac3df
Merge pull request #718 from Tria-plc/alpha
...
Alpha
2026-07-15 23:26:28 +03:00
marshal
e3fccbd24d
Merge pull request #717 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-15 23:18:55 +03:00
Marshal
fc44eee25e
implement update train details feature: add DTO, service method, and UI modal for editing train name and run numbers
2026-07-15 20:14:39 +00:00
Abubeker Yasin
d0a3fb3ca3
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 23:14:19 +03:00
Abubeker Yasin
7725b0d5d4
Update payments.service.ts
2026-07-15 23:14:05 +03:00
Eyob T.
f4ae970fc9
Merge pull request #716 from Tria-plc/alpha
...
Fix booking detail for roundtrip
2026-07-15 22:05:56 +03:00
Roba Boru
916b41d541
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 22:03:58 +03:00
Roba Boru
230fdfb852
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 22:03:48 +03:00
Roba Boru
63accc8bd3
Fix booking detail for roundtrip
2026-07-15 22:03:29 +03:00
Abubeker Yasin
5360075a74
Merge pull request #715 from Tria-plc/alpha
...
Alpha
2026-07-15 21:47:32 +03:00
Abubeker Yasin
458f27c1b1
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 21:33:17 +03:00
Eyob T.
fa40dc787b
Merge pull request #714 from Tria-plc/alpha
...
Update seatmap for blocked seats
2026-07-15 21:32:35 +03:00
Roba Boru
4452ec2410
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 21:29:51 +03:00
Roba Boru
be7b829845
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 21:29:35 +03:00
Roba Boru
f185da2163
Update seatmap for blocked seats
2026-07-15 21:28:35 +03:00
Abubeker Yasin
9cf71e7e7a
feat: ( payment ) add waafi webhook log
2026-07-15 21:23:10 +03:00
Stephanos A.
9a8c42d0b3
Merge pull request #713 from Tria-plc/alpha
...
Seat block issue resolution
2026-07-15 21:13:50 +03:00
Stephanos A
2d2fcfbda9
Seat block issue resolution
2026-07-15 21:11:23 +03:00
Abubeker Yasin
2ffb2f9f60
remove auth
2026-07-15 20:05:55 +03:00
Roba Boru
ffa5a114b5
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 19:57:18 +03:00
Roba Boru
0d117362d6
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 19:56:58 +03:00
Roba Boru
be46744417
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 19:56:22 +03:00
Stephanos A.
b12df90e59
Merge pull request #712 from Tria-plc/alpha
...
Currency issue resolution
2026-07-15 19:53:38 +03:00
Stephanos A
8bda06b226
Currency issue resolution
2026-07-15 19:50:32 +03:00
Stephanos A.
d45b4e78d4
Merge pull request #711 from Tria-plc/alpha
...
Alpha
2026-07-15 19:21:35 +03:00
Stephanos A
4343ead1fe
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 19:18:49 +03:00
Stephanos A
7bbd34f159
Currency issue resolution
2026-07-15 19:18:35 +03:00
mulish77
a8690a60d8
Merge pull request #710 from Tria-plc/dev
...
prod deployment
2026-07-15 19:09:12 +03:00
Hagernesh Tadesse
6518ba799a
Merge pull request #709 from Tria-plc/wh-dashboard
...
Added performed by to warehouse for audit
2026-07-15 18:35:32 +03:00
Hagernesh
2647776d19
feat(warehouse): stamp actor as display name instead of UUID
...
Add actorLabel(user) — resolves the authenticated user to a readable name
(name → username → email → id) — and use it for the performed_by audit stamp on
every warehouse action, so the activity log shows a person, not a UUID. The
freight DB has no users table to join, so the name is stamped at write time.
approve-delivery keeps the raw user id (it is an id argument, not the audit
label). Existing rows keep their prior value; this applies going forward.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-15 15:24:05 +00:00
Hagernesh
2044312d93
feat(warehouse): stamp authenticated user as action actor (performedBy)
...
Warehouse mutation endpoints now record the JWT-authenticated user as the actor
(user.id) instead of trusting a client-supplied performedBy string, unlocking
per-operator productivity metrics and a trustworthy audit trail. Covers receive,
receive-bulk, reserve, store, ready-for-loading, ready-for-pickup, load-onto-
train, bulk-dispatch, dispatch, deliver, gate-clearance, approve-delivery, the
Djibouti/import auto-unload actions, and fee-invoice generation. The prior
client value is kept only as a fallback for unauthenticated/internal calls.
move/load do not yet carry an actor (their DTOs have no performedBy) — separate
follow-up.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-15 14:51:21 +00:00
