fix: remove duplicate status displays
1. Remove delivery status from info grid (already shown as Badge in header) 2. Remove SMS notification Badge from SmsStatusCard header (timeline shows it) 3. Remove inline hint on blocked buttons — keep only warning banner below
This commit is contained in:
parent
9cf7cfbdf4
commit
5818b94bbe
|
|
@ -911,10 +911,7 @@ export const OrderDetailPanel = ({
|
||||||
<p className="text-xs text-[var(--color-text-muted)]">Обновлена</p>
|
<p className="text-xs text-[var(--color-text-muted)]">Обновлена</p>
|
||||||
<p className="font-medium !text-[var(--color-text)]">{formatDateTime(order.updatedAt)}</p>
|
<p className="font-medium !text-[var(--color-text)]">{formatDateTime(order.updatedAt)}</p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
|
||||||
<p className="text-xs text-[var(--color-text-muted)]">{isPickupOrder ? "Статус самовывоза" : "Статус доставки"}</p>
|
|
||||||
<p className="font-medium !text-[var(--color-text)]">{getOrderGroupDeliveryStatusLabel(order.deliveryStatus || order.delivery_status)}</p>
|
|
||||||
</div>
|
|
||||||
{(order.pickupCode || order.pickup_code) && (order.deliveryType === "pickup" || order.delivery_type === "pickup") ? (
|
{(order.pickupCode || order.pickup_code) && (order.deliveryType === "pickup" || order.delivery_type === "pickup") ? (
|
||||||
<div>
|
<div>
|
||||||
<p className="text-xs text-[var(--color-text-muted)]">Код выдачи</p>
|
<p className="text-xs text-[var(--color-text-muted)]">Код выдачи</p>
|
||||||
|
|
|
||||||
|
|
@ -177,11 +177,8 @@ export const SmsStatusCard = ({ order, userRole }) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Panel className="p-4">
|
<Panel className="p-4">
|
||||||
<div className="mb-3 flex items-center justify-between">
|
<div className="mb-3">
|
||||||
<h3 className="text-sm font-semibold text-[var(--color-text)]">📱 SMS-уведомления</h3>
|
<h3 className="text-sm font-semibold text-[var(--color-text)]">📱 SMS-уведомления</h3>
|
||||||
<Badge tone={NOTIF_TONES[notifStatus] || "neutral"}>
|
|
||||||
{NOTIF_LABELS[notifStatus] || notifStatus}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Timeline */}
|
{/* Timeline */}
|
||||||
|
|
|
||||||
|
|
@ -95,10 +95,6 @@ const StatusActionPanel = ({
|
||||||
variant={isCurrent ? "primary" : (statusOption.mismatch ? "ghost" : "secondary")}
|
variant={isCurrent ? "primary" : (statusOption.mismatch ? "ghost" : "secondary")}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (blockedBySchedule) {
|
if (blockedBySchedule) {
|
||||||
onConfirmStatus?.({
|
|
||||||
type: "hint",
|
|
||||||
hint: "⚠ Нельзя поставить «" + statusOption.label + "» без даты и времени доставки. Сначала согласуйте дату выше.",
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isCurrent && hint) {
|
if (isCurrent && hint) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue