Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-29 09:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,548 Commits 97 Branches 0 Tags
84baa0f009b7d78a723fd6e388e4eb13456d918c
Commit Graph

216 Commits

Author SHA1 Message Date
Hagernesh Tadesse
7712340c51 Merge pull request #525 from Tria-plc/Truckdetantion 
Container truck assignment on customer portal for import
 2026-07-08 07:41:22 +03:00
Hagernesh
3f6b9ac974 Container truck assignment on customer portal for import 2026-07-08 04:36:03 +00:00
Marshal
9dd9ace313 add reference field to train schedules and implement unique sequence generation 2026-07-07 23:06:44 +00:00
Marshal
88b1e548a2 resolve conflict 2026-07-07 22:24:42 +00:00
Marshal
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +00:00
Marshal
87a95b37bf enhance train scheduling and booking management 2026-07-07 21:38:45 +00:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
Hagernesh
35ccf1bc95 truck type detantion 2026-07-07 10:02:43 +00:00
Hagernesh
48b36a2621 Merge remote-tracking branch 'origin/dev' into Truckdetantion 2026-07-07 08:49:20 +00:00
Hagernesh
392038852e Truck detention on lastmile 2026-07-07 08:45:51 +00:00
natib21
fdd7b1711e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-07 08:33:25 +00:00
Hagernesh Tadesse
ff0fa6bb9e Merge pull request #498 from Tria-plc/Doublehandling 
Doublehandling
 2026-07-07 09:48:26 +03:00
natib21
75427ea63a fix tracker 2026-07-07 06:39:02 +00:00
Hagernesh
24fa6ab83b Doublehandling 2026-07-07 06:25:58 +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
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
natib21
fb4ffa5d67 fix 2026-07-06 12:23:25 +00:00
natib21
6b0db45be2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-06 12:06:22 +00:00
natib21
998a6801ab fleet 2026-07-06 12:05:52 +00:00
Nathnael
4800d1db35 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 10:58:57 +00:00
Nathnael
5a10c14ceb feat: setup the notification module to the api 2026-07-06 06:51:38 +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
93b8b69464 Add window close hour to booking desk configuration 2026-07-05 08:53:27 +00:00
Hagernesh
00cd1fccf6 train loading for import 2026-07-04 09:33:07 +00:00
Hagernesh
5b4f624188 Per truck exit and per truck grn 2026-07-04 08:42:57 +00:00
marshal
8084b411ca Merge pull request #453 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-04 08:00:26 +03:00
Marshal
f37078d51d update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:59:51 +00:00
natib21
bd88424167 fix 2026-07-04 01:47:28 +00:00
marshal
82cefc63d2 Merge pull request #442 from Tria-plc/freight_feature/usermanagement 
add hard capacity ceiling to weight limit rules
 2026-07-04 04:13:01 +03:00
Marshal
8ea2c8e95a add hard capacity ceiling to weight limit rules 2026-07-04 01:11:23 +00:00
yaschalew10
ee3657467d Merge pull request #435 from Tria-plc/freight/feature/first_mile_invoice 
Freight/feature/first mile invoice
 2026-07-04 01:57:06 +03:00
natib21
16bd7fabcc mile 2026-07-03 20:21:16 +00:00
natib21
77dc14f6a5 mile 2026-07-03 20:00:41 +00:00
Marshal
ff9cb4e6cd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 18:48:18 +00:00
Marshal
8db19dfacf Add snapshot of booking-window rules to train schedules and update related logic 2026-07-03 18:45:45 +00:00
Marshal
a5c46505e3 Add migration to widen window_duration_hours precision and update related components for duration handling 2026-07-03 16:37:09 +00:00
Marshal
6dc6914397 Add migration to repair schema drift and implement contract step banner in UI 2026-07-03 15:24:12 +00:00
natib21
e893af8133 fix 2026-07-03 15:22:51 +00:00
natib21
0e6ebda6f6 fix 2026-07-03 15:21:23 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
e881e8de84 fix 2026-07-03 14:21:46 +00:00
natib21
e14e02e7f2 fix 2026-07-03 14:07:43 +00:00
Hagernesh
01bd01cc05 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:06:34 +00:00
marshal
7eb62a0ba2 Merge pull request #423 from Tria-plc/freight_feature/usermanagement 
fix issues
 2026-07-03 16:55:26 +03:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +00:00
Hagernesh
e2867e3086 import loading backend 2026-07-03 13:47:45 +00:00