Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,868 Commits 96 Branches 0 Tags
sync-test
Commit Graph

1617 Commits

Author SHA1 Message Date
marshal
00d1263f6d fix seed issue 2026-06-16 12:15:48 +03:00
Hagernesh
314e9b79cc Faciklity add 2026-06-16 09:06:11 +00:00
Marshal
7151bce288 changes 2026-06-16 08:56:52 +00:00
hagiye
f5d6d8e7da Batch 1 to 3 implementation 2026-06-16 11:36:24 +03:00
marshal
1f0a642c03 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-15 16:16:33 +03:00
Marshal
87c6e12fbd fix allocate bookigns 2026-06-15 13:15:22 +00:00
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
marshal
fe1bed8c4b payment integration 2026-06-15 11:09:58 +03:00
ghost2023
44aef8c1b3 feat: add more fields to the reference service array 2026-06-15 09:56:59 +03:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +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
eee7b719b0 user management 2026-06-13 14:32:26 +03: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
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
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
8618ea2aa8 add cron jobs and aslo 2026-06-11 20:59:24 +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
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
c871330f7f resolve merge conflict 2026-06-11 10:52:37 +03:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
Marshal
257428be18 ui design for schedule 2026-06-09 23:25:52 +00:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
Eyosiyas Girma
7c5e7408b0 Merge branch 'freight/develop' into freight/feature/telebirr-integration 2026-06-08 16:35:18 +03:00
hagiye
7facbeda22 Train scheduling API,Routes and UI 2026-06-08 16:31:28 +03:00
Eyosiyas
3a66242f8b working on dmoney 2026-06-08 16:29:20 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
marshal
675975bc08 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine 2026-06-08 10:05:48 +03:00
marshal
88df20be6b change price logic on the ,rule engine ui, auto generate the contrat 2026-06-08 10:04:23 +03:00
hagiye
3d1f972e52 Merge freight/develop into wagon-types 2026-06-08 09:34:02 +03:00
hagiye
b78796d76b mantine added to Train, wagon, containers and cargoes 2026-06-08 09:29:34 +03:00
Nathnael Wondisha
95fb544ec2 Merge pull request #116 from Tria-plc/freight/feat/payment 
freight/feat/payment
 2026-06-08 08:52:39 +03:00
ghost2023
df725015a1 fix(api): improve payment status API handling and frontend user experience 2026-06-08 08:51:54 +03:00
hagiye
bffa5020ac wagon types added UI with API integrations 2026-06-07 21:56:33 +03:00
marshal
4993453993 generate contract by the system, add waggon type,fix ui 2026-06-07 01:20:52 +03:00
Marshal
08b46c306f ui improvemnt 2026-06-06 21:17:20 +00:00
Michael Abebe
b45421d2a2 feat(freight): changed the train schedule 2026-06-06 16:31:19 +03:00
Michael Abebe
a9c2f2eb97 feat(freight): added routes and locomotives 2026-06-06 16:23:48 +03:00
ghost2023
4994e19d57 signup update 2026-06-06 11:45:53 +03:00
Eyosiyas Girma
e067da29df Merge pull request #108 from Tria-plc/freight/feature/payment 
providers
 2026-06-06 11:45:19 +03:00
Eyosiyas
b5f64bc9ad providers 2026-06-06 11:32:14 +03:00