Fix ICS calendar issues and improve email template code quality

- Fix ATTENDEE mailto to use customerEmail instead of customerName
- Add icsEscape helper for proper RFC 5545 text escaping
- Calculate ICS duration from treatments array instead of separate param
- Add renderTreatmentList helper to reduce code duplication in email templates

src/server/lib/email-templates.ts

@@ -8,6 +8,27 @@ function formatDateGerman(dateString: string): string {
   return `${day}.${month}.${year}`;
 }
 
+// Helper function to render treatment list HTML
+function renderTreatmentList(
+  treatments: Array<{id: string; name: string; duration: number; price: number}>,
+  options: { showPrices: boolean } = { showPrices: true }
+): string {
+  const totalDuration = treatments.reduce((sum, t) => sum + t.duration, 0);
+  const totalPrice = treatments.reduce((sum, t) => sum + t.price, 0);
+  
+  const treatmentItems = treatments.map(t => 
+    options.showPrices 
+      ? `<li><strong>${t.name}</strong> - ${t.duration} Min - ${t.price.toFixed(2)} €</li>`
+      : `<li>${t.name} - ${t.duration} Min - ${t.price.toFixed(2)} €</li>`
+  ).join('');
+  
+  const totalLine = options.showPrices
+    ? `<li style="border-top: 1px solid #e2e8f0; margin-top: 8px; padding-top: 8px;"><strong>Gesamt:</strong> ${totalDuration} Min - ${totalPrice.toFixed(2)} €</li>`
+    : `<li style="font-weight: 600; margin-top: 4px;">Gesamt: ${totalDuration} Min - ${totalPrice.toFixed(2)} €</li>`;
+  
+  return `${treatmentItems}${totalLine}`;
+}
+
 let cachedLogoDataUrl: string | null = null;
 
 async function getLogoDataUrl(): Promise<string | null> {
@@ -86,8 +107,8 @@ async function renderBrandedEmail(title: string, bodyHtml: string): Promise<stri
   </div>`;
 }
 
-export async function renderBookingPendingHTML(params: { name: string; date: string; time: string; statusUrl?: string }) {
-  const { name, date, time, statusUrl } = params;
+export async function renderBookingPendingHTML(params: { name: string; date: string; time: string; statusUrl?: string; treatments: Array<{id: string; name: string; duration: number; price: number}> }) {
+  const { name, date, time, statusUrl, treatments } = params;
   const formattedDate = formatDateGerman(date);
   const domain = process.env.DOMAIN || 'localhost:5173';
   const protocol = domain.includes('localhost') ? 'http' : 'https';
@@ -96,6 +117,12 @@ export async function renderBookingPendingHTML(params: { name: string; date: str
   const inner = `
     <p>Hallo ${name},</p>
     <p>wir haben deine Anfrage für <strong>${formattedDate}</strong> um <strong>${time}</strong> erhalten.</p>
+    <div style="background-color: #f8fafc; border-left: 4px solid #db2777; padding: 16px; margin: 20px 0; border-radius: 4px;">
+      <p style="margin: 0 0 8px 0; font-weight: 600; color: #db2777;">💅 Deine Behandlungen:</p>
+      <ul style="margin: 0; color: #475569; list-style: none; padding: 0;">
+        ${renderTreatmentList(treatments, { showPrices: true })}
+      </ul>
+    </div>
     <p>Wir bestätigen deinen Termin in Kürze. Du erhältst eine weitere E-Mail, sobald der Termin bestätigt ist.</p>
     ${statusUrl ? `
     <div style="background-color: #fef9f5; border-left: 4px solid #f59e0b; padding: 16px; margin: 20px 0; border-radius: 4px;">
@@ -113,8 +140,8 @@ export async function renderBookingPendingHTML(params: { name: string; date: str
   return renderBrandedEmail("Deine Terminanfrage ist eingegangen", inner);
 }
 
-export async function renderBookingConfirmedHTML(params: { name: string; date: string; time: string; cancellationUrl?: string; reviewUrl?: string }) {
-  const { name, date, time, cancellationUrl, reviewUrl } = params;
+export async function renderBookingConfirmedHTML(params: { name: string; date: string; time: string; cancellationUrl?: string; reviewUrl?: string; treatments: Array<{id: string; name: string; duration: number; price: number}> }) {
+  const { name, date, time, cancellationUrl, reviewUrl, treatments } = params;
   const formattedDate = formatDateGerman(date);
   const domain = process.env.DOMAIN || 'localhost:5173';
   const protocol = domain.includes('localhost') ? 'http' : 'https';
@@ -123,6 +150,12 @@ export async function renderBookingConfirmedHTML(params: { name: string; date: s
   const inner = `
     <p>Hallo ${name},</p>
     <p>wir haben deinen Termin am <strong>${formattedDate}</strong> um <strong>${time}</strong> bestätigt.</p>
+    <div style="background-color: #f8fafc; border-left: 4px solid #db2777; padding: 16px; margin: 20px 0; border-radius: 4px;">
+      <p style="margin: 0 0 8px 0; font-weight: 600; color: #db2777;">💅 Deine Behandlungen:</p>
+      <ul style="margin: 0; color: #475569; list-style: none; padding: 0;">
+        ${renderTreatmentList(treatments, { showPrices: true })}
+      </ul>
+    </div>
     <p>Wir freuen uns auf dich!</p>
     <div style="background-color: #f8fafc; border-left: 4px solid #db2777; padding: 16px; margin: 20px 0; border-radius: 4px;">
       <p style="margin: 0; font-weight: 600; color: #db2777;">📋 Wichtiger Hinweis:</p>
@@ -152,8 +185,8 @@ export async function renderBookingConfirmedHTML(params: { name: string; date: s
   return renderBrandedEmail("Termin bestätigt", inner);
 }
 
-export async function renderBookingCancelledHTML(params: { name: string; date: string; time: string }) {
-  const { name, date, time } = params;
+export async function renderBookingCancelledHTML(params: { name: string; date: string; time: string; treatments: Array<{id: string; name: string; duration: number; price: number}> }) {
+  const { name, date, time, treatments } = params;
   const formattedDate = formatDateGerman(date);
   const domain = process.env.DOMAIN || 'localhost:5173';
   const protocol = domain.includes('localhost') ? 'http' : 'https';
@@ -162,6 +195,12 @@ export async function renderBookingCancelledHTML(params: { name: string; date: s
   const inner = `
     <p>Hallo ${name},</p>
     <p>dein Termin am <strong>${formattedDate}</strong> um <strong>${time}</strong> wurde abgesagt.</p>
+    <div style="background-color: #f8fafc; border-left: 4px solid #db2777; padding: 16px; margin: 20px 0; border-radius: 4px;">
+      <p style="margin: 0 0 8px 0; font-weight: 600; color: #db2777;">💅 Abgesagte Behandlungen:</p>
+      <ul style="margin: 0; color: #475569; list-style: none; padding: 0;">
+        ${renderTreatmentList(treatments, { showPrices: true })}
+      </ul>
+    </div>
     <p>Bitte buche einen neuen Termin. Bei Fragen helfen wir dir gerne weiter.</p>
     <div style="background-color: #f8fafc; border-left: 4px solid #3b82f6; padding: 16px; margin: 20px 0; border-radius: 4px;">
       <p style="margin: 0; font-weight: 600; color: #3b82f6;">📋 Rechtliche Informationen:</p>
@@ -176,13 +215,14 @@ export async function renderAdminBookingNotificationHTML(params: {
   name: string; 
   date: string; 
   time: string; 
-  treatment: string;
+  treatments: Array<{id: string; name: string; duration: number; price: number}>;
   phone: string;
   notes?: string;
   hasInspirationPhoto: boolean;
 }) {
-  const { name, date, time, treatment, phone, notes, hasInspirationPhoto } = params;
+  const { name, date, time, treatments, phone, notes, hasInspirationPhoto } = params;
   const formattedDate = formatDateGerman(date);
+  
   const inner = `
     <p>Hallo Admin,</p>
     <p>eine neue Buchungsanfrage ist eingegangen:</p>
@@ -191,7 +231,11 @@ export async function renderAdminBookingNotificationHTML(params: {
       <ul style="margin: 8px 0 0 0; color: #475569; list-style: none; padding: 0;">
         <li><strong>Name:</strong> ${name}</li>
         <li><strong>Telefon:</strong> ${phone}</li>
-        <li><strong>Behandlung:</strong> ${treatment}</li>
+        <li><strong>Behandlungen:</strong>
+          <ul style="margin: 4px 0 0 0; list-style: none; padding: 0 0 0 16px;">
+            ${renderTreatmentList(treatments, { showPrices: false })}
+          </ul>
+        </li>
         <li><strong>Datum:</strong> ${formattedDate}</li>
         <li><strong>Uhrzeit:</strong> ${time}</li>
         ${notes ? `<li><strong>Notizen:</strong> ${notes}</li>` : ''}

src/server/lib/email.ts

@@ -29,15 +29,27 @@ function formatDateForICS(date: string, time: string): string {
   return `${year}${month}${day}T${hours}${minutes}00`;
 }
 
+// Helper function to escape text values for ICS files (RFC 5545)
+function icsEscape(text: string): string {
+  return text
+    .replace(/\\/g, '\\\\')  // Backslash must be escaped first
+    .replace(/;/g, '\\;')    // Semicolon
+    .replace(/,/g, '\\,')    // Comma
+    .replace(/\n/g, '\\n');  // Newline
+}
+
 // Helper function to create ICS (iCalendar) file content
 function createICSFile(params: {
   date: string; // YYYY-MM-DD
   time: string; // HH:MM
-  durationMinutes: number;
   customerName: string;
-  treatmentName: string;
+  customerEmail?: string;
+  treatments: Array<{id: string; name: string; duration: number; price: number}>;
 }): string {
-  const { date, time, durationMinutes, customerName, treatmentName } = params;
+  const { date, time, customerName, customerEmail, treatments } = params;
+  
+  // Calculate duration from treatments
+  const durationMinutes = treatments.reduce((sum, t) => sum + t.duration, 0);
   
   // Calculate start and end times in Europe/Berlin timezone
   const dtStart = formatDateForICS(date, time);
@@ -57,6 +69,17 @@ function createICSFile(params: {
   const now = new Date();
   const dtstamp = now.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z';
   
+  // Build treatments list for SUMMARY and DESCRIPTION
+  const treatmentNames = icsEscape(treatments.map(t => t.name).join(', '));
+  const totalDuration = treatments.reduce((sum, t) => sum + t.duration, 0);
+  const totalPrice = treatments.reduce((sum, t) => sum + t.price, 0);
+  
+  const treatmentDetails = treatments.map(t => 
+    `${icsEscape(t.name)} (${t.duration} Min, ${t.price.toFixed(2)} EUR)`
+  ).join('\\n');
+  
+  const description = `Behandlungen:\\n${treatmentDetails}\\n\\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} EUR\\n\\nTermin bei Stargirlnails Kiel`;
+  
   // ICS content
   const icsContent = [
     'BEGIN:VCALENDAR',
@@ -69,11 +92,11 @@ function createICSFile(params: {
     `DTSTAMP:${dtstamp}`,
     `DTSTART;TZID=Europe/Berlin:${dtStart}`,
     `DTEND;TZID=Europe/Berlin:${dtEnd}`,
-    `SUMMARY:${treatmentName} - Stargirlnails Kiel`,
-    `DESCRIPTION:Termin für ${treatmentName} bei Stargirlnails Kiel`,
+    `SUMMARY:${treatmentNames} - Stargirlnails Kiel`,
+    `DESCRIPTION:${description}`,
     'LOCATION:Stargirlnails Kiel',
     `ORGANIZER;CN=Stargirlnails Kiel:mailto:${process.env.EMAIL_FROM?.match(/<(.+)>/)?.[1] || 'no-reply@stargirlnails.de'}`,
-    `ATTENDEE;CN=${customerName};RSVP=TRUE:mailto:${customerName}`,
+    ...(customerEmail ? [`ATTENDEE;CN=${customerName};RSVP=TRUE:mailto:${customerEmail}`] : []),
     'STATUS:CONFIRMED',
     'SEQUENCE:0',
     'BEGIN:VALARM',
@@ -187,9 +210,9 @@ export async function sendEmailWithAGBAndCalendar(
   calendarParams: {
     date: string;
     time: string;
-    durationMinutes: number;
     customerName: string;
-    treatmentName: string;
+    customerEmail?: string;
+    treatments: Array<{id: string; name: string; duration: number; price: number}>;
   }
 ): Promise<{ success: boolean }> {
   const agbBase64 = await getAGBPDFBase64();

src/server/rpc/bookings.ts

@@ -363,12 +363,18 @@ const create = os
         name: input.customerName, 
         date: input.appointmentDate, 
         time: input.appointmentTime,
-        statusUrl: bookingUrl 
+        statusUrl: bookingUrl,
+        treatments: input.treatments
       });
+      
+      const treatmentsText = input.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+      const totalDuration = input.treatments.reduce((sum, t) => sum + t.duration, 0);
+      const totalPrice = input.treatments.reduce((sum, t) => sum + t.price, 0);
+      
       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. 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`,
+      text: `Hallo ${input.customerName},\n\nwir haben deine Anfrage für ${formattedDate} um ${input.appointmentTime} erhalten.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\n\nWir 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(() => {});
     })();
@@ -377,25 +383,26 @@ const create = os
     void (async () => {
       if (!process.env.ADMIN_EMAIL) return;
       
-      // Build treatment list string
-      const treatmentsList = input.treatments.map(t => `${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join(', ');
-      
       const adminHtml = await renderAdminBookingNotificationHTML({
         name: input.customerName,
         date: input.appointmentDate,
         time: input.appointmentTime,
-        treatment: treatmentsList,
+        treatments: input.treatments,
         phone: input.customerPhone || "Nicht angegeben",
         notes: input.notes,
         hasInspirationPhoto: !!input.inspirationPhoto
       });
 
       const homepageUrl = generateUrl();
+      const treatmentsText = input.treatments.map(t => `  - ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+      const totalDuration = input.treatments.reduce((sum, t) => sum + t.duration, 0);
+      const totalPrice = input.treatments.reduce((sum, t) => sum + t.price, 0);
       
       const adminText = `Neue Buchungsanfrage eingegangen:\n\n` +
         `Name: ${input.customerName}\n` +
         `Telefon: ${input.customerPhone || "Nicht angegeben"}\n` +
-        `Behandlungen: ${treatmentsList}\n` +
+        `Behandlungen:\n${treatmentsText}\n` +
+        `Gesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\n` +
         `Datum: ${formatDateGerman(input.appointmentDate)}\n` +
         `Uhrzeit: ${input.appointmentTime}\n` +
         `${input.notes ? `Notizen: ${input.notes}\n` : ''}` +
@@ -472,41 +479,48 @@ const updateStatus = os
           date: booking.appointmentDate, 
           time: booking.appointmentTime,
           cancellationUrl: bookingUrl, // Now points to booking status page
-          reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`)
+          reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`),
+          treatments: booking.treatments
         });
         
-        // Get treatment information for ICS file
-        const treatmentName = booking.treatments && booking.treatments.length > 0
-          ? booking.treatments.map(t => t.name).join(', ')
-          : "Behandlung";
-        const treatmentDuration = booking.treatments && booking.treatments.length > 0
-          ? booking.treatments.reduce((sum, t) => sum + t.duration, 0)
-          : (booking.bookedDurationMinutes || 60);
+        const treatmentsText = booking.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+        const totalDuration = booking.treatments.reduce((sum, t) => sum + t.duration, 0);
+        const totalPrice = booking.treatments.reduce((sum, t) => sum + t.price, 0);
         
         if (booking.customerEmail) {
         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\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`,
+          text: `Hallo ${booking.customerName},\n\nwir haben deinen Termin am ${formattedDate} um ${booking.appointmentTime} bestätigt.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\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,
           bcc: process.env.ADMIN_EMAIL ? [process.env.ADMIN_EMAIL] : undefined,
         }, {
           date: booking.appointmentDate,
           time: booking.appointmentTime,
-          durationMinutes: treatmentDuration,
           customerName: booking.customerName,
-          treatmentName: treatmentName
+          customerEmail: booking.customerEmail,
+          treatments: booking.treatments
         });
         }
       } else if (input.status === "cancelled") {
         const formattedDate = formatDateGerman(booking.appointmentDate);
         const homepageUrl = generateUrl();
-        const html = await renderBookingCancelledHTML({ name: booking.customerName, date: booking.appointmentDate, time: booking.appointmentTime });
+        const html = await renderBookingCancelledHTML({ 
+          name: booking.customerName, 
+          date: booking.appointmentDate, 
+          time: booking.appointmentTime,
+          treatments: booking.treatments
+        });
+        
+        const treatmentsText = booking.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+        const totalDuration = booking.treatments.reduce((sum, t) => sum + t.duration, 0);
+        const totalPrice = booking.treatments.reduce((sum, t) => sum + t.price, 0);
+        
         if (booking.customerEmail) {
         await sendEmail({
           to: booking.customerEmail,
           subject: "Dein Termin wurde abgesagt",
-          text: `Hallo ${booking.customerName},\n\nleider wurde dein Termin am ${formattedDate} um ${booking.appointmentTime} abgesagt. Bitte buche einen neuen Termin.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
+          text: `Hallo ${booking.customerName},\n\nleider wurde dein Termin am ${formattedDate} um ${booking.appointmentTime} abgesagt.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\n\nBitte buche einen neuen Termin.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
           html,
           bcc: process.env.ADMIN_EMAIL ? [process.env.ADMIN_EMAIL] : undefined,
         });
@@ -550,11 +564,21 @@ const remove = os
       try {
         const formattedDate = formatDateGerman(booking.appointmentDate);
         const homepageUrl = generateUrl();
-        const html = await renderBookingCancelledHTML({ name: booking.customerName, date: booking.appointmentDate, time: booking.appointmentTime });
+        const html = await renderBookingCancelledHTML({ 
+          name: booking.customerName, 
+          date: booking.appointmentDate, 
+          time: booking.appointmentTime,
+          treatments: booking.treatments
+        });
+        
+        const treatmentsText = booking.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+        const totalDuration = booking.treatments.reduce((sum, t) => sum + t.duration, 0);
+        const totalPrice = booking.treatments.reduce((sum, t) => sum + t.price, 0);
+        
         await sendEmail({
           to: booking.customerEmail,
           subject: "Dein Termin wurde abgesagt",
-          text: `Hallo ${booking.customerName},\n\nleider wurde dein Termin am ${formattedDate} um ${booking.appointmentTime} abgesagt. Bitte buche einen neuen Termin.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
+          text: `Hallo ${booking.customerName},\n\nleider wurde dein Termin am ${formattedDate} um ${booking.appointmentTime} abgesagt.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\n\nBitte buche einen neuen Termin.\n\nRechtliche Informationen: ${generateUrl('/legal')}\nZur Website: ${homepageUrl}\n\nLiebe Grüße\nStargirlnails Kiel`,
           html,
           bcc: process.env.ADMIN_EMAIL ? [process.env.ADMIN_EMAIL] : undefined,
         });
@@ -665,20 +689,24 @@ const createManual = os
             date: input.appointmentDate,
             time: input.appointmentTime,
             cancellationUrl: bookingUrl,
-            reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`)
+            reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`),
+            treatments: input.treatments
           });
 
+          const treatmentsText = input.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+          const totalPrice = input.treatments.reduce((sum, t) => sum + t.price, 0);
+
         await sendEmailWithAGBAndCalendar({
           to: input.customerEmail!,
           subject: "Dein Termin wurde bestätigt - AGB im Anhang",
-          text: `Hallo ${input.customerName},\n\nwir haben deinen Termin am ${formattedDate} um ${input.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`,
+          text: `Hallo ${input.customerName},\n\nwir haben deinen Termin am ${formattedDate} um ${input.appointmentTime} bestätigt.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €\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,
         }, {
             date: input.appointmentDate,
             time: input.appointmentTime,
-            durationMinutes: totalDuration,
             customerName: input.customerName,
-            treatmentName: input.treatments.map(t => t.name).join(', ')
+            customerEmail: input.customerEmail,
+            treatments: input.treatments
           });
         } catch (e) {
           console.error("Email send failed for manual booking:", e);
@@ -843,21 +871,23 @@ export const router = {
           time: updated.appointmentTime,
           cancellationUrl: generateUrl(`/booking/${bookingAccessToken.token}`),
           reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`),
+          treatments: updated.treatments,
         });
-        const treatmentName = updated.treatments && updated.treatments.length > 0
-          ? updated.treatments.map(t => t.name).join(', ')
-          : "Behandlung";
+        
+        const treatmentsText = updated.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+        const totalPrice = updated.treatments.reduce((sum, t) => sum + t.price, 0);
+        
         await sendEmailWithAGBAndCalendar({
           to: updated.customerEmail,
           subject: "Terminänderung bestätigt",
-          text: `Hallo ${updated.customerName}, dein neuer Termin ist am ${formatDateGerman(updated.appointmentDate)} um ${updated.appointmentTime}.`,
+          text: `Hallo ${updated.customerName}, dein neuer Termin ist am ${formatDateGerman(updated.appointmentDate)} um ${updated.appointmentTime}.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${duration} Min, ${totalPrice.toFixed(2)} €`,
           html,
         }, {
           date: updated.appointmentDate,
           time: updated.appointmentTime,
-          durationMinutes: duration,
           customerName: updated.customerName,
-          treatmentName: treatmentName,
+          customerEmail: updated.customerEmail,
+          treatments: updated.treatments,
         }).catch(() => {});
       }
 
@@ -898,11 +928,23 @@ export const router = {
       // Notify customer that original stays
       if (booking.customerEmail) {
         const bookingAccessToken = await queryClient.cancellation.createToken({ bookingId: booking.id });
+        
+        const treatmentsText = booking.treatments.map(t => `- ${t.name} (${t.duration} Min, ${t.price.toFixed(2)} €)`).join('\n');
+        const totalDuration = booking.treatments.reduce((sum, t) => sum + t.duration, 0);
+        const totalPrice = booking.treatments.reduce((sum, t) => sum + t.price, 0);
+        
         await sendEmail({
           to: booking.customerEmail,
           subject: "Terminänderung abgelehnt",
-          text: `Du hast den Vorschlag zur Terminänderung abgelehnt. Dein ursprünglicher Termin am ${formatDateGerman(booking.appointmentDate)} um ${booking.appointmentTime} bleibt bestehen.`,
-          html: await renderBookingConfirmedHTML({ name: booking.customerName, date: booking.appointmentDate, time: booking.appointmentTime, cancellationUrl: generateUrl(`/booking/${bookingAccessToken.token}`), reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`) }),
+          text: `Du hast den Vorschlag zur Terminänderung abgelehnt. Dein ursprünglicher Termin am ${formatDateGerman(booking.appointmentDate)} um ${booking.appointmentTime} bleibt bestehen.\n\nBehandlungen:\n${treatmentsText}\n\nGesamt: ${totalDuration} Min, ${totalPrice.toFixed(2)} €`,
+          html: await renderBookingConfirmedHTML({ 
+            name: booking.customerName, 
+            date: booking.appointmentDate, 
+            time: booking.appointmentTime, 
+            cancellationUrl: generateUrl(`/booking/${bookingAccessToken.token}`), 
+            reviewUrl: generateUrl(`/review/${bookingAccessToken.token}`),
+            treatments: booking.treatments
+          }),
         }).catch(() => {});
       }
 

src/server/rpc/recurring-availability.ts

@@ -272,7 +272,12 @@ const getAvailableTimes = os
   .input(
     z.object({
       date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
-      treatmentId: z.string(),
+      treatmentIds: z.array(z.string())
+        .min(1, "Mindestens eine Behandlung muss ausgewählt werden")
+        .max(3, "Maximal 3 Behandlungen können ausgewählt werden")
+        .refine(list => {
+          return list.length === new Set(list).size;
+        }, { message: "Doppelte Behandlungen sind nicht erlaubt" }),
     })
   )
   .handler(async ({ input }) => {
@@ -287,13 +292,22 @@ const getAvailableTimes = os
         return [];
       }
       
-      // Get treatment duration
-      const treatment = await treatmentsKV.getItem(input.treatmentId);
-      if (!treatment) {
-        throw new Error("Behandlung nicht gefunden.");
+      // Get multiple treatments and calculate total duration
+      const treatments = await Promise.all(
+        input.treatmentIds.map(id => treatmentsKV.getItem(id))
+      );
+      
+      // Validate that all treatments exist
+      const missingTreatments = treatments
+        .map((t, i) => t ? null : input.treatmentIds[i])
+        .filter(id => id !== null);
+      
+      if (missingTreatments.length > 0) {
+        throw new Error(`Behandlung(en) nicht gefunden: ${missingTreatments.join(', ')}`);
       }
       
-      const treatmentDuration = treatment.duration;
+      // Calculate total duration by summing all treatment durations
+      const treatmentDuration = treatments.reduce((sum, t) => sum + (t?.duration || 0), 0);
       
       // Parse the date to get day of week
       const [year, month, day] = input.date.split('-').map(Number);
@@ -344,36 +358,38 @@ const getAvailableTimes = os
         ['pending', 'confirmed', 'completed'].includes(booking.status)
       );
       
-      // Optimize treatment duration lookup with Map caching
-      const uniqueTreatmentIds = [...new Set(dateBookings.map(booking => booking.treatmentId))];
+      // Build cache only for legacy treatmentId bookings
+      const legacyTreatmentIds = [...new Set(dateBookings.filter(b => b.treatmentId).map(b => b.treatmentId as string))];
       const treatmentDurationMap = new Map<string, number>();
       
-      for (const treatmentId of uniqueTreatmentIds) {
-        const treatment = await treatmentsKV.getItem(treatmentId);
-        treatmentDurationMap.set(treatmentId, treatment?.duration || 60);
-      }
-      
-      // Get treatment durations for all bookings using the cached map
-      const bookingTreatments = new Map();
-      for (const booking of dateBookings) {
-        // Use bookedDurationMinutes if available, otherwise fallback to treatment duration
-        const duration = booking.bookedDurationMinutes || treatmentDurationMap.get(booking.treatmentId) || 60;
-        bookingTreatments.set(booking.id, duration);
+      // Only build cache if there are legacy bookings
+      if (legacyTreatmentIds.length > 0) {
+        for (const id of legacyTreatmentIds) {
+          const t = await treatmentsKV.getItem(id);
+          treatmentDurationMap.set(id, t?.duration || 60);
+        }
       }
       
       // Filter out booking conflicts
       const availableTimesFiltered = availableTimes.filter(slotTime => {
         const slotStartMinutes = parseTime(slotTime);
-        const slotEndMinutes = slotStartMinutes + treatmentDuration;
+        const slotEndMinutes = slotStartMinutes + treatmentDuration; // total from selected treatments
         
-        // Check if this slot overlaps with any existing booking
         const hasConflict = dateBookings.some(booking => {
-          const bookingStartMinutes = parseTime(booking.appointmentTime);
-          const bookingDuration = bookingTreatments.get(booking.id) || 60;
-          const bookingEndMinutes = bookingStartMinutes + bookingDuration;
+          let bookingDuration: number;
+          if (booking.treatments && booking.treatments.length > 0) {
+            bookingDuration = booking.treatments.reduce((sum: number, t: { duration: number }) => sum + t.duration, 0);
+          } else if (booking.bookedDurationMinutes) {
+            bookingDuration = booking.bookedDurationMinutes;
+          } else if (booking.treatmentId) {
+            bookingDuration = treatmentDurationMap.get(booking.treatmentId) || 60;
+          } else {
+            bookingDuration = 60;
+          }
           
-          // Check overlap: slotStart < bookingEnd && slotEnd > bookingStart
-          return slotStartMinutes < bookingEndMinutes && slotEndMinutes > bookingStartMinutes;
+          const bookingStart = parseTime(booking.appointmentTime);
+          const bookingEnd = bookingStart + bookingDuration;
+          return slotStartMinutes < bookingEnd && slotEndMinutes > bookingStart;
         });
         
         return !hasConflict;