Backend and frontend updates: auth, email, payments, events, tickets; carrousel images; mobile event detail layout; i18n

backend/src/lib/auth.ts

@@ -5,7 +5,7 @@ import crypto from 'crypto';
 import { Context } from 'hono';
 import { db, dbGet, dbAll, users, magicLinkTokens, userSessions } from '../db/index.js';
 import { eq, and, gt } from 'drizzle-orm';
-import { generateId, getNow } from './utils.js';
+import { generateId, getNow, toDbDate } from './utils.js';
 
 const JWT_SECRET = new TextEncoder().encode(process.env.JWT_SECRET || 'your-super-secret-key-change-in-production');
 const JWT_ISSUER = 'spanglish';
@@ -51,7 +51,7 @@ export async function createMagicLinkToken(
 ): Promise<string> {
   const token = generateSecureToken();
   const now = getNow();
-  const expiresAt = new Date(Date.now() + expiresInMinutes * 60 * 1000).toISOString();
+  const expiresAt = toDbDate(new Date(Date.now() + expiresInMinutes * 60 * 1000));
 
   await (db as any).insert(magicLinkTokens).values({
     id: generateId(),
@@ -113,7 +113,7 @@ export async function createUserSession(
 ): Promise<string> {
   const sessionToken = generateSecureToken();
   const now = getNow();
-  const expiresAt = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(); // 30 days
+  const expiresAt = toDbDate(new Date(Date.now() + 30 * 24 * 60 * 60 * 1000)); // 30 days
 
   await (db as any).insert(userSessions).values({
     id: generateId(),

backend/src/lib/email.ts

@@ -522,6 +522,7 @@ export const emailService = {
   
   /**
    * Send booking confirmation email
+   * Supports multi-ticket bookings - includes all tickets in the booking
    */
   async sendBookingConfirmation(ticketId: string): Promise<{ success: boolean; error?: string }> {
     // Get ticket with event info
@@ -547,14 +548,37 @@ export const emailService = {
       return { success: false, error: 'Event not found' };
     }
     
+    // Get all tickets in this booking (if multi-ticket)
+    let allTickets: any[] = [ticket];
+    if (ticket.bookingId) {
+      allTickets = await dbAll(
+        (db as any)
+          .select()
+          .from(tickets)
+          .where(eq((tickets as any).bookingId, ticket.bookingId))
+      );
+    }
+    
+    const ticketCount = allTickets.length;
     const locale = ticket.preferredLanguage || 'en';
     const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
     
-    // Generate ticket PDF URL
+    // Generate ticket PDF URL (primary ticket, or use combined endpoint for multi)
     const apiUrl = process.env.API_URL || 'http://localhost:3001';
-    const ticketPdfUrl = `${apiUrl}/api/tickets/${ticket.id}/pdf`;
+    const ticketPdfUrl = ticketCount > 1 && ticket.bookingId
+      ? `${apiUrl}/api/tickets/booking/${ticket.bookingId}/pdf`
+      : `${apiUrl}/api/tickets/${ticket.id}/pdf`;
     
     const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
+    
+    // Build attendee list for multi-ticket emails
+    const attendeeNames = allTickets.map(t => 
+      `${t.attendeeFirstName} ${t.attendeeLastName || ''}`.trim()
+    ).join(', ');
+    
+    // Calculate total price for multi-ticket bookings
+    const totalPrice = event.price * ticketCount;
+    
     return this.sendTemplateEmail({
       templateSlug: 'booking-confirmation',
       to: ticket.attendeeEmail,
@@ -565,6 +589,7 @@ export const emailService = {
         attendeeName: attendeeFullName,
         attendeeEmail: ticket.attendeeEmail,
         ticketId: ticket.id,
+        bookingId: ticket.bookingId || ticket.id,
         qrCode: ticket.qrCode || '',
         ticketPdfUrl,
         eventTitle,
@@ -573,6 +598,11 @@ export const emailService = {
         eventLocation: event.location,
         eventLocationUrl: event.locationUrl || '',
         eventPrice: this.formatCurrency(event.price, event.currency),
+        // Multi-ticket specific variables
+        ticketCount: ticketCount.toString(),
+        totalPrice: this.formatCurrency(totalPrice, event.currency),
+        attendeeNames,
+        isMultiTicket: ticketCount > 1 ? 'true' : 'false',
       },
     });
   },
@@ -615,15 +645,48 @@ export const emailService = {
       return { success: false, error: 'Event not found' };
     }
     
+    // Calculate total amount for multi-ticket bookings
+    let totalAmount = payment.amount;
+    let ticketCount = 1;
+    
+    if (ticket.bookingId) {
+      // Get all payments for this booking
+      const bookingTickets = await dbAll<any>(
+        (db as any)
+          .select()
+          .from(tickets)
+          .where(eq((tickets as any).bookingId, ticket.bookingId))
+      );
+      
+      ticketCount = bookingTickets.length;
+      
+      // Sum up all payment amounts for the booking
+      const bookingPayments = await Promise.all(
+        bookingTickets.map((t: any) => 
+          dbGet<any>((db as any).select().from(payments).where(eq((payments as any).ticketId, t.id)))
+        )
+      );
+      
+      totalAmount = bookingPayments
+        .filter((p: any) => p)
+        .reduce((sum: number, p: any) => sum + Number(p.amount || 0), 0);
+    }
+    
     const locale = ticket.preferredLanguage || 'en';
     const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
     
     const paymentMethodNames: Record<string, Record<string, string>> = {
-      en: { bancard: 'Card', lightning: 'Lightning (Bitcoin)', cash: 'Cash' },
-      es: { bancard: 'Tarjeta', lightning: 'Lightning (Bitcoin)', cash: 'Efectivo' },
+      en: { bancard: 'Card', lightning: 'Lightning (Bitcoin)', cash: 'Cash', bank_transfer: 'Bank Transfer', tpago: 'TPago' },
+      es: { bancard: 'Tarjeta', lightning: 'Lightning (Bitcoin)', cash: 'Efectivo', bank_transfer: 'Transferencia Bancaria', tpago: 'TPago' },
     };
     
     const receiptFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
+    
+    // Format amount with ticket count info for multi-ticket bookings
+    const amountDisplay = ticketCount > 1 
+      ? `${this.formatCurrency(totalAmount, payment.currency)} (${ticketCount} tickets)`
+      : this.formatCurrency(totalAmount, payment.currency);
+    
     return this.sendTemplateEmail({
       templateSlug: 'payment-receipt',
       to: ticket.attendeeEmail,
@@ -632,10 +695,10 @@ export const emailService = {
       eventId: event.id,
       variables: {
         attendeeName: receiptFullName,
-        ticketId: ticket.id,
+        ticketId: ticket.bookingId || ticket.id,
         eventTitle,
         eventDate: this.formatDate(event.startDatetime, locale),
-        paymentAmount: this.formatCurrency(payment.amount, payment.currency),
+        paymentAmount: amountDisplay,
         paymentMethod: paymentMethodNames[locale]?.[payment.provider] || payment.provider,
         paymentReference: payment.reference || payment.id,
         paymentDate: this.formatDate(payment.paidAt || payment.createdAt, locale),
@@ -750,8 +813,24 @@ export const emailService = {
     const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
     const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
 
-    // Generate a payment reference using ticket ID
-    const paymentReference = `SPG-${ticket.id.substring(0, 8).toUpperCase()}`;
+    // Calculate total price for multi-ticket bookings
+    let totalPrice = event.price;
+    let ticketCount = 1;
+    
+    if (ticket.bookingId) {
+      // Count all tickets in this booking
+      const bookingTickets = await dbAll<any>(
+        (db as any)
+          .select()
+          .from(tickets)
+          .where(eq((tickets as any).bookingId, ticket.bookingId))
+      );
+      ticketCount = bookingTickets.length;
+      totalPrice = event.price * ticketCount;
+    }
+
+    // Generate a payment reference using booking ID or ticket ID
+    const paymentReference = `SPG-${(ticket.bookingId || ticket.id).substring(0, 8).toUpperCase()}`;
 
     // Generate the booking URL for returning to payment page
     const frontendUrl = process.env.FRONTEND_URL || 'https://spanglish.com';
@@ -762,17 +841,22 @@ export const emailService = {
       ? 'payment-instructions-tpago' 
       : 'payment-instructions-bank-transfer';
 
+    // Format amount with ticket count info for multi-ticket bookings
+    const amountDisplay = ticketCount > 1 
+      ? `${this.formatCurrency(totalPrice, event.currency)} (${ticketCount} tickets)`
+      : this.formatCurrency(totalPrice, event.currency);
+
     // Build variables based on payment method
     const variables: Record<string, any> = {
       attendeeName: attendeeFullName,
       attendeeEmail: ticket.attendeeEmail,
-      ticketId: ticket.id,
+      ticketId: ticket.bookingId || ticket.id,
       eventTitle,
       eventDate: this.formatDate(event.startDatetime, locale),
       eventTime: this.formatTime(event.startDatetime, locale),
       eventLocation: event.location,
       eventLocationUrl: event.locationUrl || '',
-      paymentAmount: this.formatCurrency(event.price, event.currency),
+      paymentAmount: amountDisplay,
       paymentReference,
       bookingUrl,
     };