diff --git a/src/components/admin/AdminDashboard.jsx b/src/components/admin/AdminDashboard.jsx
index ba5c962..4cd916e 100644
--- a/src/components/admin/AdminDashboard.jsx
+++ b/src/components/admin/AdminDashboard.jsx
@@ -39,7 +39,7 @@ const STATUS_COLORS = {
loaded: '#6366f1',
on_route: '#8b5cf6',
delivered: '#10b981',
- picked_up: '#10b981',
+ picked_up: '#14b8a6',
paid_storage: '#06b6d4',
problem: '#ef4444',
cancelled: '#64748b',
@@ -112,7 +112,7 @@ export const AdminDashboard = () => {
- {Array.from({ length: 6 }).map((_, i) => (
+ {Array.from({ length: 7 }).map((_, i) => (
@@ -150,12 +150,12 @@ export const AdminDashboard = () => {
// ── Trend & Driver Data ───────────────────────────────────────────────────
const trendData = (dailyTrend || []).map(d => ({
date: d.date ? new Date(d.date).toLocaleDateString('ru-RU', { day: '2-digit', month: '2-digit' }) : '',
- delivered: d.delivered || 0, total: d.total || 0, problems: d.problems || 0,
+ delivered: d.delivered || 0, picked_up: d.picked_up || 0, total: d.total || 0, problems: d.problems || 0,
}));
const driverData = (driverStats || []).map(d => ({
name: d.driver_name || 'Неизвестный',
- total: d.total || 0, delivered: d.delivered || 0, problems: d.problems || 0,
+ total: d.total || 0, delivered: d.delivered || 0, picked_up: d.picked_up || 0, problems: d.problems || 0,
}));
// Funnel: ALWAYS show all steps, even with 0 values
@@ -189,6 +189,7 @@ export const AdminDashboard = () => {
{ label: 'Ожидает', val: sv.pending },
{ label: 'В работе', val: sv.in_progress },
{ label: 'Доставлено', val: sv.delivered },
+ { label: 'Вывезено', val: sv.picked_up },
{ label: 'Проблемы', val: sv.problem },
{ label: '% доставки', val: sv.delivery_rate != null ? sv.delivery_rate + '%' : '—' },
].map((kpi, i) => (
@@ -237,6 +238,7 @@ export const AdminDashboard = () => {
+
@@ -367,6 +369,7 @@ export const AdminDashboard = () => {
} />
+