@easypayment/medusa-paypal 0.6.6 → 0.6.7

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

@@ -319,7 +319,7 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
+function PayPalApplePayPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 const config = adminSdk.defineRouteConfig({
@@ -916,7 +916,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   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: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
     },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

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

@@ -318,7 +318,7 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
+function PayPalApplePayPage() {
   return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 const config = defineRouteConfig({
@@ -915,7 +915,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   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: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
     },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

package/.medusa/server/src/subscribers/paypal-order-invoice.d.ts

@@ -0,0 +1,13 @@
+import type { MedusaContainer } from "@medusajs/framework/types";
+export default function paypalOrderInvoiceSubscriber({ event, container, }: {
+    event: {
+        data: {
+            id: string;
+        };
+    };
+    container: MedusaContainer;
+}): Promise<void>;
+export declare const config: {
+    event: string;
+};
+//# sourceMappingURL=paypal-order-invoice.d.ts.map

package/.medusa/server/src/subscribers/paypal-order-invoice.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"paypal-order-invoice.d.ts","sourceRoot":"","sources":["../../../../src/subscribers/paypal-order-invoice.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAKhE,wBAA8B,4BAA4B,CAAC,EACzD,KAAK,EACL,SAAS,GACV,EAAE;IACD,KAAK,EAAE;QAAE,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;IAC/B,SAAS,EAAE,eAAe,CAAA;CAC3B,iBA6FA;AAED,eAAO,MAAM,MAAM;;CAElB,CAAA"}

package/.medusa/server/src/subscribers/paypal-order-invoice.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+exports.default = paypalOrderInvoiceSubscriber;
+const paypal_auth_1 = require("../modules/paypal/utils/paypal-auth");
+const provider_ids_1 = require("../modules/paypal/utils/provider-ids");
+async function paypalOrderInvoiceSubscriber({ event, container, }) {
+    const orderId = event?.data?.id;
+    if (!orderId)
+        return;
+    try {
+        const query = container.resolve("query");
+        const paypal = container.resolve("paypal_onboarding");
+        // Fetch the order with payment session data
+        const { data: orders } = await query.graph({
+            entity: "order",
+            fields: [
+                "id",
+                "display_id",
+                "payment_collections.payment_sessions.id",
+                "payment_collections.payment_sessions.data",
+                "payment_collections.payment_sessions.provider_id",
+                "payment_collections.payment_sessions.status",
+            ],
+            filters: { id: orderId },
+        });
+        const order = orders?.[0];
+        if (!order)
+            return;
+        // Find the PayPal session
+        const sessions = order.payment_collections?.flatMap((pc) => pc.payment_sessions || []) || [];
+        const paypalSession = sessions
+            .filter((s) => (0, provider_ids_1.isPayPalProviderId)(s.provider_id))
+            .sort((a, b) => new Date(b.created_at || 0).getTime() - new Date(a.created_at || 0).getTime())[0];
+        if (!paypalSession)
+            return;
+        const paypalData = (paypalSession.data?.paypal || {});
+        const paypalOrderId = String(paypalData.order_id || "");
+        if (!paypalOrderId)
+            return;
+        // Get invoice prefix from settings
+        const settings = await paypal.getSettings().catch(() => ({}));
+        const settingsData = settings && typeof settings === "object" && "data" in settings
+            ? (settings.data ?? {})
+            : {};
+        const additionalSettings = (settingsData.additional_settings || {});
+        const invoicePrefix = typeof additionalSettings.invoicePrefix === "string"
+            ? additionalSettings.invoicePrefix
+            : "";
+        // Build industry-standard invoice ID: prefix + order display_id
+        // e.g. "WC-139" or "ORD-139"
+        const displayId = String(order.display_id || "");
+        const invoiceId = `${invoicePrefix}${displayId}`.trim();
+        if (!invoiceId)
+            return;
+        // Patch the PayPal order with the correct invoice_id
+        const creds = await paypal.getActiveCredentials();
+        const { accessToken, base } = await (0, paypal_auth_1.getPayPalAccessToken)(creds);
+        const patchResp = await fetch(`${base}/v2/checkout/orders/${paypalOrderId}`, {
+            method: "PATCH",
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify([
+                {
+                    op: "replace",
+                    path: "/purchase_units/@reference_id=='default'/invoice_id",
+                    value: invoiceId,
+                },
+            ]),
+        });
+        if (patchResp.ok || patchResp.status === 204) {
+            console.info(`[PayPal] invoice_id updated to "${invoiceId}" for PayPal order ${paypalOrderId} (Medusa order ${orderId})`);
+        }
+        else {
+            const text = await patchResp.text().catch(() => "");
+            console.warn(`[PayPal] invoice_id patch failed (${patchResp.status}) for order ${paypalOrderId}: ${text}`);
+        }
+    }
+    catch (e) {
+        // Non-fatal — never block order placement
+        console.warn("[PayPal] paypalOrderInvoiceSubscriber error:", e?.message || e);
+    }
+}
+exports.config = {
+    event: "order.placed",
+};
+//# sourceMappingURL=paypal-order-invoice.js.map

package/.medusa/server/src/subscribers/paypal-order-invoice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"paypal-order-invoice.js","sourceRoot":"","sources":["../../../../src/subscribers/paypal-order-invoice.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easypayment/medusa-paypal",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Industry-standard PayPal integration for Medusa v2",
   "license": "MIT",
   "main": "./.medusa/server/src/index.js",

package/src/subscribers/paypal-order-invoice.ts

@@ -0,0 +1,109 @@
+import type { MedusaContainer } from "@medusajs/framework/types"
+import type PayPalModuleService from "../modules/paypal/service"
+import { getPayPalAccessToken } from "../modules/paypal/utils/paypal-auth"
+import { isPayPalProviderId } from "../modules/paypal/utils/provider-ids"
+
+export default async function paypalOrderInvoiceSubscriber({
+  event,
+  container,
+}: {
+  event: { data: { id: string } }
+  container: MedusaContainer
+}) {
+  const orderId = event?.data?.id
+  if (!orderId) return
+
+  try {
+    const query = container.resolve("query") as any
+    const paypal = container.resolve<PayPalModuleService>("paypal_onboarding")
+
+    // Fetch the order with payment session data
+    const { data: orders } = await query.graph({
+      entity: "order",
+      fields: [
+        "id",
+        "display_id",
+        "payment_collections.payment_sessions.id",
+        "payment_collections.payment_sessions.data",
+        "payment_collections.payment_sessions.provider_id",
+        "payment_collections.payment_sessions.status",
+      ],
+      filters: { id: orderId },
+    })
+
+    const order = orders?.[0]
+    if (!order) return
+
+    // Find the PayPal session
+    const sessions = order.payment_collections?.flatMap(
+      (pc: any) => pc.payment_sessions || []
+    ) || []
+
+    const paypalSession = sessions
+      .filter((s: any) => isPayPalProviderId(s.provider_id))
+      .sort((a: any, b: any) =>
+        new Date(b.created_at || 0).getTime() - new Date(a.created_at || 0).getTime()
+      )[0]
+
+    if (!paypalSession) return
+
+    const paypalData = (paypalSession.data?.paypal || {}) as Record<string, any>
+    const paypalOrderId = String(paypalData.order_id || "")
+    if (!paypalOrderId) return
+
+    // Get invoice prefix from settings
+    const settings = await paypal.getSettings().catch(() => ({}))
+    const settingsData =
+      settings && typeof settings === "object" && "data" in settings
+        ? ((settings as { data?: Record<string, any> }).data ?? {})
+        : {}
+    const additionalSettings = (settingsData.additional_settings || {}) as Record<string, any>
+    const invoicePrefix =
+      typeof additionalSettings.invoicePrefix === "string"
+        ? additionalSettings.invoicePrefix
+        : ""
+
+    // Build industry-standard invoice ID: prefix + order display_id
+    // e.g. "WC-139" or "ORD-139"
+    const displayId = String(order.display_id || "")
+    const invoiceId = `${invoicePrefix}${displayId}`.trim()
+    if (!invoiceId) return
+
+    // Patch the PayPal order with the correct invoice_id
+    const creds = await paypal.getActiveCredentials()
+    const { accessToken, base } = await getPayPalAccessToken(creds)
+
+    const patchResp = await fetch(`${base}/v2/checkout/orders/${paypalOrderId}`, {
+      method: "PATCH",
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify([
+        {
+          op: "replace",
+          path: "/purchase_units/@reference_id=='default'/invoice_id",
+          value: invoiceId,
+        },
+      ]),
+    })
+
+    if (patchResp.ok || patchResp.status === 204) {
+      console.info(
+        `[PayPal] invoice_id updated to "${invoiceId}" for PayPal order ${paypalOrderId} (Medusa order ${orderId})`
+      )
+    } else {
+      const text = await patchResp.text().catch(() => "")
+      console.warn(
+        `[PayPal] invoice_id patch failed (${patchResp.status}) for order ${paypalOrderId}: ${text}`
+      )
+    }
+  } catch (e: any) {
+    // Non-fatal — never block order placement
+    console.warn("[PayPal] paypalOrderInvoiceSubscriber error:", e?.message || e)
+  }
+}
+
+export const config = {
+  event: "order.placed",
+}