@webbers/pay-payments-medusa 1.0.15 → 2.0.0

package/.medusa/server/package.json

@@ -1,10 +1,14 @@
 {
     "name": "@webbers/pay-payments-medusa",
     "displayName": "Medusa v2 Pay. Plugin",
-    "version": "1.0.15",
+    "version": "2.0.0",
     "description": "The Pay.nl payment provider plugin for Medusa v2",
     "author": "Webbers B.V. <development@webbers.com>",
     "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/webbersagency/pay-payments-medusa"
+    },
     "files": [
         ".medusa/server"
     ],
@@ -23,11 +27,11 @@
         "./constants.js": "./constants.js"
     },
     "keywords": [
-        "medusa",
-        "plugin",
-        "medusa-plugin-other",
-        "medusa-plugin",
-        "medusa-v2"
+        "medusa-v2",
+        "medusa-plugin-integration",
+        "medusa-plugin-payment",
+        "pay.",
+        "medusa-webbers"
     ],
     "scripts": {
         "build": "medusa plugin:build",
@@ -35,43 +39,43 @@
         "prepublishOnly": "medusa plugin:build"
     },
     "devDependencies": {
-        "@medusajs/admin-sdk": "^2.8.4",
-        "@medusajs/cli": "^2.8.4",
-        "@medusajs/framework": "^2.8.4",
-        "@medusajs/icons": "^2.8.4",
-        "@medusajs/medusa": "^2.8.4",
-        "@medusajs/test-utils": "^2.8.4",
-        "@medusajs/types": "^2.8.4",
-        "@medusajs/ui": "^4.0.14",
-        "@mikro-orm/cli": "^6.4.16",
-        "@mikro-orm/core": "^6.4.16",
-        "@mikro-orm/knex": "^6.4.16",
-        "@mikro-orm/migrations": "^6.4.16",
-        "@mikro-orm/postgresql": "^6.4.16",
+        "@medusajs/admin-sdk": "^2.10.1",
+        "@medusajs/cli": "^2.10.1",
+        "@medusajs/framework": "^2.10.1",
+        "@medusajs/icons": "^2.10.1",
+        "@medusajs/medusa": "^2.10.1",
+        "@medusajs/test-utils": "^2.10.1",
+        "@medusajs/types": "^2.10.1",
+        "@medusajs/ui": "^4.0.21",
+        "@mikro-orm/cli": "6.4.3",
+        "@mikro-orm/core": "6.4.3",
+        "@mikro-orm/knex": "6.4.3",
+        "@mikro-orm/migrations": "6.4.3",
+        "@mikro-orm/postgresql": "6.4.3",
         "@swc/core": "1.5.7",
-        "@types/node": "^20.19.1",
-        "@types/react": "^18.3.23",
+        "@types/node": "^20.19.11",
+        "@types/react": "^18.3.24",
         "@types/react-dom": "^18.3.7",
         "awilix": "^8.0.1",
-        "pg": "^8.16.2",
-        "prettier": "^3.6.0",
+        "pg": "^8.16.3",
+        "prettier": "^3.6.2",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.2",
+        "typescript": "^5.9.2",
         "vite": "^5.4.19",
         "yalc": "^1.0.0-pre.53"
     },
     "peerDependencies": {
-        "@medusajs/admin-sdk": "^2.8.4",
-        "@medusajs/cli": "^2.8.4",
-        "@medusajs/core-flows": "^2.8.4",
-        "@medusajs/framework": "^2.8.4",
-        "@medusajs/icons": "^2.8.4",
-        "@medusajs/js-sdk": "^2.8.4",
-        "@medusajs/medusa": "^2.8.4",
-        "@medusajs/test-utils": "^2.8.4",
+        "@medusajs/admin-sdk": "^2.10.1",
+        "@medusajs/cli": "^2.10.1",
+        "@medusajs/core-flows": "^2.10.1",
+        "@medusajs/framework": "^2.10.1",
+        "@medusajs/icons": "^2.10.1",
+        "@medusajs/js-sdk": "^2.10.1",
+        "@medusajs/medusa": "^2.10.1",
+        "@medusajs/test-utils": "^2.10.1",
         "@medusajs/ui": "^4.0.3",
         "@mikro-orm/cli": "6.4.3",
         "@mikro-orm/core": "6.4.3",

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

@@ -57,7 +57,7 @@ const sdk = new Medusa__default.default({
   }
 });
 const displayName = "Medusa v2 Pay. Plugin";
-const version = "1.0.15";
+const version = "2.0.0";
 function getSortedPaymentMethods(data) {
   const { checkoutOptions, checkoutSequence } = data;
   const { primary } = checkoutSequence.default;

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

@@ -54,7 +54,7 @@ const sdk = new Medusa({
   }
 });
 const displayName = "Medusa v2 Pay. Plugin";
