diff --git a/apps/web/components/ui/TableActions.tsx b/apps/web/components/ui/TableActions.tsx
index 74307a30cf..193d169fb5 100644
--- a/apps/web/components/ui/TableActions.tsx
+++ b/apps/web/components/ui/TableActions.tsx
@@ -12,7 +12,9 @@ export type ActionType = {
label: string;
disabled?: boolean;
color?: "primary" | "secondary";
-} & ({ href?: never; onClick: () => any } | { href?: string; onClick?: never }) & { actions?: ActionType[] };
+} & ({ href?: never; onClick: () => any } | { href?: string; onClick?: never }) & {
+ actions?: ActionType[];
+ };
interface Props {
actions: ActionType[];
diff --git a/apps/web/components/ui/form/PhoneInput.tsx b/apps/web/components/ui/form/PhoneInput.tsx
index 2689273e84..5455c21bae 100644
--- a/apps/web/components/ui/form/PhoneInput.tsx
+++ b/apps/web/components/ui/form/PhoneInput.tsx
@@ -20,7 +20,8 @@ function PhoneInput({ control, name, ...rest }: PhoneInputProps
);
diff --git a/apps/web/lib/emails/email-manager.ts b/apps/web/lib/emails/email-manager.ts
index 32d51a73f7..ae681f70cd 100644
--- a/apps/web/lib/emails/email-manager.ts
+++ b/apps/web/lib/emails/email-manager.ts
@@ -4,6 +4,7 @@ import AttendeeAwaitingPaymentEmail from "@lib/emails/templates/attendee-awaitin
import AttendeeCancelledEmail from "@lib/emails/templates/attendee-cancelled-email";
import AttendeeDeclinedEmail from "@lib/emails/templates/attendee-declined-email";
import AttendeeRequestEmail from "@lib/emails/templates/attendee-request-email";
+import AttendeeRequestRescheduledEmail from "@lib/emails/templates/attendee-request-reschedule-email";
import AttendeeRescheduledEmail from "@lib/emails/templates/attendee-rescheduled-email";
import AttendeeScheduledEmail from "@lib/emails/templates/attendee-scheduled-email";
import ForgotPasswordEmail, { PasswordReset } from "@lib/emails/templates/forgot-password-email";
@@ -11,12 +12,11 @@ import OrganizerCancelledEmail from "@lib/emails/templates/organizer-cancelled-e
import OrganizerPaymentRefundFailedEmail from "@lib/emails/templates/organizer-payment-refund-failed-email";
import OrganizerRequestEmail from "@lib/emails/templates/organizer-request-email";
import OrganizerRequestReminderEmail from "@lib/emails/templates/organizer-request-reminder-email";
+import OrganizerRequestRescheduleEmail from "@lib/emails/templates/organizer-request-reschedule-email";
import OrganizerRescheduledEmail from "@lib/emails/templates/organizer-rescheduled-email";
import OrganizerScheduledEmail from "@lib/emails/templates/organizer-scheduled-email";
import TeamInviteEmail, { TeamInvite } from "@lib/emails/templates/team-invite-email";
-import OrganizerRequestRescheduledEmail from "./templates/organizer-request-reschedule-email";
-
export const sendScheduledEmails = async (calEvent: CalendarEvent) => {
const emailsToSend: Promise[] = [];
@@ -211,41 +211,33 @@ export const sendTeamInviteEmail = async (teamInviteEvent: TeamInvite) => {
});
};
-export const sendRequestRescheduleEmail = async (calEvent: CalendarEvent) => {
- await new Promise((resolve, reject) => {
- try {
- const rescheduleEmail = new OrganizerRequestRescheduledEmail(calEvent);
- resolve(rescheduleEmail.sendEmail());
- } catch (e) {
- reject(console.error("RescheduleEmail.sendEmail failed", e));
- }
- });
-
+export const sendRequestRescheduleEmail = async (
+ calEvent: CalendarEvent,
+ metadata: { rescheduleLink: string }
+) => {
const emailsToSend: Promise[] = [];
- // emailsToSend.push(
- // ...calEvent.attendees.map((attendee) => {
- // return new Promise((resolve, reject) => {
- // try {
- // const requestRescheduleEmail = new AttendeeRequesRescheduledEmail(calEvent, attendee);
- // resolve(requestRescheduleEmail.sendEmail());
- // } catch (e) {
- // reject(console.error("AttendeeRequestRescheduledEmail.sendEmail failed", e));
- // }
- // });
- // })
- // );
+ emailsToSend.push(
+ new Promise((resolve, reject) => {
+ try {
+ const requestRescheduleEmail = new AttendeeRequestRescheduledEmail(calEvent, metadata);
+ resolve(requestRescheduleEmail.sendEmail());
+ } catch (e) {
+ reject(console.error("AttendeeRequestRescheduledEmail.sendEmail failed", e));
+ }
+ })
+ );
- // emailsToSend.push(
- // new Promise((resolve, reject) => {
- // try {
- // const requestRescheduleEmail = new OrganizerRequestRescheduledEmail(calEvent);
- // resolve(requestRescheduleEmail.sendEmail());
- // } catch (e) {
- // reject(console.error("OrganizerRequestRescheduledEmail.sendEmail failed", e));
- // }
- // })
- // );
+ emailsToSend.push(
+ new Promise((resolve, reject) => {
+ try {
+ const requestRescheduleEmail = new OrganizerRequestRescheduleEmail(calEvent, metadata);
+ resolve(requestRescheduleEmail.sendEmail());
+ } catch (e) {
+ reject(console.error("OrganizerRequestRescheduledEmail.sendEmail failed", e));
+ }
+ })
+ );
await Promise.all(emailsToSend);
};
diff --git a/apps/web/lib/emails/templates/attendee-request-reschedule-email.ts b/apps/web/lib/emails/templates/attendee-request-reschedule-email.ts
new file mode 100644
index 0000000000..ec3b522e52
--- /dev/null
+++ b/apps/web/lib/emails/templates/attendee-request-reschedule-email.ts
@@ -0,0 +1,219 @@
+import dayjs from "dayjs";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import timezone from "dayjs/plugin/timezone";
+import toArray from "dayjs/plugin/toArray";
+import utc from "dayjs/plugin/utc";
+import { createEvent, DateArray, Person } from "ics";
+
+import { getCancelLink } from "@calcom/lib/CalEventParser";
+import { Attendee } from "@calcom/prisma/client";
+import { CalendarEvent } from "@calcom/types/Calendar";
+
+import {
+ emailHead,
+ emailSchedulingBodyHeader,
+ emailBodyLogo,
+ emailScheduledBodyHeaderContent,
+ emailSchedulingBodyDivider,
+} from "./common";
+import OrganizerScheduledEmail from "./organizer-scheduled-email";
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(localizedFormat);
+dayjs.extend(toArray);
+
+export default class AttendeeRequestRescheduledEmail extends OrganizerScheduledEmail {
+ private metadata: { rescheduleLink: string };
+ constructor(calEvent: CalendarEvent, metadata: { rescheduleLink: string }) {
+ super(calEvent);
+ this.metadata = metadata;
+ }
+ protected getNodeMailerPayload(): Record {
+ const toAddresses = [this.calEvent.attendees[0].email];
+
+ return {
+ icalEvent: {
+ filename: "event.ics",
+ content: this.getiCalEventAsString(),
+ },
+ from: `Cal.com <${this.getMailerOptions().from}>`,
+ to: toAddresses.join(","),
+ subject: `${this.calEvent.organizer.language.translate("rescheduled_event_type_subject", {
+ eventType: this.calEvent.type,
+ name: this.calEvent.attendees[0].name,
+ date: `${this.getOrganizerStart().format("h:mma")} - ${this.getOrganizerEnd().format(
+ "h:mma"
+ )}, ${this.calEvent.organizer.language.translate(
+ this.getOrganizerStart().format("dddd").toLowerCase()
+ )}, ${this.calEvent.organizer.language.translate(
+ this.getOrganizerStart().format("MMMM").toLowerCase()
+ )} ${this.getOrganizerStart().format("D")}, ${this.getOrganizerStart().format("YYYY")}`,
+ })}`,
+ html: this.getHtmlBody(),
+ text: this.getTextBody(),
+ };
+ }
+
+ // @OVERRIDE
+ protected getiCalEventAsString(): string | undefined {
+ console.log("overriding");
+ const icsEvent = createEvent({
+ start: dayjs(this.calEvent.startTime)
+ .utc()
+ .toArray()
+ .slice(0, 6)
+ .map((v, i) => (i === 1 ? v + 1 : v)) as DateArray,
+ startInputType: "utc",
+ productId: "calendso/ics",
+ title: this.calEvent.organizer.language.translate("ics_event_title", {
+ eventType: this.calEvent.type,
+ name: this.calEvent.attendees[0].name,
+ }),
+ description: this.getTextBody(),
+ duration: { minutes: dayjs(this.calEvent.endTime).diff(dayjs(this.calEvent.startTime), "minute") },
+ organizer: { name: this.calEvent.organizer.name, email: this.calEvent.organizer.email },
+ attendees: this.calEvent.attendees.map((attendee: Person) => ({
+ name: attendee.name,
+ email: attendee.email,
+ })),
+ status: "CANCELLED",
+ method: "CANCEL",
+ });
+ if (icsEvent.error) {
+ throw icsEvent.error;
+ }
+ return icsEvent.value;
+ }
+ // @OVERRIDE
+ protected getWhen(): string {
+ return `
+
+
+
`;
+ }
+
+ protected getTextBody(): string {
+ return `
+${this.calEvent.organizer.language.translate("request_reschedule_title_attendee")}
+${this.calEvent.organizer.language.translate("request_reschedule_subtitle", {
+ organizer: this.calEvent.organizer.name,
+})},
+${this.getWhat()}
+${this.getWhen()}
+${this.getLocation()}
+${this.getAdditionalNotes()}
+${this.calEvent.organizer.language.translate("need_to_reschedule_or_cancel")}
+${getCancelLink(this.calEvent)}
+`.replace(/(<([^>]+)>)/gi, "");
+ }
+
+ protected getHtmlBody(): string {
+ const headerContent = this.calEvent.organizer.language.translate("rescheduled_event_type_subject", {
+ eventType: this.calEvent.type,
+ name: this.calEvent.attendees[0].name,
+ date: `${this.getOrganizerStart().format("h:mma")} - ${this.getOrganizerEnd().format(
+ "h:mma"
+ )}, ${this.calEvent.organizer.language.translate(
+ this.getOrganizerStart().format("dddd").toLowerCase()
+ )}, ${this.calEvent.organizer.language.translate(
+ this.getOrganizerStart().format("MMMM").toLowerCase()
+ )} ${this.getOrganizerStart().format("D")}, ${this.getOrganizerStart().format("YYYY")}`,
+ });
+
+ return `
+
+
+ ${emailHead(headerContent)}
+
+ ${this.calEvent.organizer.language.translate("when")}
++ ${this.calEvent.organizer.language.translate( + this.getOrganizerStart().format("dddd").toLowerCase() + )}, ${this.calEvent.organizer.language.translate( + this.getOrganizerStart().format("MMMM").toLowerCase() + )} ${this.getOrganizerStart().format("D")}, ${this.getOrganizerStart().format( + "YYYY" + )} | ${this.getOrganizerStart().format("h:mma")} - ${this.getOrganizerEnd().format( + "h:mma" + )} (${this.getTimezone()}) +
+
+ ${emailSchedulingBodyHeader("calendarCircle")}
+ ${emailScheduledBodyHeaderContent(
+ this.calEvent.organizer.language.translate("request_reschedule_title_attendee"),
+ this.calEvent.organizer.language.translate("request_reschedule_subtitle", {
+ organizer: this.calEvent.organizer.name,
+ })
+ )}
+ ${emailSchedulingBodyDivider()}
+
+
+
+
+ `;
+ }
+}
diff --git a/apps/web/lib/emails/templates/common/scheduling-body-head.ts b/apps/web/lib/emails/templates/common/scheduling-body-head.ts
index 7f3a6d6690..fc715d2a26 100644
--- a/apps/web/lib/emails/templates/common/scheduling-body-head.ts
+++ b/apps/web/lib/emails/templates/common/scheduling-body-head.ts
@@ -40,7 +40,7 @@ export const emailSchedulingBodyHeader = (headerType: BodyHeadType): string => {
+
+
+
+
+ ${emailSchedulingBodyDivider()}
+
+ |
+
+
+
+
+
|
+
+
+
+
+
+ ${emailBodyLogo()}
+
+ |
+
+
+
+
+
|
+
+ | + |
-
${emailBodyLogo()}
diff --git a/apps/web/pages/[user]/[type].tsx b/apps/web/pages/[user]/[type].tsx
index 9748dfb6c1..4b68205f17 100644
--- a/apps/web/pages/[user]/[type].tsx
+++ b/apps/web/pages/[user]/[type].tsx
@@ -24,6 +24,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
const userParam = asStringOrNull(context.query.user);
const typeParam = asStringOrNull(context.query.type);
const dateParam = asStringOrNull(context.query.date);
+ const rescheduleUid = asStringOrNull(context.query.rescheduleUid);
if (!userParam || !typeParam) {
throw new Error(`File is not named [type]/[user]`);
@@ -214,6 +215,43 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
eventTypeObject.schedule = null;
eventTypeObject.availability = [];
+ type Booking = {
+ startTime: Date | string;
+ description: string | null;
+ attendees?: {
+ email: string;
+ name: string;
+ }[];
+ } | null;
+ // @NOTE: being used several times refactor to exported function
+ async function getBooking(rescheduleUid: string): Promise
|