diff --git a/apps/api/v2/src/platform/schedules/schedules_2024_06_11/controllers/schedules.controller.ts b/apps/api/v2/src/platform/schedules/schedules_2024_06_11/controllers/schedules.controller.ts index c0184b6c6d..149be5fbd8 100644 --- a/apps/api/v2/src/platform/schedules/schedules_2024_06_11/controllers/schedules.controller.ts +++ b/apps/api/v2/src/platform/schedules/schedules_2024_06_11/controllers/schedules.controller.ts @@ -60,8 +60,8 @@ export class SchedulesController_2024_06_11 { The point of creating schedules is for event types to be available at specific times. - The first goal of schedules is to have a default schedule. If you are platform customer and created managed users, then it is important to note that each managed user should have a default schedule. - 1. If you passed \`timeZone\` when creating managed user, then the default schedule from Monday to Friday from 9AM to 5PM will be created with that timezone. The managed user can then change the default schedule via the \`AvailabilitySettings\` atom. + The first goal of schedules is to have a default schedule. If you are a platform customer and have created managed users, then it is important to note that each managed user should have a default schedule. + 1. If you passed \`timeZone\` when creating a managed user, then the default schedule from Monday to Friday from 9AM to 5PM will be created with that timezone. The managed user can then change the default schedule via the \`AvailabilitySettings\` atom. 2. If you did not, then we assume you want the user to have this specific schedule right away. You should create a default schedule by specifying \`"isDefault": true\` in the request body. Until the user has a default schedule the user can't be booked nor manage their schedule via the AvailabilitySettings atom. diff --git a/apps/docs/content/installation.mdx b/apps/docs/content/installation.mdx index f028c604b8..7cdd6ea656 100644 --- a/apps/docs/content/installation.mdx +++ b/apps/docs/content/installation.mdx @@ -1,6 +1,6 @@ # Installation -There are multiple ways in which you can deploy Cal.diy, providing support for customers who want to implement Cal.diy within their existing infrastructure stack. Let's go through them one-by-one. You can find the instructions for deployment in our README file, which is the section you see when you scroll down in our GitHub repository, or if you've got a copy of Cal.diy downloaded already, you can open the file contained in the downloaded repository called `README.md`. +There are multiple ways in which you can deploy Cal.diy, providing support for customers who want to implement Cal.diy within their existing infrastructure stack. Let's go through them one by one. You can find the instructions for deployment in our README file, which is the section you see when you scroll down in our GitHub repository, or if you've got a copy of Cal.diy downloaded already, you can open the file contained in the downloaded repository called `README.md`. ## Requirements diff --git a/apps/web/components/apps/paypal/Setup.tsx b/apps/web/components/apps/paypal/Setup.tsx index 5a368efb00..894df78b91 100644 --- a/apps/web/components/apps/paypal/Setup.tsx +++ b/apps/web/components/apps/paypal/Setup.tsx @@ -83,19 +83,19 @@ export default function PayPalSetup() {
-

Getting started with Paypal APP

+

Getting started with the PayPal app

- Here in Cal.diy we offer Paypal as one of our payment gateway. You can use your own Paypal - Business account to receive payments from your customers enabling and setting up price and - currency for each of your event types. + Cal.diy offers PayPal as one of its payment gateways. You can use your own PayPal + Business account to receive payments from your customers by setting a price and currency + for each of your event types.

Important requirements:

Resources:

@@ -118,7 +118,7 @@ export default function PayPalSetup() {
    {/* @TODO: translate */}
  1. - Log into your Paypal Developer account and create a new app{" "} + Log into your PayPal Developer account and create a new app{" "} { await page.getByTestId("new-schedule").first().click(); await page.locator('[id="name"]').fill("More working hours"); page.locator('[type="submit"]').click(); - await expect(page.getByTestId("availablity-title")).toHaveValue("More working hours"); + await expect(page.getByTestId("availability-title")).toHaveValue("More working hours"); }); await test.step("Can delete a schedule", async () => { await page.getByTestId("go-back-button").click(); @@ -147,11 +147,11 @@ test.describe("Availability", () => { const save = (await localize("en"))("save"); const copyTimesTo = (await localize("en"))("copy_times_to"); - const availTitle = page.getByTestId("availablity-title"); + const availTitle = page.getByTestId("availability-title"); await availTitle.locator("xpath=..").locator("span.whitespace-pre").first().click(); await expect(availTitle).toBeEditable(); // change availability name - await page.getByTestId("availablity-title").fill("Working Hours test"); + await page.getByTestId("availability-title").fill("Working Hours test"); await expect(page.getByTestId("subtitle").first()).toBeVisible(); await page.getByTestId(sunday).getByRole("switch").click(); await page.getByTestId(monday).first().click(); diff --git a/apps/web/playwright/payment-apps.e2e.ts b/apps/web/playwright/payment-apps.e2e.ts index e7875cb297..f6815531ba 100644 --- a/apps/web/playwright/payment-apps.e2e.ts +++ b/apps/web/playwright/payment-apps.e2e.ts @@ -239,8 +239,8 @@ test.describe("Payment app", () => { await page.getByRole("button", { name: "Setup" }).click(); - // Expect "Getting started with Paypal APP" to be displayed - await expect(page.locator("text=Getting started with Paypal APP").first()).toBeVisible(); + await expect(page).toHaveURL(/\/apps\/paypal\/setup/); + await expect(page.getByText("Getting started with the PayPal app")).toBeVisible(); }); /** diff --git a/packages/app-store/_utils/stripe.ts b/packages/app-store/_utils/stripe.ts index 8e8586975d..22dffa8204 100644 --- a/packages/app-store/_utils/stripe.ts +++ b/packages/app-store/_utils/stripe.ts @@ -30,7 +30,7 @@ const userType = { } satisfies Prisma.UserSelect; export type UserType = Prisma.UserGetPayload<{ select: typeof userType }>; -/** This will retrieve the customer ID from Stripe or create it if it doesn't exists yet. */ +/** This will retrieve the customer ID from Stripe or create it if it doesn't exist yet. */ export async function getStripeCustomerId(user: UserType): Promise { let customerId: string | null = null; diff --git a/packages/app-store/stripepayment/lib/customer.ts b/packages/app-store/stripepayment/lib/customer.ts index 4a214ffffa..081e593b53 100644 --- a/packages/app-store/stripepayment/lib/customer.ts +++ b/packages/app-store/stripepayment/lib/customer.ts @@ -30,7 +30,7 @@ const userType = { type UserType = Prisma.UserGetPayload<{ select: typeof userType }>; -/** This will retrieve the customer ID from Stripe or create it if it doesn't exists yet. */ +/** This will retrieve the customer ID from Stripe or create it if it doesn't exist yet. */ export async function getStripeCustomerId(user: UserType): Promise { let customerId: string | null = null; diff --git a/packages/app-store/vital/lib/reschedule.ts b/packages/app-store/vital/lib/reschedule.ts index d682ef94fa..2fb4d3782b 100644 --- a/packages/app-store/vital/lib/reschedule.ts +++ b/packages/app-store/vital/lib/reschedule.ts @@ -113,7 +113,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { startTime: bookingToReschedule.startTime.toISOString(), endTime: bookingToReschedule.endTime.toISOString(), attendees: usersToPeopleType( - // username field doesn't exists on attendee but could be in the future + // username field doesn't exist on attendee but could be added in the future bookingToReschedule.attendees as unknown as PersonAttendeeCommonFields[], tAttendees ), diff --git a/packages/app-store/wipemycalother/lib/reschedule.ts b/packages/app-store/wipemycalother/lib/reschedule.ts index 8637a22a0d..c6a7f2c9e7 100644 --- a/packages/app-store/wipemycalother/lib/reschedule.ts +++ b/packages/app-store/wipemycalother/lib/reschedule.ts @@ -116,7 +116,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { startTime: bookingToReschedule.startTime.toISOString(), endTime: bookingToReschedule.endTime.toISOString(), attendees: usersToPeopleType( - // username field doesn't exists on attendee but could be in the future + // username field doesn't exist on attendee but could be added in the future bookingToReschedule.attendees as unknown as PersonAttendeeCommonFields[], tAttendees ), diff --git a/packages/embeds/embed-core/src/ModalBox/ModalBoxHtml.ts b/packages/embeds/embed-core/src/ModalBox/ModalBoxHtml.ts index 5f49710e5d..19a6bc21ff 100644 --- a/packages/embeds/embed-core/src/ModalBox/ModalBoxHtml.ts +++ b/packages/embeds/embed-core/src/ModalBox/ModalBoxHtml.ts @@ -7,7 +7,7 @@ function getStyle() {