Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 19:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,023 Commits 96 Branches 0 Tags
07ca838504b1ff636286dfb8b940c53ee0354eea
Commit Graph

2329 Commits

Author SHA1 Message Date
Roba Boru
6a9227b0f6 Extend seat hold time if booking created 2026-07-15 09:15:49 +03:00
Roba Boru
658b8d0077 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-15 08:13:39 +03:00
Roba Boru
64b362ff51 Fix expired seat 2026-07-15 08:13:23 +03:00
Abubeker Yasin
89ae06a5a8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-15 00:45:39 +03:00
Abubeker Yasin
f8658d63b8 feat: ( currency ) add multiple from currency 2026-07-15 00:45:24 +03:00
Stephanos A
c0b99b50a9 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-15 00:40:08 +03:00
Stephanos A
25fdf88a77 Booking currency updates, audit logging updates 2026-07-15 00:39:53 +03:00
Roba Boru
ae2db7feb4 remove fare from seat selection summary 2026-07-14 22:59:46 +03:00
Roba Boru
effc9cefe2 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 22:51:43 +03:00
Roba Boru
7dc130d0ad Show seat left on booking result 2026-07-14 22:51:26 +03:00
Stephanos A
5aa1892e19 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 22:44:07 +03:00
Stephanos A
d92d1cdaa4 Segment price override enabled 2026-07-14 22:43:57 +03:00
Roba Boru
36ecbbe6d0 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:58:02 +03:00
Roba Boru
89b99b0a08 Fix seat label 2026-07-14 21:57:34 +03:00
Abubeker Yasin
0d29a940a6 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 21:26:36 +03:00
Abubeker Yasin
43aecf8376 Update page.tsx 2026-07-14 21:25:27 +03:00
Roba Boru
18d38891a4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:22:23 +03:00
Roba Boru
660c611a1c Fix route datetime on lookup page 2026-07-14 21:22:04 +03:00
Roba Boru
c2a7d99480 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 21:10:16 +03:00
Abubeker Yasin
9d93e5c300 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 21:10:02 +03:00
Abubeker Yasin
7d64c91915 feat: ( auth ) restore sign in/register UI in nav bar, sidebar, and auth-check 2026-07-14 21:09:49 +03:00
Stephanos A
05ff0c2595 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 20:58:36 +03:00
Stephanos A
f243fdd4e3 Currency and converted amount for non ETB 2026-07-14 20:51:40 +03:00
Abubeker Yasin
7439303eea Merge pull request #683 from Tria-plc/alpha 
Alpha
 2026-07-14 20:20:27 +03:00
Abubeker Yasin
c8fe2a78f8 Update schedules.controller.ts 2026-07-14 20:18:11 +03:00
Abubeker Yasin
38dd064e3f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 20:17:02 +03:00
Abubeker Yasin
fc684a0f65 feat: ( permissions ) add permssions for master data 2026-07-14 20:04:42 +03:00
Hagernesh
7e934b3433 feat(warehouse,last-mile): truck load size rule, dedup last-mile, driver-required + arrival prefill 
Truck loading:
- loadTruck enforces max 2 containers / one 40ft (two 20ft) and auto-marks an
  assigned truck arrived on load; container-items payload + modal expose
  container size with a client-side selection cap.
- Show "#x containers pending assignment" in the portal truck card and the
  backoffice container modal.

Last-mile:
- create() is idempotent — return the existing record for a booking instead of
  inserting a duplicate delivery row (fixed the same booking showing twice in
  Assign-Mile).
- setVehicles/update reject a truck with no assigned driver; the Assign toast
  now surfaces the reason.
- New GET /last-mile/booking/:id/arrival-trucks returns assigned EDR trucks with
  driver details; ReleaseOrderModal fetches and auto-fills them so an assigned
  EDR truck no longer reads as "not assigned yet".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 14:16:45 +00:00
Roba Boru
ba05cecfca Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 16:54:49 +03:00
Roba Boru
12ab3f33b1 Fix stop route 2026-07-14 16:54:24 +03:00
marshal
5bc6d6b669 Merge pull request #680 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-14 16:52:06 +03:00
Marshal
b102a31fc1 fix train builder and consolidation 2026-07-14 13:51:31 +00:00
Marshal
5cffe2860c fix train builder and consolidation 2026-07-14 13:49:39 +00:00
Eyob T.
adaebbc83b Merge pull request #678 from Tria-plc/alpha 
Update arrival time to terminal text
 2026-07-14 16:12:28 +03:00
Marshal
01459bd73c train 2026-07-14 13:11:38 +00:00
Marshal
b5a97d344a train 2026-07-14 13:10:00 +00:00
Roba Boru
7b7a4058ad Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 16:09:03 +03:00
Roba Boru
446cea76e1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 16:08:52 +03:00
Roba Boru
e785c117e4 Update arrival to terminal text 2026-07-14 16:08:33 +03:00
Eyob T.
278d7c333a Merge pull request #677 from Tria-plc/alpha 
Alpha
 2026-07-14 16:05:02 +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
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
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