From e8771ed9994d19490767ba5a1f099413b7919dc9 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Wed, 16 Jul 2025 13:58:02 +0300
Subject: [PATCH] refactor(order-form/datetime-select): enhance date selection
 logic to include slot availability check

---
 .../orders/order-form/datetime-select.tsx           | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/web/components/orders/order-form/datetime-select.tsx b/apps/web/components/orders/order-form/datetime-select.tsx
index 5d179ad..7f0430c 100644
--- a/apps/web/components/orders/order-form/datetime-select.tsx
+++ b/apps/web/components/orders/order-form/datetime-select.tsx
@@ -45,17 +45,12 @@ export function DateSelect() {
     <Calendar
       className="bg-background"
       disabled={(date) => {
-        return dayjs().isAfter(dayjs(date), 'day');
+        return (
+          dayjs().isAfter(dayjs(date), 'day') ||
+          !slots?.some((slot) => dayjs(slot?.date).isSame(date, 'day'))
+        );
       }}
       mode="single"
-      modifiers={{
-        hasEvent: (date) => {
-          return slots?.some((slot) => dayjs(slot?.date).isSame(date, 'day')) || false;
-        },
-      }}
-      modifiersClassNames={{
-        hasEvent: 'border-primary border-2 rounded-xl',
-      }}
       onMonthChange={(date) => setCurrentMonthDate(date)}
       onSelect={(date) => {
         if (date) setDate(date);