From 669c4a30231e293d788c10f9f1e93a17388211e5 Mon Sep 17 00:00:00 2001 From: "diana.dolgolyova" Date: Tue, 24 Mar 2026 15:26:05 +0300 Subject: [PATCH] fix: reminders include contacted bookings, confirmation details persist after status revert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Reminders query now includes 'contacted' group bookings with confirmed_date, preventing people from being forgotten when admin hasn't clicked "Подтвердить" - Confirmation details (group, date) remain visible regardless of booking status, so "Вернуть" no longer hides previously entered info --- src/app/admin/bookings/page.tsx | 2 +- src/lib/db.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/admin/bookings/page.tsx b/src/app/admin/bookings/page.tsx index 23afa64..035b514 100644 --- a/src/app/admin/bookings/page.tsx +++ b/src/app/admin/bookings/page.tsx @@ -288,7 +288,7 @@ function GroupBookingsTab() { renderExtra={(b) => ( <> {b.groupInfo && {b.groupInfo}} - {b.status === "confirmed" && (b.confirmedGroup || b.confirmedDate) && ( + {(b.confirmedGroup || b.confirmedDate) && ( {b.confirmedGroup} {b.confirmedDate && ` · ${new Date(b.confirmedDate + "T12:00").toLocaleDateString("ru-RU", { day: "numeric", month: "short" })}`} diff --git a/src/lib/db.ts b/src/lib/db.ts index 8cd2e9f..016abfc 100644 --- a/src/lib/db.ts +++ b/src/lib/db.ts @@ -868,7 +868,7 @@ export function getUpcomingReminders(): ReminderItem[] { // Group bookings — confirmed with date today/tomorrow try { const gbRows = db.prepare( - "SELECT * FROM group_bookings WHERE status = 'confirmed' AND confirmed_date IN (?, ?)" + "SELECT * FROM group_bookings WHERE status IN ('confirmed', 'contacted') AND confirmed_date IN (?, ?)" ).all(today, tomorrow) as GroupBookingRow[]; for (const r of gbRows) { items.push({