From efa2a836348165d0dc07c99c149973d3dab18efd Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 Jun 2026 20:08:15 +0000 Subject: [PATCH] fix: requires_address warning only shown when address is actually empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Previously: status 'requires_address' always showed 'Адрес не указан' warning even when address was filled in - Now: warning only appears when both status is 'requires_address' AND effectiveAddress is empty - Label 'Доставка (требуется адрес)' also only shows when address is missing --- src/components/orders/OrderDetailPanel.jsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx index 7753097..d3958a1 100644 --- a/src/components/orders/OrderDetailPanel.jsx +++ b/src/components/orders/OrderDetailPanel.jsx @@ -710,17 +710,18 @@ export const OrderDetailPanel = ({ {(() => { const isPickup = isPickupOrder; + const effectiveAddress = isPickup + ? (order.customerAddress || "") + : (order.deliveryAddress || ""); + const requiresAddress = (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && !effectiveAddress; const deliveryTypeLabel = isPickup ? "Самовывоз" - : (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") + : requiresAddress ? "Доставка (требуется адрес)" : "Доставка"; const dateLabel = isPickup ? "Дата самовывоза" : "Дата доставки"; const timeLabel = isPickup ? "Время самовывоза" : "Время доставки"; const addressLabel = isPickup ? "Адрес клиента" : "Адрес доставки"; - const effectiveAddress = isPickup - ? (order.customerAddress || "") - : (order.deliveryAddress || ""); return (
@@ -740,7 +741,7 @@ export const OrderDetailPanel = ({ Тип

{deliveryTypeLabel}

- {(order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && ( + {requiresAddress && (
📍