Skip to content

Scheduling infrastructure for absolutely everyone.

feat: add setting to allow booking through a reschedule link (#21652)

devin-ai-integration[bot]11bddbb71dc4
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index 0f9ae333b21..c6036c2050d 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -60,6 +60,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
slug: true,
allowReschedulingPastBookings: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
team: {
select: {
parentId: true,
@@ -110,18 +111,31 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
profileEnrichedBookingUser: enrichedBookingUser,
});
+ const isForcedRescheduleForCancelledBooking = allowRescheduleForCancelledBooking;
// If booking is already REJECTED, we can't reschedule this booking. Take the user to the booking page which would show it's correct status and other details.
// If the booking is CANCELLED and allowRescheduleForCancelledBooking is false, we redirect the user to the original event link.
// A booking that has been rescheduled to a new booking will also have a status of CANCELLED
const isDisabledRescheduling = booking.eventType?.disableRescheduling;
- if (
- isDisabledRescheduling ||
- (!allowRescheduleForCancelledBooking &&
- (booking.status === BookingStatus.CANCELLED || booking.status === BookingStatus.REJECTED))
- ) {
+ // This comes from query param and thus is considered forced
+ const canRescheduleCancelledBooking =
+ isForcedRescheduleForCancelledBooking || booking.eventType?.allowReschedulingCancelledBookings;
+ const isNonRescheduleableBooking =
+ booking.status === BookingStatus.CANCELLED || booking.status === BookingStatus.REJECTED;
+
+ if (isDisabledRescheduling) {
+ return {
+ redirect: {
+ destination: `/booking/${uid}`,
+ permanent: false,
+ },
+ };
+ }
+
+ if (isNonRescheduleableBooking) {
+ const canReschedule = booking.status === BookingStatus.CANCELLED && canRescheduleCancelledBooking;
return {
redirect: {
- destination: booking.status === BookingStatus.CANCELLED ? eventUrl : `/booking/${uid}`,
+ destination: canReschedule ? eventUrl : `/booking/${uid}`,
permanent: false,
},
};
diff --git a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
index 8564a4efcea..08e09281cd1 100644
--- a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
+++ b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
@@ -71,7 +71,11 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
let booking: GetBookingType | null = null;
if (rescheduleUid) {
booking = await getBookingForReschedule(`${rescheduleUid}`, session?.user?.id);
- if (booking?.status === BookingStatus.CANCELLED && !allowRescheduleForCancelledBooking) {
+ if (
+ booking?.status === BookingStatus.CANCELLED &&
+ !allowRescheduleForCancelledBooking &&
+ !eventData.allowReschedulingCancelledBookings
+ ) {
return {
redirect: {
permanent: false,
@@ -212,6 +216,7 @@ const getTeamWithEventsData = async (
hidden: true,
disableCancelling: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
interfaceLanguage: true,
hosts: {
take: 3,
diff --git a/apps/web/playwright/booking-pages.e2e.ts b/apps/web/playwright/booking-pages.e2e.ts
index 802045cb755..8da6410a341 100644
--- a/apps/web/playwright/booking-pages.e2e.ts
+++ b/apps/web/playwright/booking-pages.e2e.ts
@@ -252,8 +252,8 @@ test.describe("pro user", () => {
await page.goto(`/reschedule/${bookingCancelledId}`);
- // Should be redirected to the original event link
- await expect(page).toHaveURL(new RegExp(`/${pro.username}/${eventSlug}`));
+ expect(page.url()).not.toContain("rescheduleUid");
+ await expect(cancelledHeadline).toBeVisible();
});
test("can book an event that requires confirmation and then that booking can be accepted by organizer", async ({
diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts
index ead6f8de70e..0ec9ccb16c2 100644
--- a/apps/web/playwright/reschedule.e2e.ts
+++ b/apps/web/playwright/reschedule.e2e.ts
@@ -389,6 +389,62 @@ test.describe("Reschedule Tests", async () => {
// It is tested in teams.e2e.ts
});
+ test("Should redirect to cancelled page when allowReschedulingCancelledBookings is false (default)", async ({
+ page,
+ users,
+ bookings,
+ }) => {
+ const user = await users.create();
+ const eventType = user.eventTypes[0];
+
+ await prisma.eventType.update({
+ where: {
+ id: eventType.id,
+ },
+ data: {
+ allowReschedulingCancelledBookings: false,
+ },
+ });
+
+ const booking = await bookings.create(user.id, user.username, eventType.id, {
+ status: BookingStatus.CANCELLED,
+ });
+
+ await page.goto(`/reschedule/${booking.uid}`);
+
+ expect(page.url()).not.toContain("rescheduleUid");
+ await expect(page.locator('[data-testid="cancelled-headline"]')).toBeVisible();
+ });
+
+ test("Should allow rescheduling when allowReschedulingCancelledBookings is true", async ({
+ page,
+ users,
+ bookings,
+ }) => {
+ const user = await users.create();
+ const eventType = user.eventTypes[0];
+
+ await prisma.eventType.update({
+ where: {
+ id: eventType.id,
+ },
+ data: {
+ allowReschedulingCancelledBookings: true,
+ },
+ });
+
+ const booking = await bookings.create(user.id, user.username, eventType.id, {
+ status: BookingStatus.CANCELLED,
+ });
+
+ await page.goto(`/reschedule/${booking.uid}`);
+
+ await selectFirstAvailableTimeSlotNextMonth(page);
+ await bookTimeSlot(page);
+
+ await expect(page.locator("[data-testid=success-page]")).toBeVisible();
+ });
+
test.describe("Organization", () => {
test("Booking should be rescheduleable for a user that was moved to an organization through org domain", async ({
users,
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index d9c7563da6f..ffa0c3a834d 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1171,6 +1171,8 @@
"confirm_delete_api_key": "Revoke this API key",
"disable_rescheduling": "Disable Rescheduling",
"description_disable_rescheduling": "Guests can no longer reschedule the event with calendar invite or email",
+ "allow_rescheduling_cancelled_bookings": "Allow booking through reschedule link",
+ "description_allow_rescheduling_cancelled_bookings": "When enabled, users will be able to create a new booking when trying to reschedule a cancelled booking",
"disable_cancelling": "Disable Cancelling",
"description_disable_cancelling": "Guests can no longer cancel the event with calendar invite or email",
"revoke_api_key": "Revoke API key",
diff --git a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
index 9cec8a58e61..86c2c99cb1a 100644
--- a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
+++ b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
@@ -60,7 +60,9 @@ async function processReschedule({
booking === null ||
!booking.eventTypeId ||
(booking?.eventTypeId === props.eventData?.id &&
- (booking.status !== BookingStatus.CANCELLED || allowRescheduleForCancelledBooking))
+ (booking.status !== BookingStatus.CANCELLED ||
+ allowRescheduleForCancelledBooking ||
+ !!(props.eventData as any)?.allowReschedulingCancelledBookings))
) {
props.booking = booking;
props.rescheduleUid = Array.isArray(rescheduleUid) ? rescheduleUid[0] : rescheduleUid;
diff --git a/apps/web/test/lib/handleChildrenEventTypes.test.ts b/apps/web/test/lib/handleChildrenEventTypes.test.ts
index 54f7499f031..9c9b4a4c6bf 100644
--- a/apps/web/test/lib/handleChildrenEventTypes.test.ts
+++ b/apps/web/test/lib/handleChildrenEventTypes.test.ts
@@ -147,6 +147,7 @@ describe("handleChildrenEventTypes", () => {
userId: 4,
rrSegmentQueryValue: undefined,
assignRRMembersUsingSegment: false,
+ allowReschedulingCancelledBookings: false,
},
});
expect(result.newUserIds).toEqual([4]);
@@ -206,6 +207,7 @@ describe("handleChildrenEventTypes", () => {
deleteMany: {},
},
instantMeetingScheduleId: undefined,
+ allowReschedulingCancelledBookings: false,
},
where: {
userId_parentId: {
@@ -315,6 +317,7 @@ describe("handleChildrenEventTypes", () => {
workflows: undefined,
rrSegmentQueryValue: undefined,
assignRRMembersUsingSegment: false,
+ allowReschedulingCancelledBookings: false,
},
});
expect(result.newUserIds).toEqual([4]);
@@ -371,6 +374,7 @@ describe("handleChildrenEventTypes", () => {
},
lockTimeZoneToggleOnBookingPage: false,
requiresBookerEmailVerification: false,
+ allowReschedulingCancelledBookings: false,
},
where: {
userId_parentId: {
@@ -476,6 +480,7 @@ describe("handleChildrenEventTypes", () => {
rrSegmentQueryValue: undefined,
assignRRMembersUsingSegment: false,
useEventLevelSelectedCalendars: false,
+ allowReschedulingCancelledBookings: false,
},
});
const { profileId, rrSegmentQueryValue, ...rest } = evType;
diff --git a/packages/features/ee/managed-event-types/lib/handleChildrenEventTypes.ts b/packages/features/ee/managed-event-types/lib/handleChildrenEventTypes.ts
index 7875c0d4780..6fd6cb5674c 100644
--- a/packages/features/ee/managed-event-types/lib/handleChildrenEventTypes.ts
+++ b/packages/features/ee/managed-event-types/lib/handleChildrenEventTypes.ts
@@ -187,6 +187,7 @@ export default async function handleChildrenEventTypes({
rrSegmentQueryValue: undefined,
assignRRMembersUsingSegment: false,
useEventLevelSelectedCalendars: false,
+ allowReschedulingCancelledBookings: managedEventTypeValues.allowReschedulingCancelledBookings ?? false,
},
});
})
@@ -259,6 +260,7 @@ export default async function handleChildrenEventTypes({
: {
deleteMany: {},
},
+ allowReschedulingCancelledBookings: managedEventTypeValues.allowReschedulingCancelledBookings ?? false,
metadata: {
...(eventType.metadata as Prisma.JsonObject),
...(metadata?.multipleDuration && "length" in unlockedFieldProps
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index be706ca4a01..cfab715163b 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -497,6 +497,9 @@ export const EventAdvancedTab = ({
const disableCancellingLocked = shouldLockDisableProps("disableCancelling");
const disableReschedulingLocked = shouldLockDisableProps("disableRescheduling");
+ const allowReschedulingCancelledBookingsLocked = shouldLockDisableProps(
+ "allowReschedulingCancelledBookings"
+ );
const { isLocked, ...eventNameLocked } = shouldLockDisableProps("eventName");
@@ -508,6 +511,10 @@ export const EventAdvancedTab = ({
const [disableRescheduling, setDisableRescheduling] = useState(eventType.disableRescheduling || false);
+ const [allowReschedulingCancelledBookings, setallowReschedulingCancelledBookings] = useState(
+ eventType.allowReschedulingCancelledBookings ?? false
+ );
+
const closeEventNameTip = () => setShowEventNameTip(false);
const [isEventTypeColorChecked, setIsEventTypeColorChecked] = useState(!!eventType.eventTypeColor);
@@ -1028,6 +1035,26 @@ export const EventAdvancedTab = ({
/>
)}
/>
+
+ <Controller
+ name="allowReschedulingCancelledBookings"
+ render={({ field: { onChange } }) => (
+ <SettingsToggle
+ labelClassName="text-sm"
+ toggleSwitchAtTheEnd={true}
+ switchContainerClassName="border-subtle rounded-lg border py-6 px-4 sm:px-6"
+ title={t("allow_rescheduling_cancelled_bookings")}
+ data-testid="allow-rescheduling-cancelled-bookings-toggle"
+ {...allowReschedulingCancelledBookingsLocked}
+ description={t("description_allow_rescheduling_cancelled_bookings")}
+ checked={allowReschedulingCancelledBookings}
+ onCheckedChange={(val) => {
+ setallowReschedulingCancelledBookings(val);
+ onChange(val);
+ }}
+ />
+ )}
+ />
{!isPlatform && (
<>
<Controller
diff --git a/packages/features/eventtypes/lib/getPublicEvent.ts b/packages/features/eventtypes/lib/getPublicEvent.ts
index 996ff07caf3..796114169c0 100644
--- a/packages/features/eventtypes/lib/getPublicEvent.ts
+++ b/packages/features/eventtypes/lib/getPublicEvent.ts
@@ -84,6 +84,7 @@ const getPublicEventSelect = (fetchAllUsers: boolean) => {
seatsPerTimeSlot: true,
disableCancelling: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
seatsShowAvailabilityCount: true,
bookingFields: true,
teamId: true,
@@ -528,6 +529,7 @@ export const getPublicEvent = async (
assignAllTeamMembers: event.assignAllTeamMembers,
disableCancelling: event.disableCancelling,
disableRescheduling: event.disableRescheduling,
+ allowReschedulingCancelledBookings: event.allowReschedulingCancelledBookings,
interfaceLanguage: event.interfaceLanguage,
};
};
diff --git a/packages/lib/server/eventTypeSelect.ts b/packages/lib/server/eventTypeSelect.ts
index a94ad4d256d..68c62e5fe76 100644
--- a/packages/lib/server/eventTypeSelect.ts
+++ b/packages/lib/server/eventTypeSelect.ts
@@ -33,6 +33,7 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
disableGuests: true,
disableCancelling: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
hideCalendarNotes: true,
minimumBookingNotice: true,
beforeEventBuffer: true,
diff --git a/packages/lib/server/repository/eventType.ts b/packages/lib/server/repository/eventType.ts
index f09971dc197..436712d5f47 100644
--- a/packages/lib/server/repository/eventType.ts
+++ b/packages/lib/server/repository/eventType.ts
@@ -517,6 +517,7 @@ export class EventTypeRepository {
disableGuests: true,
disableCancelling: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
minimumBookingNotice: true,
beforeEventBuffer: true,
afterEventBuffer: true,
diff --git a/packages/lib/test/builder.ts b/packages/lib/test/builder.ts
index 34af3190936..6d553397772 100644
--- a/packages/lib/test/builder.ts
+++ b/packages/lib/test/builder.ts
@@ -126,6 +126,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
seatsShowAttendees: null,
disableCancelling: false,
disableRescheduling: false,
+ allowReschedulingCancelledBookings: false,
seatsShowAvailabilityCount: null,
maxLeadThreshold: null,
includeNoShowInRRCalculation: false,
diff --git a/packages/prisma/migrations/20250605102526_add_allow_reschedule_of_cancelled_column/migration.sql b/packages/prisma/migrations/20250605102526_add_allow_reschedule_of_cancelled_column/migration.sql
new file mode 100644
index 00000000000..35da015e616
--- /dev/null
+++ b/packages/prisma/migrations/20250605102526_add_allow_reschedule_of_cancelled_column/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventType" ADD COLUMN "allowReschedulingCancelledBookings" BOOLEAN DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 56aa60c42f9..d0d3738cd73 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -152,6 +152,7 @@ model EventType {
schedulingType SchedulingType?
schedule Schedule? @relation(fields: [scheduleId], references: [id])
scheduleId Int?
+ allowReschedulingCancelledBookings Boolean? @default(false)
// price is deprecated. It has now moved to metadata.apps.stripe.price. Plan to drop this column.
price Int @default(0)
// currency is deprecated. It has now moved to metadata.apps.stripe.currency. Plan to drop this column.
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index 60930fe8353..164cffa678b 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -629,6 +629,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
disableGuests: true,
disableCancelling: true,
disableRescheduling: true,
+ allowReschedulingCancelledBookings: true,
requiresConfirmation: true,
canSendCalVideoTranscriptionEmails: true,
requiresConfirmationForFreeEmail: true,