natib21
8e0cc7d5ee
fix: vehicles data extraction in maintenance + financial pages
...
Both MaintenancePage and FinancialReportsPage were calling
vehiclesService.getAll() but not extracting res.data property.
Result was vehicles being undefined, causing .map error.
Fixed to match FuelPurchasePage pattern:
const res = await vehiclesService.getAll()
return res.data || []
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 13:10:47 +00: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
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
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
360e61ac15
fix: use byId() instead of detail() in QUERY_KEYS
...
QUERY_KEYS.FIRST_MILE and QUERY_KEYS.LAST_MILE have byId() not detail().
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 04:04:56 +00:00
natib21
0bc9534172
fix: replace apiClient with api in FirstMilePage
...
Use correct import 'api' from '@/auth/http' instead of undefined 'apiClient'.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 04:03:29 +00:00
natib21
b142552f17
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix
2026-06-30 03:46:26 +00:00
natib21
b1d9045d0b
fix: remove isPostPaymentCompleted filter check
...
Property removed from entities until migration creates column.
Temporarily skip this filter until feature is fully implemented.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 03:15:58 +00:00
yaschalew
1193e2bfa9
fix commit
2026-06-29 18:35:51 +03:00
yaschalew
690753154f
fix
2026-06-29 18:29:24 +03:00
natib21
9b11eeb623
fix
2026-06-29 14:54:34 +00:00
natib21
6fa315db0f
fix
2026-06-29 14:45:22 +00:00
Nathnael
feae27d0c3
feat: improve the invoices in the portal
2026-06-29 14:26:25 +00:00
Nathnael Wondisha
4cf8e89780
Merge branch 'dev' into freight/feat/invoice
2026-06-29 17:24:29 +03:00
Nathnael
e9f9450b0f
fix: types
2026-06-29 14:10:10 +00:00
Nathnael
6d40d185d6
feat: setup the invoice page in the portal
2026-06-29 13:54:14 +00:00
marshal
d22fb6bb22
Merge pull request #338 from Tria-plc/freight_feature/contrat
...
payemnt
2026-06-29 15:10:57 +03:00
marshal
a83a686f37
payemnt
2026-06-29 15:09:19 +03:00
marshal
1795bb8830
Merge pull request #335 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 15:07:25 +03:00
marshal
211301b7ce
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 15:06:23 +03:00
marshal
1491db304b
payemnt
2026-06-29 15:04:01 +03:00
yaschalew10
db7f0cb601
Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice
...
Freight/feature/last mile invoice
2026-06-29 15:03:00 +03:00
natib21
835facc65a
fix
2026-06-29 11:12:51 +00:00
Nathnael
c37e8acfdc
Merge branch 'dev' into freight/feat/invoice
2026-06-29 10:58:12 +00:00
hagiye
64cab3ecd0
Merge branch 'dev' of github.com:Tria-plc/edr-platform into handover
2026-06-29 13:49:25 +03:00
hagiye
9176df5e4b
Marshaling document Receive Export and import handover to customer
2026-06-29 13:48:58 +03:00
marshal
943a986b05
Merge pull request #332 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 13:36:14 +03:00
Marshal
1c170ec790
remove unused import for PackageCheck in step2-service-type.tsx
2026-06-29 10:34:40 +00:00
Marshal
15a19053d9
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 10:27:16 +00:00
Marshal
6be461bb2f
add profile creation flow with license upload in NewContractPage
2026-06-29 10:25:06 +00:00
marshal
bdca3a1e8d
Merge pull request #331 from Tria-plc/freight_feature/contrat
...
merge conflict
2026-06-29 12:52:50 +03:00
marshal
9fe90c8ef7
merge conflict
2026-06-29 12:50:47 +03:00
marshal
7f63d4bd2b
Merge pull request #330 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 12:49:33 +03:00
marshal
1c01c792fc
merge conflict
2026-06-29 12:45:40 +03:00
natib21
fc03e27bdc
fix
2026-06-29 09:43:31 +00:00
natib21
9f0d16886d
fix
2026-06-29 09:33:56 +00:00
marshal
2ad384e63b
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 12:31:21 +03:00
Marshal
0f7cac2b68
add booking request functionality for GENERAL customs contracts
...
- Create migration for booking_requests table with necessary fields and indexes.
- Implement BookingRequestRepository for database operations related to booking requests.
- Develop BookingRequestService to handle business logic for submitting, accepting, rejecting, and canceling booking requests.
- Create DTOs for creating booking requests and reviewing them.
- Define BookingRequest entity to map to the booking_requests table.
- Add UI components for managing shipment requests, including detail and list pages.
- Implement OperationDatePicker component for selecting available shipment days.
2026-06-29 09:30:44 +00:00
natib21
31b38311ff
fix
2026-06-29 09:30:44 +00:00
natib21
4a7503a667
fix
2026-06-29 09:27:43 +00:00
natib21
9d7d08cf5d
fix
2026-06-29 09:24:45 +00:00
hagiye
d55f9312bf
Marshaling document Receive Export and import handover to customer
2026-06-29 12:24:14 +03:00
natib21
6aad868fb2
fix
2026-06-29 09:20:37 +00:00
natib21
8728347642
fix
2026-06-29 09:16:03 +00:00
natib21
8a8a1b7316
fix
2026-06-29 09:11:48 +00:00
natib21
6607fda5fd
fix
2026-06-29 08:57:34 +00:00
natib21
8bb1cb18b5
fix
2026-06-29 08:55:40 +00:00
natib21
17ee6ea292
fix
2026-06-29 08:49:36 +00:00
natib21
0d922a132f
fix
2026-06-29 08:46:03 +00:00
natib21
40320d247a
fix
2026-06-29 08:37:48 +00:00
