diff --git a/apps/web/components/eventtype/RecurringEventController.tsx b/apps/web/components/eventtype/RecurringEventController.tsx index 7511a24ee2..518805fa96 100644 --- a/apps/web/components/eventtype/RecurringEventController.tsx +++ b/apps/web/components/eventtype/RecurringEventController.tsx @@ -1,10 +1,11 @@ import { Collapsible, CollapsibleContent } from "@radix-ui/react-collapsible"; -import React, { useState } from "react"; +import { useState } from "react"; import { UseFormReturn } from "react-hook-form"; import { Frequency as RRuleFrequency } from "rrule"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RecurringEvent } from "@calcom/types/Calendar"; +import { Alert } from "@calcom/ui/Alert"; import Select from "@components/ui/form/Select"; @@ -40,15 +41,17 @@ export default function RecurringEventController({ })); return ( - <> - {!paymentEnabled && ( -
-
- -
-
+
+
+ +
+
+ {paymentEnabled ? ( + + ) : ( + <>
-
-
- )} - + + )} +
+
); } diff --git a/apps/web/pages/event-types/[type].tsx b/apps/web/pages/event-types/[type].tsx index 02f5213923..dae70aa507 100644 --- a/apps/web/pages/event-types/[type].tsx +++ b/apps/web/pages/event-types/[type].tsx @@ -38,6 +38,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import showToast from "@calcom/lib/notification"; import { StripeData } from "@calcom/stripe/server"; import { RecurringEvent } from "@calcom/types/Calendar"; +import { Alert } from "@calcom/ui/Alert"; import Button from "@calcom/ui/Button"; import { Dialog, DialogContent, DialogTrigger } from "@calcom/ui/Dialog"; import Switch from "@calcom/ui/Switch"; @@ -1732,7 +1733,7 @@ const EventTypePage = (props: inferSSRProps) => { formMethods={formMethods} eventType={eventType}> - {hasPaymentIntegration && !recurringEventDefined && ( + {hasPaymentIntegration && ( <>
@@ -1746,40 +1747,44 @@ const EventTypePage = (props: inferSSRProps) => {
-
-
-
-
- { - setRequirePayment(event.target.checked); - if (!event.target.checked) { - formMethods.setValue("price", 0); - } - }} - id="requirePayment" - name="requirePayment" - type="checkbox" - className="text-primary-600 h-4 w-4 rounded border-gray-300" - defaultChecked={requirePayment} - /> -
-
-

- {t("require_payment")} (0.5% +{" "} - - - {" "} - {t("commission_per_transaction")}) -

+ {recurringEventDefined ? ( + + ) : ( +
+
+
+
+ { + setRequirePayment(event.target.checked); + if (!event.target.checked) { + formMethods.setValue("price", 0); + } + }} + id="requirePayment" + name="requirePayment" + type="checkbox" + className="text-primary-600 h-4 w-4 rounded border-gray-300" + defaultChecked={requirePayment} + /> +
+
+

+ {t("require_payment")} (0.5% +{" "} + + + {" "} + {t("commission_per_transaction")}) +

+
-
+ )}
{requirePayment && (
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index af287e6656..b299b4d5fc 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -251,6 +251,8 @@ "booking_submitted_recurring": "Your recurring meeting has been submitted", "booking_confirmed": "Your booking has been confirmed", "booking_confirmed_recurring": "Your recurring meeting has been confirmed", + "warning_recurring_event_payment": "Payments are not supported with Recurring Events yet", + "warning_payment_recurring_event": "Recurring events are not supported with Payments yet", "enter_new_password": "Enter the new password you'd like for your account.", "reset_password": "Reset Password", "change_your_password": "Change your password",