Commit Graph

119 Commits

Author SHA1 Message Date
SennayT
37c13ee7e1 move deployment to dev branch 2026-05-28 14:12:32 +03:00
SennayT
af5f4cd038 change node version and modify docker compose 2026-05-28 14:03:49 +03:00
Sennay
e7bb4db4ce Merge branch 'dev' into feat/improve-buid-pipeline 2026-05-28 13:50:51 +03:00
SennayT
90eec499f9 modify deploy user for passenger 2026-05-28 13:45:32 +03:00
SennayT
e18811c76d modify deploy user 2026-05-28 13:34:31 +03:00
SennayT
2a93de138f move pipelines to one file 2026-05-28 13:33:09 +03:00
SennayT
d462ddaf29 modify environment location 2026-05-28 13:29:37 +03:00
SennayT
39954f6e67 modify branch name 2026-05-28 13:28:23 +03:00
SennayT
f79ff77925 add COMPOSE_PROJECT_NAME for each workflow 2026-05-28 13:01:52 +03:00
SennayT
342ccb63de modify pipeline to speed up deployment 2026-05-28 12:52:56 +03:00
Sennay
695ef3c27b Merge pull request #44 from Tria-plc/alpha
Alpha
2026-05-28 11:28:28 +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
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
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
Abubeker Yasin
ac55c0cebc feat(passenger-api): expose fayda verification endpoints and wire into app 2026-05-26 12:02:46 +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
Abubeker Yasin
57456f0902 feat(fayda): add fayda config and jose dependency 2026-05-25 14:41:26 +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
SennayT
c12dbd47ff generate migrations 2026-05-23 09:47:36 +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
Sennay
b0382a1978 Merge pull request #29 from Tria-plc/feat/telebirr-integration
feat(payments): support web and mobile platform for Telebirr initiation
2026-05-23 09:23:55 +03:00
Sennay
db4a6367e7 Merge pull request #29 from Tria-plc/feat/telebirr-integration
feat(payments): support web and mobile platform for Telebirr initiation
2026-05-23 09:23:55 +03:00
Eyob T.
69d3891308 Merge pull request #31 from Tria-plc/alpha
Alpha
2026-05-23 09:01:16 +03:00
Eyob T.
89fbc25955 Merge pull request #30 from Tria-plc/fix/deployment_fix
Fix/deployment fix
2026-05-23 09:00:43 +03:00
Eyob T.
1c430fcdc4 Merge pull request #30 from Tria-plc/fix/deployment_fix
Fix/deployment fix
2026-05-23 09:00:43 +03:00
Eyob T.
30837c5ea8 Deployment failure fix 2026-05-23 08:59:57 +03:00
Eyob T.
7282e32c52 Deployment failure fix 2026-05-23 08:59:57 +03:00
Abubeker Yasin
5d5ec6b766 feat(payments): support web and mobile platform for Telebirr initiation 2026-05-23 05:07:24 +03:00
Abubeker Yasin
6397572b47 feat(payments): support web and mobile platform for Telebirr initiation 2026-05-23 05:07:24 +03:00
Stephanos A.
d4fb8b5df5 Merge pull request #24 from Tria-plc/alpha
Merge request from alpha to dev
2026-05-22 18:20:05 +03:00
Stephanos A.
707aafc757 Merge pull request #24 from Tria-plc/alpha
Merge request from alpha to dev
2026-05-22 18:20:05 +03:00
Stephanos A.
b67cb8610e Merge branch 'dev' into alpha 2026-05-22 18:19:36 +03:00