From c0c549adca7ff186ff4cda95777e786be89e8be4 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 30 Jun 2026 09:04:27 +0000 Subject: [PATCH] feat: show delivery type (pickup/delivery) in logistics board + driver planner --- src/components/driver/DriverDeliveryPlanner.jsx | 3 +++ src/components/logistics/LogisticsReadinessBoard.jsx | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/driver/DriverDeliveryPlanner.jsx b/src/components/driver/DriverDeliveryPlanner.jsx index 4fe743f..c8eaa9b 100644 --- a/src/components/driver/DriverDeliveryPlanner.jsx +++ b/src/components/driver/DriverDeliveryPlanner.jsx @@ -419,6 +419,9 @@ export const DriverDeliveryPlanner = ({ orderGroups = [], onOpenOrder, currentUs {getOrderGroupDeliveryHalfDay(item) ? ` · ${getOrderGroupDeliveryHalfDay(item)}` : ""} + + {item.deliveryType === "pickup" ? "🏪 Самовывоз" : "🚚 Доставка"} +
diff --git a/src/components/logistics/LogisticsReadinessBoard.jsx b/src/components/logistics/LogisticsReadinessBoard.jsx index 74fc3bc..8883a4d 100644 --- a/src/components/logistics/LogisticsReadinessBoard.jsx +++ b/src/components/logistics/LogisticsReadinessBoard.jsx @@ -71,12 +71,13 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO const totalGroups = filteredGroups.length; - const COLS = "grid-cols-[minmax(140px,2fr)_minmax(80px,1fr)_minmax(100px,1.2fr)_minmax(80px,1fr)_minmax(100px,1fr)_minmax(120px,1fr)]"; + const COLS = "grid-cols-[minmax(140px,2fr)_minmax(80px,1fr)_minmax(70px,0.7fr)_minmax(100px,1.2fr)_minmax(80px,1fr)_minmax(100px,1fr)_minmax(120px,1fr)]"; const TableHeader = () => (
Клиент
Город
+
Тип
Дата доставки
Водитель
Статус
@@ -172,6 +173,11 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO
{group.city || group.customerAddress || "—"}
+
+ + {group.deliveryType === "pickup" ? "🏪 Самовывоз" : "🚚 Доставка"} + +
{group.deliveryDate ? {formatDate(group.deliveryDate)}{group.deliveryTime ? · {group.deliveryTime} : ""}