marshal
699f7466e2
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 22:45:31 +03:00
Sennay
b512e77ce1
Update VITE_API_URL to production endpoint
2026-06-16 22:35:27 +03:00
Eyob T.
d110391c05
Merge pull request #189 from Tria-plc/alpha
...
Update roundtrip booking result
2026-06-16 22:33:41 +03:00
Roba Boru
ad2a175ff5
Merge remove changes
2026-06-16 22:29:50 +03:00
Roba Boru
57c2549738
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 22:29:31 +03:00
Roba Boru
001a1a7d98
Update roundtrip booking result
2026-06-16 22:29:10 +03:00
Stephanos A
865105eb6a
Revert "fix: add lockfile corruption handling to CI/CD and Dockertfiles"
...
This reverts commit 560aff222b
2026-06-16 22:25:26 +03:00
Sennay
2d513b78a3
Update VITE_API_URL for production deployment
2026-06-16 22:15:57 +03:00
Eyob T.
c1d96f1daf
Merge pull request #188 from Tria-plc/revert-187-alpha
...
Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles"
2026-06-16 22:02:54 +03:00
Stephanos A.
7a00955588
Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles"
2026-06-16 21:58:26 +03:00
Eyob T.
eb7db6db21
Merge pull request #187 from Tria-plc/alpha
...
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:48:40 +03:00
Stephanos A
560aff222b
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:40:01 +03:00
Eyob T.
fc57c66d0a
Merge pull request #185 from Tria-plc/alpha
...
Merge request for booking endpoint and other enhancements
2026-06-16 20:20:41 +03:00
yaschalew10
38f18d1fde
Merge pull request #186 from Tria-plc/freight/hotfix_1
...
fix prod issue
2026-06-16 19:40:27 +03:00
natib21
018ae5e059
fix prod issue
2026-06-16 16:39:29 +00:00
Stephanos A
ad83c87e2f
Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields.
2026-06-16 19:30:09 +03:00
Stephanos A
eb60fc340d
Refactor booking creation to support one-way and round-trip bookings with enhanced DTOs and service methods
2026-06-16 18:44:09 +03:00
Marshal
e8c6a2bbd2
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 15:28:38 +00:00
Marshal
052829c7e6
Add freight demo data seeder and permissions management
...
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
marshal
7e1c2dcbd8
Merge pull request #184 from Tria-plc/freight/develop
...
Freight/develop
2026-06-16 18:26:01 +03:00
marshal
8098adedaa
Merge pull request #183 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 18:25:12 +03:00
marshal
369f2892fb
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 18:13:25 +03:00
Eyob T.
2e9e69275a
Merge pull request #180 from Tria-plc/alpha
...
Enhance DTOs and services to support sequence and operational status for coaches and stations
2026-06-16 17:40:01 +03:00
marshal
82954b1ec1
Merge pull request #182 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 17:31:28 +03:00
marshal
10364fe924
ass signature on the profile
2026-06-16 17:30:22 +03:00
Marshal
43a822a2ac
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 14:27:00 +00:00
Marshal
f6c28635bc
add 'My signature' menu item to user menu
2026-06-16 14:26:17 +00:00
marshal
ea9b9c7346
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 17:20:31 +03:00
Marshal
2d0f5ce6ee
changes
2026-06-16 14:17:40 +00:00
yaschalew10
fef2239d39
Merge pull request #181 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 17:02:49 +03:00
marshal
2592e604fb
changes
2026-06-16 16:57:15 +03:00
Marshal
524d3b6418
add reusable per-user contract signatures with profile prefill and approval
2026-06-16 13:34:04 +00:00
Marshal
62ce2dc64f
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 13:27:29 +00:00
Marshal
366a335f85
add reusable per-user contract signatures with profile prefill and approval
2026-06-16 13:26:45 +00:00
Stephanos A
421e30dc6c
Enhance DTOs and services to support sequence and operational status for coaches and stations
2026-06-16 16:25:33 +03:00
Nathnael Wondisha
c5b8a97a25
Merge pull request #179 from Tria-plc/freight/develop
...
Freight/develop
2026-06-16 16:23:01 +03:00
Nathnael Wondisha
b82e4ac46e
Merge branch 'dev' into freight/develop
2026-06-16 16:22:38 +03:00
Nathnael Wondisha
8777c5e26f
Merge pull request #176 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 16:19:55 +03:00
Nathnael Wondisha
ab3583d9ee
Merge pull request #178 from Tria-plc/freight/fix/fixes
...
Freight/fix/fixes
2026-06-16 16:19:14 +03:00
Nathnael
edc63379bc
fix: type error
2026-06-16 13:16:42 +00:00
Nathnael
9afa23cc47
feat: add dashboard summary endpoint and related DTOs for company KPIs
2026-06-16 13:11:56 +00:00
Nathnael
16f16e7d7e
fix: booking payment
2026-06-16 13:11:56 +00:00
ghost2023
1d4edfc98c
fix: type error to booking and edit booking
2026-06-16 16:11:07 +03:00
Yonas Tewabe
4484ed60e6
Update deploy.yml
2026-06-16 16:05:20 +03:00
Eyob T.
797d643ec6
Merge pull request #177 from Tria-plc/feat/payment-microservice
...
Feat/payment microservice
2026-06-16 16:00:03 +03:00
ghost2023
17dfce0d18
fixes
2026-06-16 15:45:58 +03:00
Abubeker Yasin
30fecc3627
fix ( telebirr ) remove booking ref from title
2026-06-16 15:33:03 +03:00
Abubeker Yasin
c56e0e794c
Update payments.module.ts
2026-06-16 15:25:14 +03:00
Abubeker Yasin
1ed2c4d2f0
Merge branch 'dev' into feat/payment-microservice
2026-06-16 15:24:33 +03:00
marshal
f682adc5be
feat(bookings): add endpoint to list customer's payable bookings
...
Add GET /bookings/my endpoint that returns bookings owned by the authenticated user's company that are ready for payment (FULLY_EXECUTED, SELECTED_FOR_BATCH, AWAITING_PAYMENT) and not yet PAID. Add paymentStatus and excludePaymentStatus filters to repository query builder and filter DTO.
2026-06-16 15:24:16 +03:00
