@easypayment/medusa-paypal 0.6.5 → 0.6.6

package/.medusa/server/src/admin/index.js

@@ -319,7 +319,7 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 const config = adminSdk.defineRouteConfig({
@@ -916,7 +916,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalGooglePayPage() {
+function PayPalApplePayPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 function PayPalPayLaterMessagingPage() {
@@ -1211,16 +1211,16 @@ const routeModule = {
       path: "/settings/paypal/advanced-card-payments"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

package/.medusa/server/src/admin/index.mjs

@@ -318,7 +318,7 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 const config = defineRouteConfig({
@@ -915,7 +915,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalGooglePayPage() {
+function PayPalApplePayPage() {
   return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 function PayPalPayLaterMessagingPage() {
@@ -1210,16 +1210,16 @@ const routeModule = {
       path: "/settings/paypal/advanced-card-payments"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

package/.medusa/server/src/modules/paypal/payment-provider/service.d.ts

@@ -23,10 +23,6 @@ declare class PayPalPaymentProvider extends AbstractPaymentProvider<Options> {
     private recordSuccess;
     private recordPaymentEvent;
     createAccountHolder(input: CreateAccountHolderInput): Promise<CreateAccountHolderOutput>;
-    /**
-     * Create a payment session when the customer selects PayPal.
-     * Must return an object containing an `id` and `data`.
-     */
     initiatePayment(input: InitiatePaymentInput): Promise<InitiatePaymentOutput>;
     updatePayment(input: UpdatePaymentInput): Promise<UpdatePaymentOutput>;
     authorizePayment(input: AuthorizePaymentInput): Promise<AuthorizePaymentOutput>;
@@ -36,10 +32,6 @@ declare class PayPalPaymentProvider extends AbstractPaymentProvider<Options> {
     refundPayment(input: RefundPaymentInput): Promise<RefundPaymentOutput>;
     cancelPayment(input: CancelPaymentInput): Promise<CancelPaymentOutput>;
     deletePayment(_input: DeletePaymentInput): Promise<DeletePaymentOutput>;
-    /**
-     * Required by AbstractPaymentProvider in Medusa v2.
-     * This is used by /hooks/payment/{identifier}_{providerId}
-     */
     getWebhookActionAndData(payload: ProviderWebhookPayload["payload"]): Promise<WebhookActionResult>;
 }
 export default PayPalPaymentProvider;

package/.medusa/server/src/modules/paypal/payment-provider/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/paypal/payment-provider/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,2BAA2B,CAAA;AASlC,KAAK,OAAO,GAAG,EAAE,CAAA;AAWjB,cAAM,qBAAsB,SAAQ,uBAAuB,CAAC,OAAO,CAAC;IAClE,MAAM,CAAC,UAAU,SAAW;IAE5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;gBAExB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO;IAKzD,OAAO,CAAC,oBAAoB;IAWxB,eAAe;4BAWqD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;oBACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;YAmBjE,uBAAuB;YAQrB,oBAAoB;YAqDtB,eAAe;IAkB7B,OAAO,CAAC,iBAAiB;YAQX,oBAAoB;IAclC,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,sBAAsB;IAqB9B,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,cAAc;YA6BR,aAAa;YAeb,aAAa;YAab,kBAAkB;IAa1B,mBAAmB,CACvB,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC;IAarC;;;OAGG;IACG,eAAe,CACnB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC;IA2C3B,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsBtE,gBAAgB,CACpB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC;IAmK5B,eAAe,CACnB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC;IAyB3B,gBAAgB,CACpB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC;IAwC5B,cAAc,CAClB,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,oBAAoB,CAAC;IAyK1B,aAAa,CACjB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,mBAAmB,CAAC;IA2GzB,aAAa,CACjB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,mBAAmB,CAAC;IAwHzB,aAAa,CACjB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,mBAAmB,CAAC;IAI/B;;;OAGG;IACG,uBAAuB,CAC3B,OAAO,EAAE,sBAAsB,CAAC,SAAS,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;CAGhC;AAED,eAAe,qBAAqB,CAAA;AACpC,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/paypal/payment-provider/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,2BAA2B,CAAA;AASlC,KAAK,OAAO,GAAG,EAAE,CAAA;AAUjB,cAAM,qBAAsB,SAAQ,uBAAuB,CAAC,OAAO,CAAC;IAClE,MAAM,CAAC,UAAU,SAAW;IAE5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;gBAExB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO;IAKzD,OAAO,CAAC,oBAAoB;IAWtB,eAAe;4BAW6C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;oBACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;YAoB3D,uBAAuB;YAQvB,oBAAoB;YA0DpB,eAAe;IAkB7B,OAAO,CAAC,iBAAiB;YAWX,oBAAoB;IAclC,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,cAAc;YAWR,aAAa;YAYb,aAAa;YAUb,kBAAkB;IAU1B,mBAAmB,CACvB,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC;IAY/B,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAgC5E,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAoBtE,gBAAgB,CACpB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC;IAmN5B,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAyB5E,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAwC/E,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAyKzE,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2GtE,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiHtE,aAAa,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAIvE,uBAAuB,CAC3B,OAAO,EAAE,sBAAsB,CAAC,SAAS,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;CAGhC;AAED,eAAe,qBAAqB,CAAA;AACpC,OAAO,EAAE,qBAAqB,EAAE,CAAA"}

package/.medusa/server/src/modules/paypal/payment-provider/service.js

@@ -11,7 +11,6 @@ function generateSessionId() {
         return (0, crypto_1.randomUUID)();
     }
     catch {
-        // Fallback for environments where randomUUID isn't available
         return `pp_${Date.now()}_${Math.random().toString(16).slice(2)}`;
     }
 }
@@ -72,10 +71,11 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
     async getPayPalAccessToken() {
         const paypal = this.resolvePayPalService();
         if (!paypal) {
-            // Fallback: load credentials directly from paypal_connection table
             const { Pool: _FbPool } = require("pg");
             const _fbPool = new _FbPool({ connectionString: process.env.DATABASE_URL });
-            const _fbResult = await _fbPool.query("SELECT metadata, environment, seller_client_id, seller_client_secret FROM paypal_connection WHERE status='connected' ORDER BY created_at DESC LIMIT 1").finally(() => _fbPool.end());
+            const _fbResult = await _fbPool
+                .query("SELECT metadata, environment, seller_client_id, seller_client_secret FROM paypal_connection WHERE status='connected' ORDER BY created_at DESC LIMIT 1")
+                .finally(() => _fbPool.end());
             const _fbRow = _fbResult.rows[0];
             if (!_fbRow)
                 throw new Error("No active PayPal connection found in DB");
@@ -87,7 +87,10 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
             const _fbAuth = Buffer.from(`${_fbId}:${_fbSec}`).toString("base64");
             const _fbResp = await fetch(`${_fbBase}/v1/oauth2/token`, {
                 method: "POST",
-                headers: { Authorization: `Basic ${_fbAuth}`, "Content-Type": "application/x-www-form-urlencoded" },
+                headers: {
+                    Authorization: `Basic ${_fbAuth}`,
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
                 body: "grant_type=client_credentials",
             });
             const _fbText = await _fbResp.text();
@@ -151,37 +154,28 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
     }
     mapCaptureStatus(status) {
         const normalized = String(status || "").toUpperCase();
-        if (!normalized) {
+        if (!normalized)
             return null;
-        }
-        if (normalized === "COMPLETED") {
+        if (normalized === "COMPLETED")
             return "captured";
-        }
-        if (normalized === "PENDING") {
+        if (normalized === "PENDING")
             return "pending";
-        }
-        if (["DENIED", "DECLINED", "FAILED"].includes(normalized)) {
+        if (["DENIED", "DECLINED", "FAILED"].includes(normalized))
             return "error";
-        }
-        if (["REFUNDED", "PARTIALLY_REFUNDED", "REVERSED"].includes(normalized)) {
+        if (["REFUNDED", "PARTIALLY_REFUNDED", "REVERSED"].includes(normalized))
             return "canceled";
-        }
         return null;
     }
     mapAuthorizationStatus(status) {
         const normalized = String(status || "").toUpperCase();
-        if (!normalized) {
+        if (!normalized)
             return null;
-        }
-        if (["CREATED", "APPROVED", "PENDING"].includes(normalized)) {
+        if (["CREATED", "APPROVED", "PENDING"].includes(normalized))
             return "authorized";
-        }
-        if (["VOIDED", "EXPIRED"].includes(normalized)) {
+        if (["VOIDED", "EXPIRED"].includes(normalized))
             return "canceled";
-        }
-        if (["DENIED", "DECLINED", "FAILED"].includes(normalized)) {
+        if (["DENIED", "DECLINED", "FAILED"].includes(normalized))
             return "error";
-        }
         return null;
     }
     serializeError(error) {
@@ -193,76 +187,61 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
                 message: error.message,
                 stack: error.stack,
                 cause: cause instanceof Error
-                    ? {
-                        name: cause.name,
-                        message: cause.message,
-                        stack: cause.stack,
-                    }
+                    ? { name: cause.name, message: cause.message, stack: cause.stack }
                     : cause,
             };
         }
-        return {
-            message: String(error),
-        };
+        return { message: String(error) };
     }
     mapOrderStatus(status) {
         const normalized = String(status || "").toUpperCase();
-        if (!normalized) {
+        if (!normalized)
             return "pending";
-        }
-        if (normalized === "COMPLETED") {
+        if (normalized === "COMPLETED")
             return "captured";
-        }
-        if (normalized === "APPROVED") {
+        if (normalized === "APPROVED")
             return "authorized";
-        }
-        if (["VOIDED", "CANCELLED"].includes(normalized)) {
+        if (["VOIDED", "CANCELLED"].includes(normalized))
             return "canceled";
-        }
-        if (["CREATED", "SAVED", "PAYER_ACTION_REQUIRED"].includes(normalized)) {
+        if (["CREATED", "SAVED", "PAYER_ACTION_REQUIRED"].includes(normalized))
             return "pending";
-        }
-        if (["FAILED", "EXPIRED"].includes(normalized)) {
+        if (["FAILED", "EXPIRED"].includes(normalized))
             return "error";
-        }
         return "pending";
     }
     async recordFailure(eventType, metadata) {
         const paypal = this.resolvePayPalService();
-        if (!paypal) {
+        if (!paypal)
             return;
-        }
         try {
             await paypal.recordPaymentLog(eventType, metadata);
             await paypal.recordAuditEvent(eventType, metadata);
             await paypal.recordMetric(eventType);
         }
         catch {
-            // ignore audit logging failures
+            // ignore
         }
     }
     async recordSuccess(metricName) {
         const paypal = this.resolvePayPalService();
-        if (!paypal) {
+        if (!paypal)
             return;
-        }
         try {
             await paypal.recordMetric(metricName);
         }
         catch {
-            // ignore metrics failures
+            // ignore
         }
     }
     async recordPaymentEvent(eventType, metadata) {
         const paypal = this.resolvePayPalService();
-        if (!paypal) {
+        if (!paypal)
             return;
-        }
         try {
             await paypal.recordPaymentLog(eventType, metadata);
         }
         catch {
-            // ignore payment logging failures
+            // ignore
         }
     }
     async createAccountHolder(input) {
@@ -276,10 +255,6 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
             },
         };
     }
-    /**
-     * Create a payment session when the customer selects PayPal.
-     * Must return an object containing an `id` and `data`.
-     */
     async initiatePayment(input) {
         const providerId = input.data?.provider_id;
         try {
@@ -300,15 +275,6 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
             };
         }
         catch (error) {
-            console.error("[PayPal] provider initiate failed", {
-                provider_id: providerId,
-                payment_collection_id: input.data
-                    ?.payment_collection_id,
-                cart_id: input.data?.cart_id,
-                amount: input.amount,
-                currency_code: input.currency_code,
-                error: this.serializeError(error),
-            });
             await this.recordFailure("initiate_failed", {
                 error: this.serializeError(error),
                 currency_code: input.currency_code,
@@ -339,83 +305,128 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
     async authorizePayment(input) {
         const { data, amount, currencyCode } = await this.normalizePaymentData(input);
         const existingPayPal = (data.paypal || {});
+        const { additionalSettings } = await this.resolveSettings();
+        const paymentActionRaw = typeof additionalSettings.paymentAction === "string"
+            ? additionalSettings.paymentAction
+            : "capture";
+        const returnStatus = paymentActionRaw === "authorize" ? "authorized" : "captured";
+        const timestampKey = paymentActionRaw === "authorize" ? "authorized_at" : "captured_at";
+        // ── CASE 1: Already processed (has capture_id, authorization_id, or timestamp) ──
         if (existingPayPal.capture_id ||
             existingPayPal.authorization_id ||
             data.authorized_at ||
             data.captured_at) {
-            const { additionalSettings } = await this.resolveSettings();
-            const paymentAction = typeof additionalSettings.paymentAction === "string"
-                ? additionalSettings.paymentAction
-                : "capture";
-            const returnStatus = paymentAction === "authorize" ? "authorized" : "captured";
+            console.info("[PayPal] authorizePayment: session already processed, returning", returnStatus);
             return {
                 status: returnStatus,
                 data: {
                     ...(input.data || {}),
-                    ...(paymentAction === "authorize"
-                        ? { authorized_at: new Date().toISOString() }
-                        : { captured_at: new Date().toISOString() }),
+                    [timestampKey]: data[timestampKey] || new Date().toISOString(),
                 },
             };
         }
+        // ── CASE 2: Has order_id — fetch current status from PayPal ──────────────
+        // This is the KEY fix: capture-order already processed the payment but
+        // Medusa's cart/complete workflow calls authorizePayment again with the
+        // original session data (before capture-order wrote authorization_id).
+        // We fetch the live PayPal order to get the real status.
+        const orderId = String(existingPayPal.order_id || data.order_id || "");
+        if (orderId) {
+            try {
+                console.info("[PayPal] authorizePayment: fetching live order status for", orderId);
+                const order = await this.getOrderDetails(orderId);
+                const capture = order?.purchase_units?.[0]?.payments?.captures?.[0];
+                const authorization = order?.purchase_units?.[0]?.payments?.authorizations?.[0];
+                // Order was already captured or authorized by capture-order route
+                if (capture?.id || authorization?.id) {
+                    console.info("[PayPal] authorizePayment: order already processed by PayPal, returning", returnStatus);
+                    return {
+                        status: returnStatus,
+                        data: {
+                            ...(input.data || {}),
+                            paypal: {
+                                ...existingPayPal,
+                                order_id: orderId,
+                                order,
+                                authorization_id: authorization?.id || existingPayPal.authorization_id,
+                                capture_id: capture?.id || existingPayPal.capture_id,
+                            },
+                            [timestampKey]: new Date().toISOString(),
+                        },
+                    };
+                }
+                // Order exists and is APPROVED — customer completed PayPal flow
+                // but capture-order hasn't run yet (edge case). Mark as authorized.
+                if (["APPROVED", "CREATED", "SAVED"].includes(String(order?.status || "").toUpperCase())) {
+                    console.info("[PayPal] authorizePayment: order approved, marking authorized");
+                    return {
+                        status: "authorized",
+                        data: {
+                            ...(input.data || {}),
+                            paypal: {
+                                ...existingPayPal,
+                                order_id: orderId,
+                                order,
+                            },
+                            authorized_at: new Date().toISOString(),
+                        },
+                    };
+                }
+            }
+            catch (e) {
+                // Non-fatal — log and fall through to creating a new order below
+                console.warn("[PayPal] authorizePayment: order lookup failed:", e?.message);
+            }
+        }
+        // ── CASE 3: No order_id — create a new PayPal order ──────────────────────
+        // This handles the rare case where Medusa calls authorizePayment before
+        // the frontend has created a PayPal order (e.g. admin-created orders).
         const requestId = this.getIdempotencyKey(input, "authorize");
         let debugId = null;
-        const { additionalSettings } = await this.resolveSettings();
-        const paymentActionRaw = typeof additionalSettings.paymentAction === "string"
-            ? additionalSettings.paymentAction
-            : "capture";
         const orderIntent = paymentActionRaw === "authorize" ? "AUTHORIZE" : "CAPTURE";
         try {
             const { accessToken, base } = await this.getPayPalAccessToken();
-            const existingPayPal = (data.paypal || {});
-            let orderId = String(existingPayPal.order_id || data.order_id || "");
-            let order = null;
-            let authorization = null;
-            if (!orderId) {
-                const value = (0, amounts_1.formatAmountForPayPal)(amount, currencyCode || "EUR");
-                const orderPayload = {
-                    intent: orderIntent,
-                    purchase_units: [
-                        {
-                            reference_id: data.cart_id || data.payment_collection_id || undefined,
-                            custom_id: data.session_id || data.cart_id || data.payment_collection_id || undefined,
-                            amount: {
-                                currency_code: currencyCode || "EUR",
-                                value,
-                            },
+            const value = (0, amounts_1.formatAmountForPayPal)(amount, currencyCode || "EUR");
+            const orderPayload = {
+                intent: orderIntent,
+                purchase_units: [
+                    {
+                        reference_id: data.cart_id || data.payment_collection_id || undefined,
+                        custom_id: data.session_id || data.cart_id || data.payment_collection_id || undefined,
+                        amount: {
+                            currency_code: currencyCode || "EUR",
+                            value,
                         },
-                    ],
-                    custom_id: data.session_id || data.cart_id || data.payment_collection_id || undefined,
-                };
-                const ppResp = await fetch(`${base}/v2/checkout/orders`, {
-                    method: "POST",
-                    headers: {
-                        Authorization: `Bearer ${accessToken}`,
-                        "Content-Type": "application/json",
-                        "PayPal-Request-Id": requestId,
                     },
-                    body: JSON.stringify(orderPayload),
-                });
-                const ppText = await ppResp.text();
-                debugId = ppResp.headers.get("paypal-debug-id");
-                if (!ppResp.ok) {
-                    throw new Error(`PayPal create order error (${ppResp.status}): ${ppText}${debugId ? ` debug_id=${debugId}` : ""}`);
-                }
-                order = JSON.parse(ppText);
-                orderId = String(order.id || "");
-            }
-            else {
-                order = (await this.getOrderDetails(orderId));
+                ],
+                custom_id: data.session_id || data.cart_id || data.payment_collection_id || undefined,
+            };
+            const ppResp = await fetch(`${base}/v2/checkout/orders`, {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Content-Type": "application/json",
+                    "PayPal-Request-Id": requestId,
+                },
+                body: JSON.stringify(orderPayload),
+            });
+            const ppText = await ppResp.text();
+            debugId = ppResp.headers.get("paypal-debug-id");
+            if (!ppResp.ok) {
+                throw new Error(`PayPal create order error (${ppResp.status}): ${ppText}${debugId ? ` debug_id=${debugId}` : ""}`);
             }
-            if (!order || !orderId) {
+            const order = JSON.parse(ppText);
+            const newOrderId = String(order.id || "");
+            if (!order || !newOrderId) {
                 throw new Error("Unable to resolve PayPal order details for authorization.");
             }
             const existingAuthorization = order?.purchase_units?.[0]?.payments?.authorizations?.[0] || null;
+            let authorization = null;
             if (existingAuthorization) {
                 authorization = order;
             }
             else {
-                const authorizeResp = await fetch(`${base}/v2/checkout/orders/${orderId}/authorize`, {
+                const authorizeResp = await fetch(`${base}/v2/checkout/orders/${newOrderId}/authorize`, {
                     method: "POST",
                     headers: {
                         Authorization: `Bearer ${accessToken}`,
@@ -434,7 +445,7 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
                 existingAuthorization?.id;
             await this.recordSuccess("authorize_success");
             await this.recordPaymentEvent("authorize", {
-                order_id: orderId,
+                order_id: newOrderId,
                 authorization_id: authorizationId,
                 amount,
                 currency_code: currencyCode,
@@ -446,7 +457,7 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
                     ...(input.data || {}),
                     paypal: {
                         ...(input.data || {}).paypal,
-                        order_id: orderId,
+                        order_id: newOrderId,
                         order: order || authorization,
                         authorization_id: authorizationId,
                         authorizations: authorization?.purchase_units?.[0]?.payments?.authorizations || [],
@@ -623,9 +634,7 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
             }
             const capture = JSON.parse(ppText);
             const captureId = capture?.id || capture?.purchase_units?.[0]?.payments?.captures?.[0]?.id;
-            const existingCaptures = Array.isArray(paypalData.captures)
-                ? paypalData.captures
-                : [];
+            const existingCaptures = Array.isArray(paypalData.captures) ? paypalData.captures : [];
             const captureEntry = {
                 id: captureId,
                 status: capture?.status,
@@ -788,7 +797,6 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
                 await this.recordPaymentEvent("void", {
                     order_id: orderId,
                     authorization_id: authorizationId,
-                    request_id: requestId,
                 });
             }
             else if (captureId) {
@@ -820,12 +828,6 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
                 paypalData.refund_status = refund?.status;
                 paypalData.refunds = [...existingRefunds, refundEntry];
                 await this.recordSuccess("cancel_refund_success");
-                await this.recordPaymentEvent("cancel_refund", {
-                    order_id: orderId,
-                    capture_id: captureId,
-                    refund_id: refund?.id,
-                    request_id: requestId,
-                });
             }
             return {
                 data: {
@@ -856,10 +858,6 @@ class PayPalPaymentProvider extends utils_1.AbstractPaymentProvider {
     async deletePayment(_input) {
         return { data: {} };
     }
-    /**
-     * Required by AbstractPaymentProvider in Medusa v2.
-     * This is used by /hooks/payment/{identifier}_{providerId}
-     */
     async getWebhookActionAndData(payload) {
         return (0, webhook_utils_1.getPayPalWebhookActionAndData)(payload);
     }