Commit Graph

4711 Commits

Author SHA1 Message Date
Roba Boru
db0af7cc00 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-26 16:25:45 +03:00
Roba Boru
769294d12f Fare engine added 2026-05-26 16:25:24 +03:00
SennayT
671d24b81d fix: fix typerror on stations object 2026-05-26 15:02:38 +03:00
SennayT
a69031ccc1 add grouped argument to docker build 2026-05-26 15:02:37 +03:00
yaschalew10
ee80d597c1 Merge pull request #40 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
2026-05-26 14:49:49 +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
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
Abubeker Yasin
ac55c0cebc feat(passenger-api): expose fayda verification endpoints and wire into app 2026-05-26 12:02:46 +03:00
yaschalew
ffd38f8025 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/user_registration 2026-05-26 10:16:41 +03:00
yaschalew
8a7a56766f add onboarding 2026-05-26 10:15:59 +03:00
yaschalew10
589bf33091 Merge pull request #39 from Tria-plc/freight_feature/booking/minio
add signed url
2026-05-26 09:36:01 +03:00
marshal
37b0c48cc0 add signed url 2026-05-26 09:34:44 +03:00
marshal
f23d570427 changes 2026-05-26 09:24:47 +03:00
yaschalew
5a4d6baec2 user account create 2026-05-26 05:40:53 +03:00
hagiye
f90e5e0e1c company detail api and frontend 2026-05-26 01:06:06 +03:00
Abubeker Yasin
1c65c326e5 Merge branch 'alpha' into dev 2026-05-25 23:37:13 +03:00
Abubeker Yasin
6a0bf42c65 feat(payments): model payment methods as platform catalog with guest access 2026-05-25 23:34:11 +03:00
Abubeker Yasin
20151286f2 feat(fayda): implement verifayda oidc service 2026-05-25 17:22:49 +03:00
Abubeker Yasin
28448c0268 feat(passenger-api): add pkce and client-assertion utilities for fayda 2026-05-25 17:03:44 +03:00
Abubeker Yasin
71c5534618 feat(fayda): add fayda oidc prisma models and migrate user fields 2026-05-25 16:52:12 +03:00
Michael Abebe
a8d26b73b8 ui update 2026-05-25 16:27:54 +03:00
Michael Abebe
235b4b9a93 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice 2026-05-25 15:53:35 +03:00
Michael Abebe
516d2c8b45 feat(freight:backoffice): added org structure managemnet 2026-05-25 15:50:47 +03:00
Abubeker Yasin
57456f0902 feat(fayda): add fayda config and jose dependency 2026-05-25 14:41:26 +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
Stephanos A
80cea364c7 Enhance API documentation tags and improve checkout URL handling in WaafiProvider 2026-05-24 16:40:50 +03:00
Stephanos A
b16f4037f4 Enhance API documentation tags and improve checkout URL handling in WaafiProvider 2026-05-24 16:40:50 +03:00
Stephanos A
882aef7fcf Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-24 16:31:36 +03:00
Stephanos A
2c99ed900f Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-24 16:31:36 +03:00
Stephanos A
87a423c859 Nationality, guest booking, waafi adapter, overall booking flow updates 2026-05-24 16:20:55 +03:00
Stephanos A
f803748278 Nationality, guest booking, waafi adapter, overall booking flow updates 2026-05-24 16:20:55 +03:00
Nathnael Wondisha
879e277cfc Merge pull request #37 from Tria-plc/freight/feature/ui-intergration
freight/feature/ui intergration
2026-05-23 11:55:13 +03:00
ghost2023
dc41da3731 feat: wire up the create booking form 2026-05-23 11:54:13 +03:00
ghost2023
8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs 2026-05-23 11:21:17 +03:00
yaschalew10
a252b88dfb Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component
Freight/features/dynamic terminal component
2026-05-23 11:13:24 +03:00
yaschalew10
a80f64e772 Merge pull request #35 from Tria-plc/freight_feature/booking/minio
feat(bookings): support multiple containers per booking via JSONB array
2026-05-23 11:10:29 +03:00
marshal
ae317540c1 feat(bookings): support multiple containers per booking via JSONB array 2026-05-23 11:08:35 +03:00
mengstabketemaw
cf3869ef66 features: dynamic terminal components 2026-05-23 11:08:05 +03:00
mengstabketemaw
3485ef299d fix local merge conflict 2026-05-23 10:52:31 +03:00
yaschalew10
578f6f84ef Merge pull request #34 from Tria-plc/freight_feature/booking/minio
change the schema from public to freight
2026-05-23 10:03:01 +03:00
marshal
2064e6efda change the schema from public to freight 2026-05-23 10:00:40 +03:00
yaschalew10
3b4a184ab4 Merge pull request #33 from Tria-plc/freight_feature/booking/minio
Freight feature/booking/minio
2026-05-23 09:54:35 +03:00
SennayT
c12dbd47ff generate migrations 2026-05-23 09:47:36 +03:00
marshal
ecbf1f2408 mergefix 2026-05-23 09:38:19 +03:00
marshal
82c6b1284e implement contract booking functionality and MinIO setup 2026-05-23 09:31:52 +03:00
SennayT
2fa89d929d remove portal 2026-05-23 09:31:26 +03:00
Sennay
465863be36 Merge pull request #32 from Tria-plc/alpha
Alpha
2026-05-23 09:25:16 +03:00