Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 22:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,390 Commits 96 Branches 0 Tags
d3de4a6abd5c38b9e61ce9be9694fd736900f879
Commit Graph

1867 Commits

Author SHA1 Message Date
Nathnael
1fdd5e3c4c feat: add permissions 2026-07-06 14:10:44 +00:00
Nathnael
894474704b fix: unused var 2026-07-06 14:09:55 +00:00
Nathnael
46e5761405 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 13:46:27 +00:00
marshal
1531c16d1a Merge pull request #491 from Tria-plc/freight_feature/usermanagement 
implement intercity booking management and booking window websocket i…
 2026-07-06 16:44:56 +03:00
Marshal
fed5f2f43f implement intercity booking management and booking window websocket integration 2026-07-06 13:28:21 +00:00
Hagernesh Tadesse
f4ed9db8e4 Merge pull request #490 from Tria-plc/PertruckExit 
Pertruck exit

Per-truck Exit Paper button in the TruckDispatchModal → downloads that truck's PDF.
Rule applied

Single truck / whole booking → the existing per-booking release doc.
Multiple trucks → one exit paper per truck (its containers).
 2026-07-06 16:22:38 +03:00
Hagernesh
756ad73e9c pERTRUCK EXIT 2026-07-06 13:16:34 +00:00
Abubeker Yasin
995e75652b Merge pull request #488 from Tria-plc/alpha 
fix: lock file
 2026-07-06 15:55:51 +03:00
Abubeker Yasin
96a9f40b93 fix: lock file 2026-07-06 15:49:22 +03:00
Hagernesh
551a5fdeed list trucks + loadable containers → load) 2026-07-06 12:40:34 +00:00
Hagernesh Tadesse
065dfa7b5e Merge pull request #485 from Tria-plc/CutomerTruckAssign 
separte handover edr lastmile and customer last mile flow

Self-haul: handover auto-generated on first truck arrival.
Signed when customer approves delivery 

Fixes
Import train dispatch no longer blocked by loading confirmation (committed 0a170182).
Marshalling / handover / GRN docs no longer masquerade as "Release Order" (decoupled from the release fallback).
Weighing modal now fetches trucks from both last-mile + customer portal, shows "Truck is not assigned yet".
Name fields (warehouse/fee/allocation) → letters-only.
11 build errors = stale package dist → rebuilt @edr/types + @edr/api-common.
jose missing dep → installed.

Features built
Multi-truck self-haul assignment — 1–2 containers/truck, per-truck arrival; entities + migration + service + controller + portal card. Exit paper carries truck info; freight-order PDF lists every truck.
Import vs export split — import: no container pre-select, staff weigh + register load on leaving (departTruck, gross weight, gate-out, locks), exit paper per container; export: pre-selected containers, receive-only.
Per-container GRN + received_to_port — on booking_container_units; auto-marked on receive (export delivery), staff-confirmed GRN (per batch / per booking), staff-only.
Online demurrage/storage pay in customer portal — Telebirr/Waafi pay button on warehouse invoices.
Container-number picker on truck assignment (surfaced booking container numbers).
 2026-07-06 15:31:25 +03:00
Hagernesh
fe9503638b separte handover edr lastmile and customer last mile flow 2026-07-06 12:27:58 +00:00
Abubeker Yasin
b45d180ee4 fix: ( pnpm ) lock file 2026-07-06 15:01:55 +03:00
Nathnael
8b6b1596b5 chore: docs to freight 2026-07-06 11:37:57 +00:00
Nathnael
4800d1db35 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 10:58:57 +00:00
Nathnael
298ad6227b style: ui improvement to the notification cards. 2026-07-06 10:54:43 +00:00
Abubeker Yasin
c24214333a Merge pull request #481 from Tria-plc/alpha 
Alpha
 2026-07-06 13:51:11 +03:00
