From 3b93e755fbe8f59c6df4ca496851e1ef2bc814fa Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Tue, 14 Jul 2026 18:48:03 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=BC=D0=BE=D0=B3=D1=83=D1=82=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D0=94=D0=BE=D1=81=D1=82=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B1=D0=B5=D0=B7=20=D1=87=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D0=B4=D0=BD=D1=8F=20+=20=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=80=D1=83=D1=8E=D1=89=D0=B8=D0=B9=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=20=D1=83=D0=B4=D0=B0=D0=BB=D1=91?=
 =?UTF-8?q?=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/orders/OrderDetailPanel.jsx  | 6 +++++-
 src/components/orders/StatusActionPanel.jsx | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index 3eec303..5a2bf17 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -1197,7 +1197,11 @@ export const OrderDetailPanel = ({
               return statusOptions.map((statusOption) => {
                 const isSelected = pendingStatus?.value === statusOption.value;
                 const isMismatch = statusOption.mismatch;
-                const blockedBySchedule = statusOption.requiresSchedule && !hasDeliverySchedule;
+                const hasDeliveryDate = !!(order?.deliveryDate || order?.customerDate);
+                const hasDeliverySchedule = hasDeliveryDate && !!(order?.deliveryTime || order?.deliveryHalfDay || order?.delivery_time);
+                const canSkipHalfDay = ["logistician", "admin", "mega_admin", "manager"].includes(userRole);
+                const scheduleReady = canSkipHalfDay ? hasDeliveryDate : hasDeliverySchedule;
+                const blockedBySchedule = statusOption.requiresSchedule && !scheduleReady;
                 return (
                   <Button
                     key={statusOption.value}
diff --git a/src/components/orders/StatusActionPanel.jsx b/src/components/orders/StatusActionPanel.jsx
index 0664df5..be40074 100644
--- a/src/components/orders/StatusActionPanel.jsx
+++ b/src/components/orders/StatusActionPanel.jsx
@@ -87,7 +87,9 @@ const StatusActionPanel = ({
       <div className="flex flex-wrap gap-2">
         {allStatuses.map((statusOption) => {
           const isCurrent = currentStatus === statusOption.value;
-          const blockedBySchedule = statusOption.requiresSchedule && !hasDeliverySchedule;
+          const canSkipHalfDay = ["logistician", "admin", "mega_admin", "manager"].includes(userRole);
+          const scheduleReady = canSkipHalfDay ? hasDeliveryDate : hasDeliverySchedule;
+          const blockedBySchedule = statusOption.requiresSchedule && !scheduleReady;
           const blockedByDriver = statusOption.requiresDriver !== false && !hasDriver;
           const hint = getHint(statusOption.value);
           return (