From 052e5e7e86cbe25fe57889450685ee0be42e1347 Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Mon, 13 Jul 2026 14:42:36 +0000
Subject: [PATCH] fix: calendar overlap + allow past dates for logistician
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. CalendarWidget: add relative to calendar container so absolute popup
   positions correctly (no more overlapping with other elements)
2. OrderDetailPanel: logistician/admin/manager can select past dates
   (3 months back) for retroactive delivery closing
3. canGoBack always true for logistician — can navigate to past months
4. Existing past delivery dates are preserved (not reset to tomorrow)
---
 src/components/orders/CalendarWidget.jsx   |  2 +-
 src/components/orders/OrderDetailPanel.jsx | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/orders/CalendarWidget.jsx b/src/components/orders/CalendarWidget.jsx
index a56f0e4..ab4dcb5 100644
--- a/src/components/orders/CalendarWidget.jsx
+++ b/src/components/orders/CalendarWidget.jsx
@@ -58,7 +58,7 @@ const CalendarWidget = ({
 }) => {
   return (
     <div className={layoutClassName}>
-      <div className={calendarClassName}>
+      <div className={(calendarClassName || "") + " relative"}>
         <Button
           variant="ghost"
           aria-label={label}
diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index 1e2d8b5..834a526 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -616,11 +616,19 @@ export const OrderDetailPanel = ({
       setIsSavingShipment(false);
     }
   }, [onSaveShipmentData, order?.id]);
-  const minSelectableDateKey = React.useMemo(() => getNextSelectableDateKey(), []);
+  const minSelectableDateKey = React.useMemo(() => {
+    // Logistician/admin can set past dates for retroactive delivery closing
+    if (["logistician", "admin", "mega_admin", "manager"].includes(userRole)) {
+      const past = new Date();
+      past.setMonth(past.getMonth() - 3);
+      return toDateKey(past);
+    }
+    return getNextSelectableDateKey();
+  }, [userRole]);
   const [currentMonth, setCurrentMonth] = React.useState(() => {
     const existingDeliveryDate = fromDateKey(order?.deliveryDate);
     const fallbackDate = fromDateKey(minSelectableDateKey) || new Date();
-    const sourceDate = existingDeliveryDate && isFutureDeliveryDate(toDateKey(existingDeliveryDate))
+    const sourceDate = existingDeliveryDate
       ? existingDeliveryDate
       : fallbackDate;
 
@@ -635,7 +643,10 @@ export const OrderDetailPanel = ({
       }),
     [currentMonth],
   );
-  const canGoBack = toDateKey(currentMonth) > toDateKey(startOfMonth(fromDateKey(minSelectableDateKey) || new Date()));
+  const canGoBack = (() => {
+    if (["logistician", "admin", "mega_admin", "manager"].includes(userRole)) return true;
+    return toDateKey(currentMonth) > toDateKey(startOfMonth(fromDateKey(minSelectableDateKey) || new Date()));
+  })();
 
   React.useEffect(() => {
     setSelectedDriverId(order?.assignedDriverId || "");
@@ -645,7 +656,10 @@ export const OrderDetailPanel = ({
   React.useEffect(() => {
     const normalizedDeliveryDate = normalizeDateForInput(order?.deliveryDate);
     const nextSelectableDateKey = getNextSelectableDateKey();
-    const selectedDateKey = isFutureDeliveryDate(normalizedDeliveryDate) ? normalizedDeliveryDate : nextSelectableDateKey;
+    const canUsePastDate = ["logistician", "admin", "mega_admin", "manager"].includes(userRole);
+    const selectedDateKey = (normalizedDeliveryDate && (canUsePastDate || isFutureDeliveryDate(normalizedDeliveryDate)))
+      ? normalizedDeliveryDate
+      : nextSelectableDateKey;
     setDeliveryDate(selectedDateKey);
     const selectedDate = fromDateKey(selectedDateKey) || new Date();
     setCurrentMonth(startOfMonth(selectedDate));