Commit Graph

2965 Commits

Author SHA1 Message Date
Marshal
01459bd73c train 2026-07-14 13:11:38 +00:00
Marshal
b5a97d344a train 2026-07-14 13:10:00 +00:00
Eyob T.
278d7c333a Merge pull request #677 from Tria-plc/alpha
Alpha
2026-07-14 16:05:02 +03:00
Hagernesh Tadesse
af1d41f02f Merge pull request #676 from Tria-plc/accrualdashboard
Accrualdashboard
accrual (fee.service, rules.controller, AccrualDashboard, migration 2140, ack dto, + weight fix)
handover signer-name (booking-handover.entity, handover.service, migration 2130)
portal delivery/docs (DocumentsTab, ApproveDeliveryModal, api.ts, bookings.service, approve-delivery dto)
Guard warehouse / inventory / fee endpoints with RBAC permissions Type: Security Summary: All backoffice warehouse, import/export inventory, and fee (demurrage/storage/double-handling/detention) endpoints were unauthenticated. Wired existing edr_freight_app:warehouse* permissions via @BookingStaff (JwtGuard + permission guard) onto 83 staff endpoints across 8 controllers. Portal/customer endpoints intentionally excluded (need a separate customer-ownership guard). Acceptance: Staff endpoints require the matching permission; customer portal doc/invoice flows unaffected.
2026-07-14 16:01:30 +03:00
Stephanos A
9bd19c5ca7 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 16:00:51 +03:00
Stephanos A
ed901777a6 Price issue on sign in path addressed, Djibouti side pricing updates added 2026-07-14 16:00:39 +03:00
Yonas Tewabe
ddd3501239 Update docker-compose.yaml 2026-07-14 16:00:04 +03:00
Hagernesh
65f6015c5e feat(warehouse): guard warehouse/inventory/fee endpoints with RBAC permissions
Apply JwtGuard + FreightPermissionGuard (via @BookingStaff) to 83 staff
endpoints across the 8 warehouse controllers, using existing
edr_freight_app:warehouse* permissions: warehouses/yards/zones,
inventory receive/move/load/unload/dispatch/gate-pass/release/deliver/inspect
(incl. import & export queues), allocation + fee rules (demurrage/storage/
double-handling), accrual dashboard + acknowledge, and fee invoices.

Customer-portal endpoints (booking-scoped documents, approve-delivery,
portal fee-invoice view/document/receipt/pay-online) are intentionally left
unguarded — they need a customer-ownership guard, not staff permissions.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-14 12:54:41 +00:00
Hagernesh
a367306565 feat(warehouse): accrual acknowledge/snooze + zone weight fix, handover signer, portal delivery
Accrual dashboard:
- warehouse_accrual_acks table (migration 2140) + acknowledge/unacknowledge
  endpoints; dashboard rows carry acknowledged/snoozeUntil, acked items sink
  and are skipped by the alert cron. Row menu: mark reviewed / snooze 3d / 7d /
  un-acknowledge; acked rows dimmed with a "Reviewed" badge.
- Fix zone weight occupancy: normalise inventory kg vs zone-capacity tonnes.

Handover (rode along, shared files):
- Require signer full name on delivery handover (signature optional);
  migration 2130 adds signer_name.

