From 57c22be60d3079c63f7681a799e70ac13317877d Mon Sep 17 00:00:00 2001 From: HotelSync Date: Wed, 11 Mar 2026 17:08:10 +0300 Subject: [PATCH] Add floor map, rental module wiring, VIP tags and payment tracking in BookingModal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - New: Поэтажный план (/floor-map) — room status visualization per floor with color coding (occupied/arriving/departing/available/dirty/maintenance), click free room to create booking - New: FloorMapModal — embeddable in BookingModal via "Поэтажный план" button near room selector - New: RentalBookingModal — full-day toggle, hour start/end selects, conflict detection, price summary - CalendarPage: rental objects/bookings shown in шахматка when rental module is active - BookingsPage: "Аренда" tab with rental bookings table when rental module is active - BookingModal: guest tags (VIP, Постоянный гость, etc.), payment method (cash/terminal), paidAmount input, debt/задолженность display, floor map quick-access button - Sidebar: "План этажей" nav link added under Управление Co-Authored-By: Claude Sonnet 4.6 --- src/App.tsx | 2 + src/components/bookings/BookingModal.tsx | 494 ++++++++++++------- src/components/calendar/BookingCalendar.tsx | 142 +++++- src/components/floormap/FloorMap.tsx | 213 ++++++++ src/components/floormap/FloorMapModal.tsx | 39 ++ src/components/layout/Sidebar.tsx | 3 +- src/components/rental/RentalBookingModal.tsx | 250 ++++++++++ src/data/rentalData.ts | 134 +++++ src/pages/BookingsPage.tsx | 354 ++++++++----- src/pages/CalendarPage.tsx | 14 + src/pages/FloorMapPage.tsx | 84 ++++ 11 files changed, 1432 insertions(+), 297 deletions(-) create mode 100644 src/components/floormap/FloorMap.tsx create mode 100644 src/components/floormap/FloorMapModal.tsx create mode 100644 src/components/rental/RentalBookingModal.tsx create mode 100644 src/data/rentalData.ts create mode 100644 src/pages/FloorMapPage.tsx diff --git a/src/App.tsx b/src/App.tsx index 5c7da9c..26b24d9 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -16,6 +16,7 @@ import { ReportsPage } from './pages/ReportsPage' import { WebsitePage } from './pages/WebsitePage' import { BookingWidgetPage } from './pages/BookingWidgetPage' import { AvailabilityPage } from './pages/AvailabilityPage' +import { FloorMapPage } from './pages/FloorMapPage' import { AdminDashboard } from './pages/AdminDashboard' export default function App() { @@ -43,6 +44,7 @@ export default function App() { } /> } /> } /> + } /> {/* Admin routes */} diff --git a/src/components/bookings/BookingModal.tsx b/src/components/bookings/BookingModal.tsx index 0f2fece..bc3d3f8 100644 --- a/src/components/bookings/BookingModal.tsx +++ b/src/components/bookings/BookingModal.tsx @@ -1,8 +1,12 @@ import { useState } from 'react' import { format } from 'date-fns' +import { Star, Banknote, CreditCard, AlertCircle, Map } from 'lucide-react' import { Modal } from '../ui/Modal' import { cn, BOOKING_STATUS_LABELS, SOURCE_LABELS } from '../../lib/utils' import type { Booking, DraftBooking, Room, BookingStatus, BookingSource } from '../../types' +import { FloorMapModal } from '../floormap/FloorMapModal' + +const GUEST_TAGS = ['VIP', 'Постоянный гость', 'Корпоративный', 'Медовый месяц', 'День рождения', 'Особые пожелания'] interface BookingModalProps { open: boolean @@ -15,33 +19,42 @@ interface BookingModalProps { export function BookingModal({ open, draft, rooms, onClose, onSave, existing }: BookingModalProps) { const [form, setForm] = useState({ - roomId: existing?.roomId ?? draft.roomId, - guestName: existing?.guestName ?? '', - guestEmail: existing?.guestEmail ?? '', - checkIn: existing?.checkIn ?? draft.checkIn, - checkOut: existing?.checkOut ?? draft.checkOut, - adults: existing?.adults ?? 2, - children: existing?.children ?? 0, - source: (existing?.source ?? 'direct') as BookingSource, - status: (existing?.status ?? 'confirmed') as BookingStatus, - notes: existing?.notes ?? '', + roomId: existing?.roomId ?? draft.roomId, + guestName: existing?.guestName ?? '', + guestEmail: existing?.guestEmail ?? '', + checkIn: existing?.checkIn ?? draft.checkIn, + checkOut: existing?.checkOut ?? draft.checkOut, + adults: existing?.adults ?? 2, + children: existing?.children ?? 0, + source: (existing?.source ?? 'direct') as BookingSource, + status: (existing?.status ?? 'confirmed') as BookingStatus, + notes: existing?.notes ?? '', }) + const [guestTags, setGuestTags] = useState([]) + const [paymentMethod, setPaymentMethod] = useState<'cash' | 'terminal' | null>(null) + const [paidAmount, setPaidAmount] = useState(existing?.paidAmount ?? 0) + const [showFloorMap, setShowFloorMap] = useState(false) const room = rooms.find(r => r.id === form.roomId) const nights = form.checkIn && form.checkOut ? Math.max(0, (new Date(form.checkOut).getTime() - new Date(form.checkIn).getTime()) / 86400000) : 0 const total = (room?.baseRate ?? 0) * nights + const debt = Math.max(0, total - paidAmount) + const isFutureBooking = form.checkIn > format(new Date(), 'yyyy-MM-dd') const set = (k: K, v: typeof form[K]) => setForm(prev => ({ ...prev, [k]: v })) + const toggleTag = (tag: string) => + setGuestTags(prev => prev.includes(tag) ? prev.filter(t => t !== tag) : [...prev, tag]) + const handleSave = () => { if (!form.guestName || !form.checkIn || !form.checkOut) return onSave({ ...form, totalAmount: total, - paidAmount: existing?.paidAmount ?? 0, + paidAmount, id: existing?.id ?? `b-${Date.now()}`, hotelId: 'hotel-1', guestId: existing?.guestId ?? `g-${Date.now()}`, @@ -50,183 +63,310 @@ export function BookingModal({ open, draft, rooms, onClose, onSave, existing }: } return ( - - - - - } - > -
- {/* Room */} -
- - -
- - {/* Guest */} -
+ <> + + + + + } + > +
+ {/* Room */}
- - set('guestName', e.target.value)} - /> -
-
- - set('guestEmail', e.target.value)} - /> -
-
- - {/* Dates */} -
-
- - set('checkIn', e.target.value)} - /> -
-
- - set('checkOut', e.target.value)} - /> -
-
- - {/* Guests count */} -
-
- - set('adults', parseInt(e.target.value) || 1)} - /> -
-
- - set('children', parseInt(e.target.value) || 0)} - /> -
-
- +
+ + +
-
- {/* Source */} -
- -
- {(Object.entries(SOURCE_LABELS) as [BookingSource, string][]).map(([k, v]) => ( - + ) + })} +
+
+ + {/* Dates */} +
+
+ + set('checkIn', e.target.value)} + /> +
+
+ + set('checkOut', e.target.value)} + /> +
+
+ + {/* Guests count */} +
+
+ + set('adults', parseInt(e.target.value) || 1)} + /> +
+
+ + set('children', parseInt(e.target.value) || 0)} + /> +
+
+ + +
-
- {/* Notes */} -
- -