diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json index 6dc127f50e..6a74b445f7 100644 --- a/apps/web/public/static/locales/de/common.json +++ b/apps/web/public/static/locales/de/common.json @@ -945,5 +945,12 @@ "new_seat_subject": "Neuer Teilnehmer {{name}} beim {{eventType}} am {{date}}", "new_seat_title": "Jemand hat sich zu einem Ereignis hinzugefügt", "app_upgrade_description": "Um diese Funktion nutzen zu können, müssen Sie ein Upgrade auf einen Pro-Account durchführen.", - "invalid_number": "Ungültige Telefonnummer" + "invalid_number": "Ungültige Telefonnummer", + "event_name_workflow": "Event Name", + "organizer_name_workflow": "Organisator Name", + "attendee_name_workflow": "Teilnehmer Name", + "event_date_workflow": "Event Datum", + "event_time_workflow": "Event Zeit", + "location_workflow": "Ort", + "additional_notes_workflow": "Zusätzliche Notizen" } diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index d135f9d113..a63b4a5fee 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -1000,6 +1000,14 @@ "no_active_event_types": "No active event types", "new_seat_subject": "New Attendee {{name}} on {{eventType}} at {{date}}", "new_seat_title": "Someone has added themselves to an event", + "variable": "Variable", + "event_name_workflow": "Event name", + "organizer_name_workflow": "Organizer name", + "attendee_name_workflow": "Attendee name", + "event_date_workflow": "Event date", + "event_time_workflow": "Event time", + "location_workflow": "Location", + "additional_notes_workflow": "Additional notes", "app_upgrade_description": "In order to use this feature, you need to upgrade to a Pro account.", "invalid_number": "Invalid phone number", "navigate": "Navigate", @@ -1010,5 +1018,13 @@ "embed": "Embed", "new_username": "New username", "current_username": "Current username", + "example_1": "Example 1", + "example_2": "Example 2", + "additonal_input_label": "Additonal input label", + "company_size": "Company size", + "what_help_needed": "What do you need help with?", + "variable_format": "Variable format", + "custom_input_as_variable_info": "Ignore all special characters of the additonal input label (use only letters and numbers), use uppercase for all letters and replace whitespaces with underscores.", + "using_additional_inputs_as_variables": "How to use additional inputs as variables?", "missing_connected_calendar": "No calendar connected" } diff --git a/packages/dayjs/index.ts b/packages/dayjs/index.ts index 62e049f3a0..27b233c9e2 100644 --- a/packages/dayjs/index.ts +++ b/packages/dayjs/index.ts @@ -20,6 +20,32 @@ dayjs.extend(timeZone); dayjs.extend(toArray); dayjs.extend(utc); +require('dayjs/locale/ar'); +require('dayjs/locale/bg'); +require('dayjs/locale/cs'); +require('dayjs/locale/de'); +require('dayjs/locale/es'); +require('dayjs/locale/es-mx'); +require('dayjs/locale/fr'); +require('dayjs/locale/he'); +require('dayjs/locale/hu'); +require('dayjs/locale/it'); +require('dayjs/locale/ja'); +require('dayjs/locale/ko'); +require('dayjs/locale/nl'); +require('dayjs/locale/pl'); +require('dayjs/locale/pt'); +require('dayjs/locale/pt-br'); +require('dayjs/locale/ro'); +require('dayjs/locale/ru'); +require('dayjs/locale/sr'); +require('dayjs/locale/sv'); +require('dayjs/locale/tr'); +require('dayjs/locale/uk'); +require('dayjs/locale/vi'); +require('dayjs/locale/zh-tw'); +require('dayjs/locale/zh-cn'); + export type Dayjs = dayjs.Dayjs; export type { ConfigType } from "dayjs"; diff --git a/packages/features/ee/workflows/api/scheduleEmailReminders.ts b/packages/features/ee/workflows/api/scheduleEmailReminders.ts index 4d92d23029..e95145f924 100644 --- a/packages/features/ee/workflows/api/scheduleEmailReminders.ts +++ b/packages/features/ee/workflows/api/scheduleEmailReminders.ts @@ -8,6 +8,7 @@ import dayjs from "@calcom/dayjs"; import { defaultHandler } from "@calcom/lib/server"; import prisma from "@calcom/prisma"; +import customTemplate, { VariablesType } from "../lib/reminders/templates/customTemplate"; import emailReminderTemplate from "../lib/reminders/templates/emailReminderTemplate"; const sendgridAPIKey = process.env.SENDGRID_API_KEY as string; @@ -103,6 +104,30 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { name || "" ); break; + case WorkflowTemplates.CUSTOM: + const variables: VariablesType = { + eventName: reminder.booking?.eventType?.title || "", + organizerName: reminder.booking?.user?.name || "", + attendeeName: reminder.booking?.attendees[0].name, + eventDate: dayjs(reminder.booking?.startTime).tz(timeZone), + eventTime: dayjs(reminder.booking?.startTime).tz(timeZone), + timeZone: timeZone, + location: reminder.booking?.location || "", + additionalNotes: reminder.booking?.description, + customInputs: reminder.booking?.customInputs, + }; + const emailSubject = await customTemplate( + reminder.workflowStep.emailSubject || "", + variables, + reminder.booking?.user?.locale || "" + ); + emailContent.emailSubject = emailSubject.text; + emailContent.emailBody = await customTemplate( + reminder.workflowStep.reminderBody || "", + variables, + reminder.booking?.user?.locale || "" + ); + break; } if (emailContent.emailSubject.length > 0 && emailContent.emailBody.text.length > 0 && sendTo) { const batchIdResponse = await client.request({ diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts index 9afc0245e7..38098fca4a 100644 --- a/packages/features/ee/workflows/api/scheduleSMSReminders.ts +++ b/packages/features/ee/workflows/api/scheduleSMSReminders.ts @@ -7,6 +7,7 @@ import { defaultHandler } from "@calcom/lib/server"; import prisma from "@calcom/prisma"; import * as twilio from "../lib/reminders/smsProviders/twilioProvider"; +import customTemplate, { VariablesType } from "../lib/reminders/templates/customTemplate"; import smsReminderTemplate from "../lib/reminders/templates/smsReminderTemplate"; async function handler(req: NextApiRequest, res: NextApiResponse) { @@ -82,6 +83,25 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { userName ); break; + case WorkflowTemplates.CUSTOM: + const variables: VariablesType = { + eventName: reminder.booking?.eventType?.title, + organizerName: reminder.booking?.user?.name || "", + attendeeName: reminder.booking?.attendees[0].name, + eventDate: dayjs(reminder.booking?.startTime).tz(timeZone), + eventTime: dayjs(reminder.booking?.startTime).tz(timeZone), + timeZone: timeZone, + location: reminder.booking?.location || "", + additionalNotes: reminder.booking?.description, + customInputs: reminder.booking?.customInputs, + }; + const customMessage = await customTemplate( + reminder.workflowStep.reminderBody || "", + variables, + reminder.booking?.user?.locale || "" + ); + message = customMessage.text; + break; } if (message?.length && message?.length > 0 && sendTo) { const scheduledSMS = await twilio.scheduleSMS(sendTo, message, reminder.scheduledDate); diff --git a/packages/features/ee/workflows/components/AddVariablesDropdown.tsx b/packages/features/ee/workflows/components/AddVariablesDropdown.tsx new file mode 100644 index 0000000000..cf41cf714c --- /dev/null +++ b/packages/features/ee/workflows/components/AddVariablesDropdown.tsx @@ -0,0 +1,49 @@ +import classNames from "@calcom/lib/classNames"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { Dropdown, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@calcom/ui/Dropdown"; + +interface IAddVariablesDropdown { + addVariable: (isEmailSubject: boolean, variable: string) => void; + disabled: boolean; + isEmailSubject: boolean; +} + +const variables = [ + "event_name_workflow", + "organizer_name_workflow", + "attendee_name_workflow", + "event_date_workflow", + "event_time_workflow", + "location_workflow", + "additional_notes_workflow", +]; + +export const AddVariablesDropdown = (props: IAddVariablesDropdown) => { + const { t } = useLocale(); + + return ( + + + + {t("variable")} + + + {variables.map((variable) => ( + + + + ))} + + + ); +}; diff --git a/packages/features/ee/workflows/components/NewWorkflowButton.tsx b/packages/features/ee/workflows/components/NewWorkflowButton.tsx index 3d0bcfea3a..a6280c8818 100644 --- a/packages/features/ee/workflows/components/NewWorkflowButton.tsx +++ b/packages/features/ee/workflows/components/NewWorkflowButton.tsx @@ -232,7 +232,9 @@ export function NewWorkflowButton() { )}
- +