Commit Graph

  • b9ca90bb9c Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-05-27 19:32:45 +03:00
  • 2ceb993c60 Segment based seat assignement added Roba Boru 2026-05-27 15:11:23 +03:00
  • 78cf8e7cbb feat: ( fayda ) add the fayda variables Abubeker Yasin 2026-05-27 11:31:44 +03:00
  • 4e500700ec feat(fayda): add fayda verification endpoints and login-with-fayda Abubeker Yasin 2026-05-26 17:28:50 +03:00
  • 3c6bd724f2 Get fare class on search Roba Boru 2026-05-26 16:54:52 +03:00
  • db0af7cc00 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-05-26 16:25:45 +03:00
  • 769294d12f Fare engine added Roba Boru 2026-05-26 16:25:24 +03:00
  • 671d24b81d fix: fix typerror on stations object SennayT 2026-05-25 09:52:52 +03:00
  • a69031ccc1 add grouped argument to docker build SennayT 2026-05-25 09:47:45 +03:00
  • ee80d597c1 Merge pull request #40 from Tria-plc/freight/feature/bootstrap_backoffice yaschalew10 2026-05-26 14:49:49 +03:00
  • cad3dd8e2d fix(freight:api): fixed removed seeder in merge Michael Abebe 2026-05-26 13:47:58 +03:00
  • 39c3f3cf43 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice Michael Abebe 2026-05-26 13:37:34 +03:00
  • 54b122bb3a feat(freight:backoffice): added position type Michael Abebe 2026-05-26 13:35:49 +03:00
  • b487d47055 feat(freight:backoffice): migrated smart-office user-management Michael Abebe 2026-05-26 12:50:40 +03:00
  • ac55c0cebc feat(passenger-api): expose fayda verification endpoints and wire into app Abubeker Yasin 2026-05-26 12:02:46 +03:00
  • ffd38f8025 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/user_registration yaschalew 2026-05-26 10:16:41 +03:00
  • 8a7a56766f add onboarding yaschalew 2026-05-26 10:15:59 +03:00
  • 589bf33091 Merge pull request #39 from Tria-plc/freight_feature/booking/minio yaschalew10 2026-05-26 09:36:01 +03:00
  • 37b0c48cc0 add signed url marshal 2026-05-26 09:34:44 +03:00
  • f23d570427 changes marshal 2026-05-26 09:24:47 +03:00
  • 5a4d6baec2 user account create yaschalew 2026-05-26 05:40:53 +03:00
  • f90e5e0e1c company detail api and frontend hagiye 2026-05-26 01:06:06 +03:00
  • 1c65c326e5 Merge branch 'alpha' into dev Abubeker Yasin 2026-05-25 23:37:13 +03:00
  • 6a0bf42c65 feat(payments): model payment methods as platform catalog with guest access Abubeker Yasin 2026-05-25 23:34:11 +03:00
  • 20151286f2 feat(fayda): implement verifayda oidc service Abubeker Yasin 2026-05-25 17:22:49 +03:00
  • 28448c0268 feat(passenger-api): add pkce and client-assertion utilities for fayda Abubeker Yasin 2026-05-25 17:03:44 +03:00
  • 71c5534618 feat(fayda): add fayda oidc prisma models and migrate user fields Abubeker Yasin 2026-05-25 16:52:12 +03:00
  • a8d26b73b8 ui update Michael Abebe 2026-05-25 16:27:54 +03:00
  • 235b4b9a93 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice Michael Abebe 2026-05-25 15:53:35 +03:00
  • 516d2c8b45 feat(freight:backoffice): added org structure managemnet Michael Abebe 2026-05-25 15:50:09 +03:00
  • 57456f0902 feat(fayda): add fayda config and jose dependency Abubeker Yasin 2026-05-25 14:41:26 +03:00
  • ab1dfe0c16 Merge pull request #38 from Tria-plc/freight_feature/booking/minio yaschalew10 2026-05-25 10:58:56 +03:00
  • 9432814e3b implement file module and add files relation to booking entity and populate on fetch marshal 2026-05-25 10:19:08 +03:00
  • 80cea364c7 Enhance API documentation tags and improve checkout URL handling in WaafiProvider Stephanos A 2026-05-24 16:40:50 +03:00
  • b16f4037f4 Enhance API documentation tags and improve checkout URL handling in WaafiProvider Stephanos A 2026-05-24 16:40:50 +03:00
  • 882aef7fcf Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-05-24 16:31:36 +03:00
  • 2c99ed900f Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-05-24 16:31:36 +03:00
  • 87a423c859 Nationality, guest booking, waafi adapter, overall booking flow updates Stephanos A 2026-05-24 16:20:55 +03:00
  • f803748278 Nationality, guest booking, waafi adapter, overall booking flow updates Stephanos A 2026-05-24 16:20:55 +03:00
  • 879e277cfc Merge pull request #37 from Tria-plc/freight/feature/ui-intergration Nathnael Wondisha 2026-05-23 11:55:13 +03:00
  • dc41da3731 feat: wire up the create booking form ghost2023 2026-05-23 11:54:13 +03:00
  • 8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs ghost2023 2026-05-23 11:03:47 +03:00
  • a252b88dfb Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component yaschalew10 2026-05-23 11:13:24 +03:00
  • a80f64e772 Merge pull request #35 from Tria-plc/freight_feature/booking/minio yaschalew10 2026-05-23 11:10:29 +03:00
  • ae317540c1 feat(bookings): support multiple containers per booking via JSONB array marshal 2026-05-23 11:08:35 +03:00
  • cf3869ef66 features: dynamic terminal components mengstabketemaw 2026-05-23 11:08:05 +03:00
  • 3485ef299d fix local merge conflict mengstabketemaw 2026-05-23 10:52:31 +03:00
  • 578f6f84ef Merge pull request #34 from Tria-plc/freight_feature/booking/minio yaschalew10 2026-05-23 10:03:01 +03:00
  • 2064e6efda change the schema from public to freight marshal 2026-05-23 10:00:40 +03:00
  • 3b4a184ab4 Merge pull request #33 from Tria-plc/freight_feature/booking/minio yaschalew10 2026-05-23 09:54:35 +03:00
  • c12dbd47ff generate migrations SennayT 2026-05-23 09:47:36 +03:00
  • ecbf1f2408 mergefix marshal 2026-05-23 09:38:19 +03:00
  • 82c6b1284e implement contract booking functionality and MinIO setup marshal 2026-05-23 09:31:52 +03:00
  • 2fa89d929d remove portal SennayT 2026-05-23 09:31:26 +03:00
  • 465863be36 Merge pull request #32 from Tria-plc/alpha Sennay 2026-05-23 09:25:16 +03:00
  • db4a6367e7 Merge pull request #29 from Tria-plc/feat/telebirr-integration Sennay 2026-05-23 09:23:55 +03:00
  • b0382a1978 Merge pull request #29 from Tria-plc/feat/telebirr-integration Sennay 2026-05-23 09:23:55 +03:00
  • 69d3891308 Merge pull request #31 from Tria-plc/alpha Eyob T. 2026-05-23 09:01:16 +03:00
  • 1c430fcdc4 Merge pull request #30 from Tria-plc/fix/deployment_fix Eyob T. 2026-05-23 09:00:43 +03:00
  • 89fbc25955 Merge pull request #30 from Tria-plc/fix/deployment_fix Eyob T. 2026-05-23 09:00:43 +03:00
  • 7282e32c52 Deployment failure fix Eyob T. 2026-05-23 08:59:57 +03:00
  • 30837c5ea8 Deployment failure fix Eyob T. 2026-05-23 08:59:57 +03:00
  • 6397572b47 feat(payments): support web and mobile platform for Telebirr initiation Abubeker Yasin 2026-05-23 05:07:24 +03:00
  • 5d5ec6b766 feat(payments): support web and mobile platform for Telebirr initiation Abubeker Yasin 2026-05-23 05:07:24 +03:00
  • 69db7cd960 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into feature/file_settings yaschalew 2026-05-22 20:12:47 +03:00
  • 2c1ef13121 add user registrations yaschalew 2026-05-22 20:12:04 +03:00
  • 707aafc757 Merge pull request #24 from Tria-plc/alpha Stephanos A. 2026-05-22 18:20:05 +03:00
  • d4fb8b5df5 Merge pull request #24 from Tria-plc/alpha Stephanos A. 2026-05-22 18:20:05 +03:00
  • 3448be861d Merge branch 'dev' into alpha Stephanos A. 2026-05-22 18:19:36 +03:00
  • b67cb8610e Merge branch 'dev' into alpha Stephanos A. 2026-05-22 18:19:36 +03:00
  • a470244f06 Merge pull request #28 from Tria-plc/freight/feature/bootstrap_backoffice yaschalew10 2026-05-22 18:03:07 +03:00
  • 2272255bef Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice Michael Abebe 2026-05-22 17:58:23 +03:00
  • 27e2cfcf6b feat(freight:backoffice): added login page and basic authorization Michael Abebe 2026-05-22 17:55:20 +03:00
  • 5c0d44ed7c Merge pull request #27 from Tria-plc/freight/feature/dynamic-dropdown Nathnael Wondisha 2026-05-22 17:34:36 +03:00
  • bf4d9550f1 feat: implemented dynamic select ghost2023 2026-05-22 17:32:35 +03:00
  • 724a99a2fc chore: add the dropdown service to the api repo ghost2023 2026-05-22 17:31:26 +03:00
  • 5b926293a0 Merge pull request #26 from Tria-plc/freight/feature/rebuild_booking_form Nathnael Wondisha 2026-05-22 17:19:36 +03:00
  • 1949bed303 fix: the muliple wagon validation ghost2023 2026-05-22 16:35:21 +03:00
  • 80db8f11df refactor ghost2023 2026-05-22 16:21:14 +03:00
  • 2c9ca6f16b feat(freight:backoffice): added basic frontend integration with auth(login) page Michael Abebe 2026-05-22 17:15:46 +03:00
  • 2dad9137dd Set schema to 'passenger' Stephanos A 2026-05-22 16:21:24 +03:00
  • 2f17f9c9ce Set schema to 'passenger' Stephanos A 2026-05-22 16:21:24 +03:00
  • 87f66a2f92 Merge pull request #25 from Tria-plc/freight/feature/rebuild_booking_form Nathnael Wondisha 2026-05-22 15:53:39 +03:00
  • c9bf3f6726 fix: react update to v19 ghost2023 2026-05-22 15:47:26 +03:00
  • 3b2a0c6ffc chore: packages ghost2023 2026-05-22 15:44:21 +03:00
  • 4691f5ad3f feat: enhance the new booking form with RHC ghost2023 2026-05-22 15:43:20 +03:00
  • 6287022a53 style: improve the switch component ghost2023 2026-05-22 15:42:56 +03:00
  • 672987cd1e Migrations update Stephanos A 2026-05-22 15:05:20 +03:00
  • 92fb6e3cc3 Migrations update Stephanos A 2026-05-22 15:05:20 +03:00
  • 95e03e9b76 Refactor business logic for train,schedule,coach,seat and search modules Roba Boru 2026-05-22 14:47:38 +03:00
  • 096c717bfa Refactor business logic for train,schedule,coach,seat and search modules Roba Boru 2026-05-22 14:47:38 +03:00
  • e9362abecd feat(bookings): Rework New Booking flow to support cargo type selection ghost2023 2026-05-22 11:38:22 +03:00
  • 37916a0cae chore: add switch component from shadcn to ui-common ghost2023 2026-05-22 11:37:24 +03:00
  • 47bcc82c88 chore: install react-hook-form, zod and @hookform/resolvers to freight web portal ghost2023 2026-05-22 10:47:12 +03:00
  • 9fbe27e634 chore: add field component from shadcn to ui-common ghost2023 2026-05-22 10:45:13 +03:00
  • 74333e5e42 fix: incorrect NewBookingPage ghost2023 2026-05-22 10:36:44 +03:00
  • f9a9d9923c Merge pull request #23 from Tria-plc/freight/feature/rebuild_booking_form Nathnael Wondisha 2026-05-21 17:12:42 +03:00
  • 509e1f0611 style: rebuild the new booking portal based on the US ghost2023 2026-05-21 17:07:15 +03:00
  • 4234c2fdd5 Refactor seat class handling Stephanos A 2026-05-21 14:31:07 +03:00
  • 9151110fd8 Refactor seat class handling Stephanos A 2026-05-21 14:31:07 +03:00