Commit Graph

536 Commits

Author SHA1 Message Date
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
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
yaschalew10
779f1283d7 Merge pull request #59 from Tria-plc/freight/feature/registeration
freight/feature/registeration
2026-06-01 12:46:57 +03:00
ghost2023
b76ae8b81e refactor(onboarding): Restructure OnboardingPage for user type selection 2026-06-01 11:37:47 +03:00
ghost2023
0aece8f1dc feat(portal): Overhaul authentication flow and application routing 2026-06-01 11:37:47 +03:00
Stephanos A.
f9922344c0 Merge pull request #58 from Tria-plc/alpha
Merge alpha to dev
2026-05-31 14:02:45 +03:00
Stephanos A
7b92983a13 Merge branch 'dev' into alpha 2026-05-31 14:01:14 +03:00
Stephanos A
5059a1fe58 First passenger and back office portal commit 2026-05-31 13:15:44 +03:00
yaschalew10
243a18e3e3 Merge pull request #57 from Tria-plc/freight_feature/booking/minio
complete rule engine and working on booking flow
2026-05-31 10:16:57 +03:00
marshal
6b6a1d56d6 update the Consolidation and wagon filling on booking and Add GET /bookings/reference-data endpoint for booking form catalog (yards, containers, services, shipping lines, cargo types) 2026-05-30 12:45:52 +03:00
marshal
badeeff345 complete rule engine and booking flow 2026-05-30 11:52:50 +03:00
hagiye
56f0908912 fix conflict 2026-05-30 11:30:39 +03:00
yaschalew10
eb18a51108 Merge pull request #56 from Tria-plc/freight/feature/user_registration
Freight/feature/user registration
2026-05-30 11:29:55 +03:00
hagiye
ccbc642075 rure engine 2026-05-30 11:19:40 +03:00
marshal
7bbb95e9fd complete rule engine and booking flow 2026-05-30 10:28:51 +03:00
marshal
430dc44937 complete rule engine and booking flow 2026-05-30 10:27:59 +03:00
yaschalew
1b8391186d customer registration 2026-05-30 09:47:26 +03:00
yaschalew
b8f6438371 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/user_registration 2026-05-29 19:50:42 +03:00
yaschalew10
251d7d8bd4 Merge pull request #55 from Tria-plc/freight/feature/profile-page
Add Profile page, and rebuild the booking detail page
2026-05-29 19:50:17 +03:00
yaschalew
55f611b9e8 fix conflict 2026-05-29 19:46:18 +03:00
ghost2023
bf51ead32d feat(portal): Add Profile page, refactor booking details, and remove documents module 2026-05-29 17:37:02 +03:00
yaschalew
ac35218299 add docs settings to admin page 2026-05-29 16:50:55 +03:00