Uncodedtech
diff --git a/‎apps/web/public/static/locales/en/common.json‎
Lines changed: 4 additions & 0 deletions b/‎apps/web/public/static/locales/en/common.json‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎packages/features/ee/workflows/components/WorkflowStepContainer.tsx‎
Lines changed: 100 additions & 88 deletions b/‎packages/features/ee/workflows/components/WorkflowStepContainer.tsx‎
Lines changed: 100 additions & 88 deletions
diff --git a/‎packages/features/ee/workflows/lib/reminders/emailReminderManager.ts‎
Lines changed: 20 additions & 8 deletions b/‎packages/features/ee/workflows/lib/reminders/emailReminderManager.ts‎
Lines changed: 20 additions & 8 deletions
diff --git a/‎packages/features/ee/workflows/lib/reminders/smsReminderManager.ts‎
Lines changed: 14 additions & 1 deletion b/‎packages/features/ee/workflows/lib/reminders/smsReminderManager.ts‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts‎
Lines changed: 81 additions & 22 deletions b/‎packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts‎
Lines changed: 81 additions & 22 deletions
diff --git a/‎packages/features/ee/workflows/lib/reminders/utils.ts‎
Lines changed: 2 additions & 2 deletions b/‎packages/features/ee/workflows/lib/reminders/utils.ts‎
Lines changed: 2 additions & 2 deletions
@@ -1622,12 +1622,14 @@
   "example_1": "Example 1",
   "example_2": "Example 2",
   "booking_question_identifier": "Booking Question Identifier",
+  "form_field_identifier": "Form Field Identifier",
   "company_size": "Company size",
   "what_help_needed": "What do you need help with?",
   "variable_format": "Variable format",
   "webhook_subscriber_url_reserved": "Webhook subscriber url is already defined",
   "custom_input_as_variable_info": "Ignore all special characters of the additional input label (use only letters and numbers), use uppercase for all letters and replace whitespaces with underscores.",
   "using_booking_questions_as_variables": "How do I use booking questions as variables?",
+  "using_form_responses_as_variables": "How do I use form responses as variables?",
   "download_desktop_app": "Download desktop app",
   "set_ping_link": "Set Ping link",
   "rate_limit_exceeded": "Rate limit exceeded",
@@ -1923,6 +1925,7 @@
   "show_attendees": "Share attendee information between guests",
   "show_available_seats_count": "Show the number of available seats",
   "how_booking_questions_as_variables": "How to use booking questions as variables?",
+  "how_form_responses_as_variables": "How to use form responses as variables?",
   "format": "Format",
   "questions": "Questions",
   "all_info_your_booker_provide": "All the info your booker should provide before booking with you.",
@@ -1939,6 +1942,7 @@
   "billing_portal": "Billing portal",
   "billing_help_cta": "Contact support",
   "ignore_special_characters_booking_questions": "Ignore special characters in your booking question identifier. Use only letters and numbers",
+  "ignore_special_characters_form_responses": "Ignore special characters in your form field identifier. Use only letters and numbers",
   "retry": "Retry",
   "fetching_calendars_error": "There was a problem fetching your calendars. Please <1>try again</1> or reach out to customer support.",
   "calendar_connection_fail": "Calendar connection failed",
 
@@ -1,5 +1,4 @@
 import type { EventStatus } from "ics";
-import { v4 as uuidv4 } from "uuid";
 
 import dayjs from "@calcom/dayjs";
 import generateIcsString from "@calcom/emails/lib/generateIcsString";
@@ -24,7 +23,10 @@ import { sendOrScheduleWorkflowEmails } from "./providers/emailProvider";
 import type { FormSubmissionData, WorkflowContextData } from "./reminderScheduler";
 import type { AttendeeInBookingInfo, BookingInfo, timeUnitLowerCase } from "./smsReminderManager";
 import type { VariablesType } from "./templates/customTemplate";
-import customTemplate from "./templates/customTemplate";
+import customTemplate, {
+  transformBookingResponsesToVariableFormat,
+  transformRoutingFormResponsesToVariableFormat,
+} from "./templates/customTemplate";
 import emailRatingTemplate from "./templates/emailRatingTemplate";
 import emailReminderTemplate from "./templates/emailReminderTemplate";
 
@@ -62,7 +64,12 @@ type SendEmailReminderParams = {
     subject: string;
     html: string;
     replyTo?: string;
-    attachments?: any[];
+    attachments?: {
+      content: string;
+      filename: string;
+      contentType: string;
+      disposition: string;
+    }[];
     sender?: string | null;
   };
   sendTo: string[];
