Nathnael Wondisha
1ea2f065c6
Merge branch 'freight/develop' into freight/feat/company-profile
2026-06-18 17:48:07 +03:00
marshal
3ad18277ea
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 17:04:35 +03:00
ghost2023
81a495ec61
refactor: cut off the old customre entity
2026-06-18 14:41:16 +03:00
marshal
aef1214d1e
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 10:29:42 +03:00
Marshal
62038458f8
refactor: disable demo data seeders while retaining for easy re-enabling
2026-06-18 07:27:57 +00:00
natib21
58fcf9ce3f
fix data integrity issue
2026-06-18 07:13:08 +00:00
Marshal
16bb0b5246
changes
2026-06-18 06:58:01 +00:00
Hagernesh
89d651693b
automation of loading and unloading
2026-06-17 22:33:06 +00:00
Marshal
052829c7e6
Add freight demo data seeder and permissions management
...
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
Marshal
524d3b6418
add reusable per-user contract signatures with profile prefill and approval
2026-06-16 13:34:04 +00:00
Hagernesh
d5a536956f
Loading queque changes
2026-06-16 09:25:47 +00:00
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
484151d909
payments
2026-06-14 15:59:52 +03:00
Marshal
cde3e462ba
automate the schedule
2026-06-11 19:42:23 +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
