Roba Boru
|
a74a9232f2
|
Fix build error
|
2026-06-17 16:54:16 +03:00 |
|
Roba Boru
|
8c691ae33f
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-17 16:50:56 +03:00 |
|
Yonas Tewabe
|
9d59ecb29a
|
Update tailwind.config.js
|
2026-06-17 16:50:44 +03:00 |
|
Roba Boru
|
b5abe79294
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-17 16:50:41 +03:00 |
|
Roba Boru
|
2bfce8beb1
|
Update booking summary page layout and update notification service
|
2026-06-17 16:49:05 +03:00 |
|
Abubeker Yasin
|
5d0812ade1
|
Merge pull request #201 from Tria-plc/feat/payment-microservice
Feat/payment microservice
|
2026-06-17 16:00:52 +03:00 |
|
Abubeker Yasin
|
6ecc19c69c
|
Update waafi.provider.ts
|
2026-06-17 15:59:46 +03:00 |
|
Stephanos A
|
a6fc8e3eb6
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-17 15:52:29 +03:00 |
|
Stephanos A
|
25668e7916
|
Enhance guest booking functionality with round trip support and fare engine integration
|
2026-06-17 15:52:18 +03:00 |
|
Roba Boru
|
d67f4a8358
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-17 15:18:26 +03:00 |
|
Roba Boru
|
a304ed2f03
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-17 15:07:38 +03:00 |
|
Roba Boru
|
1d34354e66
|
Update booking result page for round trip
|
2026-06-17 15:07:05 +03:00 |
|
Yonas Tewabe
|
2a9729304f
|
Update .gitignore
|
2026-06-17 14:54:11 +03:00 |
|
Yonas Tewabe
|
1ad1999b2f
|
Update tailwind.config.js
|
2026-06-17 14:53:45 +03:00 |
|
Yonas Tewabe
|
3e618c8f71
|
Update tailwind.config.js
|
2026-06-17 14:52:59 +03:00 |
|
Yonas Tewabe
|
999a58011c
|
Update deploy.yml
|
2026-06-17 04:00:10 -07:00 |
|
Nathnael Wondisha
|
52f0fd7e62
|
Merge pull request #198 from Tria-plc/freight/fix/hot-fixes
Freight/fix/hot fixes
|
2026-06-17 13:43:58 +03:00 |
|
ghost2023
|
a4a58d264a
|
fix
|
2026-06-17 13:43:35 +03:00 |
|
Stephanos A
|
24ee3b88f5
|
Round trip booking and additional enhancements
|
2026-06-17 13:42:20 +03:00 |
|
ghost2023
|
dcb2de7631
|
fix: settings page
|
2026-06-17 13:34:23 +03:00 |
|
ghost2023
|
2a0f16241b
|
fix: improve the setting onboarding flow
|
2026-06-17 13:17:09 +03:00 |
|
ghost2023
|
e007b28285
|
fix: type errors
|
2026-06-17 13:16:06 +03:00 |
|
Sennay
|
b6cbfd2c1f
|
Force recreate containers during deployment
Added --force-recreate option to docker compose command.
|
2026-06-17 12:59:06 +03:00 |
|
Sennay
|
f4d7b5c87b
|
Update Docker build command in deploy.yml
Remove the --no-cache option from the Docker build command.
|
2026-06-17 12:44:54 +03:00 |
|
Sennay
|
d348be5879
|
Remove rabbitmq dependency conditions
Removed 'depends_on' condition for rabbitmq service in both passenger and payment APIs.
|
2026-06-17 12:40:16 +03:00 |
|
Yonas Tewabe
|
12574768de
|
Update docker-compose.yaml
|
2026-06-17 12:38:01 +03:00 |
|
Abubeker Yasin
|
58af6ee2db
|
fix:( payment ) fix date and add waafi demo callback
|
2026-06-17 12:31:20 +03:00 |
|
Yonas Tewabe
|
b2f1cec37e
|
Remove concurrency settings from deploy.yml
Removed concurrency settings from the deploy workflow.
|
2026-06-17 12:25:33 +03:00 |
|
Abubeker Yasin
|
4ba91400d6
|
Merge pull request #196 from Tria-plc/feat/payment-microservice
fix: ( telebirr ) fix webhook return types
|
2026-06-17 12:12:34 +03:00 |
|
Abubeker Yasin
|
1b6bc47026
|
fix: ( telebirr ) fix webhook return types
|
2026-06-17 12:04:00 +03:00 |
|
Nathnael Wondisha
|
cae2848db7
|
Merge pull request #195 from Tria-plc/freight/feat/portal-fixes
Freight/feat/portal fixes
|
2026-06-17 11:02:33 +03:00 |
|
Nathnael
|
8b7dcdb897
|
fixes
|
2026-06-17 08:00:58 +00:00 |
|
Nathnael
|
24f314150c
|
fix
|
2026-06-17 08:00:58 +00:00 |
|
Nathnael
|
c59e100e5e
|
style: ui fix in scheduling
|
2026-06-17 08:00:58 +00:00 |
|
Nathnael Wondisha
|
585d86b8af
|
Merge pull request #194 from Tria-plc/freight/develop
Freight/develop
|
2026-06-17 10:19:59 +03:00 |
|
Nathnael Wondisha
|
815c3f4548
|
Merge branch 'dev' into freight/develop
|
2026-06-17 10:19:43 +03:00 |
|
Nathnael Wondisha
|
fc514bb6be
|
Merge pull request #193 from Tria-plc/freight/feat/portal-fixes
Freight/feat/portal fixes
|
2026-06-17 10:18:24 +03:00 |
|
ghost2023
|
c96c863070
|
fix
|
2026-06-17 10:15:14 +03:00 |
|
Nathnael
|
3919464acb
|
fix: the route direction
|
2026-06-17 07:14:21 +00:00 |
|
Nathnael
|
4f20b07d81
|
refactor: the portal dashboard
|
2026-06-17 07:02:15 +00:00 |
|
marshal
|
e9de1e8f0f
|
Merge pull request #192 from Tria-plc/freight_feature/priority
Switch payment API URL from localhost to production domain in payment…
|
2026-06-17 09:33:53 +03:00 |
|
marshal
|
2be9b948ba
|
Switch payment API URL from localhost to production domain in payment client service
|
2026-06-17 09:31:18 +03:00 |
|
Nathnael
|
1ca98f32ea
|
style: improved the review ui
|
2026-06-17 06:24:03 +00:00 |
|
Eyob T.
|
5ba052fda9
|
Merge pull request #191 from Tria-plc/alpha
Update pnpm-lock.yaml
|
2026-06-17 08:12:26 +03:00 |
|
Stephanos A
|
81a9c614b7
|
Update pnpm-lock.yaml
|
2026-06-17 08:10:59 +03:00 |
|
marshal
|
7cada1a0af
|
Merge pull request #190 from Tria-plc/freight_feature/priority
Freight feature/priority
|
2026-06-17 07:49:05 +03:00 |
|
marshal
|
0b7492c502
|
Switch API configuration from localhost to production URL in portal and add localhost comment in backoffice
|
2026-06-17 07:47:09 +03:00 |
|
marshal
|
b2cd30c773
|
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
|
2026-06-17 07:37:38 +03:00 |
|
Marshal
|
2de3f78fb0
|
Add payments management features including summary and listing, and integrate with the dashboard
|
2026-06-17 04:35:43 +00:00 |
|
marshal
|
f59dbdc033
|
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
|
2026-06-17 04:57:33 +03:00 |
|