@@ -159,7 +166,7 @@ const scheduleEmailReminderForEvt = async (args: scheduleEmailReminderArgs & { e
       attendeeName = attendeeToBeUsedInMail.name;
       timeZone = evt.organizer.timeZone;
       break;
-    case WorkflowActions.EMAIL_ATTENDEE:
+    case WorkflowActions.EMAIL_ATTENDEE: {
       // check if first attendee of sendTo is present in the attendees list, if not take the evt attendee
       const attendeeEmailToBeUsedInMailFromEvt = evt.attendees.find(
         (attendee) => attendee.email === sendTo[0]
@@ -171,6 +178,7 @@ const scheduleEmailReminderForEvt = async (args: scheduleEmailReminderArgs & { e
       attendeeName = evt.organizer.name;
       timeZone = attendeeToBeUsedInMail.timeZone;
       break;
+    }
   }
 
   let emailContent = {
@@ -199,7 +207,7 @@ const scheduleEmailReminderForEvt = async (args: scheduleEmailReminderArgs & { e
       timeZone: timeZone,
       location: evt.location,
       additionalNotes: evt.additionalNotes,
-      responses: evt.responses,
+      responses: transformBookingResponsesToVariableFormat(evt.responses),
       meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
       cancelLink: `${bookerUrl}/booking/${evt.uid}?cancel=true${
         recipientEmail ? `&cancelledBy=${encodeURIComponent(recipientEmail)}` : ""
@@ -358,12 +366,16 @@ const scheduleEmailReminderForForm = async (
 
   if (emailBody) {
     const timeFormat = getTimeFormatStringFromUserTimeFormat(formData.user.timeFormat);
-    //todo: add variables
-    const emailSubjectTemplate = customTemplate(emailSubject, {}, formData.user.locale, timeFormat);
+
+    const variables: VariablesType = {
+      responses: transformRoutingFormResponsesToVariableFormat(formData.responses),
+    };
+
+    const emailSubjectTemplate = customTemplate(emailSubject, variables, formData.user.locale, timeFormat);
     emailContent.emailSubject = emailSubjectTemplate.text;
     emailContent.emailBody = customTemplate(
       emailBody,
-      {},
+      variables,
       formData.user.locale,
       timeFormat,
       hideBranding
 
@@ -10,6 +10,7 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import type { TimeFormat } from "@calcom/lib/timeFormat";
+import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import type { PrismaClient } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
@@ -26,6 +27,7 @@ import type { ScheduleReminderArgs } from "./emailReminderManager";
 import { scheduleSmsOrFallbackEmail, sendSmsOrFallbackEmail } from "./messageDispatcher";
 import * as twilio from "./providers/twilioProvider";
 import type { FormSubmissionData } from "./reminderScheduler";
+import customTemplate, { transformRoutingFormResponsesToVariableFormat } from "./templates/customTemplate";
 import smsReminderTemplate from "./templates/smsReminderTemplate";
 
 export enum timeUnitLowerCase {
@@ -318,7 +320,18 @@ const scheduleSMSReminderForForm = async (
 ) => {
   const { message, triggerEvent, reminderPhone, sender, userId, teamId, action, formData } = args;
 
-  const smsMessage = message;
+  let smsMessage = message;
+
+  if (smsMessage && formData.responses) {
+    const timeFormat = getTimeFormatStringFromUserTimeFormat(formData.user.timeFormat);
+
+    const variables = {
+      responses: transformRoutingFormResponsesToVariableFormat(formData.responses),
+    };
+
+    const processedMessage = customTemplate(smsMessage, variables, formData.user.locale, timeFormat);
+    smsMessage = processedMessage.text;
+  }
 
   if (smsMessage.trim().length > 0) {
     const smsMessageWithoutOptOut = await WorkflowOptOutService.addOptOutMessage(
 
@@ -1,10 +1,68 @@
 import { guessEventLocationType } from "@calcom/app-store/locations";
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
 import { APP_NAME } from "@calcom/lib/constants";
 import { TimeFormat } from "@calcom/lib/timeFormat";
 import type { CalEventResponses } from "@calcom/types/Calendar";
 
+export type WorkflowVariableResponses = Record<
+  string,
+  {
+    value:
+      | string
+      | number
+      | boolean
+      | string[]
+      | Record<string, string>
+      | { value: string; optionValue: string };
+  }
+>;
+
+export function transformBookingResponsesToVariableFormat(
+  responses: CalEventResponses | null | undefined
+): WorkflowVariableResponses | null {
+  if (!responses) return null;
+
+  const transformed: WorkflowVariableResponses = {};
+
+  for (const [key, response] of Object.entries(responses)) {
+    if (response?.value !== undefined) {
+      transformed[key] = {
+        value: response.value,
+      };
+    }
+  }
+
+  return Object.keys(transformed).length > 0 ? transformed : null;
+}
+
+export function transformRoutingFormResponsesToVariableFormat(
+  responses: FORM_SUBMITTED_WEBHOOK_RESPONSES | null | undefined
+): WorkflowVariableResponses | null {
+  if (!responses) return null;
+
+  const transformed: WorkflowVariableResponses = {};
+
+  for (const [key, response] of Object.entries(responses)) {
+    if (response?.value !== undefined) {
+      transformed[key] = {
+        value: response.value,
+      };
+    }
+  }
+
+  return Object.keys(transformed).length > 0 ? transformed : null;
+}
+
+export function formatIdentifierToVariable(key: string): string {
+  return key
+    .replace(/[^a-zA-Z0-9 ]/g, "")
+    .trim()
+    .replaceAll(" ", "_")
+    .toUpperCase();
+}
+
 export type VariablesType = {
   eventName?: string;
   organizerName?: string;
@@ -17,7 +75,7 @@ export type VariablesType = {
   timeZone?: string;
   location?: string | null;
   additionalNotes?: string | null;
-  responses?: CalEventResponses | null;
+  responses?: WorkflowVariableResponses | null;
   meetingUrl?: string;
   cancelLink?: string;
   cancelReason?: string | null;
@@ -42,12 +100,15 @@ const customTemplate = (
   timeFormat?: TimeFormat,
   isBrandingDisabled?: boolean
 ) => {
-  const translatedDate = new Intl.DateTimeFormat(locale, {
-    weekday: "long",
-    month: "long",
-    day: "numeric",
-    year: "numeric",
-  }).format(variables.eventDate?.add(dayjs().tz(variables.timeZone).utcOffset(), "minute").toDate());
+  const eventDate = variables.eventDate;
+  const translatedDate = eventDate
+    ? new Intl.DateTimeFormat(locale, {
+        weekday: "long",
+        month: "long",
+        day: "numeric",
+        year: "numeric",
+      }).format(eventDate.add(dayjs().tz(variables.timeZone).utcOffset(), "minute").toDate())
+    : "";
 
   let locationString = variables.location || "";
 
@@ -132,23 +193,21 @@ const customTemplate = (
       return;
     }
 
+    // handle custom variables from form/booking responses
     if (variables.responses) {
       Object.keys(variables.responses).forEach((customInput) => {
-        const formatedToVariable = customInput
-          .replace(/[^a-zA-Z0-9 ]/g, "")
-          .trim()
-          .replaceAll(" ", "_")
-          .toUpperCase();
-
-        if (
-          variable === formatedToVariable &&
-          variables.responses &&
-          variables.responses[customInput as keyof typeof variables.responses].value
-        ) {
-          dynamicText = dynamicText.replace(
-            `{${variable}}`,
-            variables.responses[customInput as keyof typeof variables.responses].value.toString()
-          );
+        const formatedToVariable = formatIdentifierToVariable(customInput);
+
+        if (variable === formatedToVariable && variables.responses) {
+          const response = variables.responses[customInput];
+          if (response?.value !== undefined) {
+            const responseValue = response.value;
+            const valueString = Array.isArray(responseValue)
+              ? responseValue.join(", ")
+              : String(responseValue);
+
+            dynamicText = dynamicText.replace(`{${variable}}`, valueString);
+          }
         }
       });
     }
 
@@ -8,7 +8,7 @@ import { IMMEDIATE_WORKFLOW_TRIGGER_EVENTS } from "../constants";
 import { getWorkflowRecipientEmail } from "../getWorkflowReminders";
 import type { AttendeeInBookingInfo, BookingInfo } from "./smsReminderManager";
 import type { VariablesType } from "./templates/customTemplate";
-import customTemplate from "./templates/customTemplate";
+import customTemplate, { transformBookingResponsesToVariableFormat } from "./templates/customTemplate";
 
 export const bulkShortenLinks = async (links: string[]) => {
   if (!process.env.DUB_API_KEY) {
@@ -74,7 +74,7 @@ export const getSMSMessageWithVariables = async (
     timeZone: timeZone,
     location: evt.location,
     additionalNotes: evt.additionalNotes,
-    responses: evt.responses,
+    responses: transformBookingResponsesToVariableFormat(evt.responses),
     meetingUrl,
     cancelLink,
     rescheduleLink,