From 1ffd8bacc54358a2934c47c1d5e938b20d8817af Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Mon, 13 Jul 2026 12:02:25 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20block=20=D0=94=D0=BE=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE/=D0=92=D1=8B=D0=B2=D0=B5=D0=B7?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20without=20delivery=20date+half-day,=20remo?=
 =?UTF-8?q?ve=20=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=BE=20f?=
 =?UTF-8?q?rom=20logistic=20panel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StatusActionPanel: removed Загружено button
- StatusActionPanel: Доставлено/Вывезено require deliveryDate + half-day
- StatusActionPanel: warning banner when schedule missing
- Driver status panel in OrderDetailPanel: same schedule check
- Blocked buttons shown dimmed (opacity-40)
---
 src/components/orders/OrderDetailPanel.jsx  |  1 +
 src/components/orders/StatusActionPanel.jsx | 33 ++++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index dd1b570..3e68165 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -1167,6 +1167,7 @@ export const OrderDetailPanel = ({
               return statusOptions.map((statusOption) => {
                 const isSelected = pendingStatus?.value === statusOption.value;
                 const isMismatch = statusOption.mismatch;
+                const blockedBySchedule = statusOption.requiresSchedule && !hasDeliverySchedule;
                 return (
                   <Button
                     key={statusOption.value}
diff --git a/src/components/orders/StatusActionPanel.jsx b/src/components/orders/StatusActionPanel.jsx
index 99ca7a5..dd7ec90 100644
--- a/src/components/orders/StatusActionPanel.jsx
+++ b/src/components/orders/StatusActionPanel.jsx
@@ -20,15 +20,19 @@ const StatusActionPanel = ({
   const currentStatus = order.deliveryStatus || order.delivery_status;
   const isPickup = (order.deliveryType || order.delivery_type) === "pickup" || currentStatus === "pickup";
 
-  // Build status options — primary matches delivery type, secondary is mismatch
+  // Check if delivery date and half-day are set
+  const hasDeliveryDate = !!(order.deliveryDate || order.customerDate);
+  const hasDeliveryHalfDay = !!(order.deliveryTime || order.deliveryHalfDay || order.delivery_time || order.delivery_half_day);
+  const hasDeliverySchedule = hasDeliveryDate && hasDeliveryHalfDay;
+
+  // Build status options — no "Загружено", "Доставлено"/"Вывезено" require date+half-day
   const allStatuses = isPickup
     ? [
         { value: "pending_confirmation", label: "Ожидает согласования", manual: true },
         { value: "agreed", label: "Согласовано", manual: false, hint: "Согласуйте дату доставки выше" },
         { value: "driver_assigned", label: "Назначен водитель", manual: false, hint: "Назначьте водителя из списка" },
-        { value: "loaded", label: "Загружено", manual: true },
-        { value: "picked_up", label: "Вывезено", manual: true, primary: true },
-        { value: "delivered", label: "Доставлено", manual: true, mismatch: true },
+        { value: "picked_up", label: "Вывезено", manual: true, primary: true, requiresSchedule: true },
+        { value: "delivered", label: "Доставлено", manual: true, mismatch: true, requiresSchedule: true },
         { value: "requires_address", label: "Требуется адрес", manual: true },
         { value: "problem", label: "Проблема", manual: true },
         { value: "cancelled", label: "Отменено", manual: true },
@@ -37,9 +41,8 @@ const StatusActionPanel = ({
         { value: "pending_confirmation", label: "Ожидает согласования", manual: true },
         { value: "agreed", label: "Согласовано", manual: false, hint: "Согласуйте дату доставки выше" },
         { value: "driver_assigned", label: "Назначен водитель", manual: false, hint: "Назначьте водителя из списка" },
-        { value: "loaded", label: "Загружено", manual: true },
-        { value: "delivered", label: "Доставлено", manual: true, primary: true },
-        { value: "picked_up", label: "Вывезено", manual: true, mismatch: true },
+        { value: "delivered", label: "Доставлено", manual: true, primary: true, requiresSchedule: true },
+        { value: "picked_up", label: "Вывезено", manual: true, mismatch: true, requiresSchedule: true },
         { value: "requires_address", label: "Требуется адрес", manual: true },
         { value: "problem", label: "Проблема", manual: true },
         { value: "cancelled", label: "Отменено", manual: true },
@@ -57,6 +60,7 @@ const StatusActionPanel = ({
         {allStatuses.map((statusOption) => {
           const isCurrent = currentStatus === statusOption.value;
           const isClickable = statusOption.manual !== false && !isCurrent;
+          const blockedBySchedule = statusOption.requiresSchedule && !hasDeliverySchedule;
           return (
             <div key={statusOption.value} className="relative group">
               <Button
@@ -66,6 +70,13 @@ const StatusActionPanel = ({
                     onConfirmStatus?.({ type: "hint", hint: statusOption.hint || "" });
                     return;
                   }
+                  if (blockedBySchedule) {
+                    onConfirmStatus?.({
+                      type: "hint",
+                      hint: "⚠ Нельзя поставить «" + statusOption.label + "» без даты и времени доставки. Сначала согласуйте дату выше.",
+                    });
+                    return;
+                  }
                   onConfirmStatus?.({
                     type: "status",
                     status: statusOption.value,
@@ -75,6 +86,7 @@ const StatusActionPanel = ({
                   });
                 }}
                 disabled={isSavingStatusChange}
+                className={blockedBySchedule ? "opacity-40 cursor-not-allowed" : ""}
               >
                 {statusOption.label}
               </Button>
@@ -82,8 +94,13 @@ const StatusActionPanel = ({
           );
         })}
       </div>
+      {!hasDeliverySchedule && (
+        <div className="rounded-xl border border-[var(--color-warning)] bg-[var(--color-warning-soft)] px-3 py-2 text-xs text-[var(--color-warning)]">
+          ⚠ Чтобы поставить «Доставлено» или «Вывезено», сначала укажите дату и половину дня доставки выше.
+        </div>
+      )}
     </Panel>
   );
 };
 
-export { StatusActionPanel };
\ No newline at end of file
+export { StatusActionPanel };