diff --git a/backend/src/routes/deposit.ts b/backend/src/routes/deposit.ts index 5507181..f999378 100644 --- a/backend/src/routes/deposit.ts +++ b/backend/src/routes/deposit.ts @@ -428,15 +428,15 @@ const deposit: FastifyPluginAsync = async (fastify) => { // Get all minibar consumptions from housekeeping tasks for this room const { rows } = await db.query( - `SELECT mc.quantity, mc.price_at_time, + `SELECT mc.quantity, mc.price_per_unit, mi.name AS item_name, - (mc.quantity * mc.price_at_time) AS line_total + (mc.quantity * mc.price_per_unit) AS line_total FROM minibar_consumptions mc JOIN minibar_items mi ON mi.id = mc.item_id JOIN housekeeping_tasks ht ON ht.id = mc.task_id WHERE ht.room_id = $1 AND ht.hotel_id = $2 - AND mc.created_at >= (SELECT check_in FROM bookings WHERE id = $3) - ORDER BY mc.created_at ASC`, + AND mc.recorded_at >= (SELECT check_in FROM bookings WHERE id = $3) + ORDER BY mc.recorded_at ASC`, [bRows[0].room_id, hotelId, bookingId], ) diff --git a/src/components/bookings/BookingDetailPanel.tsx b/src/components/bookings/BookingDetailPanel.tsx index 5ae138f..d2c0fcd 100644 --- a/src/components/bookings/BookingDetailPanel.tsx +++ b/src/components/bookings/BookingDetailPanel.tsx @@ -72,7 +72,7 @@ function DepositWidget({ slug, bookingId }: { slug: string; bookingId: string }) const [yookassaMsg, setYookassaMsg] = useState(null) const [releaseError, setReleaseError] = useState(null) const [presets, setPresets] = useState([]) - const [minibarItems, setMinibarItems] = useState>([]) + const [minibarItems, setMinibarItems] = useState>([]) const [minibarTotal, setMinibarTotal] = useState(0) useEffect(() => { diff --git a/src/lib/api.ts b/src/lib/api.ts index 05c807d..97bd188 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -773,7 +773,7 @@ export const api = { req('DELETE', `/api/hotels/${slug}/bookings/${bookingId}/deposit`), getMinibarForBooking: (slug: string, bookingId: string) => - req<{ items: Array<{ itemName: string; quantity: number; priceAtTime: number; lineTotal: number }>; total: number }>( + req<{ items: Array<{ itemName: string; quantity: number; pricePerUnit: number; lineTotal: number }>; total: number }>( 'GET', `/api/hotels/${slug}/bookings/${bookingId}/deposit/minibar`, ),