@easypayment/medusa-payment-paypal 0.9.12 → 0.9.13

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

@@ -224,9 +224,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 const DEFAULT_FORM = {
   enabled: true,
   title: "Credit or Debit Card",
@@ -311,9 +308,6 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 const config = adminSdk.defineRouteConfig({
   label: "PayPal Connection"
 });
@@ -898,6 +892,12 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
+function PayPalGooglePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 function PayPalPayLaterMessagingPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
@@ -1119,22 +1119,22 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
-    {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
-    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
+    {
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
+    },
     {
       Component: PayPalPayLaterMessagingPage,
       path: "/settings/paypal/pay-later-messaging"

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

@@ -223,9 +223,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
-  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 const DEFAULT_FORM = {
   enabled: true,
   title: "Credit or Debit Card",
@@ -310,9 +307,6 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
-  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 const config = defineRouteConfig({
   label: "PayPal Connection"
 });
@@ -897,6 +891,12 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
+}
+function PayPalGooglePayPage() {
+  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 function PayPalPayLaterMessagingPage() {
   return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
 }
@@ -1118,22 +1118,22 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
-    {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
-    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
+    {
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
+    },
     {
       Component: PayPalPayLaterMessagingPage,
       path: "/settings/paypal/pay-later-messaging"

package/.medusa/server/src/api/store/paypal-complete/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/store/paypal-complete/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAK7E,wBAAsB,IAAI,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,2BA6FjE"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/store/paypal-complete/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAM7E,wBAAsB,IAAI,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,2BAyGjE"}

package/.medusa/server/src/api/store/paypal-complete/route.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.POST = POST;
 const utils_1 = require("@medusajs/framework/utils");
+const core_flows_1 = require("@medusajs/core-flows");
 async function POST(req, res) {
     const { cart_id } = req.body;
     if (!cart_id || typeof cart_id !== "string") {
@@ -16,6 +17,7 @@ async function POST(req, res) {
             entity: "cart",
             fields: [
                 "id",
+                "completed_at",
                 "payment_collection.payment_sessions.id",
                 "payment_collection.payment_sessions.data",
                 "payment_collection.payment_sessions.status",
@@ -26,7 +28,11 @@ async function POST(req, res) {
             ],
             filters: { id: cart_id },
         });
-        const sessions = carts?.[0]?.payment_collection?.payment_sessions || [];
+        const cart = carts?.[0];
+        if (cart?.completed_at) {
+            return res.json({ success: true, cart_id, already_completed: true });
+        }
+        const sessions = cart?.payment_collection?.payment_sessions || [];
         const session = sessions
             .filter((s) => String(s.provider_id || "").includes("paypal"))
             .sort((a, b) => new Date(b.created_at || 0).getTime() - new Date(a.created_at || 0).getTime())[0];
@@ -58,18 +64,26 @@ async function POST(req, res) {
             });
         }
         const currentStatus = String(session.status || "");
-        if (currentStatus === "authorized") {
-            console.info("[paypal-complete] session already authorized, skipping authorizePaymentSession");
-            return res.json({ success: true, session_id: session.id, status: currentStatus });
+        if (currentStatus !== "authorized") {
+            try {
+                await paymentModule.authorizePaymentSession(session.id, {});
+                console.info("[paypal-complete] authorizePaymentSession succeeded for session", session.id);
+            }
+            catch (e) {
+                console.warn("[paypal-complete] authorizePaymentSession non-fatal:", e?.message);
+            }
         }
         try {
-            await paymentModule.authorizePaymentSession(session.id, {});
-            console.info("[paypal-complete] authorizePaymentSession succeeded for session", session.id);
+            const { result } = await (0, core_flows_1.completeCartWorkflow)(req.scope).run({
+                input: { id: cart_id },
+            });
+            console.info("[paypal-complete] cart completed, order:", result?.id);
+            return res.json({ success: true, cart_id, order_id: result?.id });
         }
         catch (e) {
-            console.warn("[paypal-complete] authorizePaymentSession non-fatal:", e?.message);
+            console.warn("[paypal-complete] completeCartWorkflow failed:", e?.message);
+            return res.json({ success: true, session_id: session.id });
         }
-        return res.json({ success: true, session_id: session.id });
     }
     catch (e) {
         console.error("[paypal-complete] error:", e?.message || e);

package/.medusa/server/src/api/store/paypal-complete/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/store/paypal-complete/route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/store/paypal-complete/route.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easypayment/medusa-payment-paypal",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "description": "PayPal integration for Medusa v2",
   "author": "EasyPayment Plugins",
   "license": "MIT",
@@ -39,27 +39,33 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@medusajs/admin-sdk": "2.12.5",
-    "@medusajs/cli": "2.12.5",
-    "@medusajs/framework": "2.12.5",
-    "@medusajs/medusa": "2.12.5",
-    "@medusajs/test-utils": "2.12.5",
+    "@medusajs/admin-sdk": "^2.15.3",
+    "@medusajs/cli": "^2.15.3",
+    "@medusajs/framework": "^2.15.3",
+    "@medusajs/icons": "^2.15.3",
+    "@medusajs/medusa": "^2.15.3",
+    "@medusajs/test-utils": "^2.15.3",
     "@medusajs/ui": "^4.0.0",
-    "@medusajs/icons": "2.12.5",
     "@swc/core": "^1.5.7",
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
     "@medusajs/admin-sdk": "^2.12.0",
     "@medusajs/framework": "^2.12.0",
+    "@medusajs/icons": "^2.12.0",
     "@medusajs/medusa": "^2.12.0",
-    "@medusajs/ui": "^4.0.0",
-    "@medusajs/icons": "^2.12.0"
+    "@medusajs/ui": "^4.0.0"
   },
   "peerDependenciesMeta": {
-    "@medusajs/admin-sdk": { "optional": true },
-    "@medusajs/ui": { "optional": true },
-    "@medusajs/icons": { "optional": true }
+    "@medusajs/admin-sdk": {
+      "optional": true
+    },
+    "@medusajs/ui": {
+      "optional": true
+    },
+    "@medusajs/icons": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public"
@@ -82,4 +88,4 @@
     "medusa-paypal-integration",
     "medusa-paypal"
   ]
-}
+}

package/src/api/store/paypal-complete/route.ts

@@ -1,6 +1,7 @@
 import type { MedusaRequest, MedusaResponse } from "@medusajs/framework/http"
 import type { IPaymentModuleService } from "@medusajs/framework/types"
 import { Modules } from "@medusajs/framework/utils"
+import { completeCartWorkflow } from "@medusajs/core-flows"
 import type PayPalModuleService from "../../../modules/paypal/service"
 
 export async function POST(req: MedusaRequest, res: MedusaResponse) {
@@ -20,6 +21,7 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) {
       entity: "cart",
       fields: [
         "id",
+        "completed_at",
         "payment_collection.payment_sessions.id",
         "payment_collection.payment_sessions.data",
         "payment_collection.payment_sessions.status",
@@ -31,7 +33,12 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) {
       filters: { id: cart_id },
     })
 
-    const sessions = carts?.[0]?.payment_collection?.payment_sessions || []
+    const cart = carts?.[0]
+    if (cart?.completed_at) {
+      return res.json({ success: true, cart_id, already_completed: true })
+    }
+
+    const sessions = cart?.payment_collection?.payment_sessions || []
     const session = sessions
       .filter((s: any) => String(s.provider_id || "").includes("paypal"))
       .sort(
@@ -79,19 +86,25 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) {
     }
 
     const currentStatus = String(session.status || "")
-    if (currentStatus === "authorized") {
-      console.info("[paypal-complete] session already authorized, skipping authorizePaymentSession")
-      return res.json({ success: true, session_id: session.id, status: currentStatus })
+    if (currentStatus !== "authorized") {
+      try {
+        await (paymentModule as any).authorizePaymentSession(session.id, {})
+        console.info("[paypal-complete] authorizePaymentSession succeeded for session", session.id)
+      } catch (e: any) {
+        console.warn("[paypal-complete] authorizePaymentSession non-fatal:", e?.message)
+      }
     }
 
     try {
-      await (paymentModule as any).authorizePaymentSession(session.id, {})
-      console.info("[paypal-complete] authorizePaymentSession succeeded for session", session.id)
+      const { result } = await completeCartWorkflow(req.scope).run({
+        input: { id: cart_id },
+      })
+      console.info("[paypal-complete] cart completed, order:", result?.id)
+      return res.json({ success: true, cart_id, order_id: result?.id })
     } catch (e: any) {
-      console.warn("[paypal-complete] authorizePaymentSession non-fatal:", e?.message)
+      console.warn("[paypal-complete] completeCartWorkflow failed:", e?.message)
+      return res.json({ success: true, session_id: session.id })
     }
-
-    return res.json({ success: true, session_id: session.id })
   } catch (e: any) {
     console.error("[paypal-complete] error:", e?.message || e)
     return res.status(500).json({ message: "Internal error" })