fix: requires_address warning only shown when address is actually empty
- 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
This commit is contained in:
parent
491b7705fd
commit
efa2a83634
|
|
@ -710,17 +710,18 @@ export const OrderDetailPanel = ({
|
||||||
|
|
||||||
{(() => {
|
{(() => {
|
||||||
const isPickup = isPickupOrder;
|
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
|
const deliveryTypeLabel = isPickup
|
||||||
? "Самовывоз"
|
? "Самовывоз"
|
||||||
: (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address")
|
: requiresAddress
|
||||||
? "Доставка (требуется адрес)"
|
? "Доставка (требуется адрес)"
|
||||||
: "Доставка";
|
: "Доставка";
|
||||||
const dateLabel = isPickup ? "Дата самовывоза" : "Дата доставки";
|
const dateLabel = isPickup ? "Дата самовывоза" : "Дата доставки";
|
||||||
const timeLabel = isPickup ? "Время самовывоза" : "Время доставки";
|
const timeLabel = isPickup ? "Время самовывоза" : "Время доставки";
|
||||||
const addressLabel = isPickup ? "Адрес клиента" : "Адрес доставки";
|
const addressLabel = isPickup ? "Адрес клиента" : "Адрес доставки";
|
||||||
const effectiveAddress = isPickup
|
|
||||||
? (order.customerAddress || "")
|
|
||||||
: (order.deliveryAddress || "");
|
|
||||||
return (
|
return (
|
||||||
<div className="grid gap-3 rounded-[24px] border border-[var(--color-border)] bg-[var(--color-surface-strong)] p-4 md:grid-cols-4">
|
<div className="grid gap-3 rounded-[24px] border border-[var(--color-border)] bg-[var(--color-surface-strong)] p-4 md:grid-cols-4">
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -740,7 +741,7 @@ export const OrderDetailPanel = ({
|
||||||
Тип
|
Тип
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1 text-base font-medium !text-[var(--color-text)]">{deliveryTypeLabel}</p>
|
<p className="mt-1 text-base font-medium !text-[var(--color-text)]">{deliveryTypeLabel}</p>
|
||||||
{(order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && (
|
{requiresAddress && (
|
||||||
<div className="mt-2 flex items-start gap-2 rounded-xl border border-[rgba(239,68,68,0.3)] bg-[rgba(239,68,68,0.08)] p-3">
|
<div className="mt-2 flex items-start gap-2 rounded-xl border border-[rgba(239,68,68,0.3)] bg-[rgba(239,68,68,0.08)] p-3">
|
||||||
<span className="text-lg">📍</span>
|
<span className="text-lg">📍</span>
|
||||||
<div>
|
<div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue