golomazov/hotelsync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: minibar consumptions not showing in deposit release form

Browse Source 
Wrong column names in SQL query: price_at_time→price_per_unit,
created_at→recorded_at. Also fixed type mismatch priceAtTime→pricePerUnit.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
HotelSync
2026-04-06 15:28:38 +03:00
parent d686f5abe6
commit 5b46175c91
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/routes/deposit.ts
View File

@@ -428,15 +428,15 @@ const deposit: FastifyPluginAsync = async (fastify) => {
// Get all minibar consumptions from housekeeping tasks for this room // Get all minibar consumptions from housekeeping tasks for this room
const { rows } = await db.query( const { rows } = await db.query(
`SELECT mc.quantity, mc.price_at_time, `SELECT mc.quantity, mc.price_per_unit,
mi.name AS item_name, 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 FROM minibar_consumptions mc
JOIN minibar_items mi ON mi.id = mc.item_id JOIN minibar_items mi ON mi.id = mc.item_id
JOIN housekeeping_tasks ht ON ht.id = mc.task_id JOIN housekeeping_tasks ht ON ht.id = mc.task_id
WHERE ht.room_id = $1 AND ht.hotel_id = $2 WHERE ht.room_id = $1 AND ht.hotel_id = $2
AND mc.created_at >= (SELECT check_in FROM bookings WHERE id = $3) AND mc.recorded_at >= (SELECT check_in FROM bookings WHERE id = $3)
ORDER BY mc.created_at ASC`, ORDER BY mc.recorded_at ASC`,
[bRows[0].room_id, hotelId, bookingId], [bRows[0].room_id, hotelId, bookingId],
) )

2
src/components/bookings/BookingDetailPanel.tsx
View File

@@ -72,7 +72,7 @@ function DepositWidget({ slug, bookingId }: { slug: string; bookingId: string })
const [yookassaMsg, setYookassaMsg] = useState<string | null>(null) const [yookassaMsg, setYookassaMsg] = useState<string | null>(null)
const [releaseError, setReleaseError] = useState<string | null>(null) const [releaseError, setReleaseError] = useState<string | null>(null)
const [presets, setPresets] = useState<DepositPreset[]>([]) const [presets, setPresets] = useState<DepositPreset[]>([])
const [minibarItems, setMinibarItems] = useState<Array<{ itemName: string; quantity: number; priceAtTime: number; lineTotal: number }>>([]) const [minibarItems, setMinibarItems] = useState<Array<{ itemName: string; quantity: number; pricePerUnit: number; lineTotal: number }>>([])
const [minibarTotal, setMinibarTotal] = useState(0) const [minibarTotal, setMinibarTotal] = useState(0)
useEffect(() => { useEffect(() => {

2
src/lib/api.ts
View File

@@ -773,7 +773,7 @@ export const api = {
req<void>('DELETE', `/api/hotels/${slug}/bookings/${bookingId}/deposit`), req<void>('DELETE', `/api/hotels/${slug}/bookings/${bookingId}/deposit`),
getMinibarForBooking: (slug: string, bookingId: string) => 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`, 'GET', `/api/hotels/${slug}/bookings/${bookingId}/deposit/minibar`,
), ),