diff --git a/src/server/rpc/bookings.ts b/src/server/rpc/bookings.ts
index fe6745c..4414088 100644
--- a/src/server/rpc/bookings.ts
+++ b/src/server/rpc/bookings.ts
@@ -158,13 +158,22 @@ const create = os
// Notify customer: request received (pending)
void (async () => {
+ // Create booking access token for status viewing
+ const bookingAccessToken = await queryClient.cancellation.createToken({ bookingId: id });
+ const bookingUrl = generateUrl(`/booking/${bookingAccessToken.token}`);
+
const formattedDate = formatDateGerman(input.appointmentDate);
const homepageUrl = generateUrl();
- const html = await renderBookingPendingHTML({ name: input.customerName, date: input.appointmentDate, time: input.appointmentTime });
+ const html = await renderBookingPendingHTML({
+ name: input.customerName,
+ date: input.appointmentDate,
+ time: input.appointmentTime,
+ statusUrl: bookingUrl
+ });
await sendEmail({
to: input.customerEmail,
subject: "Deine Terminanfrage ist eingegangen",
- text: `Hallo ${input.customerName},\n\nwir haben deine Anfrage für ${formattedDate} um ${input.appointmentTime} erhalten. Wir bestätigen deinen Termin in Kürze.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
+ text: `Hallo ${input.customerName},\n\nwir haben deine Anfrage für ${formattedDate} um ${input.appointmentTime} erhalten. Wir bestätigen deinen Termin in Kürze. Du erhältst eine weitere E-Mail, sobald der Termin bestätigt ist.\n\nTermin-Status ansehen: ${bookingUrl}\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
html,
}).catch(() => {});
})();
@@ -292,18 +301,18 @@ const updateStatus = os
// Email notifications on status changes
try {
if (input.status === "confirmed") {
- // Create cancellation token for this booking
- const cancellationToken = await queryClient.cancellation.createToken({ bookingId: booking.id });
+ // Create booking access token for this booking (status + cancellation)
+ const bookingAccessToken = await queryClient.cancellation.createToken({ bookingId: booking.id });
const formattedDate = formatDateGerman(booking.appointmentDate);
- const cancellationUrl = generateUrl(`/cancel/${cancellationToken.token}`);
+ const bookingUrl = generateUrl(`/booking/${bookingAccessToken.token}`);
const homepageUrl = generateUrl();
const html = await renderBookingConfirmedHTML({
name: booking.customerName,
date: booking.appointmentDate,
time: booking.appointmentTime,
- cancellationUrl
+ cancellationUrl: bookingUrl // Now points to booking status page
});
// Get treatment information for ICS file
@@ -315,7 +324,7 @@ const updateStatus = os
await sendEmailWithAGBAndCalendar({
to: booking.customerEmail,
subject: "Dein Termin wurde bestätigt - AGB im Anhang",
- text: `Hallo ${booking.customerName},\n\nwir haben deinen Termin am ${formattedDate} um ${booking.appointmentTime} bestätigt.\n\nWichtiger Hinweis: Die Allgemeinen Geschäftsbedingungen (AGB) findest du im Anhang dieser E-Mail. Bitte lies sie vor deinem Termin durch.\n\nFalls du den Termin stornieren möchtest, kannst du das hier tun: ${cancellationUrl}\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nBis bald!\nStargirlnails Kiel`,
+ text: `Hallo ${booking.customerName},\n\nwir haben deinen Termin am ${formattedDate} um ${booking.appointmentTime} bestätigt.\n\nWichtiger Hinweis: Die Allgemeinen Geschäftsbedingungen (AGB) findest du im Anhang dieser E-Mail. Bitte lies sie vor deinem Termin durch.\n\nTermin-Status ansehen und verwalten: ${bookingUrl}\nFalls du den Termin stornieren möchtest, kannst du das über den obigen Link tun.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nBis bald!\nStargirlnails Kiel`,
html,
cc: process.env.ADMIN_EMAIL ? [process.env.ADMIN_EMAIL] : undefined,
}, {
diff --git a/src/server/rpc/cancellation.ts b/src/server/rpc/cancellation.ts
index f6cbdd1..e20bcae 100644
--- a/src/server/rpc/cancellation.ts
+++ b/src/server/rpc/cancellation.ts
@@ -4,18 +4,21 @@ import { createKV } from "@/server/lib/create-kv";
import { createKV as createAvailabilityKV } from "@/server/lib/create-kv";
import { randomUUID } from "crypto";
-// Schema for cancellation token
-const CancellationTokenSchema = z.object({
+// Schema for booking access token (used for both status viewing and cancellation)
+const BookingAccessTokenSchema = z.object({
id: z.string(),
bookingId: z.string(),
token: z.string(),
expiresAt: z.string(),
createdAt: z.string(),
+ purpose: z.enum(["booking_access"]), // For future extensibility
});
-type CancellationToken = z.output
;
+type BookingAccessToken = z.output;
+// Backwards compatibility alias
+type CancellationToken = BookingAccessToken;
-const cancellationKV = createKV("cancellation_tokens");
+const cancellationKV = createKV("cancellation_tokens");
// Types for booking and availability
type Booking = {
@@ -70,12 +73,13 @@ const createToken = os
expiresAt.setDate(expiresAt.getDate() + 30);
const token = randomUUID();
- const cancellationToken: CancellationToken = {
+ const cancellationToken: BookingAccessToken = {
id: randomUUID(),
bookingId: input.bookingId,
token,
expiresAt: expiresAt.toISOString(),
createdAt: new Date().toISOString(),
+ purpose: "booking_access",
};
await cancellationKV.setItem(cancellationToken.id, cancellationToken);
@@ -105,15 +109,32 @@ const getBookingByToken = os
const treatmentsKV = createKV("treatments");
const treatment = await treatmentsKV.getItem(booking.treatmentId);
+ // Calculate if cancellation is still possible
+ const minStornoTimespan = parseInt(process.env.MIN_STORNO_TIMESPAN || "24");
+ const appointmentDateTime = new Date(`${booking.appointmentDate}T${booking.appointmentTime}:00`);
+ const now = new Date();
+ const timeDifferenceHours = (appointmentDateTime.getTime() - now.getTime()) / (1000 * 60 * 60);
+ const canCancel = timeDifferenceHours >= minStornoTimespan &&
+ booking.status !== "cancelled" &&
+ booking.status !== "completed";
+
return {
id: booking.id,
customerName: booking.customerName,
+ customerEmail: booking.customerEmail,
+ customerPhone: booking.customerPhone,
appointmentDate: booking.appointmentDate,
appointmentTime: booking.appointmentTime,
treatmentId: booking.treatmentId,
treatmentName: treatment?.name || "Unbekannte Behandlung",
+ treatmentDuration: treatment?.duration || 60,
+ treatmentPrice: treatment?.price || 0,
status: booking.status,
+ notes: booking.notes,
formattedDate: formatDateGerman(booking.appointmentDate),
+ createdAt: booking.createdAt,
+ canCancel,
+ hoursUntilAppointment: Math.max(0, Math.round(timeDifferenceHours)),
};
});
+
+ {statusInfo.icon} {statusInfo.label}
+
+