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
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
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
Abubeker Yasin
e5850fbc63
feat: ( payment ) return url based on payment method
2026-06-16 15:23:32 +03:00
Marshal
64fad99bdc
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 12:21:16 +00:00
Marshal
52a9462228
add booking endpoint for featch payable bookings
2026-06-16 12:20:49 +00:00
ghost2023
cf3db76bb1
type fixes
2026-06-16 15:13:11 +03:00
Eyob T.
90f86262c0
Merge pull request #175 from Tria-plc/alpha
...
Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.124 and its dependencies
2026-06-16 14:59:03 +03:00
Stephanos A
a61130cd51
Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies
2026-06-16 14:56:35 +03:00
ghost2023
e0e6020020
fixes
2026-06-16 14:54:07 +03:00
Eyob T.
022da79387
Merge pull request #174 from Tria-plc/alpha
...
Request to merge updates on round trip journeys, UAT feedback items, back office documentation
2026-06-16 14:49:50 +03:00
Stephanos A
eb97c11ddb
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 14:41:33 +03:00
Stephanos A
e03c11e7ee
Build issues resolution
2026-06-16 14:41:27 +03:00
Stephanos A
fc5f77c817
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 14:40:09 +03:00
Yonas Tewabe
7be5be9c54
Update deploy.yml
2026-06-16 14:37:57 +03:00
Eyob T.
232c986cbb
Merge pull request #173 from Tria-plc/alpha
...
Update email and sms services
2026-06-16 14:32:18 +03:00
marshal
166067fbe7
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 14:29:17 +03:00
Nathnael Wondisha
c0b6869232
Merge pull request #172 from Tria-plc/freight/fix/fixes
...
freight/fix/fixes
2026-06-16 14:28:24 +03:00
ghost2023
e47340c2c8
fixes
2026-06-16 14:27:17 +03:00
marshal
3ca564f073
simplify build script and add tinymce dependency
2026-06-16 14:26:47 +03:00
Roba Boru
06035a2b94
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 14:22:21 +03:00
Roba Boru
1a71f654b1
Update email and sms services
2026-06-16 14:21:56 +03:00
ghost2023
d6ad094d5a
style: use mantine in settings page
2026-06-16 14:19:52 +03:00
