marshal
58e6e05458
add login image
2026-06-17 20:30:20 +03:00
Marshal
5b9fed57fe
add payment success and failure pages with environment variable support
2026-06-17 17:13:19 +00:00
Marshal
3798b28bcd
implement auto-consolidation for freight bookings at submission time
2026-06-17 16:46:44 +00:00
Marshal
bd0d90eddd
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-17 16:33:07 +00:00
Eyob T.
ddf42f3a34
Merge pull request #202 from Tria-plc/alpha
...
Pull request for round trip and transit related updates
2026-06-17 18:47:31 +03:00
Stephanos A
4601ee0e60
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-17 18:12:58 +03:00
Stephanos A
a82538d9db
feat: enhance search and ticketing for multi-leg (round trip + transit) journeys
2026-06-17 18:12:49 +03:00
Marshal
9dc3bc0765
enhance booking form UI with new components and improved layouts
2026-06-17 14:12:14 +00:00
Eyob T.
978893f8e5
Merge pull request #200 from Tria-plc/alpha
...
Update booking result for round trip
2026-06-17 17:02:27 +03:00
Roba Boru
2c33ce44bf
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-17 16:54:37 +03:00
Roba Boru
a74a9232f2
Fix build error
2026-06-17 16:54:16 +03:00
Yonas Tewabe
276c229cd4
Fix missing newline at end of tailwind.config.js
...
Add missing newline at the end of tailwind.config.js
2026-06-17 16:51:13 +03:00
Marshal
c89f7dcc11
implement PayNowButton component and integrate payment functionality in booking rows
2026-06-17 13:50:57 +00: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
Marshal
7eb6228d31
feat: add shipment tracking feature with live updates
...
- Implemented tracking functionality for bookings, allowing users to track their shipments in real-time.
- Added new API endpoints for fetching tracking data.
- Created a ShipmentTrackingModal component to display tracking information, including current status, checkpoints, and estimated arrival times.
- Enhanced the booking detail view to include tracking options for eligible bookings.
- Updated the train scheduling service to include scheduled departure and arrival times in the response.
- Introduced utility functions for managing tracking stages and statuses.
2026-06-17 13:23:40 +00: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
Marshal
cd31f3612c
Implement user-based booking access control and enhance booking filtering options
2026-06-17 12:35:29 +00: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
marshal
31710494d4
add telebirr and waafi icon
2026-06-17 14:53:30 +03:00
Yonas Tewabe
3e618c8f71
Update tailwind.config.js
2026-06-17 14:52:59 +03:00
marshal
611c8201da
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-17 14:33:07 +03:00
marshal
d7476a51c1
Removed console.log statements and corrected the amount calculation by removing the multiplication by 100.
2026-06-17 14:21:33 +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