Nathnael
ca3a6072d8 style: improve the ui of the toast for notifications 2026-07-06 10:38:27 +00:00
Abubeker Yasin
7b9f15fa58 feat: ( iam ): add EDR-branded OTP SMS messages via IamModule.forRoot 2026-07-06 13:34:20 +03:00
Nathnael
abe26c2c60 feat: update the ui of the notification 2026-07-06 10:29:59 +00:00
marshal
8b41e80ecc Merge pull request #480 from Tria-plc/freight_feature/usermanagement 
refactor contract handling to support single route per contract and i…
 2026-07-06 12:04:49 +03:00
Marshal
38413c4499 refactor contract handling to support single route per contract and improve reference generation logic 2026-07-06 09:02:54 +00:00
Nathnael
68c60f9e61 feat: add destination to the notification 2026-07-06 09:02:18 +00:00
ghost2023
8f5dfd83c5 fix: api prefix 2026-07-06 11:58:06 +03:00
marshal
75e6543143 Merge pull request #479 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-06 11:43:23 +03:00
Marshal
8336a5aff8 refactor contract handling to support single route per contract and improve reference generation logic 2026-07-06 08:42:44 +00:00
Marshal
1b92c57e23 refactor contract handling to support single route per contract and improve reference generation logic 2026-07-06 08:36:11 +00:00
Abubeker Yasin
82a835d3af refactor: ( iam ) update iam package 2026-07-06 11:29:46 +03:00
Marshal
544cd4620c enhance permission filtering for sidebar items and improve risk assignment logic in clearance components 2026-07-06 07:52:20 +00:00
Nathnael
c8f65829d1 feat: setup notification to the portal 2026-07-06 06:52:26 +00:00
Nathnael
439e1ec29e feat: setup notification to the backoffice 2026-07-06 06:52:09 +00:00
Nathnael
5a10c14ceb feat: setup the notification module to the api 2026-07-06 06:51:38 +00:00
Stephanos A.
3d6bdb7b25 Merge pull request #478 from Tria-plc/alpha 
Package boarding station updates
 2026-07-06 08:55:05 +03:00
Stephanos A
19308e3969 Package boarding station updates 2026-07-06 08:53:56 +03:00
Stephanos A.
3975c914df Merge pull request #477 from Tria-plc/alpha 
Package payment amount fixes
 2026-07-06 07:40:34 +03:00
Stephanos A
76bf81eec3 Package payment amount fixes 2026-07-06 07:37:00 +03:00
marshal
09a0c6144a Merge pull request #476 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-06 07:16:07 +03:00
Roba Boru
dd4f2dcba9 update seatmap and voucher 2026-07-06 06:12:52 +03:00
Roba Boru
42cba4473d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-06 03:15:57 +03:00
Roba Boru
c852f99a3a Update passenger contact information 2026-07-06 03:15:43 +03:00
Marshal
44fbb481b1 refactor T1 document handling and update related logic for import/export processes 2026-07-05 22:58:02 +00:00
Marshal
58fa0d9184 improve error handling and query structure in runWarehouseArrivalAutomation 2026-07-05 22:41:39 +00:00
Marshal
5192c6b949 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-05 22:22:34 +00:00
Marshal
ac7bff8cc8 add overnight desk handling and effective window configuration for train schedules 2026-07-05 22:22:04 +00:00
Marshal
caa8397563 enhance booking window logic to support overnight desk configurations and update related UI components 2026-07-05 21:29:09 +00:00
Marshal
3485a7d63d add loading confirmation for import-Djibouti trains before dispatch 2026-07-05 21:07:03 +00:00
Stephanos A.
06f4939591 Merge pull request #473 from Tria-plc/alpha 
Alpha
 2026-07-05 23:06:50 +03:00
Stephanos A
0fe623095d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-05 23:05:38 +03:00
Stephanos A
102905d7e3 Additional UAT issue resolutions 2026-07-05 23:05:14 +03:00
Abubeker Yasin
a487a7e66b Merge pull request #472 from Tria-plc/alpha 
Alpha
 2026-07-05 22:57:51 +03:00