Commit Graph

2411 Commits

Author SHA1 Message Date
Nathnael
17b7a4f6dc chore: update the supportconversation schema 2026-07-07 13:26:59 +00:00
Nathnael
692a24f5d3 chore: add socket to packages api 2026-07-07 13:25:48 +00:00
Hagernesh Tadesse
ff0fa6bb9e Merge pull request #498 from Tria-plc/Doublehandling
Doublehandling
2026-07-07 09:48:26 +03:00
Hagernesh
24fa6ab83b Doublehandling 2026-07-07 06:25:58 +00:00
marshal
a171cf1f96 Merge pull request #497 from Tria-plc/freight_feature/usermanagement
enhance booking and contract notification systems
2026-07-07 09:07:31 +03:00
Stephanos A.
323bc9fcca Merge pull request #496 from Tria-plc/alpha
UAT - total fare amount display issues resolution
2026-07-07 08:52:42 +03:00
Stephanos A
30661a2699 Build issue resolutions 2026-07-07 08:52:00 +03:00
Stephanos A
ae0e48e6ed UAT - total fare amount display issues resolution 2026-07-07 08:16:48 +03:00
Hagernesh
96b78fc72e Login fixed — freight-api boots (PgBouncer search_path + migrations-table reconcile).
Invoice PDF styled (vector fallback, no Docker change).
Marshalling doc styled (table-aware fallback, portrait/landscape).
Load to Train tab — per-train arrived containers → multiselect → load onto wagons.
Yard/zone list filtered by freight type.
2026-07-06 21:09:56 +00:00
Marshal
05b13e84a8 enhance booking and contract notification systems
- Added detailed logging for socket connection events in useBookingWindowSocket.
- Introduced new notification types for contract status and schedule updates.
- Updated notification visuals to include new icons for contract status.
- Enhanced notification href resolution for contract status and schedule updates.
- Implemented booking lifecycle notifier service for customer and staff notifications.
- Created contract notifier service for managing contract lifecycle notifications.
- Added end-to-end tests for booking window socket functionality.
2026-07-06 21:03:08 +00:00
Hagernesh Tadesse
8b5ba8415f Merge pull request #494 from Tria-plc/PertruckExit
Export Loading to train
2026-07-06 22:21:03 +03:00
Stephanos A.
22daeb7f17 Merge pull request #495 from Tria-plc/alpha
Alpha
2026-07-06 22:13:42 +03:00
Hagernesh
838895897d Marshaling doc fix 2026-07-06 19:12:14 +00:00
Stephanos A
36055d0d82 Package booking new rules update, cascade delete option updates 2026-07-06 22:12:04 +03:00
Hagernesh
8785d992ab export loading 2026-07-06 19:00:04 +00:00
Hagernesh
bc47a42e1e export loading 2026-07-06 18:53:25 +00:00
marshal
7a9906279b Merge pull request #493 from Tria-plc/freight_feature/usermanagement
enhance user management and booking features with permissions and rea…
2026-07-06 20:58:17 +03:00
Marshal
8bd00ea78a enhance user management and booking features with permissions and real-time updates 2026-07-06 17:15:22 +00:00
Nathnael Wondisha
d3de4a6abd Merge pull request #492 from Tria-plc/freight/feat/fixes-v1
Freight/feat/fixes v1
2026-07-06 17:12:51 +03:00
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
Hagernesh
692d9074d0 feat: container/bulk items datatable on warehouse view details
Adds a per-container/bulk items view for a booking with derived lifecycle
stage (PENDING -> RECEIVED -> GRN -> LOADED -> LEFT -> DELIVERED) and reference
badges (booking, contract, last-mile). Backend containerItems() aggregates
booking_container_units + customer_truck_containers + inventory; exposed at
GET warehouse-inventory/bookings/:id/container-items.

Frontend ContainerItemsModal (opened from the View Details eye): stage tabs
with counts, ref columns, checkbox multiselect of loadable items -> pick truck
-> load (Truck_dispatch), and per-row per-truck Exit Paper.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-06 13:46:16 +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
Stephanos A
f52d7442ac Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-06 16:31:21 +03:00
Stephanos A
9b6423392b UAT issues resolution 2026-07-06 16:30:48 +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
53edc8ef67 Merge pull request #484 from Tria-plc/alpha
fix: ( pnpm ) lock file
2026-07-06 15:24:35 +03:00
Abubeker Yasin
b45d180ee4 fix: ( pnpm ) lock file 2026-07-06 15:01:55 +03:00
Nathnael
323262da62 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 11:38:53 +00:00
Nathnael
8b6b1596b5 chore: docs to freight 2026-07-06 11:37:57 +00:00
Nathnael Wondisha
907f4edc0a Merge pull request #482 from Tria-plc/freight/feat/fixes-v1
Central notification system with inapp notfication using socket.io
2026-07-06 14:00:12 +03: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