Portal delivery/docs (rode along, shared files):
- Approve-delivery name capture, booking-scoped GRN/release docs.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-14 12:54:41 +00:00
Hagernesh
d9fe79e160 accrual dashboard for port and terminal or warehouse related documents 2026-07-14 12:54:40 +00:00
Hagernesh
a542a13893 wAREHOUSE kPI strips 2026-07-14 12:54:40 +00:00
robiman
452355e292 Merge pull request #674 from Tria-plc/alpha
Fix datetime format
2026-07-14 14:40:40 +03:00
Roba Boru
c7ac6c590e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:38:20 +03:00
Roba Boru
2b60004195 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:38:11 +03:00
Roba Boru
ec519e128e Fix datetime format 2026-07-14 14:37:57 +03:00
Abubeker Yasin
2d37e2dd17 Merge pull request #673 from Tria-plc/alpha
Alpha
2026-07-14 14:18:47 +03:00
Abubeker Yasin
ef5d643ba4 feat: ( redirect ) add redirect url based on the domain name 2026-07-14 14:16:48 +03:00
marshal
f7f311660b Merge pull request #672 from Tria-plc/freight_feature/usermanagement
train
2026-07-14 14:09:18 +03:00
Marshal
6d0cf50b4d train 2026-07-14 11:06:49 +00:00
Roba Boru
cee06775e1 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:06:02 +03:00
Roba Boru
84fc2ebb1d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:05:50 +03:00
Abubeker Yasin
8904c00f6e Merge pull request #671 from Tria-plc/alpha
Update main.ts
2026-07-14 12:50:09 +03:00
Abubeker Yasin
1ace808b4a Update main.ts 2026-07-14 12:49:15 +03:00
Abubeker Yasin
8849c0959d Merge pull request #670 from Tria-plc/alpha
Alpha
2026-07-14 12:44:43 +03:00
Abubeker Yasin
500699d65f refactor: ( auth ) comment out the auth 2026-07-14 12:41:12 +03:00
yaschalew10
e56498a46f Merge pull request #669 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 12:30:11 +03:00
natib21
81bce1da31 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 09:29:11 +00:00
robiman
5c8e5cbbfe Merge pull request #668 from Tria-plc/alpha
pass baseurl to header
2026-07-14 12:28:36 +03:00
natib21
a48e830584 fix ui 2026-07-14 09:27:44 +00:00
Roba Boru
8ade28f70d pass baseurl to header 2026-07-14 12:26:29 +03:00
Roba Boru
8cc2ad969f Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 12:23:17 +03:00
yaschalew10
61ed332599 Merge pull request #667 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 12:14:19 +03:00
natib21
8a2da09500 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 09:13:29 +00:00
natib21
1b9b4ebb77 fix ui 2026-07-14 09:12:22 +00:00
Abubeker Yasin
149c668e23 Merge pull request #666 from Tria-plc/alpha
refactor: ( sign ) remove auth
2026-07-14 12:03:42 +03:00
Abubeker Yasin
cf7bad1606 Merge pull request #665 from Tria-plc/alpha
refactor: ( sign ) remove auth
2026-07-14 12:02:59 +03:00
Abubeker Yasin
a2465977e0 refactor: ( sign ) remove auth 2026-07-14 12:01:36 +03:00
yaschalew10
0071e43182 Merge pull request #664 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 11:52:01 +03:00
natib21
263195da34 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 08:49:39 +00:00
natib21
246bf940b2 fix ui 2026-07-14 08:49:20 +00:00
natib21
e63e6a2fc0 fix ui 2026-07-14 08:47:46 +00:00
Yonas Tewabe
36849584b0 Add gps-tracker environment configuration 2026-07-14 11:31:24 +03:00
Abubeker Yasin
ebb67679a8 Merge pull request #663 from Tria-plc/dev
m
2026-07-14 11:21:03 +03:00
Abubeker Yasin
17570e9900 Merge pull request #662 from Tria-plc/alpha
Alpha
2026-07-14 11:19:36 +03:00
Abubeker Yasin
4cce471ebe feat: ( cors ) update cors 2026-07-14 11:16:58 +03:00
yaschalew10
e93e2ffd74 Merge pull request #661 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 11:03:37 +03:00
yaschalew
790d3a6286 fix 2026-07-14 11:02:41 +03:00
Stephanos A
68f9dd878d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 11:00:54 +03:00
Stephanos A
6b0f2728f0 Passenger back office support page link restored 2026-07-14 11:00:37 +03:00
natib21
22cf8eabd1 fix ui 2026-07-14 07:59:17 +00:00