Commit Graph

4977 Commits

Author SHA1 Message Date
Nathnael Wondisha
879e277cfc Merge pull request #37 from Tria-plc/freight/feature/ui-intergration
freight/feature/ui intergration
2026-05-23 11:55:13 +03:00
ghost2023
dc41da3731 feat: wire up the create booking form 2026-05-23 11:54:13 +03:00
ghost2023
8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs 2026-05-23 11:21:17 +03:00
yaschalew10
a252b88dfb Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component
Freight/features/dynamic terminal component
2026-05-23 11:13:24 +03:00
yaschalew10
a80f64e772 Merge pull request #35 from Tria-plc/freight_feature/booking/minio
feat(bookings): support multiple containers per booking via JSONB array
2026-05-23 11:10:29 +03:00
marshal
ae317540c1 feat(bookings): support multiple containers per booking via JSONB array 2026-05-23 11:08:35 +03:00
mengstabketemaw
cf3869ef66 features: dynamic terminal components 2026-05-23 11:08:05 +03:00
mengstabketemaw
3485ef299d fix local merge conflict 2026-05-23 10:52:31 +03:00
yaschalew10
578f6f84ef Merge pull request #34 from Tria-plc/freight_feature/booking/minio
change the schema from public to freight
2026-05-23 10:03:01 +03:00
marshal
2064e6efda change the schema from public to freight 2026-05-23 10:00:40 +03:00
yaschalew10
3b4a184ab4 Merge pull request #33 from Tria-plc/freight_feature/booking/minio
Freight feature/booking/minio
2026-05-23 09:54:35 +03:00
SennayT
c12dbd47ff generate migrations 2026-05-23 09:47:36 +03:00
marshal
ecbf1f2408 mergefix 2026-05-23 09:38:19 +03:00
marshal
82c6b1284e implement contract booking functionality and MinIO setup 2026-05-23 09:31:52 +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
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