Commit Graph

4007 Commits

Author SHA1 Message Date
Stephanos A
ae85e28c8d Merge branch 'dev' into alpha 2026-06-02 20:55:25 +03:00
Stephanos A
5c0a118f13 Build and deployment issues resolutions 2026-06-02 20:48:14 +03:00
Stephanos A
3e27933c71 Removed old files 2026-06-02 20:36:01 +03:00
Stephanos A.
254fdf2f02 Merge pull request #72 from Tria-plc/alpha
Restore deployment for passenger web apps
2026-06-02 19:55:41 +03:00
Stephanos A
e69b63d088 Restore deployment for passenger web apps 2026-06-02 19:52:20 +03:00
Stephanos A.
47d44ab1c5 Merge pull request #71 from Tria-plc/revert-70-alpha
Build related issues resolution
2026-06-02 19:41:58 +03:00
Stephanos A.
03387fb226 Revert "Build related issues resolution" 2026-06-02 19:40:54 +03:00
Stephanos A.
b7b5582098 Merge pull request #70 from Tria-plc/alpha
Build related issues resolution
2026-06-02 19:33:18 +03:00
Stephanos A
5c59ea8e76 Merge branch 'dev' into alpha 2026-06-02 19:32:11 +03:00
Stephanos A
dcba12993f Build related issues resolution 2026-06-02 19:14:34 +03:00
hagiye
18015ceaff Merge freight/develop 2026-06-02 17:11:51 +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
5727680ea6 Merge pull request #67 from Tria-plc/freight/feature/edr_org_seeder
Freight/feature/edr org seeder
2026-06-02 16:16:36 +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
SennayT
c9af19687c remove pipelines for frontends 2026-06-02 15:35:05 +03:00
Stephanos A.
4ba6006331 Fix: Update import path in ScheduleDetailPage to use path alias 2026-06-02 15:04:38 +03:00
Stephanos A.
8c605d31f5 Merge pull request #66 from Tria-plc/alpha
Merge from alpha to dev: updates to the passenger web portal and api endpoints
2026-06-02 14:57:54 +03:00
Stephanos A
34940ca843 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-02 14:51:19 +03:00
Stephanos A
ed30ab0cda Updated the passenger web portal and added more endpoints to the api 2026-06-02 14:51:12 +03:00
ghost2023
34bf4ade48 refactor(api): Introduce unified API layer for freight backoffice 2026-06-02 14:43:18 +03:00
ghost2023
169e49faae fixes 2026-06-02 14:04:23 +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
SennayT
d21a040233 include freight api in workspace and fix pnpm lockfile 2026-06-02 11:28:33 +03:00
hagiye
d52a5715e0 Rate Matrix Rules user story 2026-06-02 10:47:36 +03:00
ghost2023
243803fc29 feat(bookings): Integrate booking list and detail pages with API 2026-06-02 10:09:05 +03:00
Abubeker Yasin
092199f536 feat(passenger-api): integrate @tria-plc IAM package (dual-ORM iam schema + package auth guard) 2026-06-02 09:30:46 +03:00
marshal
6eacc8bf48 Merge pull request #65 from Tria-plc/freight_feature/rule_engine_and_design
Freight feature/rule engine and design
2026-06-02 00:00:32 +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
yaschalew10
73dacfa27d Merge pull request #64 from Tria-plc/freight/feature/booking-page
feat(backoffice): Add Booking Requests routes and sidebar navigation
2026-06-01 23:06:06 +03:00
ghost2023
2ae47c451e feat(backoffice): Add Booking Requests routes and sidebar navigation 2026-06-01 22:59:12 +03:00
Michael Abebe
e870717720 Merge pull request #63 from Tria-plc/freight/feature/edr_org_seeder
Freight/feature/edr org seeder
2026-06-01 17:28:46 +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
yaschalew10
edd878bb0b Merge pull request #62 from Tria-plc/freight/feature/booking-api
WIP booking api integration
2026-06-01 16:45:14 +03:00
ghost2023
a267526be5 refactor(bookings): Migrate new booking API payload to use reference data IDs 2026-06-01 16:39:11 +03:00
ghost2023
217f1bf097 feat(bookings): Implement skeleton loaders for new booking form steps 2026-06-01 16:39:11 +03:00
ghost2023
c880e8c7f9 feat(api): Add endpoint for booking reference data 2026-06-01 16:39:11 +03:00
ghost2023
ff3cbed747 feat(freight): Introduce booking reference data endpoint & schemas 2026-06-01 16:39:11 +03:00
Michael Abebe
57776c4fef feat(freight:backoffice): role and permission seeder 2026-06-01 16:28:04 +03:00
marshal
b9ca0b8a82 add login image 2026-06-01 16:17:39 +03:00
yaschalew10
973fc2cc85 Merge pull request #61 from Tria-plc/freight/rule_engine_ui
Freight/rule engine UI
2026-06-01 16:09:37 +03:00
hagiye
3682bda85c rule engine UI, services and API integration 2026-06-01 16:01:51 +03:00
marshal
788ab979f4 Merge pull request #60 from Tria-plc/freight_feature/booking/minio
add  reference-data
2026-06-01 15:21:41 +03:00
marshal
4285e704bd changes 2026-06-01 15:14:03 +03:00