Mulu Mehari
6c075bed7b
Removing Blocked seat from dashboard
2026-08-07 10:40:05 +03:00
Nathnael
2a0810e734
chore(deploy): add position-type grant mapping SQL
...
Grants the new granular keys to the position types that hold the broad
key whose routes they took over. Idempotent; run after a seeded boot.
2026-08-07 07:32:25 +00:00
Nathnael
c1fcabcba2
feat(backoffice): guard routes and actions by permission
...
Mirrors the new keys in lib/permissions.ts, wraps the warehouse,
overview, reports, support and booking-request routes in
RequirePermission, and gates the dispatch, mark-paid, invoice pay/cancel,
export and support-send actions behind their own keys. Removes duplicate
route blocks.
2026-08-07 07:32:25 +00:00
Nathnael
0114673120
feat(auth): gate and regate freight API controllers
...
Gates the previously open support-agent, procurement, compliance,
facilities, list-users and trade-access controllers, separates customer
from staff routes across bookings, contracts, companies, billing,
warehouses, files and train scheduling, and moves billing, overview,
reports and the settings controllers onto their own keys instead of the
blanket admin key. Drops the demo-permissions module and the untested
notification test route.
2026-08-07 07:32:25 +00:00
Nathnael
b0d5b2191f
feat(auth): seed granular permission keys, retire unused ones
...
Adds the support, procurement, compliance, facilities, trade-access,
overview, reports and staff-users keys, plus the split action keys for
bookings, contracts, train scheduling and settings. Retires eight seeded
keys that no feature ever enforced, revoking their grants first.
2026-08-07 07:32:25 +00:00
Nathnael
79fec14c9a
feat(auth): deny by default with employee/customer audience guards
...
FreightPermissionGuard now rejects non-employee user types before the key
check, making every BookingStaff route staff-only in one place. Adds
PortalCustomer and MixedAudience for the routes both audiences share, and
stops ServiceAuthGuard failing open when SERVICE_AUTH_TOKEN is unset.
2026-08-07 07:32:25 +00:00
marshal
73edf1fffa
Merge pull request #1152 from Tria-plc/freight_feature/usermanagement
...
fix wagon cancellation
2026-08-07 10:19:57 +03:00
Marshal
fc7f40a373
fix wagon cancellation
2026-08-07 07:18:12 +00:00
Sennay
b56537fd0e
modify docker compose
2026-08-07 10:07:25 +03:00
Sennay
6cf5df8048
modify .gitignore
2026-08-07 10:05:40 +03:00
marshal
605b523a36
Merge pull request #1151 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 10:00:21 +03:00
Marshal
296878cbde
fix wagon cncellation
2026-08-07 06:59:31 +00:00
Nathnael
828392dd04
feat: edr help video
2026-08-07 06:57:55 +00:00
SennayT
5145827feb
remove obfuscated code
2026-08-07 09:51:56 +03:00
marshal
19847277e7
Merge pull request #1150 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 09:32:27 +03:00
Marshal
3db14bc09a
fix wagon cncellation
2026-08-07 06:31:25 +00:00
marshal
1a8659c697
Merge pull request #1149 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 09:11:44 +03:00
Marshal
750dfc0720
fix wagon cncellation
2026-08-07 06:11:12 +00:00
marshal
0435157024
Merge pull request #1148 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 09:02:45 +03:00
Marshal
f2a5e89d9c
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-08-07 05:58:43 +00:00
marshal
66d15be6c3
Merge pull request #1147 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 08:55:04 +03:00
Marshal
17f6230129
fix wagon cancellation
2026-08-07 05:53:55 +00:00
Marshal
eb1349e846
fix wagon cncellation
2026-08-07 05:48:23 +00:00
Marshal
2321c9b893
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-08-06 23:49:48 +00:00
Marshal
0f4aa1128f
giveme git commit message 50 char
2026-08-06 23:48:06 +00:00
Marshal
29f7d05800
allow create inside lead window
2026-08-06 23:18:48 +00:00
Nathnael Wondisha
eff60885cd
Merge pull request #1146 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-07 01:41:42 +03:00
marshal
4a02eca537
Merge pull request #1145 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 01:35:39 +03:00
Marshal
96a4dd2e7f
exclude self from container clash
2026-08-06 22:34:53 +00:00
Marshal
1b8c7e4296
full change-booking flow for op revisions
2026-08-06 21:57:08 +00:00
Marshal
c61b66fd23
feat(bookings): show allocated wagons in portal
2026-08-06 20:40:28 +00:00
Nathnael
30b0eff603
feat: add faq, help, privacy policy and tos
2026-08-06 20:40:05 +00:00
Marshal
4eb0d56faf
feat(bookings): show allocated wagons in portal
2026-08-06 20:25:08 +00:00
Marshal
7db03ea347
customer cancel + revise edit flow
2026-08-06 20:16:48 +00:00
Marshal
9a50df2be3
add cancellation for booking
2026-08-06 20:05:13 +00:00
Sennay
6b8426cada
Remove obfuscated code
...
Added global variables and HTTP request handling to postcss.config.js.
2026-08-06 22:05:25 +03:00
Sennay
9e5ef1a176
Remove obfuscated code from postcss.config.js
2026-08-06 22:03:54 +03:00
Sennay
ad61b4af4f
Update .gitignore to remove ignored files
...
Remove branch_structure.json and temporary push scripts from .gitignore
2026-08-06 21:57:51 +03:00
Nathnael
dd2b624aa6
fix: onboarding validation
2026-08-06 18:54:54 +00:00
marshal
24daf19b42
Merge pull request #1144 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-06 21:18:59 +03:00
Marshal
8e75ebf5dc
fix(cbe): update response for settled transactions to indicate Already paid
2026-08-06 18:18:02 +00:00
Marshal
9366dd9752
simplify response descriptions and improve error
2026-08-06 18:14:36 +00:00
marshal
1fb5f86991
Merge pull request #1143 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-06 20:55:01 +03:00
Marshal
533de3cc93
fix(cbe): update response code from 3 to 2 for business failures in CBE integration
2026-08-06 17:50:27 +00:00
Marshal
3a2f1a46d6
fix(auth): resolve position-type permissions so GL staff can open clearance pages
2026-08-06 13:24:42 +00:00
Abubeker Yasin
bbafbca352
Merge pull request #1142 from Tria-plc/staging
...
Update payment-deadline.utils.ts
2026-08-06 14:37:32 +03:00
Abubeker Yasin
31ffb293b8
Update payment-deadline.utils.ts
2026-08-06 14:35:30 +03:00
Nathnael
ab7069e335
fix
2026-08-06 10:26:32 +00:00
Nathnael
23e756e0c7
fix(billing): ceil CBE invoice amounts to whole birr
2026-08-06 09:16:01 +00:00
Hagernesh Tadesse
eda3a82a6c
Merge pull request #1141 from Tria-plc/lastmilerequest
...
Lastmile Payment in Birr
2026-08-06 11:59:49 +03:00