-const version = "1.0.15";
+const version = "2.0.0";
 function getSortedPaymentMethods(data) {
   const { checkoutOptions, checkoutSequence } = data;
   const { primary } = checkoutSequence.default;

package/.medusa/server/src/api/store/carts/[id]/duplicate/route.js

@@ -2,157 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
-const core_flows_1 = require("@medusajs/medusa/core-flows");
+const duplicate_cart_1 = require("../../../../../workflows/cart/duplicate-cart");
 const GET = async (req, res) => {
-    const { id } = req.params;
-    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    const { data: [cart], } = await query.graph({
-        entity: utils_1.Modules.CART,
-        filters: {
-            id,
-        },
-        fields: [
-            "id",
-            "email",
-            "customer.id",
-            "type",
-            "metadata",
-            "sales_channel_id",
-            "completed_at",
-            "billing_address.*",
-            "shipping_address.*",
-            "items.*",
-            "items.adjustments.promotion.*",
-            "promotions.*",
-            "region.id",
-            "shipping_methods.*",
-        ],
-    });
-    if (!cart.completed_at) {
-        throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Cannot duplicate uncompleted cart.");
-    }
-    const billing_address = cart?.billing_address;
-    const shipping_address = cart?.shipping_address;
-    const { result: newCart } = await (0, core_flows_1.createCartWorkflow)(req.scope).run({
-        input: {
-            region_id: cart?.region_id ?? "",
-            email: cart?.email ?? "",
-            billing_address: {
-                first_name: billing_address?.first_name ?? undefined,
-                last_name: billing_address?.last_name ?? undefined,
-                phone: billing_address?.phone ?? undefined,
-                company: billing_address?.company ?? undefined,
-                address_1: billing_address?.address_1 ?? undefined,
-                address_2: billing_address?.address_2 ?? undefined,
-                city: billing_address?.city ?? undefined,
-                country_code: billing_address?.country_code ?? undefined,
-                province: billing_address?.province ?? undefined,
-                postal_code: billing_address?.postal_code ?? undefined,
-                metadata: billing_address?.metadata ?? undefined,
-            },
-            shipping_address: {
-                first_name: shipping_address?.first_name ?? undefined,
-                last_name: shipping_address?.last_name ?? undefined,
-                phone: shipping_address?.phone ?? undefined,
-                company: shipping_address?.company ?? undefined,
-                address_1: shipping_address?.address_1 ?? undefined,
-                address_2: shipping_address?.address_2 ?? undefined,
-                city: shipping_address?.city ?? undefined,
-                country_code: shipping_address?.country_code ?? undefined,
-                province: shipping_address?.province ?? undefined,
-                postal_code: shipping_address?.postal_code ?? undefined,
-                metadata: shipping_address?.metadata ?? undefined,
-            },
-            customer_id: cart?.customer_id ?? undefined,
-            metadata: cart?.metadata ?? undefined,
-            sales_channel_id: cart.sales_channel_id ?? undefined,
-        },
-    });
-    await (0, core_flows_1.addShippingMethodToCartWorkflow)(req.scope).run({
+    const we = req.scope.resolve(utils_1.Modules.WORKFLOW_ENGINE);
+    const response = await we.run(duplicate_cart_1.duplicateCartWorkflowId, {
         input: {
-            cart_id: newCart.id,
-            options: cart?.shipping_methods?.map((sm) => ({
-                id: sm?.shipping_option_id ?? "",
-                data: {
-                    ...sm?.data,
-                },
-            })),
+            id: req.params.id,
         },
+        transactionId: "cart-duplicate-" + req.params.id,
     });
-    const promoCodes = cart?.promotions?.map((promotion) => promotion?.code ?? "");
-    // Add the line items
-    await (0, core_flows_1.addToCartWorkflow)(req.scope).run({
-        input: {
-            cart_id: newCart.id,
-            items: cart?.items?.map((item) => ({
-                variant_id: item?.variant_id ?? undefined,
-                quantity: item?.quantity ?? 0,
-            })),
-        },
-    });
-    await (0, core_flows_1.updateCartWorkflow)(req.scope).run({
-        input: {
-            id: newCart.id,
-            region_id: cart?.region_id ?? "",
-        },
-    });
-    await (0, core_flows_1.updateCartPromotionsWorkflow)(req.scope).run({
-        input: {
-            cart_id: newCart.id,
-            promo_codes: promoCodes,
-            action: utils_1.PromotionActions.ADD,
-        },
-    });
-    const { data: [duplicatedCart], } = await query.graph({
-        entity: utils_1.Modules.CART,
-        filters: {
-            id: newCart.id,
-        },
-        fields: [
-            "id",
-            "email",
-            "customer.id",
-            "type",
-            "metadata",
-            "sales_channel_id",
-            "completed_at",
-            "billing_address.*",
-            "shipping_address.*",
-            "items.*",
-            "items.adjustments.promotion.*",
-            "promotions.*",
-            "region.*",
-            "shipping_methods.*",
-            "payment_collection.*",
-            "currency_code",
-            "total",
-            "subtotal",
-            "tax_total",
-            "discount_total",
-            "discount_subtotal",
-            "discount_tax_total",
-            "original_total",
-            "original_tax_total",
-            "item_total",
-            "item_subtotal",
-            "item_tax_total",
-            "original_item_total",
-            "original_item_subtotal",
-            "original_item_tax_total",
-            "shipping_total",
-            "shipping_subtotal",
-            "shipping_tax_total",
-            "original_shipping_tax_total",
-            "original_shipping_subtotal",
-            "original_shipping_total",
-            "credit_line_subtotal",
-            "credit_line_tax_total",
-            "credit_line_total",
-        ],
-    });
-    res.json({
-        cart: duplicatedCart,
-    });
+    res.status(200).json({ cart: response.result });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2NhcnRzL1tpZF0vZHVwbGljYXRlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUtrQztBQUNsQyw0REFNb0M7QUFFN0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBQyxFQUFFLEVBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFBO0lBRXZCLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sRUFDSixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FDYixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsZUFBTyxDQUFDLElBQUk7UUFDcEIsT0FBTyxFQUFFO1lBQ1AsRUFBRTtTQUNIO1FBQ0QsTUFBTSxFQUFFO1lBQ04sSUFBSTtZQUNKLE9BQU87WUFDUCxhQUFhO1lBQ2IsTUFBTTtZQUNOLFVBQVU7WUFDVixrQkFBa0I7WUFDbEIsY0FBYztZQUNkLG1CQUFtQjtZQUNuQixvQkFBb0I7WUFDcEIsU0FBUztZQUNULCtCQUErQjtZQUMvQixjQUFjO1lBQ2QsV0FBVztZQUNYLG9CQUFvQjtTQUNyQjtLQUNGLENBQUMsQ0FBQTtJQUVGLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDdkIsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksRUFDOUIsb0NBQW9DLENBQ3JDLENBQUE7SUFDSCxDQUFDO0lBRUQsTUFBTSxlQUFlLEdBQUcsSUFBSSxFQUFFLGVBQWUsQ0FBQTtJQUM3QyxNQUFNLGdCQUFnQixHQUFHLElBQUksRUFBRSxnQkFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2NhcnRzL1tpZF0vZHVwbGljYXRlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFpRDtBQUNqRCxpRkFBb0Y7QUFFN0UsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGVBQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUVyRCxNQUFNLFFBQVEsR0FBRyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsd0NBQXVCLEVBQUU7UUFDckQsS0FBSyxFQUFFO1lBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRTtTQUNsQjtRQUNELGFBQWEsRUFBRSxpQkFBaUIsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7S0FDakQsQ0FBQyxDQUFBO0lBRUYsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLE1BQU0sRUFBQyxDQUFDLENBQUE7QUFDL0MsQ0FBQyxDQUFBO0FBWFksUUFBQSxHQUFHLE9BV2YifQ==

package/.medusa/server/src/providers/pay/core/pay-base.js

@@ -62,8 +62,6 @@ class PayBase extends utils_1.AbstractPaymentProvider {
     }
     createPayOrderPayload(order, paymentSession) {
         const session_id = paymentSession.data?.session_id;
-        const paymentMethodInput = paymentSession.data
-            ?.paymentMethodInput;
         const currency = order.currency_code.toUpperCase();
         const products = order.items.map((item) => ({
             id: item.variant_sku || item.variant_id || item.id,
@@ -103,13 +101,16 @@ class PayBase extends utils_1.AbstractPaymentProvider {
             });
         }
         let paymentMethod;
-        if (typeof this.paymentCreateOptions.methodId !== "undefined") {
+        const methodId = this.paymentCreateOptions.methodId;
+        if (typeof methodId !== "undefined") {
+            const paymentMethodInput = paymentSession.data?.paymentMethodInput;
             paymentMethod = {
-                id: this.paymentCreateOptions.methodId,
+                id: methodId,
                 input: paymentMethodInput,
             };
         }
-        const baseReturnUrl = (order?.sales_channel?.metadata?.pay_return_url ?? this.options_.returnUrl);
+        const baseReturnUrl = order?.sales_channel?.metadata?.pay_return_url ??
+            this.options_.returnUrl;
         const payload = {
             reference: order.display_id.toString(),
             description: this.getPaymentDescription(order),
@@ -134,6 +135,15 @@ class PayBase extends utils_1.AbstractPaymentProvider {
                 email: order.email,
                 locale: order.metadata?.locale?.toString()?.toUpperCase() ?? "EN",
                 reference: order.customer?.id,
+                ...(!!order.billing_address?.company
+                    ? {
+                        company: {
+                            name: order.billing_address.company,
+                            vatNumber: order.metadata?.vat_number?.toString(),
+                            country: order.billing_address?.country_code?.toUpperCase(),
+                        },
+                    }
+                    : {}),
             },
             order: {
                 countryCode: order.billing_address?.country_code?.toUpperCase(),
@@ -244,14 +254,9 @@ class PayBase extends utils_1.AbstractPaymentProvider {
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Payment ID is required");
         }
         try {
-            const payment = await this.retrievePayment({
-                data: {
-                    id,
-                },
-            });
+            const payment = await this.client_.getTransaction(id);
             const value = (input.data?.amount).value;
-            const currency = payment.data?.amount
-                ?.currency;
+            const currency = payment.amount.currency;
             if (!currency) {
                 throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Currency information is missing from payment data");
             }
@@ -372,7 +377,9 @@ class PayBase extends utils_1.AbstractPaymentProvider {
         }
     }
     /**
-     * Retrieves payment details
+     * Retrieves payment details, for payment data within 35 days.
+     * Pay. Orders that are already PAID, will be on the GMS for 13 months.
+     * Otherwise, it is available for 35 days on the TGU.
      * @param input - The payment retrieval input
      * @returns The payment details
      */
@@ -382,14 +389,7 @@ class PayBase extends utils_1.AbstractPaymentProvider {
             throw new utils_1.MedusaError(utils_1.MedusaErrorTypes.INVALID_DATA, "Payment id not present");
         }
         try {
-            let data;
-            // Check if the order ID starts with a 2, in that case we will need to use the legacy Pay API.
-            if (id.startsWith("2")) {
-                data = await this.client_.getTransaction(id);
-            }
-            else {
-                data = await this.client_.getOrder(id);
-            }
+            const data = await this.client_.getOrder(id);
             return {
                 data: data,
             };
@@ -575,4 +575,4 @@ class PayBase extends utils_1.AbstractPaymentProvider {
     }
 }
 exports.default = PayBase;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pay-base.js","sourceRoot":"","sources":["../../../../../../src/providers/pay/core/pay-base.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pay-base.js","sourceRoot":"","sources":["../../../../../../src/providers/pay/core/pay-base.ts"],"names":[],"mappings":"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"}

package/.medusa/server/src/providers/pay/services/pay-direct-debit.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const pay_base_1 = __importDefault(require("../core/pay-base"));
+const types_1 = require("../types");
+class PayCreditcardService extends pay_base_1.default {
+    get paymentCreateOptions() {
+        return {
+            methodId: 137,
+            webhookUrl: this.options_.medusaUrl +
+                "/hooks/payment/" +
+                types_1.PaymentProviderKeys.DIRECTDEBIT +
+                "_pay",
+        };
+    }
+}
+PayCreditcardService.identifier = types_1.PaymentProviderKeys.DIRECTDEBIT;
+exports.default = PayCreditcardService;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5LWRpcmVjdC1kZWJpdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvcGF5L3NlcnZpY2VzL3BheS1kaXJlY3QtZGViaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnRUFBc0M7QUFDdEMsb0NBQTREO0FBRTVELE1BQU0sb0JBQXFCLFNBQVEsa0JBQU87SUFHeEMsSUFBSSxvQkFBb0I7UUFDdEIsT0FBTztZQUNMLFFBQVEsRUFBRSxHQUFHO1lBQ2IsVUFBVSxFQUNSLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUztnQkFDdkIsaUJBQWlCO2dCQUNqQiwyQkFBbUIsQ0FBQyxXQUFXO2dCQUMvQixNQUFNO1NBQ1QsQ0FBQTtJQUNILENBQUM7O0FBWE0sK0JBQVUsR0FBRywyQkFBbUIsQ0FBQyxXQUFXLENBQUE7QUFjckQsa0JBQWUsb0JBQW9CLENBQUEifQ==

package/.medusa/server/src/providers/pay/types/index.js

@@ -39,8 +39,9 @@ exports.PaymentProviderKeys = {
     PAYBYBANK: "pay-paybybank",
     MOBILEPAY: "pay-mobilepay",
     WECHATPAY: "pay-wechatpay",
+    DIRECTDEBIT: "pay-direct-debit",
 };
 __exportStar(require("./common"), exports);
 __exportStar(require("./order"), exports);
 __exportStar(require("./transaction"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3BheS90eXBlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQXdCYSxRQUFBLG1CQUFtQixHQUFHO0lBQ2pDLG1CQUFtQixFQUFFLHFCQUFxQjtJQUMxQyxPQUFPLEVBQUUsYUFBYTtJQUN0QixXQUFXLEVBQUUsZ0JBQWdCO0lBQzdCLFVBQVUsRUFBRSxzQkFBc0I7SUFDbEMsS0FBSyxFQUFFLFdBQVc7SUFDbEIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsVUFBVSxFQUFFLGdCQUFnQjtJQUM1QixNQUFNLEVBQUUsWUFBWTtJQUNwQixTQUFTLEVBQUUsZUFBZTtJQUMxQixPQUFPLEVBQUUsYUFBYTtJQUN0QixRQUFRLEVBQUUsY0FBYztJQUN4QixPQUFPLEVBQUUsYUFBYTtJQUN0QixLQUFLLEVBQUUsV0FBVztJQUNsQixPQUFPLEVBQUUsYUFBYTtJQUN0QixNQUFNLEVBQUUsWUFBWTtJQUNwQixRQUFRLEVBQUUsY0FBYztJQUN4QixJQUFJLEVBQUUsVUFBVTtJQUNoQixLQUFLLEVBQUUsV0FBVztJQUNsQixHQUFHLEVBQUUsU0FBUztJQUNkLFVBQVUsRUFBRSxnQkFBZ0I7SUFDNUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7Q0FDM0IsQ0FBQTtBQUtELDJDQUF3QjtBQUN4QiwwQ0FBdUI7QUFDdkIsZ0RBQTZCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3BheS90eXBlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQXdCYSxRQUFBLG1CQUFtQixHQUFHO0lBQ2pDLG1CQUFtQixFQUFFLHFCQUFxQjtJQUMxQyxPQUFPLEVBQUUsYUFBYTtJQUN0QixXQUFXLEVBQUUsZ0JBQWdCO0lBQzdCLFVBQVUsRUFBRSxzQkFBc0I7SUFDbEMsS0FBSyxFQUFFLFdBQVc7SUFDbEIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsVUFBVSxFQUFFLGdCQUFnQjtJQUM1QixNQUFNLEVBQUUsWUFBWTtJQUNwQixTQUFTLEVBQUUsZUFBZTtJQUMxQixPQUFPLEVBQUUsYUFBYTtJQUN0QixRQUFRLEVBQUUsY0FBYztJQUN4QixPQUFPLEVBQUUsYUFBYTtJQUN0QixLQUFLLEVBQUUsV0FBVztJQUNsQixPQUFPLEVBQUUsYUFBYTtJQUN0QixNQUFNLEVBQUUsWUFBWTtJQUNwQixRQUFRLEVBQUUsY0FBYztJQUN4QixJQUFJLEVBQUUsVUFBVTtJQUNoQixLQUFLLEVBQUUsV0FBVztJQUNsQixHQUFHLEVBQUUsU0FBUztJQUNkLFVBQVUsRUFBRSxnQkFBZ0I7SUFDNUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsV0FBVyxFQUFFLGtCQUFrQjtDQUNoQyxDQUFBO0FBS0QsMkNBQXdCO0FBQ3hCLDBDQUF1QjtBQUN2QixnREFBNkIifQ==

package/.medusa/server/src/workflows/cart/duplicate-cart.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.duplicateCartWorkflow = exports.duplicateCartWorkflowId = void 0;
+const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
+const utils_1 = require("@medusajs/framework/utils");
+const core_flows_1 = require("@medusajs/medusa/core-flows");
+const validate_cart_completed_1 = require("./steps/validate-cart-completed");
+const query_config_1 = require("@medusajs/medusa/api/store/carts/query-config");
+exports.duplicateCartWorkflowId = "duplicate-cart";
+const THREE_DAYS = 60 * 60 * 24 * 3;
+exports.duplicateCartWorkflow = (0, workflows_sdk_1.createWorkflow)({
+    name: exports.duplicateCartWorkflowId,
+    idempotent: true,
+    store: true,
+    retentionTime: THREE_DAYS,
+}, (input) => {
+    const { data: carts } = (0, core_flows_1.useQueryGraphStep)({
+        entity: utils_1.Modules.CART,
+        filters: {
+            id: input.id,
+        },
+        fields: [
+            "id",
+            "email",
+            "customer.id",
+            "type",
+            "metadata",
+            "sales_channel_id",
+            "completed_at",
+            "billing_address.*",
+            "shipping_address.*",
+            "items.*",
+            "items.adjustments.promotion.*",
+            "promotions.*",
+            "region.id",
+            "shipping_methods.*",
+        ],
+    });
+    const cart = (0, workflows_sdk_1.transform)({ carts }, (data) => {
+        return data.carts?.[0];
+    });
+    (0, validate_cart_completed_1.validateCartCompletedStep)({
+        cart: cart,
+    });
+    const billing_address = (0, workflows_sdk_1.transform)({ cart }, (data) => {
+        return data.cart?.billing_address;
+    });
+    const shipping_address = (0, workflows_sdk_1.transform)({ cart }, (data) => {
+        return data.cart?.shipping_address;
+    });
+    const newCart = core_flows_1.createCartWorkflow.runAsStep({
+        input: {
+            region_id: cart?.region_id ?? "",
+            email: cart?.email ?? "",
+            billing_address: {
+                first_name: billing_address?.first_name ?? undefined,
+                last_name: billing_address?.last_name ?? undefined,
+                phone: billing_address?.phone ?? undefined,
+                company: billing_address?.company ?? undefined,
+                address_1: billing_address?.address_1 ?? undefined,
+                address_2: billing_address?.address_2 ?? undefined,
+                city: billing_address?.city ?? undefined,
+                country_code: billing_address?.country_code ?? undefined,
+                province: billing_address?.province ?? undefined,
+                postal_code: billing_address?.postal_code ?? undefined,
+                metadata: billing_address?.metadata ?? undefined,
+            },
+            shipping_address: {
+                first_name: shipping_address?.first_name ?? undefined,
+                last_name: shipping_address?.last_name ?? undefined,
+                phone: shipping_address?.phone ?? undefined,
+                company: shipping_address?.company ?? undefined,
+                address_1: shipping_address?.address_1 ?? undefined,
+                address_2: shipping_address?.address_2 ?? undefined,
+                city: shipping_address?.city ?? undefined,
+                country_code: shipping_address?.country_code ?? undefined,
+                province: shipping_address?.province ?? undefined,
+                postal_code: shipping_address?.postal_code ?? undefined,
+                metadata: shipping_address?.metadata ?? undefined,
+            },
+            customer_id: cart?.customer_id ?? undefined,
+            metadata: cart?.metadata ?? undefined,
+            sales_channel_id: cart.sales_channel_id ?? undefined,
+        },
+    });
+    const options = (0, workflows_sdk_1.transform)({ cart }, (data) => {
+        return data.cart?.shipping_methods?.map((sm) => ({
+            id: sm?.shipping_option_id ?? "",
+            data: {
+                ...sm?.data,
+            },
+        }));
+    });
+    core_flows_1.addShippingMethodToCartWorkflow.runAsStep({
+        input: {
+            cart_id: newCart.id,
+            options,
+        },
+    });
+    const promoCodes = (0, workflows_sdk_1.transform)({ cart }, (data) => {
+        return data.cart?.promotions?.map((promotion) => promotion?.code ?? "");
+    });
+    const items = (0, workflows_sdk_1.transform)({ cart }, (data) => {
+        return data.cart?.items?.map((item) => ({
+            variant_id: item?.variant_id ?? undefined,
+            quantity: item?.quantity ?? 0,
+        }));
+    });
+    // Add the line items
+    core_flows_1.addToCartWorkflow.runAsStep({
+        input: {
+            cart_id: newCart.id,
+            items,
+        },
+    });
+    core_flows_1.updateCartWorkflow.runAsStep({
+        input: {
+            id: newCart.id,
+            region_id: cart?.region_id ?? "",
+        },
+    });
+    core_flows_1.updateCartPromotionsWorkflow.runAsStep({
+        input: {
+            cart_id: newCart.id,
+            promo_codes: promoCodes,
+            action: utils_1.PromotionActions.ADD,
+        },
+    });
+    const { data: duplicatedCart } = (0, core_flows_1.useQueryGraphStep)({
+        entity: utils_1.Modules.CART,
+        filters: {
+            id: newCart.id,
+        },
+        fields: query_config_1.defaultStoreCartFields,
+    }).config({ name: "retrieve-duplicated-cart" });
+    return new workflows_sdk_1.WorkflowResponse(duplicatedCart?.[0]);
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHVwbGljYXRlLWNhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2NhcnQvZHVwbGljYXRlLWNhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBTTBDO0FBQzFDLHFEQUFnRjtBQUNoRiw0REFPb0M7QUFDcEMsNkVBQXlFO0FBRXpFLGdGQUFvRjtBQUV2RSxRQUFBLHVCQUF1QixHQUFHLGdCQUFnQixDQUFBO0FBRXZELE1BQU0sVUFBVSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQTtBQVN0QixRQUFBLHFCQUFxQixHQUFHLElBQUEsOEJBQWMsRUFDakQ7SUFDRSxJQUFJLEVBQUUsK0JBQXVCO0lBQzdCLFVBQVUsRUFBRSxJQUFJO0lBQ2hCLEtBQUssRUFBRSxJQUFJO0lBQ1gsYUFBYSxFQUFFLFVBQVU7Q0FDMUIsRUFDRCxDQUFDLEtBQStDLEVBQUUsRUFBRTtJQUNsRCxNQUFNLEVBQUMsSUFBSSxFQUFFLEtBQUssRUFBQyxHQUFHLElBQUEsOEJBQWlCLEVBQUM7UUFDdEMsTUFBTSxFQUFFLGVBQU8sQ0FBQyxJQUFJO1FBQ3BCLE9BQU8sRUFBRTtZQUNQLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtTQUNiO1FBQ0QsTUFBTSxFQUFFO1lBQ04sSUFBSTtZQUNKLE9BQU87WUFDUCxhQUFhO1lBQ2IsTUFBTTtZQUNOLFVBQVU7WUFDVixrQkFBa0I7WUFDbEIsY0FBYztZQUNkLG1CQUFtQjtZQUNuQixvQkFBb0I7WUFDcEIsU0FBUztZQUNULCtCQUErQjtZQUMvQixjQUFjO1lBQ2QsV0FBVztZQUNYLG9CQUFvQjtTQUNyQjtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sSUFBSSxHQUFHLElBQUEseUJBQVMsRUFBQyxFQUFDLEtBQUssRUFBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDdkMsT0FBTyxJQUFJLENBQUMsS0FBSyxFQUFF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

package/.medusa/server/src/workflows/cart/steps/validate-cart-completed.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCartCompletedStep = void 0;
+const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
+const utils_1 = require("@medusajs/framework/utils");
+exports.validateCartCompletedStep = (0, workflows_sdk_1.createStep)("validate-cart-completed", async (data) => {
+    const { cart } = data;
+    if (!cart.completed_at) {
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Cannot duplicate uncompleted cart.");
+    }
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtY2FydC1jb21wbGV0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2NhcnQvc3RlcHMvdmFsaWRhdGUtY2FydC1jb21wbGV0ZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBQTBFO0FBQzFFLHFEQUFxRDtBQU94QyxRQUFBLHlCQUF5QixHQUFHLElBQUEsMEJBQVUsRUFDakQseUJBQXlCLEVBQ3pCLEtBQUssRUFBRSxJQUFvQyxFQUFFLEVBQUU7SUFDN0MsTUFBTSxFQUFDLElBQUksRUFBQyxHQUFHLElBQUksQ0FBQTtJQUVuQixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLG9DQUFvQyxDQUNyQyxDQUFBO0lBQ0gsQ0FBQztBQUNILENBQUMsQ0FDRixDQUFBIn0=

package/README.md

@@ -16,7 +16,7 @@
 
 <p align="center">
   <a href="#">
-    <img src="https://img.shields.io/badge/license-TBD-blue.svg" />
+    <img src="https://img.shields.io/badge/license-MIT-blue.svg" />
   </a>
   <a href="#">
     <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat" alt="PRs welcome!" />
@@ -30,13 +30,25 @@
   </a>
 </p>
 
+## Getting Started
 
-TBD from here
+Don’t have an account with Pay. yet? [Register now!](https://signup.pay.nl/welcome?id=M-1030-9252)
 
-## Getting Started
+> [!CAUTION] If you have subscribers listening to the `order.placed` event, update them to listen to the
+> `payment.captured` event instead. See below.
+
+> [!WARNING]
+> This plugin creates orders in Medusa **immediately**, even if the payment has not yet been captured. If a payment
+> expires,
+> the associated order will be automatically canceled.
+>
+> This change in flow is required to support asynchronous payment methods (e.g., SprayPay), where payment confirmation
+> can take hours depending on customer input.
 
 ## Table of Contents
 
+- [Demo store](#demo-store)
+- [Pay. Payment Methods](#pay-payment-methods)
 - [Features](#features)
 - [Prerequisites](#prerequisites)
 - [Installation](#installation)
@@ -44,37 +56,104 @@ TBD from here
   - [Configuration Options](#configuration-options)
   - [Environment Variables](#environment-variables)
 - [Usage](#usage)
-- [Client-Side Integration](#client-side-integration)
 - [Supported Payment Methods](#supported-payment-methods)
+- [Client-Side Integration](#client-side-integration)
+  - [Duplicate cart endpoint](#duplicate-cart-endpoint)
+  - [Adding payment method icons](#adding-payment-method-icons)
 - [Extending the Plugin](#extending-the-plugin)
-- [Local Development and Customization](#local-development-and-customization)
-- [License](#license)
+- [Medusa v1 Support](#medusa-v1-support)
 
-## Features
+## Demo store
 
-- **Multiple Payment Methods**: Supports a wide range of Pay payment methods including:
+Visit the demo store here: https://pay-demo.webbers.com
 
-  - iDEAL
-  - Bancontact
-  - Credit Card
-  - PayPal
-  - Apple Pay
-  - Gift Card
+## Pay. payment methods
 
-- **Easily Extendable**: The modular architecture makes it easy to add support for additional Pay payment methods.
+### Card payment methods
 
-- **Webhook Support**: Full support for Pay webhooks for real-time payment status updates.
+- Mastercard
+- VISA
+- American Express
+- Carte Bancaire
+- Maestro
+- PostePay
+- DanKort
+- Nexi
+- Visa Mastercard
+
+### Digital wallets
+
+- Apple Pay
+- Google Pay
+
+### Afterpay methods / Buy now pay later
+
+- iDEAL IN3
+- Billink
+- SprayPay
+- Riverty
+- Mondu
+- AlmaPAY
+- Klarna
+
+### Other
+
+- PayPal
+
+### Recurring payments
+
+- SEPA Direct Debit
+- Card-on-file / recurring card payments (tokenisation) [Coming soon]
+
+### Region specific payment methods
+
+<div style="display: flex; gap: 30px;">
+  <div>
+
+| <div style="width:200px">Payment Method</div> | <div style="width:200px">Region(s)</div>                                                        |
+|-----------------------------------------------|-------------------------------------------------------------------------------------------------|
+| iDEAL                                         | 🇳🇱 Netherlands                                                                                |
+| Bancontact                                    | 🇧🇪 Belgium                                                                                    |
+| Vipps                                         | 🇳🇴 Norway<br>🇸🇪 Sweden                                                                      |
+| Bizum                                         | 🇪🇸 Spain                                                                                      |
+| Payconiq                                      | 🇧🇪 Belgium<br>🇱🇺 Luxembourg                                                                 |
+| Twint                                         | 🇨🇭 Switzerland                                                                                |
+| MB Way                                        | 🇵🇹 Portugal                                                                                   |
+| Pay By Bank                                   | 🇧🇪 Belgium<br>🇩🇪 Germany<br>🇮🇹 Italy<br>🇱🇺 Luxembourg<br>🇳🇱 Netherlands<br>🇪🇸 Spain |
+| WeChat Pay                                    | 🇨🇳 China                                                                                      |
+
+  </div>
+  <div>
+
+| <div style="width:200px">Payment Method</div> | <div style="width:200px">Region(s)</div> |
+|-----------------------------------------------|------------------------------------------|
+| Alipay Plus                                   | 🇨🇳 China<br>🇭🇰 Hong Kong             |
+| MultiBanco                                    | 🇵🇹 Portugal                            |
+| Swish                                         | 🇸🇪 Sweden                              |
+| Satispay                                      | 🇮🇹 Italy                               |
+| Blik                                          | 🇵🇱 Poland                              |
+| EPS                                           | 🇦🇹 Austria                             |
+| Przelewy24                                    | 🇵🇱 Poland                              |
+| MobilePay                                     | 🇩🇰 Denmark<br>🇫🇮 Finland             |
+
+  </div>
+</div>
+
+### InStore / SoftPOS payments
+
+Would you like to integrate Pay. (Soft)P0S? [Get in touch!](mailto:hi@webbers.com)
+
+## Features
 
+- **Easily Extendable**: The modular architecture makes it easy to add support for additional Pay payment methods.
+- **Webhook Support**: Full support for Pay webhooks for real-time payment status updates.
 - **Automatic Capture**: Configurable automatic capture of payments.
 
 ## Prerequisites
 
-- Medusa server v2.3.0 or later
+- Medusa server v2.20.1 or later
 - Node.js v20 or later
-- A [Pay](https://www.pay.nl/en/) account and token & secret with payment methods enabled.
-
-> [!NOTE]
-> _You can get the API token & secret from your Pay dashboard: click Settings > Click sales channel > Copy api tokens_
+- A [Pay](https://signup.pay.nl/welcome?id=M-1030-9252) account and token & secret with payment methods enabled.
 
 ## Installation
 
@@ -123,21 +202,24 @@ module.exports = defineConfig({
 })
 ```
 
-## Configuration Options
+### Configuration Options
 
-| Option               | Description                                   | Default                                                                                                                                               |
-|----------------------|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `atCode`             | Your Pay AT code                              | Required                                                                                                                                              |
-| `apiToken`           | Your Pay API token                            | Required                                                                                                                                              |
-| `slCode`             | Your Pay sales channel code                   | Required                                                                                                                                              |
-| `slSecret`           | Your Pay sales channel secret                 | Required                                                                                                                                              |
-| `returnUrl`          | The URL to return to after payment            | Required                                                                                                                                              |
-| `medusaUrl`          | The URL of your Medusa server                 | Required                                                                                                                                              |
-| `testMode`           | Whether to enable test payments               | Optional                                                                                                                                              |
-| `tguApiUrl`          | Pay TGU API Url                               | Optional, use if you want to use a specific or private TGU, see [here](https://developer.pay.nl/docs/transaction-gateway-unit#multi-cores-more-tgus). |
-| `otherSlCodes`       | Your other Pay sales channel code and secrets | Optional, used for webhook signature validation when using multiple Pay. sales channels. Format `'{"SL-CODE-X":"secretX","SL-CODE-Y":"secretY"}'`     |
+> [!NOTE]
+> _You can get the API token & secret from your Pay dashboard: click Settings > Click sales channel > Copy api tokens_
+
+| Option         | Description                                   | Default                                                                                                                                               |
+|----------------|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `atCode`       | Your Pay AT code                              | Required                                                                                                                                              |
+| `apiToken`     | Your Pay API token                            | Required                                                                                                                                              |
+| `slCode`       | Your Pay sales channel code                   | Required                                                                                                                                              |
+| `slSecret`     | Your Pay sales channel secret                 | Required                                                                                                                                              |
+| `returnUrl`    | The URL to return to after payment            | Required                                                                                                                                              |
+| `medusaUrl`    | The URL of your Medusa server                 | Required                                                                                                                                              |
+| `testMode`     | Whether to enable test payments               | Optional                                                                                                                                              |
+| `tguApiUrl`    | Pay TGU API Url                               | Optional, use if you want to use a specific or private TGU, see [here](https://developer.pay.nl/docs/transaction-gateway-unit#multi-cores-more-tgus). |
+| `otherSlCodes` | Your other Pay sales channel code and secrets | Optional, used for webhook signature validation when using multiple Pay. sales channels. Format `'{"SL-CODE-X":"secretX","SL-CODE-Y":"secretY"}'`     |
 
-## Environment Variables
+### Environment Variables
 
 Create or update your `.env` file with the following variables:
 
@@ -160,7 +242,47 @@ dropdown.
 
 Make sure that the selected payment methods are enabled in your Pay origanization settings as well.
 
-### Client-Side Integration
+## Supported Payment Methods
+
+The plugin currently supports the following Pay payment methods:
+
+| <div style="width: 400px">Payment Method</div>                                                                                       | Provider ID                           |
+|--------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------|
+| **Pay. hosted checkout**                                                                                                             | `pp_pay-hosted-checkout_pay`          |
+| **Creditcards**<br>Mastercard / VISA / American Express/ Carte Bancaire / <br> Maestro / PostePay / DanKort / Nexi / Visa Mastercard | `pp_pay-creditcard-group_pay`         |
+| **Card-on-file / recurring card payments (tokenisation)**                                                                            | Coming soon                           |
+| **Apple Pay**                                                                                                                        | `pp_pay-apple-pay_pay`                |
+| **Google Pay**                                                                                                                       | `pp_pay-google-pay_pay`               |
+| **iDEAL IN3**                                                                                                                        | `pp_pay-ideal-in3_pay`                |
+| **Billink**                                                                                                                          | `pp_pay-billink_pay`                  |
+| **SprayPay**                                                                                                                         | `pp_pay-spraypay_pay`                 |
+| **Riverty**                                                                                                                          | `pp_pay-riverty_pay`                  |
+| **Mondu**                                                                                                                            | `pp_pay-mondu_pay`                    |
+| **AlmaPAY**                                                                                                                          | `pp_pay-almapay_pay`                  |
+| **Klarna**                                                                                                                           | `pp_pay-klarna_pay`                   |
+| **PayPal**                                                                                                                           | `pp_pay-paypal_pay`                   |
+| **SEPA Direct Debit**                                                                                                                | `pp_pay-direct-debit_pay`             |
+| **iDEAL**                                                                                                                            | `pp_pay-ideal_pay`                    |
+| **Bancontact**                                                                                                                       | `pp_pay-bancontact_pay`               |
+| **Vipps**                                                                                                                            | [Get in touch](mailto:hi@webbers.com) |
+| **Bizum**                                                                                                                            | [Get in touch](mailto:hi@webbers.com) |
+| **Payconiq**                                                                                                                         | `pp_pay-payconiq_pay`                 |
+| **Twint**                                                                                                                            | `pp_pay-twint_pay`                    |
+| **MB Way**                                                                                                                           | [Get in touch](mailto:hi@webbers.com) |
+| **Pay by Bank**                                                                                                                      | `pp_pay-paybybank_pay`                |
+| **WeChat Pay**                                                                                                                       | `pay-wechatpay`                       |
+| **AliPay Plus**                                                                                                                      | [Get in touch](mailto:hi@webbers.com) |
+| **MultiBanco**                                                                                                                       | [Get in touch](mailto:hi@webbers.com) |
+| **Swish**                                                                                                                            | [Get in touch](mailto:hi@webbers.com) |
+| **Satispay**                                                                                                                         | [Get in touch](mailto:hi@webbers.com) |
+| **Blik**                                                                                                                             | `pp_pay-blik_pay`                     |
+| **EPS**                                                                                                                              | `pp_pay-eps_pay`                      |
+| **Przelewy24**                                                                                                                       | `pp_przelewy24_pay`                   |
+| **MobilePAY**                                                                                                                        | `pp_pay-mobilepay_pay`                |
+| **SoftPOS**                                                                                                                          | `pp_pay-softpos_pay`                  |
+| **Gift Card**                                                                                                                        | `pp_pay-giftcard_pay`                 |
+
+## Client-Side Integration
 
 To integrate with your storefront, you'll need to implement the payment flow according to Pay's and Medusa's
 documentation. Here's a basic example:
@@ -173,22 +295,33 @@ _Example integration using the [Medusa Next.js Starter](https://github.com/medus
 
 https://github.com/user-attachments/assets/742ee261-5e41-4e33-9a72-faf1a424fc52
 
-### Supported Payment Methods
+### Duplicate cart endpoint
 
-The plugin currently supports the following Pay payment methods:
+> [!TIP]
+> Use the duplicate cart endpoint in your storefront
+>
+> When a customer cancels a payment or returns to the storefront without completing the Pay. checkout, a new duplicate
+> cart should automatically be created. This allows the customer to easily start a new transaction without losing the
+> items they had selected.
 
-| Payment Method | Provider ID             |
-|----------------|-------------------------|
-| iDEAL          | `pp_pay-ideal_pay`      |
-| Credit Card    | `pp_pay-card_pay`       |
-| Bancontact     | `pp_pay-bancontact_pay` |
-| Gift Card      | `pp_pay-giftcard_pay`   |
-| PayPal         | `pp_pay-paypal_pay`     |
-| Apple Pay      | `pp_pay-apple-pay_pay`  |
+**API Route**: `GET /store/carts/:id/duplicate`
+
+Alter your storefront retrieve cart function(s) and check if the returned cart.completed_at value is set. If so request
+a new cart with the duplicate cart endpoint and update cart id in cookies accordingly.
+
+The duplicate cart endpoint is idempotent, so it can be called multiple times with the same cart id.
+
+## Adding payment method icons
+
+1. Download the latest payment images from here: https://github.com/paynl/payment-images
+2. Add these to your storefront public assets
+3. In your checkout, create the mapping from the provider id to the icon.
+1. You can also utilize the exported `payPaymentMethods` from this plugin to find the corresponding ID.
+2. I.e. ```const paymentMethodData = payPaymentMethods.find(method => `pp_${method.value}_pay` === provider_id)```
 
 ## Extending the Plugin
 
-To add support for additional Pay payment methods, create a new service in `src/providers/Pay/services` that extends the
+To add one of the missing Pay payment methods, create a new service in `src/providers/Pay/services` that extends the
 `PayBase` class:
 
 ```typescript
@@ -214,18 +347,8 @@ Make sure to replace `new method` with the actual Pay payment method ID.
 Export your new service from `src/providers/Pay/services/index.ts`. Then add your new service to the list of services in
 `src/providers/Pay/index.ts`.
 
-## Adding payment method icons
-1. Download the latest payment images from here: https://github.com/paynl/payment-images
-2. Add these to your storefront public assets
-3. In your checkout, create the mapping from the provider id to the icon. 
-   1. You can also utilize the exported `payPaymentMethods` from this plugin to find the corresponding ID. 
-   2. I.e. ```const paymentMethodData = payPaymentMethods.find(method => `pp_${method.value}_pay` === provider_id)```
-
-## Local development and customization
-
-In case you want to customize and test the plugin locally, refer to
-the [Medusa Plugin docs](https://docs.medusajs.com/learn/fundamentals/plugins/create#3-publish-plugin-locally-for-development-and-testing).
+We will be working on providing all the available Pay. options in the near future.
 
-## License
+## Medusa v1 Support
 
-TBD
+Searching for support for Medusa v1, we have a legacy plugin available. [Get in touch](mailto:hi@webbers.com)

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@webbers/pay-payments-medusa",
   "displayName": "Medusa v2 Pay. Plugin",
-  "version": "1.0.15",
+  "version": "2.0.0",
   "description": "The Pay.nl payment provider plugin for Medusa v2",
   "author": "Webbers B.V. <development@webbers.com>",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/webbersagency/pay-payments-medusa"
+  },
   "files": [
     ".medusa/server"
   ],
@@ -23,11 +27,11 @@
     "./constants.js": "./constants.js"
   },
   "keywords": [
-    "medusa",
-    "plugin",
-    "medusa-plugin-other",
-    "medusa-plugin",
-    "medusa-v2"
+    "medusa-v2",
+    "medusa-plugin-integration",
+    "medusa-plugin-payment",
+    "pay.",
+    "medusa-webbers"
   ],
   "scripts": {
     "build": "medusa plugin:build",
@@ -35,43 +39,43 @@
     "prepublishOnly": "medusa plugin:build"
   },
   "devDependencies": {
-    "@medusajs/admin-sdk": "^2.8.4",
-    "@medusajs/cli": "^2.8.4",
-    "@medusajs/framework": "^2.8.4",
-    "@medusajs/icons": "^2.8.4",
-    "@medusajs/medusa": "^2.8.4",
-    "@medusajs/test-utils": "^2.8.4",
-    "@medusajs/types": "^2.8.4",
-    "@medusajs/ui": "^4.0.14",
-    "@mikro-orm/cli": "^6.4.16",
-    "@mikro-orm/core": "^6.4.16",
-    "@mikro-orm/knex": "^6.4.16",
-    "@mikro-orm/migrations": "^6.4.16",
-    "@mikro-orm/postgresql": "^6.4.16",
+    "@medusajs/admin-sdk": "^2.10.1",
+    "@medusajs/cli": "^2.10.1",
+    "@medusajs/framework": "^2.10.1",
+    "@medusajs/icons": "^2.10.1",
+    "@medusajs/medusa": "^2.10.1",
+    "@medusajs/test-utils": "^2.10.1",
+    "@medusajs/types": "^2.10.1",
+    "@medusajs/ui": "^4.0.21",
+    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/postgresql": "6.4.3",
     "@swc/core": "1.5.7",
-    "@types/node": "^20.19.1",
-    "@types/react": "^18.3.23",
+    "@types/node": "^20.19.11",
+    "@types/react": "^18.3.24",
     "@types/react-dom": "^18.3.7",
     "awilix": "^8.0.1",
-    "pg": "^8.16.2",
-    "prettier": "^3.6.0",
+    "pg": "^8.16.3",
+    "prettier": "^3.6.2",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2",
+    "typescript": "^5.9.2",
     "vite": "^5.4.19",
     "yalc": "^1.0.0-pre.53"
   },
   "peerDependencies": {
-    "@medusajs/admin-sdk": "^2.8.4",
-    "@medusajs/cli": "^2.8.4",
-    "@medusajs/core-flows": "^2.8.4",
-    "@medusajs/framework": "^2.8.4",
-    "@medusajs/icons": "^2.8.4",
-    "@medusajs/js-sdk": "^2.8.4",
-    "@medusajs/medusa": "^2.8.4",
-    "@medusajs/test-utils": "^2.8.4",
+    "@medusajs/admin-sdk": "^2.10.1",
+    "@medusajs/cli": "^2.10.1",
+    "@medusajs/core-flows": "^2.10.1",
+    "@medusajs/framework": "^2.10.1",
+    "@medusajs/icons": "^2.10.1",
+    "@medusajs/js-sdk": "^2.10.1",
+    "@medusajs/medusa": "^2.10.1",
+    "@medusajs/test-utils": "^2.10.1",
     "@medusajs/ui": "^4.0.3",
     "@mikro-orm/cli": "6.4.3",
     "@mikro-orm/core": "6.4.3",