Commit Graph

1110 Commits

Author SHA1 Message Date
Nathnael
570c5ee125 feat: setted up the renewal contract 2026-06-16 08:51:23 +00:00
hagiye
f5d6d8e7da Batch 1 to 3 implementation 2026-06-16 11:36:24 +03:00
Nathnael
05da2ce27a feat: ui status updates 2026-06-16 08:29:40 +00:00
yaschalew10
0cac604510 Merge pull request #167 from Tria-plc/freight_feature/payments
Freight feature/payments
2026-06-16 11:13:03 +03:00
marshal
a0dbb4ca6f backoffice cleen up 2026-06-16 11:04:36 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
yaschalew10
ba4ebee59d Merge pull request #165 from Tria-plc/freight/feature/user_management
Freight/feature/user management
2026-06-16 09:20:08 +03:00
natib21
a1244609ce auth 2026-06-16 06:17:36 +00:00
natib21
d55cc78bd9 auth 2026-06-16 06:14:44 +00:00
Marshal
28ad9363d1 tracking ui 2026-06-15 12:01:44 +00:00
Eyob T.
20d6b1b6d8 Security patch 2026-06-15 14:11:39 +03:00
ghost2023
d1347892db feat(bookings): Implement unified hierarchical bulk cargo type selection via cargoTypePath 2026-06-15 09:57:00 +03:00
ghost2023
3e2e07bb5f feat(bookings): Implement data-driven service type selection and configuration 2026-06-15 09:57:00 +03:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
ghost2023
407cf3ed1f fixes 2026-06-15 09:52:17 +03:00
ghost2023
6058b870a1 feat(train-scheduling): implement API and types for bookable schedules 2026-06-15 09:52:17 +03:00
ghost2023
28f9d58e0a style: fix 2026-06-15 09:52:16 +03:00
ghost2023
e075252639 fix: the direction for the yard 2026-06-15 09:52:16 +03:00
marshal
52c0639c8f Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:27:56 +03:00
marshal
87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI 2026-06-14 02:13:08 +03:00
Marshal
b73bf2154e add detail batch and allocation monitoring page 2026-06-13 18:28:39 +00:00
yaschalew
b417ed2fc8 fix conflict 2026-06-13 14:37:13 +03:00
yaschalew
eee7b719b0 user management 2026-06-13 14:32:26 +03:00
Marshal
e3cd369b01 ui fix 2026-06-13 08:51:57 +00:00
Marshal
b2f13c95c5 update window range 2026-06-13 07:59:48 +00:00
yaschalew
12b6406d23 fix conflict 2026-06-13 10:45:26 +03:00
marshal
2d70f892a4 Merge pull request #144 from Tria-plc/freight_feature/schedule
backoffice ui fix
2026-06-13 09:39:17 +03:00
Marshal
d3a479c142 ui fix 2026-06-12 14:21:07 +00:00
Marshal
6b79348074 ui fix 2026-06-12 12:59:01 +00:00
Marshal
db39e77e90 fix batch page ui 2026-06-12 12:46:51 +00:00
Hagernesh
95c6a71438 feat(warehouse): batch 3 — loading, dispatch & train-departure visibility
- WarehouseLoading entity + Batch3 migration (wagon loading records)
- wagon-aware load() with validation; dispatch moved to PATCH
- read-only SchedulingReadFacade (schedule/wagon/departure) — never writes scheduling
- new endpoints: GET /warehouse-loadings, loadable-wagons, booking schedule
- Loading Queue / Loaded Inventory / Dispatch Queue pages + routes + sidebar
- FreightVisual illustrations (page heroes + empty states)
- booking detail: loaded/dispatched/wagon + read-only train schedule

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-12 12:44:40 +00:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration
UI migration Again
2026-06-12 15:24:46 +03:00
marshal
da387fd310 fix merge conflict 2026-06-12 14:58:39 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Hagernesh
72e2e3c985 Recieved invontory detals 2026-06-12 06:58:21 +00:00
Marshal
132f2150a8 add cron jobs and aslo 2026-06-11 20:59:19 +00:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Hagernesh
c2b5b3b926 Merge freight/develop into Warehouses 2026-06-11 19:26:21 +00:00
Hagernesh
c86118cd8d feat(warehouse): add warehouse management module (batch 1)
Backend (edr-freight-api):
- Warehouse, WarehouseYard, WarehouseZone, WarehouseInventory entities
- CRUD for warehouses/yards/zones with scoped code uniqueness
- Inventory receive with location-hierarchy + capacity validation and
  transactional capacity-counter updates
- inspect / ready-for-loading status transitions
- inventory inquiry (booking/customer/container/cargo-type joins)
- migration creating freight.warehouse* tables

Frontend (freight backoffice):
- types, service, react-query hooks, URL constants
- reusable components: badges, filters, table/card views, inventory and
  inquiry tables, create/receive modals
- pages: Warehouse list, detail (overview/yards/zones/inventory tabs),
  inventory, inventory inquiry
- Warehouse Information card + Receive At Warehouse on booking detail
- routes + sidebar nav; app-wide ErrorBoundary

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-11 15:54:56 +00:00
Nathnael
7c5dfa3ae1 fix: edit booking docs and prefill 2026-06-11 12:32:23 +00:00
Marshal
f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule 2026-06-11 11:15:29 +00:00
Marshal
2fa2ed6bb2 ui fix 2026-06-11 11:12:41 +00:00
Nathnael
103ff53fe0 feat: add document upload to booking creation form 2026-06-11 09:11:35 +00:00
Nathnael
3fa09ec644 style: booking detail pages fix 2026-06-11 08:27:38 +00:00
Nathnael
e01a7faa20 style: auth pages fix 2026-06-11 08:27:14 +00:00
Nathnael
16f506062a feat: enhance auth guard 2026-06-11 08:22:39 +00:00
Marshal
20289621f3 fix ui 2026-06-11 08:19:16 +00:00
Nathnael
2cd585a3ac style: ui fixes to booking detail page 2026-06-11 07:11:43 +00:00
Nathnael
83edb1e063 refactor: booking page refactor 2026-06-11 06:54:38 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00