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
536 Commits 96 Branches 0 Tags
f5d6d8e7dac7ef5c7ed4f43ba6c16ab5efb05f02
Commit Graph

142 Commits

Author SHA1 Message Date
hagiye
f5d6d8e7da Batch 1 to 3 implementation 2026-06-16 11:36:24 +03: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
10b011de8f merge conflict 2026-06-10 16:45:45 +03: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
Michael Abebe
e731051320 fix(freight): fixed some issues 2026-06-06 11:12:59 +03:00
marshal
b62ea3f95f Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine 2026-06-06 10:45:34 +03:00
Michael Abebe
a39366867a fix(freight): iam module import fix 2026-06-06 10:43:33 +03:00
marshal
3e3841cf6f changes 2026-06-06 10:08:55 +03:00
marshal
0794a77678 changes 2026-06-06 10:01:40 +03:00
Michael Abebe
c31d87fc35 dep(freight): updated iam imports 2026-06-06 09:45:00 +03:00
Eyosiyas Girma
10f3c517f3 Merge branch 'freight/develop' into freight/feature/payment 2026-06-06 08:17:17 +03:00
Tria
828f93d160 minor update 2026-06-06 08:13:38 +03:00
hagiye
788de5381e feat: complete train scheduling integration 2026-06-06 05:52:47 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +03:00
hagiye
55e6ca4a3f Merge branch 'freight/develop' of https://github.com/Tria-plc/edr-platform into feature/trains-management 2026-06-05 21:07:36 +03:00
hagiye
dc42838a43 Trains management CRUD issues solved 2026-06-05 21:07:04 +03:00
Marshal
67037ba748 fix the seed for rules 2026-06-05 17:25:16 +00:00
Tria
ebe59f491a payment | webhook 2026-06-05 17:34:33 +03:00
Tria
6786bdd210 receipt template 2026-06-05 17:23:21 +03:00
Tria
620607e50c add fan number 2026-06-05 15:59:12 +03:00
Tria
21bc6948e8 receipt 2026-06-05 15:56:29 +03:00
marshal
35c9bdfce4 resolve confilict 2026-06-05 14:07:26 +03:00
marshal
d59c192137 resolve confilict 2026-06-05 13:06:16 +03:00
Eyosiyas Girma
03a997fad2 Merge branch 'freight/develop' into freight/feature/payment 2026-06-05 13:01:42 +03:00
Tria
02018c339d payment 2026-06-05 12:57:44 +03:00
Tria
c0dc9f5fc5 payment 2026-06-05 12:54:35 +03:00
Tria
7c124d9845 telebirr configured 2026-06-05 11:01:01 +03:00
marshal
ba65a3f4cc booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions 2026-06-05 11:01:00 +03:00
hagiye
b33517f47d resolve conflict 2026-06-05 10:59:52 +03:00