Commit Graph

4711 Commits

Author SHA1 Message Date
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
yaschalew
69db7cd960 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into feature/file_settings 2026-05-22 20:12:47 +03:00
yaschalew
2c1ef13121 add user registrations 2026-05-22 20:12:04 +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
Stephanos A.
3448be861d Merge branch 'dev' into alpha 2026-05-22 18:19:36 +03:00
yaschalew10
a470244f06 Merge pull request #28 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
2026-05-22 18:03:07 +03:00
Michael Abebe
2272255bef Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice 2026-05-22 17:58:43 +03:00
Michael Abebe
27e2cfcf6b feat(freight:backoffice): added login page and basic authorization 2026-05-22 17:55:20 +03:00
Nathnael Wondisha
5c0d44ed7c Merge pull request #27 from Tria-plc/freight/feature/dynamic-dropdown
Implemented the dynamic dropdown
2026-05-22 17:34:36 +03:00
ghost2023
bf4d9550f1 feat: implemented dynamic select 2026-05-22 17:32:35 +03:00
ghost2023
724a99a2fc chore: add the dropdown service to the api repo 2026-05-22 17:31:26 +03:00
Nathnael Wondisha
5b926293a0 Merge pull request #26 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
2026-05-22 17:19:36 +03:00
ghost2023
1949bed303 fix: the muliple wagon validation 2026-05-22 17:18:43 +03:00
ghost2023
80db8f11df refactor 2026-05-22 17:18:43 +03:00
Michael Abebe
2c9ca6f16b feat(freight:backoffice): added basic frontend integration with auth(login) page 2026-05-22 17:15:46 +03:00
Stephanos A
2f17f9c9ce Set schema to 'passenger' 2026-05-22 16:21:24 +03:00
Stephanos A
2dad9137dd Set schema to 'passenger' 2026-05-22 16:21:24 +03:00
Nathnael Wondisha
87f66a2f92 Merge pull request #25 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
2026-05-22 15:53:39 +03:00
ghost2023
c9bf3f6726 fix: react update to v19 2026-05-22 15:47:26 +03:00
ghost2023
3b2a0c6ffc chore: packages 2026-05-22 15:44:21 +03:00
ghost2023
4691f5ad3f feat: enhance the new booking form with RHC 2026-05-22 15:43:20 +03:00
ghost2023
6287022a53 style: improve the switch component 2026-05-22 15:42:56 +03:00
Stephanos A
92fb6e3cc3 Migrations update 2026-05-22 15:05:20 +03:00
Stephanos A
672987cd1e Migrations update 2026-05-22 15:05:20 +03:00
Roba Boru
096c717bfa Refactor business logic for train,schedule,coach,seat and search modules 2026-05-22 14:47:38 +03:00
Roba Boru
95e03e9b76 Refactor business logic for train,schedule,coach,seat and search modules 2026-05-22 14:47:38 +03:00
ghost2023
e9362abecd feat(bookings): Rework New Booking flow to support cargo type selection 2026-05-22 11:38:22 +03:00
ghost2023
37916a0cae chore: add switch component from shadcn to ui-common 2026-05-22 11:37:24 +03:00
ghost2023
47bcc82c88 chore: install react-hook-form, zod and @hookform/resolvers to freight web portal 2026-05-22 10:47:12 +03:00
ghost2023
9fbe27e634 chore: add field component from shadcn to ui-common 2026-05-22 10:45:13 +03:00
ghost2023
74333e5e42 fix: incorrect NewBookingPage 2026-05-22 10:36:44 +03:00
Nathnael Wondisha
f9a9d9923c Merge pull request #23 from Tria-plc/freight/feature/rebuild_booking_form
style: rebuild the new booking portal based on the US
2026-05-21 17:12:42 +03:00
ghost2023
509e1f0611 style: rebuild the new booking portal based on the US 2026-05-21 17:07:15 +03:00
Stephanos A
9151110fd8 Refactor seat class handling 2026-05-21 14:31:07 +03:00
Stephanos A
4234c2fdd5 Refactor seat class handling 2026-05-21 14:31:07 +03:00
Stephanos A
2e42662729 Merge remote changes: Add SeatClass model and seat-classes module while preserving local IAM integration and enhancements 2026-05-21 14:06:05 +03:00
Stephanos A
7869994045 Merge remote changes: Add SeatClass model and seat-classes module while preserving local IAM integration and enhancements 2026-05-21 14:06:05 +03:00
Nathnael Wondisha
c0b97cdf3c Merge pull request #19 from Tria-plc/nati-branch
Fix import
2026-05-21 10:39:42 +03:00
Stephanos A
3f60836e5d Implemened verifayda and currency modules 2026-05-21 10:22:08 +03:00
Stephanos A
860170f229 Implemened verifayda and currency modules 2026-05-21 10:22:08 +03:00