From 34c2565c709bb31293d5f1b24b45a209e6f40d6f Mon Sep 17 00:00:00 2001 From: alannnc Date: Fri, 1 Sep 2023 11:03:27 -0700 Subject: [PATCH] fix paypal minor issues (#11069) --- packages/app-store/paypal/api/capture.ts | 7 ------- packages/app-store/paypal/lib/Paypal.ts | 2 +- .../server/routers/viewer/eventTypes/update.handler.ts | 3 +++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/app-store/paypal/api/capture.ts b/packages/app-store/paypal/api/capture.ts index 14c577f14c..980a7ff315 100644 --- a/packages/app-store/paypal/api/capture.ts +++ b/packages/app-store/paypal/api/capture.ts @@ -4,7 +4,6 @@ import z from "zod"; import Paypal from "@calcom/app-store/paypal/lib/Paypal"; import { findPaymentCredentials } from "@calcom/features/ee/payments/api/paypal-webhook"; import { IS_PRODUCTION } from "@calcom/lib/constants"; -import { getErrorFromUnknown } from "@calcom/lib/errors"; import prisma from "@calcom/prisma"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { @@ -78,12 +77,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) } return; } catch (_err) { - const err = getErrorFromUnknown(_err); - - res.status(200).send({ - message: err.message, - stack: IS_PRODUCTION ? undefined : err.stack, - }); res.redirect(`/booking/${req.query.bookingUid}?paypalPaymentStatus=failed`); } } diff --git a/packages/app-store/paypal/lib/Paypal.ts b/packages/app-store/paypal/lib/Paypal.ts index f011bca521..b136299500 100644 --- a/packages/app-store/paypal/lib/Paypal.ts +++ b/packages/app-store/paypal/lib/Paypal.ts @@ -173,7 +173,7 @@ class Paypal { } } catch (error) { console.error(error); - return false; + throw error; } return false; } diff --git a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts index da8109abdb..dc0f28781a 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts @@ -260,6 +260,9 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => { const { default_currency } = stripeDataSchema.parse(paymentCredential.key); data.currency = default_currency; } + if (paymentCredential?.type === "paypal_payment" && input.metadata?.apps?.paypal?.currency) { + data.currency = input.metadata?.apps?.paypal?.currency.toLowerCase(); + } } const connectedLink = await ctx.prisma.hashedLink.findFirst({