marshal
ae7b9c2750
add service-types and cargo-types CRUD modules with pagination, filtering
2026-05-28 11:53:08 +03:00
marshal
e1d05d5475
add service-types and cargo-types CRUD modules with pagination, filtering
2026-05-28 11:52:29 +03:00
yaschalew10
39764c4418
Merge pull request #45 from Tria-plc/freight/feature/backoffice_permission_roles
...
Freight/feature/backoffice permission roles
2026-05-28 11:48:02 +03:00
Michael Abebe
c0fc66729b
feat(freight:backoffice): Added employees page
2026-05-28 11:44:58 +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
Sennay
695ef3c27b
Merge pull request #44 from Tria-plc/alpha
...
Alpha
2026-05-28 11:28:28 +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
yaschalew10
2e9a93d9e2
Merge pull request #43 from Tria-plc/freight_feature/booking/minio
...
allow customers booking
2026-05-28 10:37:24 +03:00
marshal
6d49c38f48
allow customers booking
2026-05-28 10:31:31 +03:00
Stephanos A.
c838e77349
fix: add missing properties to IStation interface
...
- Add 'country' property to match shared types package
- Add 'createdAt' property to match shared types package
- Add 'updatedAt' property to match shared types package
This fixes the TypeScript type mismatch error in StationsPage.tsx where
the local IStation type was missing properties required by the shared
@edr/types/passenger package during the Docker build.
Fixes: https://github.com/Tria-plc/edr-platform/actions/runs/26325256104/job/77502650459
2026-05-28 10:13:11 +03:00
yaschalew10
49a746b272
Merge pull request #42 from Tria-plc/freight/feature/user_registration
...
Freight/feature/user registration
2026-05-28 08:45:48 +03:00
yaschalew
217069fb74
fix conflict
2026-05-28 08:44:26 +03:00
yaschalew
4bacbaa96c
add route
2026-05-28 08:41:12 +03:00
robiman
939b2718d3
Merge pull request #41 from Tria-plc/dev
...
Fare engine and hold seat implementation
2026-05-27 19:37:04 +03:00
Abubeker Yasin
d4bf9b457c
Merge branch 'feat/veriFayda-integration' into alpha
2026-05-27 19:34:22 +03:00
Roba Boru
b9ca90bb9c
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-05-27 19:32:45 +03:00
Roba Boru
2ceb993c60
Segment based seat assignement added
2026-05-27 15:11:23 +03:00
Abubeker Yasin
78cf8e7cbb
feat: ( fayda ) add the fayda variables
2026-05-27 11:31:44 +03:00
Abubeker Yasin
4e500700ec
feat(fayda): add fayda verification endpoints and login-with-fayda
2026-05-26 17:28:50 +03:00
Roba Boru
3c6bd724f2
Get fare class on search
2026-05-26 16:54:52 +03:00
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
