Commit Graph

50 Commits

Author SHA1 Message Date
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
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
marshal
88df20be6b change price logic on the ,rule engine ui, auto generate the contrat 2026-06-08 10:04:23 +03:00
Michael Abebe
a9c2f2eb97 feat(freight): added routes and locomotives 2026-06-06 16:23:48 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +03:00
hagiye
dc42838a43 Trains management CRUD issues solved 2026-06-05 21:07:04 +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
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
marshal
d226d7ef22 booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions 2026-06-05 10:38:31 +03:00
ghost2023
a991139cc2 feat(bookings): Integrate auto-pricing into DRAFT booking UI, and refactor customer-company relationships across services. 2026-06-05 10:27:21 +03:00
hagiye
ed9ef2b8e1 Merge freight/develop into feature/trains-management 2026-06-05 10:25:05 +03:00
hagiye
c66b57d599 Merge freight/develop into feature/trains-management 2026-06-05 10:21:39 +03:00
Michael Abebe
8b3aaad5fd feat(freight): basics of train scheduling 2026-06-04 16:50:38 +03:00
Tria
93020b3153 working on payment 2026-06-04 16:18:14 +03:00
hagiye
71ac89edc7 trains, wagons,containers and cargoes schema and API 2026-06-04 15:56:29 +03:00
ghost2023
d61c3813cb feat(seed): Add file upload settings seeder for company onboarding 2026-06-04 15:40:38 +03:00
ghost2023
dc9244d66e feat(core): Introduce company and external profile management with dedicated API, services, and data schema 2026-06-03 16:01:07 +03:00
marshal
0eeb0e0d6f Merge pull request #69 from Tria-plc/freight_feature/rule_engine_and_design
add migration file when the app is starting
2026-06-02 16:44:50 +03:00
marshal
f93a502247 add migration file when the app is starting 2026-06-02 16:43:37 +03:00
Michael Abebe
2a489ca18d WIP 2026-06-02 12:12:28 +03:00
Michael Abebe
ec103a0e84 Merge branch 'freight/develop' into freight/feature/backoffice_iam_demo 2026-05-29 12:15:00 +03:00
yaschalew10
22e701b96f Merge pull request #52 from Tria-plc/freight_feature/booking/minio
implement rule engine module with dynamic booking evaluation
2026-05-29 11:36:06 +03:00
Michael Abebe
be5f3e1811 feat(freight:backoffice): demo iam 2026-05-29 11:21:04 +03:00
marshal
800f036005 implement rule engine module with dynamic booking evaluation, 7 entities, and Postman endpoints 2026-05-29 10:00:45 +03:00
ghost2023
e84451ca60 fix: unused import causing error 2026-05-28 15:54:40 +03:00
marshal
e1d05d5475 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:52:29 +03:00
marshal
429459ef29 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:37:12 +03:00
marshal
d08bc6d3fe add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:34:24 +03:00
yaschalew
217069fb74 fix conflict 2026-05-28 08:44:26 +03:00
Michael Abebe
cad3dd8e2d fix(freight:api): fixed removed seeder in merge 2026-05-26 13:47:58 +03:00
Michael Abebe
39c3f3cf43 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice 2026-05-26 13:37:34 +03:00
Michael Abebe
b487d47055 feat(freight:backoffice): migrated smart-office user-management 2026-05-26 12:50:40 +03:00
yaschalew
8a7a56766f add onboarding 2026-05-26 10:15:59 +03:00
yaschalew
5a4d6baec2 user account create 2026-05-26 05:40:53 +03:00
Michael Abebe
516d2c8b45 feat(freight:backoffice): added org structure managemnet 2026-05-25 15:50:47 +03:00
yaschalew10
ab1dfe0c16 Merge pull request #38 from Tria-plc/freight_feature/booking/minio
implement file module and add files relation to booking entity and po…
2026-05-25 10:58:56 +03:00
marshal
9432814e3b implement file module and add files relation to booking entity and populate on fetch 2026-05-25 10:19:08 +03:00
mengstabketemaw
3485ef299d fix local merge conflict 2026-05-23 10:52:31 +03:00
yaschalew
c7347b88d7 customer registration api integration 2026-05-21 02:21:32 +03:00
yaschalew
51d6df42bb file upload settings 2026-05-20 08:15:29 +03:00
Michael Abebe
2940d20e06 fix:(freight:auth): finished integrating the freight api with the freight portal 2026-05-18 11:07:09 +03:00
Michael Abebe
0e0d2ea450 feat(freight:api): initial backend work 2026-05-18 10:25:33 +03:00
Michael Abebe
1c5ee19388 chore: fmt 2026-05-12 16:50:18 +03:00
Muluhabt
3b8b6979db Project Initialization 2026-05-12 15:17:16 +03:00