Commit Graph

37 Commits

Author SHA1 Message Date
ghost2023
c2145b48f5 fix 2026-06-03 15:31:29 +03:00
Nathnael Wondisha
36a8002163 Merge pull request #68 from Tria-plc/freight/feature/booking-integration
freight/feature/booking integration
2026-06-03 11:26:35 +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
27ce600706 Merge branch 'freight/develop' into freight/feature/edr_org_seeder 2026-06-02 16:05:01 +03:00
ghost2023
dab72217e1 feat(bookings): Integrate booking list and detail pages with backend API 2026-06-02 16:04:47 +03:00
Michael Abebe
b5dbfc25c3 WIP 2026-06-02 15:59:58 +03:00
ghost2023
34bf4ade48 refactor(api): Introduce unified API layer for freight backoffice 2026-06-02 14:43:18 +03:00
Michael Abebe
88a280eea2 WIP 2026-06-02 13:50:54 +03:00
Michael Abebe
2a489ca18d WIP 2026-06-02 12:12:28 +03:00
Michael Abebe
88219ee9b8 WIP 2026-06-02 12:12:20 +03:00
marshal
e4859b3eeb solf merge conflict 2026-06-01 23:50:49 +03:00
marshal
452ebdbc0a rule engine and configration and fix booking for custoemr 2026-06-01 23:15:11 +03:00
ghost2023
2ae47c451e feat(backoffice): Add Booking Requests routes and sidebar navigation 2026-06-01 22:59:12 +03:00
Michael Abebe
25fa26e65d Fix merge conflict of Merge branch 'freight/develop' into freight/feature/edr_org_seeder 2026-06-01 17:28:07 +03:00
Michael Abebe
fab6819151 feat(freight:backoffice): temp add user UI 2026-06-01 17:17:54 +03:00
Michael Abebe
57776c4fef feat(freight:backoffice): role and permission seeder 2026-06-01 16:28:04 +03:00
hagiye
3682bda85c rule engine UI, services and API integration 2026-06-01 16:01:51 +03:00
hagiye
56f0908912 fix conflict 2026-05-30 11:30:39 +03:00
hagiye
ccbc642075 rure engine 2026-05-30 11:19:40 +03:00
yaschalew
55f611b9e8 fix conflict 2026-05-29 19:46:18 +03:00
yaschalew
ac35218299 add docs settings to admin page 2026-05-29 16:50:55 +03:00
Michael Abebe
ec103a0e84 Merge branch 'freight/develop' into freight/feature/backoffice_iam_demo 2026-05-29 12:15:00 +03:00
Michael Abebe
be5f3e1811 feat(freight:backoffice): demo iam 2026-05-29 11:21:04 +03:00
hagiye
6cd3afd821 Rule engine UI 2026-05-28 17:00:54 +03:00
hagiye
a5dc50f410 rule engine UI 2026-05-28 16:26:52 +03:00
Michael Abebe
c0fc66729b feat(freight:backoffice): Added employees page 2026-05-28 11:44:58 +03:00
Michael Abebe
6841c3f4d8 feat(freight:backoffice): group roles by apps 2026-05-28 10:57:20 +03:00
Michael Abebe
2ccbfe324f feat(freight:backoffice): Added permissions and roles pages under user-management dashboard 2026-05-28 10:44:41 +03:00
Michael Abebe
54b122bb3a feat(freight:backoffice): added position type 2026-05-26 13:35:49 +03:00
Michael Abebe
b487d47055 feat(freight:backoffice): migrated smart-office user-management 2026-05-26 12:50:40 +03:00
Michael Abebe
a8d26b73b8 ui update 2026-05-25 16:27:54 +03:00
Michael Abebe
516d2c8b45 feat(freight:backoffice): added org structure managemnet 2026-05-25 15:50:47 +03:00
Michael Abebe
27e2cfcf6b feat(freight:backoffice): added login page and basic authorization 2026-05-22 17:55:20 +03:00
Michael Abebe
2c9ca6f16b feat(freight:backoffice): added basic frontend integration with auth(login) page 2026-05-22 17:15:46 +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