From 112147cb0a2f441a5c90803989b7e4822e7625da Mon Sep 17 00:00:00 2001 From: root Date: Fri, 10 Jul 2026 15:15:16 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20driver=20delivery=20list=20=E2=80=94=20t?= =?UTF-8?q?able=20layout=20with=20columns:=20=E2=84=96=20|=20Client=20|=20?= =?UTF-8?q?Phone=20|=20City=20|=20Half-day?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced card-style delivery items with proper table: - № счёта (order numbers, accent color) - Клиент (customer name) - Телефон (tel: link, clickable) - Город (extracted from address) - Часть дня (delivery half-day) Problem rows highlighted with red tint + ⚠ icon --- .../driver/DriverDeliveryPlanner.jsx | 100 +++++++++--------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/src/components/driver/DriverDeliveryPlanner.jsx b/src/components/driver/DriverDeliveryPlanner.jsx index 3435289..a8b0963 100644 --- a/src/components/driver/DriverDeliveryPlanner.jsx +++ b/src/components/driver/DriverDeliveryPlanner.jsx @@ -505,65 +505,61 @@ export const DriverDeliveryPlanner = ({ orderGroups = [], onOpenOrder, currentUs {label} {items.length} {pluralGroups(items.length)} -
- {items.map((item) => { + {/* Table layout — № | Фамилия | Телефон | Город | Часть дня */} +
+
+
+
№ счёта
+
Клиент
+
Телефон
+
Город
+
Часть дня
+
+ {items.map((item) => { const hasProblem = item.hasDeliveryProblem || item.has_delivery_problem; const phoneTel = normalizePhoneForTel(item.customerPhone); const halfDayLabel = getOrderGroupDeliveryHalfDay(item); + const city = normalizeCity(item.deliveryAddress || item.delivery_address); + const orderNum = (Array.isArray(item.orderNumbers) && item.orderNumbers.length > 0) + ? item.orderNumbers.join(", ") + : (item.groupKey || "—"); return ( -
- -
- {item.deliveryAddress || item.delivery_address || "Адрес не указан"} -
- +
+ {city} +
+
+ {halfDayLabel || "—"} +
+ ); - })} + })} +
))}