Commit Graph

143 Commits

Author SHA1 Message Date
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
3fa1f54e3a fix ui 2026-06-07 00:32:07 +03:00
Michael Abebe
a9c2f2eb97 feat(freight): added routes and locomotives 2026-06-06 16:23:48 +03:00
Michael Abebe
e731051320 fix(freight): fixed some issues 2026-06-06 11:12:59 +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
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
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
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
Michael Abebe
27ce600706 Merge branch 'freight/develop' into freight/feature/edr_org_seeder 2026-06-02 16:05:01 +03:00
Michael Abebe
b5dbfc25c3 WIP 2026-06-02 15:59:58 +03:00
Michael Abebe
88a280eea2 WIP 2026-06-02 13:50:54 +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
2ccbfe324f feat(freight:backoffice): Added permissions and roles pages under user-management dashboard 2026-05-28 10:44:41 +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