diff --git a/apps/api/src/lib/cascade.ts b/apps/api/src/lib/cascade.ts index ea9f66e..a4c8ae1 100644 --- a/apps/api/src/lib/cascade.ts +++ b/apps/api/src/lib/cascade.ts @@ -1,4 +1,4 @@ -import { eq, and, gt, gte, lt, ne, or, asc } from "@groombook/db"; +import { eq, and, gt, or, asc } from "@groombook/db"; import { appointments, clients, pets, services, staff, type Db } from "@groombook/db"; import { resolveBufferMinutes } from "./buffer.js"; import { sendEmail, buildRescheduleNotificationEmail } from "../services/email.js"; @@ -53,12 +53,12 @@ export async function detectAndCascadeOverrun({ db, overrunningAppointmentId, newEndTime, - originalEndTime, + _originalEndTime, }: { db: Db; overrunningAppointmentId: string; newEndTime: Date; - originalEndTime: Date; + _originalEndTime: Date; }): Promise { const result: CascadeResult = { shifted: [], flaggedForReview: [] }; @@ -178,16 +178,16 @@ export async function detectAndCascadeOverrun({ export function isOverrun({ originalEndTime, newEndTime, - originalStartTime, - newStartTime, + _originalStartTime, + _newStartTime, status, currentTime, bufferMinutes, }: { originalEndTime: Date; newEndTime: Date; - originalStartTime: Date; - newStartTime?: Date; + _originalStartTime: Date; + _newStartTime?: Date; status: string; currentTime: Date; bufferMinutes: number; diff --git a/apps/api/src/routes/appointments.ts b/apps/api/src/routes/appointments.ts index af171d2..46a36c2 100644 --- a/apps/api/src/routes/appointments.ts +++ b/apps/api/src/routes/appointments.ts @@ -700,7 +700,7 @@ appointmentsRouter.patch( isOverrun({ originalEndTime, newEndTime: new Date(updateFields.endTime), - originalStartTime: row.startTime, + _originalStartTime: row.startTime, status: row.status, currentTime: new Date(), bufferMinutes: row.bufferMinutes ?? 0, @@ -710,7 +710,7 @@ appointmentsRouter.patch( db, overrunningAppointmentId: id, newEndTime: new Date(updateFields.endTime), - originalEndTime, + _originalEndTime: originalEndTime, }); return c.json({ ...row, cascade: cascadeResult }); } diff --git a/apps/api/src/routes/book.ts b/apps/api/src/routes/book.ts index 3fb61c9..bd6fa67 100644 --- a/apps/api/src/routes/book.ts +++ b/apps/api/src/routes/book.ts @@ -44,7 +44,6 @@ bookRouter.get("/availability", async (c) => { const serviceId = c.req.query("serviceId"); const dateStr = c.req.query("date"); const petSizeCategory = c.req.query("petSizeCategory") ?? undefined; - const petCoatType = c.req.query("petCoatType") ?? undefined; if (!serviceId || !dateStr) { return c.json({ error: "serviceId and date are required" }, 400); diff --git a/apps/web/src/pages/Book.tsx b/apps/web/src/pages/Book.tsx index 119d2de..885eb2b 100644 --- a/apps/web/src/pages/Book.tsx +++ b/apps/web/src/pages/Book.tsx @@ -515,7 +515,7 @@ export function BookPage() { - +
@@ -568,7 +568,7 @@ export function BookPage() {
Service
{selectedService.name}
-
{fmtPrice(selectedService.basePriceCents)} · {fmtDuration(selectedService.durationMinutes + ((form.petSizeCategory === "large" || form.petSizeCategory === "x-large") ? (selectedService.defaultBufferMinutes ?? 0) : 0))}
+
{fmtPrice(selectedService.basePriceCents)} · {fmtDuration(selectedService.durationMinutes + ((form.petSizeCategory === "large" || form.petSizeCategory === "xlarge") ? (selectedService.defaultBufferMinutes ?? 0) : 0))}
Date & Time