Abubeker Yasin
a667f5b2df
add test payment event
2026-06-30 15:51:47 +03:00
natib21
373c0356f2
feat: maintenance + financial reports frontend
...
MaintenancePage:
- Schedule maintenance (PREVENTIVE/CORRECTIVE/INSPECTION/REPAIR)
- View upcoming by vehicle
- Modal form with date, cost, provider, notes
FinancialReportsPage:
- Aggregate fuel + maintenance costs
- Period selector (3/6/12 months)
- Cost breakdown (percentages, ring progress)
- Operating insights (purchases, efficiency, items, avg cost)
- Cost per month calculation
Routes:
- /dashboard/maintenance
- /dashboard/financial-reports
Sidebar:
- "Maintenance" in Fleet Management
- "Financial Reports" in Fleet Management
QUERY_KEYS:
- FUEL, MAINTENANCE, FINANCIAL_REPORTS cache patterns
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 12:41:23 +00:00
natib21
f436916c42
feat: complete maintenance tracking backend
...
Service/Controller/Module:
- scheduleMaintenanceAsync: schedule work
- recordMaintenanceCost: log expenses
- getUpcomingMaintenance: due items
- getVehicleMaintenanceStats: cost aggregation
Endpoints:
- POST /maintenance/schedules
- POST /maintenance/costs
- PATCH /maintenance/schedules/:id
- GET /maintenance/upcoming/:vehicleId
- GET /maintenance/history/:vehicleId
- GET /maintenance/stats/:vehicleId
Migration: idempotent maintenance tables creation
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 12:33:29 +00:00
yaschalew
32e67f337e
Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix
2026-06-30 15:29:54 +03:00
Yonas Tewabe
9f2f1b5138
Update docker-compose.yaml
2026-06-30 15:28:39 +03:00
natib21
e59a77b859
feat: add maintenance tracking module foundation
...
Entities:
- MaintenanceSchedule: track preventive/corrective maintenance
- MaintenanceCost: record actual maintenance expenses
DTOs:
- CreateMaintenanceScheduleDto: schedule maintenance
- CreateMaintenanceCostDto: log costs
- UpdateMaintenanceScheduleDto: mark complete/adjust cost
Repository:
- getUpcomingMaintenance(): find due maintenance
- getMaintenanceCosts(): historical costs by date
- getTotalMaintenanceCost(): aggregate spending
Also fixed fuel-consumption.entity.ts: totalDistanceKm default 0
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 12:28:00 +00:00
Yonas Tewabe
90f200fdc1
Update Dockerfile.passenger-web
2026-06-30 15:26:23 +03:00
Yonas Tewabe
18e18bd15e
Update Dockerfile.web
2026-06-30 15:24:09 +03:00
Yonas Tewabe
1decdc85c7
Merge pull request #380 from Tria-plc/deployment-updates
...
feat: implement automated environment synchronization and conditional…
2026-06-30 15:18:46 +03:00
yonastewabe
2bbb37207e
feat: implement automated environment synchronization and conditional CI/CD deployment workflows
2026-06-30 15:16:47 +03:00
natib21
5d70c3b557
fix
2026-06-30 12:13:48 +00:00
Nathnael
5ad4efd7eb
feat: add pdf to the central invoice system
2026-06-30 11:58:28 +00:00
Nathnael
7fa18b8ee7
fix: reference type in payment service
2026-06-30 11:54:43 +00:00
Nathnael
3eb4a24199
fix: terminal clearing int vite
2026-06-30 11:29:28 +00:00
Nathnael
228b840c26
Merge branch 'dev' into freight/feat/invoice
2026-06-30 11:26:32 +00:00
Nathnael Wondisha
eed827e61e
Merge pull request #379 from Tria-plc/fix/apiconfig
...
fix: the hardcoded api url
2026-06-30 14:07:15 +03:00
ghost2023
48340f5e0a
fix: the hardcoded api url
2026-06-30 14:05:28 +03:00
Nathnael Wondisha
317945b49a
Merge pull request #378 from Tria-plc/fix/apiconfig
...
fix: the hardcoded api url
2026-06-30 14:02:59 +03:00
ghost2023
9619fbd9b0
fix: the hardcoded api url
2026-06-30 13:58:57 +03:00
Nathnael Wondisha
d112a7ed55
Merge pull request #377 from Tria-plc/fix/apiconfig
...
fix: testing the env
2026-06-30 13:51:33 +03:00
Nathnael
21cf24950d
feat: add partial payment to match the warehouse invoice before migration
2026-06-30 10:50:43 +00:00
ghost2023
fdb77a7036
fix: testing the env
2026-06-30 13:49:52 +03:00
yaschalew
7c48f02a15
Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix
2026-06-30 13:16:20 +03:00
natib21
f27f00d480
fix: use vehiclesService and add VEHICLES QUERY_KEYS
...
- Add VEHICLES to QUERY_KEYS constant
- Use vehiclesService.getAll() instead of direct API call
- Remove duplicate Vehicle type definitions
- Fix TypeScript type references
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 10:15:43 +00:00
yaschalew
dc3f6797c9
Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix
2026-06-30 13:12:02 +03:00
natib21
3f81bb77ad
feat: add fuel management frontend pages
...
- FuelPurchasePage: Record fuel purchases, calculate total costs
- FuelStatsPage: View fuel consumption stats, efficiency metrics
- Routes: /dashboard/fuel-purchases and /dashboard/fuel-stats
- Sidebar menu items in Fleet Management section
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 10:11:13 +00:00
natib21
7b9cd88712
fix: correct fuel module TypeScript errors
...
- Use @InjectRepository decorators for proper dependency injection
- Fix BaseRepository initialization with Repository instance
- Remove unnecessary DataSource references
- Add proper type annotations to reduce handlers
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 10:08:56 +00:00
natib21
df6e417a56
feat: add fuel management system backend
...
- FuelPurchase entity: record fuel purchases with cost tracking
- FuelConsumption entity: monthly aggregation of fuel metrics
- FuelService: record purchases, calculate stats, efficiency
- FuelController: REST API for fuel operations
- FuelModule: integrated into app
- Migration: create fuel_purchases and fuel_consumption tables
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 10:07:13 +00:00
SennayT
3c5f5b5861
fix: add docker cache for pnpm installations
2026-06-30 09:54:59 +00:00
Abubeker Yasin
7b98f74445
Merge pull request #376 from Tria-plc/alpha
...
fix: ( migration ) clean up migrations
2026-06-30 11:53:12 +03:00
SennayT
e7e523b3b2
geerate prisma client after deploying
2026-06-30 08:39:38 +00:00
Abubeker Yasin
6cb070831b
Merge branch 'alpha' into passenger/feat/iam
2026-06-30 11:16:11 +03:00
Abubeker Yasin
35a2a200d6
fix: ( migration ) clean up migrations
2026-06-30 11:11:50 +03:00
SennayT
5e43820efa
revert changes to dockerfile
2026-06-30 10:38:53 +03:00
Nathnael Wondisha
1407c345b1
Merge pull request #375 from Tria-plc/fix/apiconfig
...
fix: api url backoffice
2026-06-30 09:22:09 +03:00
ghost2023
0f762172bf
fix: api url backoffice
2026-06-30 09:19:32 +03:00
Nathnael Wondisha
d31b6f2d53
Merge pull request #374 from Tria-plc/fix/apiconfig
...
fix: api url
2026-06-30 09:15:36 +03:00
ghost2023
004c40059f
fix: api url
2026-06-30 09:13:48 +03:00
Abubeker Yasin
813381af2d
Merge pull request #373 from Tria-plc/alpha
...
Update webhooks.controller.ts
2026-06-30 09:13:46 +03:00
Abubeker Yasin
8d7ded1726
Update webhooks.controller.ts
2026-06-30 09:12:45 +03:00
Eyob T.
98da6033b5
Merge pull request #371 from Tria-plc/alpha
...
Routes management issue fix
2026-06-30 08:53:58 +03:00
Nathnael Wondisha
fec235c433
Merge pull request #372 from Tria-plc/freight/fix/migrate-undo
...
fix
2026-06-30 08:39:57 +03:00
ghost2023
c299973bb0
fix
2026-06-30 08:38:27 +03:00
Nathnael Wondisha
b5a2bd537f
Merge pull request #370 from Tria-plc/freight/fix/migrate-undo
...
fix
2026-06-30 08:32:29 +03:00
ghost2023
468ac8b28a
fix
2026-06-30 08:31:26 +03:00
Stephanos A
cdb0c23043
Routes management issue fix
2026-06-30 08:28:44 +03:00
Stephanos A.
16e8d48d9f
Merge pull request #369 from Tria-plc/alpha
...
fix(passenger-api): recreate script with LF line endings
2026-06-30 07:37:12 +03:00
Stephanos A
756aa04646
fix(passenger-api): recreate script with LF line endings
2026-06-30 07:35:55 +03:00
Hagernesh Tadesse
f59a4649d7
Merge pull request #368 from Tria-plc/importhandover
...
Importhandover
2026-06-30 07:29:16 +03:00
Stephanos A.
3509afbcf8
Merge pull request #367 from Tria-plc/alpha
...
fix(passenger-api): allow gender column migration to run
2026-06-30 07:20:52 +03:00